323 Commits

Author SHA1 Message Date
3c051638e4 feat: 返回当前用户该厂商所有数据 2024-07-16 23:55:28 +08:00
landaiqing
098533dcbc Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 23:49:58 +08:00
15a745b76d feat: 返回当前用户该厂商所有数据 2024-07-16 23:48:56 +08:00
landaiqing
cc1a8d8c89 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 18:57:20 +08:00
zlg
d7627831a7 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssQiniuController.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssTencentController.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssQiniuDomainService.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssQiniuDomainServiceImpl.java
2024-07-16 18:56:42 +08:00
zlg
a3a11880f7 fix: 多线程下载 2024-07-16 18:54:01 +08:00
landaiqing
0c2afcc37e Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 18:51:58 +08:00
6e4bbc4d51 feat: 新增当前用户该厂商所有数据 2024-07-16 17:09:50 +08:00
landaiqing
118ea40ad3 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 16:37:48 +08:00
b58f128d1a feat: 新增分享详细信息 2024-07-16 16:37:32 +08:00
landaiqing
72c6362c01 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 15:37:16 +08:00
zlg
29e17a2629 fix: 格式修正 2024-07-16 15:36:36 +08:00
zlg
c94acc5eff fix: 格式修正 2024-07-16 14:28:20 +08:00
landaiqing
2cf64967cc Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 11:45:00 +08:00
zlg
eb5a6d0e3a fix: 咖啡因缓存设置,桶与大小分离 2024-07-16 11:41:25 +08:00
landaiqing
5a40bed48f Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 11:37:05 +08:00
zlg
35ae89ad3e feat: 咖啡因缓存设置,桶与大小分离 2024-07-16 11:26:45 +08:00
landaiqing
ad510f3881 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-16 11:16:43 +08:00
zlg
02ffaac9c1 Merge remote-tracking branch 'origin/dev' into dev 2024-07-16 11:14:48 +08:00
zlg
cde9d27343 fix: 数据格式修复 2024-07-16 11:14:16 +08:00
landaiqing
86b8689ca5 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-15 23:19:55 +08:00
12463389cf feat: aliOssClient 2024-07-15 23:19:10 +08:00
landaiqing
779e1b33fc Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-15 23:17:15 +08:00
0cc06a171c feat: 分享圈列表,分享详情 2024-07-15 23:14:46 +08:00
landaiqing
28e0b5bce8 Merge remote-tracking branch 'origin/master' 2024-07-15 23:09:43 +08:00
b7131639c8 Merge pull request 'dev' (#13) from dev into master
Reviewed-on: https://git.landaiqing.space/Schisandra-Cloud-Storage/schisandra-cloud-storage/pulls/13
2024-07-15 23:09:33 +08:00
landaiqing
e631afd8a5 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-15 23:06:07 +08:00
5e868abcd7 Merge remote-tracking branch 'origin/dev' into dev 2024-07-15 23:05:38 +08:00
landaiqing
e11383d3c2 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-15 22:35:43 +08:00
zlg
dd05dfd4aa fix: 缓存设置 2024-07-15 22:25:59 +08:00
e96e608a20 Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2024-07-15 20:50:04 +08:00
landaiqing
0af1bb572f feat: 获取分享列表接口 2024-07-15 20:45:12 +08:00
4ff9808d96 Merge remote-tracking branch 'origin/dev' into dev 2024-07-15 14:23:18 +08:00
zlg
6b72a0eddf fix: 查询桶 2024-07-15 14:22:52 +08:00
landaiqing
14530e56e7 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-15 14:10:45 +08:00
f08595b517 Merge remote-tracking branch 'origin/dev' into dev 2024-07-15 14:10:18 +08:00
zlg
cb3cc9d9f5 feat: 近期文件模块设计 2024-07-15 14:09:20 +08:00
landaiqing
040bc71d14 Merge remote-tracking branch 'refs/remotes/origin/dev' 2024-07-15 11:27:48 +08:00
b75c5b5fcc Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2024-07-15 09:34:37 +08:00
landaiqing
17c8c4aba0 feat: 生成分享框架 2024-07-15 09:28:15 +08:00
d8007b6c72 Merge pull request 'fix: bug修复' (#12) from master into dev
Reviewed-on: https://git.landaiqing.space/Schisandra-Cloud-Storage/schisandra-cloud-storage/pulls/12
2024-07-13 21:07:49 +08:00
landaiqing
161e7791db fix: bug修复 2024-07-13 21:07:03 +08:00
d2a73d9771 feat: ①up,tencent,minio,qiniu,ali,sftp添加convertEntityToBOList ②注册注销bean(init,shutdown) ③controller层部分返回未修改->Result.ok 2024-07-13 20:27:38 +08:00
4693ce76e6 Merge pull request 'master' (#11) from master into dev
Reviewed-on: https://git.landaiqing.space/Schisandra-Cloud-Storage/schisandra-cloud-storage/pulls/11
2024-07-13 11:32:05 +08:00
landaiqing
d6a5ffc708 styles: 代码格式化 2024-07-13 11:30:20 +08:00
landaiqing
0983a79953 Merge remote-tracking branch 'refs/remotes/origin/dev'
# Conflicts:
#	schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssUpController.java
2024-07-13 11:24:21 +08:00
6d61672239 feat: selectAll,返回所有数据 2024-07-12 22:31:56 +08:00
6cf096219f feat: selectAll,返回所有数据 2024-07-12 22:31:28 +08:00
5874fe1c2a feat: sftp 2024-07-12 19:45:13 +08:00
cb4a20c8ed feat: ali、qiniu上传文件热力图配置 2024-07-12 11:45:23 +08:00