From e4db3d15429e1a774db078433040bc8d4cd80286 Mon Sep 17 00:00:00 2001
From: landaiqing <3517283258@qq.com>
Date: Mon, 24 Jun 2024 16:58:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pom.xml                                   | 29 +++++++++++++++++++
 .../oss/core/ali/AliOssConfiguration.java     | 18 +-----------
 .../oss/core/aws/AwsOssConfiguration.java     |  4 +--
 .../oss/core/baidu/BaiduOssConfiguration.java |  4 +--
 .../oss/core/ftp/FtpOssConfiguration.java     |  3 +-
 .../oss/core/minio/MinioOssConfiguration.java |  4 +--
 .../pom.xml                                   | 25 ----------------
 7 files changed, 38 insertions(+), 49 deletions(-)

diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/pom.xml b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/pom.xml
index 82cbaea..820c8e8 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/pom.xml
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/pom.xml
@@ -74,5 +74,34 @@
             <artifactId>schisandra-cloud-storage-oss-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
+        <!--minio-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- 阿里云 -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <scope>provided</scope>
+            <version>3.14.0</version>
+        </dependency>
+        <!-- 亚马逊 -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <version>2.17.160</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- 百度云对象存储 -->
+        <dependency>
+            <groupId>com.baidubce</groupId>
+            <artifactId>bce-java-sdk</artifactId>
+            <version>0.10.196</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssConfiguration.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssConfiguration.java
index ac3f718..2d9e3ee 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssConfiguration.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssConfiguration.java
@@ -1,37 +1,21 @@
 package com.schisandra.oss.application.oss.core.ali;
 
-import cn.hutool.core.text.CharPool;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSClientBuilder;
-
 import com.aliyun.oss.common.comm.Protocol;
 import com.schisandra.oss.application.convert.SchisandraOssAliDTOConverter;
 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.AliOssClientConfig;
 import com.schisandra.oss.application.oss.core.ali.model.AliOssConfig;
-import com.schisandra.oss.application.oss.core.minio.MinioOssClient;
 import com.schisandra.oss.domain.bo.SchisandraOssAliBO;
 import com.schisandra.oss.domain.service.SchisandraOssAliDomainService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
@@ -56,7 +40,7 @@ public class AliOssConfiguration {
             return schisandraOssAliDTO;
         });
         SchisandraOssAliDTO ali = futurePrice.join();
