Merge pull request 'fix: bug修复' (#12) from master into dev

Reviewed-on: https://git.landaiqing.space/Schisandra-Cloud-Storage/schisandra-cloud-storage/pulls/12

schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDTOConverter.java.vm

@@ -5,6 +5,8 @@ import com.schisandra.${module}.domain.bo.${modelName}BO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
+import java.util.List;
+
 /**
  * ${tableComment} dto转换器
  *
@@ -18,5 +20,6 @@ public interface ${modelName}DTOConverter {
 
     ${modelName}BO convertDTOToBO(${modelName}DTO ${_modelName}DTO);
     ${modelName}DTO convertBOToDTO(${modelName}BO ${_modelName}BO);
+    List<${modelName}DTO> convertBOToDTOList(List<${modelName}BO> ${_modelName}BOList);
 
 }

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

@@ -16,6 +16,7 @@ import com.schisandra.oss.domain.bo.SchisandraOssMinioBO;
 import com.schisandra.oss.domain.redis.RedisUtil;
 import com.schisandra.oss.domain.service.SchisandraOssAliDomainService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -73,7 +74,7 @@ public class SchisandraOssAliController {
         Preconditions.checkNotNull(userId, "用户id不能为空！");
         SchisandraOssAliBO bo = new SchisandraOssAliBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.ALI+ userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(true));
         if(schisandraOssAliDomainService.update(bo)){
             return aliOssConfiguration.aliOssClient(userId);
@@ -89,7 +90,7 @@ public class SchisandraOssAliController {
         }
         SchisandraOssAliBO bo = new SchisandraOssAliBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.ALI + userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(false));
         if(schisandraOssAliDomainService.update(bo)){
             SpringUtil.unregisterBean(OssConstant.OssType.ALI+ userId);
@@ -186,7 +187,7 @@ public class SchisandraOssAliController {
      * @param userId
      */
     @PostMapping("seleteBucket")
-    public Result<String> seleteBucket(@RequestParam String userId) {
+    public Result seleteBucket(@RequestParam String userId) {
         Preconditions.checkNotNull(userId, "不能为空");
         AliOssClient bean = SpringUtil.getBean(OssConstant.OssType.ALI+ userId);
         if(bean.selectAllBucket() != null){
@@ -225,7 +226,7 @@ public class SchisandraOssAliController {
      * @return
      */
     @PostMapping("deleteBucket")
-    public Result<String> deleteBucket(@RequestParam String userId, @RequestParam String bucket) {
+    public Result deleteBucket(@RequestParam String userId, @RequestParam String bucket) {
         Preconditions.checkNotNull(userId, "不能为空");
         Preconditions.checkNotNull(bucket, "不能为空");
         AliOssClient bean = SpringUtil.getBean(OssConstant.OssType.ALI + userId);

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

@@ -87,7 +87,7 @@ public class SchisandraOssMinioController {
         Preconditions.checkNotNull(userId, "用户id不能为空！");
         SchisandraOssMinioBO bo = new SchisandraOssMinioBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.MINIO + userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(true));
         if(schisandraOssMinioDomainService.update(bo)){
             return minioOssConfiguration.minioOssClient(userId);
@@ -103,7 +103,7 @@ public class SchisandraOssMinioController {
         }
         SchisandraOssMinioBO bo = new SchisandraOssMinioBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.MINIO + userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(false));
         if(schisandraOssMinioDomainService.update(bo)){
             SpringUtil.unregisterBean(OssConstant.OssType.MINIO + userId);

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

@@ -287,7 +287,7 @@ public class SchisandraOssQiniuController {
         Preconditions.checkNotNull(userId, "用户id不能为空！");
         SchisandraOssQiniuBO bo = new SchisandraOssQiniuBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.QINIU+ userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(true));
         if(schisandraOssQiniuDomainService.update(bo)){
             return qiNiuOssConfiguration.qiNiuOssClient(userId);
@@ -303,7 +303,7 @@ public class SchisandraOssQiniuController {
         }
         SchisandraOssQiniuBO bo = new SchisandraOssQiniuBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.QINIU + userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(false));
         if(schisandraOssQiniuDomainService.update(bo)){
             SpringUtil.unregisterBean(OssConstant.OssType.QINIU + userId);

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssSftpController.java

@@ -193,7 +193,7 @@ public class SchisandraOssSftpController {
         Preconditions.checkNotNull(userId, "用户id不能为空！");
         SchisandraOssSftpBO bo = new SchisandraOssSftpBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.SFTP+ userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(true));
         if(schisandraOssSftpDomainService.update(bo)){
             return sftpOssConfiguration.sftpOssClient(userId);
@@ -209,7 +209,7 @@ public class SchisandraOssSftpController {
         }
         SchisandraOssSftpBO bo = new SchisandraOssSftpBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.SFTP + userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(false));
         if(schisandraOssSftpDomainService.update(bo)){
             SpringUtil.unregisterBean(OssConstant.OssType.SFTP+ userId);

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

@@ -77,7 +77,7 @@ public class SchisandraOssTencentController {
         Preconditions.checkNotNull(userId, "用户id不能为空！");
         SchisandraOssTencentBO bo = new SchisandraOssTencentBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.TENCENT+ userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(true));
         if(schisandraOssTencentDomainService.update(bo)){
             return tencentOssConfiguration.tencentOssClient(userId);
@@ -93,7 +93,7 @@ public class SchisandraOssTencentController {
         }
         SchisandraOssTencentBO bo = new SchisandraOssTencentBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.TENCENT + userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(false));
         if(schisandraOssTencentDomainService.update(bo)){
             SpringUtil.unregisterBean(OssConstant.OssType.TENCENT+ userId);

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

@@ -69,7 +69,7 @@ public class SchisandraOssUpController {
         Preconditions.checkNotNull(userId, "用户id不能为空！");
         SchisandraOssUpBO bo = new SchisandraOssUpBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.UP+ userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(true));
         if(schisandraOssUpDomainService.update(bo)){
             return upOssConfiguration.upOssClient(userId);
@@ -85,7 +85,7 @@ public class SchisandraOssUpController {
         }
         SchisandraOssUpBO bo = new SchisandraOssUpBO();
         bo.setId(Long.valueOf(Id));
-        bo.setUserId(Long.valueOf(OssConstant.OssType.UP + userId));
+        bo.setUserId(Long.valueOf(userId));
         bo.setStatus(String.valueOf(false));
         if(schisandraOssUpDomainService.update(bo)){
             SpringUtil.unregisterBean(OssConstant.OssType.UP+ userId);

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/dto/SchisandraUserOssDTO.java

@@ -33,6 +33,10 @@ public class SchisandraUserOssDTO implements Serializable {
      * 
      */
     private String icon;
+    /**
+     *
+     */
+    private String configCount;
 
     /**
      * 

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/minio/MinioOssConfiguration.java

@@ -2,17 +2,12 @@ package com.schisandra.oss.application.oss.core.minio;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.schisandra.oss.application.convert.SchisandraOssAliDTOConverter;
 import com.schisandra.oss.application.convert.SchisandraOssMinioDTOConverter;
-import com.schisandra.oss.application.dto.SchisandraOssAliDTO;
 import com.schisandra.oss.application.dto.SchisandraOssMinioDTO;
 import com.schisandra.oss.application.oss.constant.OssConstant;
-import com.schisandra.oss.application.oss.core.StandardOssClient;
-import com.schisandra.oss.application.oss.core.ali.model.AliOssConfig;
 import com.schisandra.oss.application.oss.core.minio.model.MinioOssClientConfig;
 import com.schisandra.oss.application.oss.core.minio.model.MinioOssConfig;
 import com.schisandra.oss.common.entity.Result;
-import com.schisandra.oss.domain.bo.SchisandraOssAliBO;
 import com.schisandra.oss.domain.bo.SchisandraOssMinioBO;
 import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService;
 import io.minio.MinioClient;
@@ -21,8 +16,6 @@ import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -35,9 +28,6 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class MinioOssConfiguration {
 
-    @Resource
-    MinioOssConfiguration minioOssConfiguration;
-
     @Resource
     private SchisandraOssMinioDomainService schisandraOssMinioDomainService;
 
@@ -58,31 +48,16 @@ public class MinioOssConfiguration {
         minioOssConfig.setAccessKey(minio.getAccessKey());
         minioOssConfig.setSecretKey(minio.getSecretKey());
         minioOssConfig.setBasePath(minio.getBasePath());
-        try{
+        try {
-            SpringUtil.registerBean(OssConstant.OssType.MINIO+ userId, minioOssClient(minioOssConfig));
+            SpringUtil.registerBean(OssConstant.OssType.MINIO + userId, minioOssClient(minioOssConfig));
             return Result.ok();
-        }catch(Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return Result.fail();
         }
     }
 
-
+    public MinioOssClient minioOssClient(MinioOssConfig minioOssConfig) {
-    public SchisandraOssMinioDTO getSchisandraOssMinioDTO(String userId) {
-        CompletableFuture<SchisandraOssMinioDTO> futurePrice = CompletableFuture.supplyAsync(() -> {
-            SchisandraOssMinioBO minioBO = schisandraOssMinioDomainService.getMinioConfig(Long.valueOf(userId));
-            SchisandraOssMinioDTO minioDTO = SchisandraOssMinioDTOConverter.INSTANCE.convertBOToDTO(minioBO);
-            return minioDTO;
-        });
-        SchisandraOssMinioDTO minio = futurePrice.join();
-        if (ObjectUtil.isEmpty(minio)) {
-            log.error("minio配置信息获取失败");
-            return null;
-        }
-        return minio;
-    }
-
-    public StandardOssClient minioOssClient(MinioOssConfig minioOssConfig) {
         return new MinioOssClient(minioClient(minioOssConfig), minioOssConfig);
     }
 

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/bo/SchisandraUserOssBO.java

@@ -37,6 +37,10 @@ public class SchisandraUserOssBO implements Serializable {
      * 
      */
     private String name;
+    /**
+     *
+     */
+    private String configCount;
 
     /**
      * 

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/entity/SchisandraUserOss.java

@@ -58,6 +58,12 @@ public class SchisandraUserOss implements Serializable {
     @Column("bucket_count")
     private Integer bucketCount;
 
+    /**
+     *
+     */
+    @Column("config_count")
+    private String configCount;
+
     /**
      * 创建人
      */

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssAliServiceImpl.java

@@ -48,7 +48,7 @@ public class SchisandraOssAliServiceImpl implements SchisandraOssAliService {
      */
     @Override
     public int insert(SchisandraOssAli schisandraOssAli) {
-        return this.schisandraOssAliDao.insert(schisandraOssAli);
+        return this.schisandraOssAliDao.insertSelective(schisandraOssAli);
     }
 
     /**

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/resources/mapper/SchisandraUserOssDao.xml

@@ -9,6 +9,7 @@
         <result column="icon" jdbcType="VARCHAR" property="icon"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="bucket_count" jdbcType="INTEGER" property="bucketCount"/>
+        <result column="config_count" jdbcType="INTEGER" property="configCount"/>
         <result column="created_by" jdbcType="VARCHAR" property="createdBy"/>
         <result column="created_time" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>