first commit

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/OssOptions.java

@@ -2,6 +2,8 @@ package com.fdkankan.filestorage;
 
 
 
+import org.springframework.stereotype.Service;
+
 import java.io.File;
 import java.io.InputStream;
 import java.util.List;
@@ -11,7 +13,8 @@ import java.util.List;
  * <p>
  * 上传文件: uploadXxx 下载文件: downloadXxx
  */
-public interface OssOptions  {
+@Service
+public interface FileStorageTemplate {
 
     //------------------------------------------------------------------
     // 上传文件
@@ -86,6 +89,7 @@ public interface OssOptions  {
     boolean doesObjectExist(String keyName);
 
     String getBucket();
+    String getActive();
     String calculateUrl(String pathKey);
     String calculateUrl(String bucket, String pathKey);
 }

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/StorageAutoConfiguration.java

@@ -23,10 +23,12 @@ import com.qcloud.cos.auth.COSCredentials;
 import com.qcloud.cos.http.HttpProtocol;
 import com.qcloud.cos.region.Region;
 import io.minio.MinioClient;
+import org.springframework.beans.factory.annotation.Qualifier;
 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.context.annotation.Primary;
 
 /**
  * @author Xiewj
@@ -45,8 +47,10 @@ public class StorageAutoConfiguration {
                 properties.getConfig());
     }
     @Bean
+    @Qualifier("oss")
+    @Primary
     @ConditionalOnProperty(name = "filestorage.active",havingValue = "oss")
-    public AliyunOssTemplate aliyunOssTemplate(OSS oss, AliyunOssProperties properties) {
+    public FileStorageTemplate aliyunOssTemplate(OSS oss, AliyunOssProperties properties) {
         return new  AliyunOssTemplate(oss, properties);
     }
 
@@ -69,8 +73,9 @@ public class StorageAutoConfiguration {
 
 
     @Bean
+    @Qualifier("awss3")
     @ConditionalOnProperty(name = "filestorage.active",havingValue = "awss3")
-    public AwsTemplate AwsOssTemplate(AmazonS3 oss, AwsProperties properties) {
+    public FileStorageTemplate AwsOssTemplate(AmazonS3 oss, AwsProperties properties) {
         return new AwsTemplate(oss, properties);
     }
 
@@ -98,8 +103,9 @@ public class StorageAutoConfiguration {
 
 
     @Bean
+    @Qualifier("cos")
     @ConditionalOnProperty(name = "filestorage.active",havingValue = "cos")
-    public CosTemplate cosTemplate(COSClient ossClient, CosProperties properties) {
+    public FileStorageTemplate cosTemplate(COSClient ossClient, CosProperties properties) {
         return new CosTemplate(ossClient, properties);
     }
     @Bean
@@ -113,8 +119,9 @@ public class StorageAutoConfiguration {
 
 
     @Bean
+    @Qualifier("minio")
     @ConditionalOnProperty(name = "filestorage.active",havingValue = "minio")
-    public MinioTemplate minioOssTemplate(MinioClient oss, MinioProperties properties) {
+    public FileStorageTemplate minioOssTemplate(MinioClient oss, MinioProperties properties) {
         return new MinioTemplate(oss, properties);
     }
 

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/aliyun/AliyunOssTemplate.java

@@ -8,12 +8,11 @@ import com.aliyun.oss.ServiceException;
 import com.aliyun.oss.model.*;
 import com.fdkankan.filestorage.Consumer;
 import com.fdkankan.filestorage.InnerUtils;
-import com.fdkankan.filestorage.OssOptions;
+import com.fdkankan.filestorage.FileStorageTemplate;
 import com.fdkankan.filestorage.properties.AliyunOssProperties;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Base64Utils;
 import org.springframework.util.CollectionUtils;
@@ -34,11 +33,16 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service("AliyunOssTemplate")
 @ConditionalOnProperty(prefix = AliyunOssProperties.PREFIX,name = "filestorage.active",havingValue = "oss")
-public class AliyunOssTemplate implements OssOptions {
+public class AliyunOssTemplate implements FileStorageTemplate {
 
     private final OSS ossClient;
     private final AliyunOssProperties ossProperties;
 
+    @Override
+    public String getActive() {
+        return this.ossProperties.getActive();
+    }
+
     public AliyunOssTemplate(OSS ossClient, AliyunOssProperties ossProperties) {
         this.ossClient = ossClient;
         this.ossProperties = ossProperties;

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/aws/AwsTemplate.java

@@ -12,7 +12,7 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.*;
 import com.fdkankan.filestorage.Consumer;
 import com.fdkankan.filestorage.InnerUtils;
-import com.fdkankan.filestorage.OssOptions;
+import com.fdkankan.filestorage.FileStorageTemplate;
 import com.fdkankan.filestorage.properties.AwsProperties;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -35,19 +35,22 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service("AwsOssTemplate")
 @ConditionalOnProperty(prefix = AwsProperties.PREFIX,name = "filestorage.active",havingValue = "awss3")
-public class AwsTemplate implements OssOptions {
+public class AwsTemplate implements FileStorageTemplate {
 
     private final AmazonS3 amazonS3Client;
-    private final AwsProperties ossProperties;
-
-    public AwsTemplate(AmazonS3 amazonS3Client, AwsProperties ossProperties) {
+    private final AwsProperties awsProperties;
+    @Override
+    public String getActive() {
+        return this.awsProperties.getActive();
+    }
+    public AwsTemplate(AmazonS3 amazonS3Client, AwsProperties awsProperties) {
         this.amazonS3Client = amazonS3Client;
-        this.ossProperties = ossProperties;
+        this.awsProperties = awsProperties;
     }
 
     @Override
     public String uploadFile(String pathKey, String filePath) {
-        return uploadFile(ossProperties.getBucket(), pathKey, filePath);
+        return uploadFile(awsProperties.getBucket(), pathKey, filePath);
     }
 
     @Override
@@ -60,7 +63,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public String uploadFileText(String pathKey, String content) {
-        return uploadFileText(ossProperties.getBucket(), pathKey, content);
+        return uploadFileText(awsProperties.getBucket(), pathKey, content);
     }
 
     @Override
@@ -71,7 +74,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public String uploadFileBase64Image(String pathKey, String content) {
-        return uploadFileBase64Image(ossProperties.getBucket(), pathKey, content);
+        return uploadFileBase64Image(awsProperties.getBucket(), pathKey, content);
     }
 
     @Override
@@ -82,16 +85,16 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public String uploadFileBytes(String pathKey, byte[] bytes) {
-        return uploadFileBytes(ossProperties.getBucket(), pathKey, bytes);
+        return uploadFileBytes(awsProperties.getBucket(), pathKey, bytes);
     }
 
     public void createbucket() {
         try {
-            if (StrUtil.isEmpty(ossProperties.getBucket())) {
+            if (StrUtil.isEmpty(awsProperties.getBucket())) {
                 throw new IllegalArgumentException("桶名称不能为空!");
             }
             try {
-                amazonS3Client.createBucket(ossProperties.getBucket());
+                amazonS3Client.createBucket(awsProperties.getBucket());
             } catch (SdkClientException e) {
                 e.printStackTrace();
             }
@@ -108,7 +111,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public String uploadFileStream(String pathKey, InputStream stream) {
-        return uploadFileStream(ossProperties.getBucket(), pathKey, stream);
+        return uploadFileStream(awsProperties.getBucket(), pathKey, stream);
     }
 
     @Override
@@ -142,7 +145,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public File downloadFileTmp(String pathKey) {
-        return downloadFileTmp(ossProperties.getBucket(), pathKey);
+        return downloadFileTmp(awsProperties.getBucket(), pathKey);
     }
 
     @Override
@@ -155,7 +158,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public ObjectMetadata downloadFile(String pathKey, String file) {
-        return downloadFile(ossProperties.getBucket(), pathKey, file);
+        return downloadFile(awsProperties.getBucket(), pathKey, file);
     }
 
     @Override
@@ -176,7 +179,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public ObjectMetadata downloadFile(String pathKey, Consumer<InputStream> handler) {
-        return downloadFile(ossProperties.getBucket(), pathKey, handler);
+        return downloadFile(awsProperties.getBucket(), pathKey, handler);
     }
 
     @Override
@@ -204,11 +207,11 @@ public class AwsTemplate implements OssOptions {
     }
 
     public String calculateUrl(String pathKey) {
-        return calculateUrl(ossProperties.getBucket(), pathKey);
+        return calculateUrl(awsProperties.getBucket(), pathKey);
     }
 
     public String calculateUrl(String bucket, String pathKey) {
-        String host = ossProperties.getHostByBucket(bucket);
+        String host = awsProperties.getHostByBucket(bucket);
         return host + "/" + pathKey;
     }
 
@@ -230,7 +233,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public Boolean copyObject(String oldPath, String newPath) {
-        return copyObject(ossProperties.getBucket(), oldPath, ossProperties.getBucket(), newPath);
+        return copyObject(awsProperties.getBucket(), oldPath, awsProperties.getBucket(), newPath);
     }
 
     @Override
@@ -259,7 +262,7 @@ public class AwsTemplate implements OssOptions {
     @Override
     public void deleteObject(String keyName) {
         if (doesObjectExist(keyName)) {
-            deleteObject(ossProperties.getBucket(), keyName);
+            deleteObject(awsProperties.getBucket(), keyName);
         } else {
             log.warn("文件不存在,KeyName{}", keyName);
         }
@@ -278,7 +281,7 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public List<String> getFileFolder(String keyName) {
-        return getFileFolder(ossProperties.getBucket(), keyName);
+        return getFileFolder(awsProperties.getBucket(), keyName);
     }
 
     @Override
@@ -331,7 +334,7 @@ public class AwsTemplate implements OssOptions {
     }
     @Override
     public String getBucket() {
-        return ossProperties.getBucket();
+        return awsProperties.getBucket();
     }
 
     @Override
@@ -349,17 +352,17 @@ public class AwsTemplate implements OssOptions {
 
     @Override
     public boolean ossDownloadFileToLocal(String path, String localPath) {
-        return ossDownloadFileToLocal(ossProperties.getBucket(),path,localPath);
+        return ossDownloadFileToLocal(awsProperties.getBucket(),path,localPath);
     }
 
     @Override
     public boolean doesObjectExist(String keyName) {
-        return doesObjectExist(ossProperties.getBucket(), keyName);
+        return doesObjectExist(awsProperties.getBucket(), keyName);
     }
 
     @Override
     public String uploadFileImage(String pathKey, String filePath) {
-        return uploadFileImage(ossProperties.getBucket(), pathKey, filePath);
+        return uploadFileImage(awsProperties.getBucket(), pathKey, filePath);
     }
 
     @Override

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/cos/CosTemplate.java

@@ -5,24 +5,21 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.fdkankan.filestorage.Consumer;
 import com.fdkankan.filestorage.InnerUtils;
-import com.fdkankan.filestorage.OssOptions;
+import com.fdkankan.filestorage.FileStorageTemplate;
 import com.fdkankan.filestorage.properties.CosProperties;
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.model.*;
-import com.qcloud.cos.utils.Md5Utils;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Base64Utils;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -34,19 +31,22 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service("CosTemplate")
 @ConditionalOnProperty(prefix = CosProperties.PREFIX,name = "filestorage.active",havingValue = "cos")
-public class CosTemplate implements OssOptions {
+public class CosTemplate implements FileStorageTemplate {
 
     private final COSClient cosClient;
-    private final CosProperties ossProperties;
-
-    public CosTemplate(COSClient ossClient, CosProperties ossProperties) {
+    private final CosProperties cosProperties;
+    @Override
+    public String getActive() {
+        return this.cosProperties.getActive();
+    }
+    public CosTemplate(COSClient ossClient, CosProperties cosProperties) {
         this.cosClient = ossClient;
-        this.ossProperties = ossProperties;
+        this.cosProperties = cosProperties;
     }
 
     @Override
     public String uploadFile(String pathKey, String filePath) {
-        return uploadFile(ossProperties.getBucket(), pathKey, filePath);
+        return uploadFile(cosProperties.getBucket(), pathKey, filePath);
     }
 
     @Override
@@ -80,7 +80,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public String uploadFileText(String pathKey, String content) {
-        return uploadFileText(ossProperties.getBucket(), pathKey, content);
+        return uploadFileText(cosProperties.getBucket(), pathKey, content);
     }
 
     @Override
@@ -91,7 +91,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public String uploadFileBase64Image(String pathKey, String content) {
-        return uploadFileBase64Image(ossProperties.getBucket(), pathKey, content);
+        return uploadFileBase64Image(cosProperties.getBucket(), pathKey, content);
     }
 
     @Override
@@ -102,7 +102,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public String uploadFileBytes(String pathKey, byte[] bytes) {
-        return uploadFileBytes(ossProperties.getBucket(), pathKey, bytes);
+        return uploadFileBytes(cosProperties.getBucket(), pathKey, bytes);
     }
 
     @Override
@@ -113,7 +113,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public String uploadFileStream(String pathKey, InputStream stream) {
-        return uploadFileStream(ossProperties.getBucket(), pathKey, stream);
+        return uploadFileStream(cosProperties.getBucket(), pathKey, stream);
     }
 
     @Override
@@ -128,7 +128,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public File downloadFileTmp(String pathKey) {
-        return downloadFileTmp(ossProperties.getBucket(), pathKey);
+        return downloadFileTmp(cosProperties.getBucket(), pathKey);
     }
 
     @Override
@@ -141,7 +141,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public ObjectMetadata downloadFile(String pathKey, String file) {
-        return downloadFile(ossProperties.getBucket(), pathKey, file);
+        return downloadFile(cosProperties.getBucket(), pathKey, file);
     }
 
     @Override
@@ -156,7 +156,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public ObjectMetadata downloadFile(String pathKey, Consumer<InputStream> handler) {
-        return downloadFile(ossProperties.getBucket(), pathKey, handler);
+        return downloadFile(cosProperties.getBucket(), pathKey, handler);
     }
 
     @Override
@@ -200,17 +200,17 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public boolean ossDownloadFileToLocal(String path, String localPath) {
-        return ossDownloadFileToLocal(ossProperties.getBucket(),path,localPath);
+        return ossDownloadFileToLocal(cosProperties.getBucket(),path,localPath);
     }
 
     @Override
     public String calculateUrl(String pathKey) {
-        return calculateUrl(ossProperties.getBucket(), pathKey);
+        return calculateUrl(cosProperties.getBucket(), pathKey);
     }
 
     @Override
     public String calculateUrl(String bucket, String pathKey) {
-        String host = ossProperties.getHostByBucket(bucket);
+        String host = cosProperties.getHostByBucket(bucket);
         return host + "/" + pathKey;
     }
 
@@ -232,7 +232,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public Boolean copyObject(String oldPath, String newPath) {
-        return copyObject(ossProperties.getBucket(), oldPath, ossProperties.getBucket(), newPath);
+        return copyObject(cosProperties.getBucket(), oldPath, cosProperties.getBucket(), newPath);
     }
 
     @Override
@@ -248,7 +248,7 @@ public class CosTemplate implements OssOptions {
     @Override
     public void deleteObject(String keyName) {
         if (doesObjectExist(keyName)) {
-            deleteObject(ossProperties.getBucket(), keyName);
+            deleteObject(cosProperties.getBucket(), keyName);
         } else {
             log.warn("文件不存在,KeyName{}", keyName);
         }
@@ -261,7 +261,7 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public List<String> getFileFolder(String keyName) {
-        return getFileFolder(ossProperties.getBucket(), keyName);
+        return getFileFolder(cosProperties.getBucket(), keyName);
     }
 
     @Override
@@ -311,17 +311,17 @@ public class CosTemplate implements OssOptions {
 
     @Override
     public boolean doesObjectExist(String keyName) {
-        return doesObjectExist(ossProperties.getBucket(), keyName);
+        return doesObjectExist(cosProperties.getBucket(), keyName);
     }
 
     @Override
     public String getBucket() {
-        return ossProperties.getBucket();
+        return cosProperties.getBucket();
     }
 
     @Override
     public String uploadFileImage(String pathKey, String filePath) {
-        return uploadFileImage(ossProperties.getBucket(), pathKey, filePath);
+        return uploadFileImage(cosProperties.getBucket(), pathKey, filePath);
     }
 
     @Override

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/minio/MinioTemplate.java

@@ -9,7 +9,7 @@ import com.fdkankan.filestorage.Consumer;
 import com.fdkankan.filestorage.InnerUtils;
 import com.fdkankan.filestorage.properties.MinioProperties;
 
-import com.fdkankan.filestorage.OssOptions;
+import com.fdkankan.filestorage.FileStorageTemplate;
 import io.minio.*;
 import io.minio.errors.*;
 import io.minio.messages.Item;
@@ -24,7 +24,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import static com.fdkankan.filestorage.properties.MinioProperties.PREFIX;
 
 /**
  * 阿里云操作模版类, 简化常见操作
@@ -33,19 +32,22 @@ import static com.fdkankan.filestorage.properties.MinioProperties.PREFIX;
 @Slf4j
 @Service("MinioOssTemplate")
 @ConditionalOnProperty(prefix = MinioProperties.PREFIX,name = "filestorage.active",havingValue = "minio")
-public class MinioTemplate implements OssOptions {
+public class MinioTemplate implements FileStorageTemplate {
 
     private final MinioClient minioClient;
-    private final MinioProperties ossProperties;
-
-    public MinioTemplate(MinioClient minioClient, MinioProperties ossProperties) {
+    private final MinioProperties minioProperties;
+    @Override
+    public String getActive() {
+        return this.minioProperties.getActive();
+    }
+    public MinioTemplate(MinioClient minioClient, MinioProperties minioProperties) {
         this.minioClient = minioClient;
-        this.ossProperties = ossProperties;
+        this.minioProperties = minioProperties;
     }
 
     @Override
     public String uploadFile(String pathKey, String filePath) {
-        return uploadFile(ossProperties.getBucket(), pathKey, filePath);
+        return uploadFile(minioProperties.getBucket(), pathKey, filePath);
     }
 
     @Override
@@ -58,7 +60,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public String uploadFileText(String pathKey, String content) {
-        return uploadFileText(ossProperties.getBucket(), pathKey, content);
+        return uploadFileText(minioProperties.getBucket(), pathKey, content);
     }
 
     @Override
@@ -69,7 +71,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public String uploadFileBase64Image(String pathKey, String content) {
-        return uploadFileBase64Image(ossProperties.getBucket(), pathKey, content);
+        return uploadFileBase64Image(minioProperties.getBucket(), pathKey, content);
     }
 
     @Override
@@ -80,12 +82,12 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public String uploadFileBytes(String pathKey, byte[] bytes) {
-        return uploadFileBytes(ossProperties.getBucket(), pathKey, bytes);
+        return uploadFileBytes(minioProperties.getBucket(), pathKey, bytes);
     }
 
     public void createbucket() {
         try {
-            minioClient.makeBucket(MakeBucketArgs.builder().bucket(ossProperties.getBucket()).build());
+            minioClient.makeBucket(MakeBucketArgs.builder().bucket(minioProperties.getBucket()).build());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -99,7 +101,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public String uploadFileStream(String pathKey, InputStream stream) {
-        return uploadFileStream(ossProperties.getBucket(), pathKey, stream);
+        return uploadFileStream(minioProperties.getBucket(), pathKey, stream);
     }
 
     @Override
@@ -132,7 +134,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public File downloadFileTmp(String pathKey) {
-        return downloadFileTmp(ossProperties.getBucket(), pathKey);
+        return downloadFileTmp(minioProperties.getBucket(), pathKey);
     }
 
     @Override
@@ -145,7 +147,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public GetObjectResponse downloadFile(String pathKey, String file) {
-        return downloadFile(ossProperties.getBucket(), pathKey, file);
+        return downloadFile(minioProperties.getBucket(), pathKey, file);
     }
 
     @Override
@@ -166,7 +168,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public GetObjectResponse downloadFile(String pathKey, Consumer<InputStream> handler) {
-        return downloadFile(ossProperties.getBucket(), pathKey, handler);
+        return downloadFile(minioProperties.getBucket(), pathKey, handler);
     }
 
     @Override
@@ -187,11 +189,11 @@ public class MinioTemplate implements OssOptions {
     }
 
     public String calculateUrl(String pathKey) {
-        return calculateUrl(ossProperties.getBucket(), pathKey);
+        return calculateUrl(minioProperties.getBucket(), pathKey);
     }
 
     public String calculateUrl(String bucket, String pathKey) {
-        String host = ossProperties.getHostByBucket(bucket);
+        String host = minioProperties.getHostByBucket(bucket);
         return host + "/" + bucket + "/" + pathKey;
     }
 
@@ -213,7 +215,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public Boolean copyObject(String oldPath, String newPath) {
-        return copyObject(ossProperties.getBucket(), oldPath, ossProperties.getBucket(), newPath);
+        return copyObject(minioProperties.getBucket(), oldPath, minioProperties.getBucket(), newPath);
     }
 
     @Override
@@ -237,7 +239,7 @@ public class MinioTemplate implements OssOptions {
     @Override
     public void deleteObject(String keyName) {
         if (doesObjectExist(keyName)) {
-            deleteObject(ossProperties.getBucket(), keyName);
+            deleteObject(minioProperties.getBucket(), keyName);
         } else {
             log.warn("文件不存在,KeyName{}", keyName);
         }
@@ -256,7 +258,7 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public List<String> getFileFolder(String keyName) {
-        return getFileFolder(ossProperties.getBucket(), keyName);
+        return getFileFolder(minioProperties.getBucket(), keyName);
     }
 
     @Override
@@ -300,7 +302,7 @@ public class MinioTemplate implements OssOptions {
     }
     @Override
     public String getBucket() {
-        return ossProperties.getBucket();
+        return minioProperties.getBucket();
     }
 
     @Override
@@ -320,17 +322,17 @@ public class MinioTemplate implements OssOptions {
 
     @Override
     public boolean ossDownloadFileToLocal(String path, String localPath) {
-        return ossDownloadFileToLocal(ossProperties.getBucket(),path,localPath);
+        return ossDownloadFileToLocal(minioProperties.getBucket(),path,localPath);
     }
 
     @Override
     public boolean doesObjectExist(String keyName) {
-        return doesObjectExist(ossProperties.getBucket(), keyName);
+        return doesObjectExist(minioProperties.getBucket(), keyName);
     }
 
     @Override
     public String uploadFileImage(String pathKey, String filePath) {
-        return uploadFileImage(ossProperties.getBucket(), pathKey, filePath);
+        return uploadFileImage(minioProperties.getBucket(), pathKey, filePath);
     }
 
     @Override

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/properties/AliyunOssProperties.java

@@ -6,6 +6,7 @@ import com.fdkankan.filestorage.InnerUtils;
 import lombok.Data;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Map;
  */
 @Data
 @ConfigurationProperties(prefix = "filestorage.oss")
+@Component
 public class AliyunOssProperties implements Serializable, InitializingBean {
 
     public static final String PREFIX = "filestorage.oss";

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/properties/AwsProperties.java

@@ -5,6 +5,7 @@ import com.fdkankan.filestorage.InnerUtils;
 import lombok.Data;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
@@ -15,6 +16,7 @@ import java.util.Map;
  */
 @Data
 @ConfigurationProperties(prefix = "filestorage.awss3")
+@Component
 public class AwsProperties implements Serializable, InitializingBean {
 
     public static final String PREFIX = "filestorage.awss3";

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/properties/CosProperties.java

@@ -6,6 +6,7 @@ import com.qcloud.cos.ClientConfig;
 import lombok.Data;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Map;
  */
 @Data
 @ConfigurationProperties(prefix = "filestorage.cos")
+@Component
 public class CosProperties implements Serializable, InitializingBean {
 
     public static final String PREFIX = "filestorage.cos";

4dkankan-utils-filestorage/src/main/java/com/fdkankan/filestorage/properties/MinioProperties.java

@@ -5,6 +5,7 @@ import com.fdkankan.filestorage.InnerUtils;
 import lombok.Data;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
@@ -15,6 +16,7 @@ import java.util.Map;
  */
 @Data
 @ConfigurationProperties(prefix = "filestorage.minio")
+@Component
 public class MinioProperties implements Serializable, InitializingBean {
 
     public static final String PREFIX = "filestorage.minio";