-        if (ObjectUtils.isEmpty(ali)) {
+        if (ObjectUtil.isEmpty(ali)) {
             log.error("ali oss配置信息获取失败");
             return null;
         }
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/AwsOssConfiguration.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/AwsOssConfiguration.java
index 4ff15b6..1f7a930 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/AwsOssConfiguration.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/aws/AwsOssConfiguration.java
@@ -1,5 +1,6 @@
 package com.schisandra.oss.application.oss.core.aws;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.schisandra.oss.application.convert.SchisandraOssAwsDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssAwsDTO;
 import com.schisandra.oss.application.oss.core.StandardOssClient;
@@ -9,7 +10,6 @@ import com.schisandra.oss.application.oss.core.aws.model.AwsOssConfig;
 import com.schisandra.oss.domain.bo.SchisandraOssAwsBO;
 import com.schisandra.oss.domain.service.SchisandraOssAwsDomainService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Component;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.awscore.defaultsmode.DefaultsMode;
@@ -32,7 +32,7 @@ public class AwsOssConfiguration {
     public StandardOssClient awsOssClient(String userId) {
         SchisandraOssAwsBO schisandraOssAwsBO = schisandraOssAwsDomainService.getAwsOssConfig(userId);
         SchisandraOssAwsDTO schisandraOssAwsDTO = SchisandraOssAwsDTOConverter.INSTANCE.convertBOToDTO(schisandraOssAwsBO);
-        if (ObjectUtils.isEmpty(schisandraOssAwsDTO)) {
+        if (ObjectUtil.isEmpty(schisandraOssAwsDTO)) {
             log.error("AWS oss配置信息获取失败");
             return null;
         }
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/baidu/BaiduOssConfiguration.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/baidu/BaiduOssConfiguration.java
index 023e1c3..4eaf343 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/baidu/BaiduOssConfiguration.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/baidu/BaiduOssConfiguration.java
@@ -1,5 +1,6 @@
 package com.schisandra.oss.application.oss.core.baidu;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baidubce.auth.DefaultBceCredentials;
 import com.baidubce.services.bos.BosClient;
 import com.baidubce.services.bos.BosClientConfiguration;
@@ -11,7 +12,6 @@ import com.schisandra.oss.application.oss.core.baidu.model.BaiduOssConfig;
 import com.schisandra.oss.domain.bo.SchisandraOssBaiduBO;
 import com.schisandra.oss.domain.service.SchisandraOssBaiduDomainService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -33,7 +33,7 @@ public class BaiduOssConfiguration {
     public StandardOssClient baiduOssClient(String userId) {
         SchisandraOssBaiduBO schisandraOssBaiduBO = schisandraOssBaiduDomainService.getBaiduOssConfig(userId);
         SchisandraOssBaiduDTO schisandraOssBaiduDTO = SchisandraOssBaiduDTOConverter.INSTANCE.convertBOToDTO(schisandraOssBaiduBO);
-        if (ObjectUtils.isEmpty(schisandraOssBaiduDTO)) {
+        if (ObjectUtil.isEmpty(schisandraOssBaiduDTO)) {
             log.error("Baidu oss配置信息获取失败");
             return null;
         }
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ftp/FtpOssConfiguration.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ftp/FtpOssConfiguration.java
index 1ae85f6..5482722 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ftp/FtpOssConfiguration.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ftp/FtpOssConfiguration.java
@@ -1,5 +1,6 @@
 package com.schisandra.oss.application.oss.core.ftp;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.ftp.Ftp;
 import com.schisandra.oss.application.convert.SchisandraOssFtpDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssFtpDTO;
@@ -30,7 +31,7 @@ public class FtpOssConfiguration {
     public StandardOssClient ftpOssClient(String userId) {
         SchisandraOssFtpBO schisandraOssFtpBO = schisandraOssFtpDomainService.getFtpOssConfig(userId);
         SchisandraOssFtpDTO schisandraOssFtpDTO = SchisandraOssFtpDTOConverter.INSTANCE.convertBOToDTO(schisandraOssFtpBO);
-        if (ObjectUtils.isEmpty(schisandraOssFtpDTO)) {
+        if (ObjectUtil.isEmpty(schisandraOssFtpDTO)) {
             log.error("ftp oss配置信息获取失败");
             return null;
         }
diff --git a/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 b/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
index 4a1cd39..e64035a 100644
--- a/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
+++ b/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
@@ -1,5 +1,6 @@
 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.SchisandraOssMinioDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssMinioDTO;
@@ -13,7 +14,6 @@ import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService;
 import io.minio.MinioClient;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -76,7 +76,7 @@ public class MinioOssConfiguration {
             return minioDTO;
         });
         SchisandraOssMinioDTO minio = futurePrice.join();
-        if (ObjectUtils.isEmpty(minio)) {
+        if (ObjectUtil.isEmpty(minio)) {
             log.error("minio配置信息获取失败");
             return null;
         }
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/pom.xml b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/pom.xml
index d057318..727f363 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/pom.xml
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/pom.xml
@@ -106,35 +106,10 @@
             <version>5.1.1</version>
             <scope>compile</scope>
         </dependency>
-        <!--minio-->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>8.2.1</version>
-        </dependency>
         <dependency>
             <groupId>net.coobird</groupId>
             <artifactId>thumbnailator</artifactId>
             <version>0.4.8</version>
         </dependency>
-        <!-- 阿里云 -->
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.14.0</version>
-        </dependency>
-        <!-- 亚马逊 -->
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>s3</artifactId>
-            <version>2.17.160</version>
-        </dependency>
-        <!-- 百度云对象存储 -->
-        <dependency>
-            <groupId>com.baidubce</groupId>
-            <artifactId>bce-java-sdk</artifactId>
-            <version>0.10.196</version>
-        </dependency>
-
     </dependencies>
 </project>