Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zlg
2024-07-18 21:13:27 +08:00
parent 93fb58c4c5 7fd623d94c
commit 4e7b60af25
11 changed files with 140 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java
View File

@@ -413,7 +413,7 @@ public class SchisandraOssAliController {
private void parameterCheck(SchisandraOssAliDTO schisandraOssAliDTO) {
Preconditions.checkNotNull(schisandraOssAliDTO.getId(), "不能为空");
Preconditions.checkNotNull(schisandraOssAliDTO.getId(), "ID不能为空");
Preconditions.checkNotNull(schisandraOssAliDTO.getEndpoint(), "OSS地址不能为空");
Preconditions.checkNotNull(schisandraOssAliDTO.getAccessKeyId(), "AccessKey ID不能为空");
Preconditions.checkNotNull(schisandraOssAliDTO.getAccessKeySecret(), "AccessKey Secret不能为空");

2
schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java
View File

@@ -66,7 +66,7 @@ public class SchisandraOssAliDomainServiceImpl implements SchisandraOssAliDomain
@Override
public Boolean delete(SchisandraOssAliBO schisandraOssAliBO) {
SchisandraUserOss userOss = schisandraUserOssService.queryOSSByTypeAndUserId(schisandraOssAliBO.getUserId(), String.valueOf(OssType.ALI));
SchisandraUserOss userOss = schisandraUserOssService.queryOSSByTypeAndUserId(schisandraOssAliBO.getUserId(), OssType.ALI.type);
userOss.setConfigCount(userOss.getConfigCount()-1);
schisandraUserOssService.update(userOss);
SchisandraOssAli schisandraOssAli = new SchisandraOssAli();