From f847f67982293993599cd5f32c835adf5c4af55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Sun, 18 Jul 2021 18:41:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0OSS=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=B1=BB=20=E4=BD=BF=E7=94=A8=E5=86=85=E9=83=A8?= =?UTF-8?q?=E7=B1=BB=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/properties/AliyunProperties.java | 40 ----- .../properties/CloudStorageProperties.java | 150 ++++++++++++++++++ .../ruoyi/oss/properties/MinioProperties.java | 40 ----- .../oss/properties/QcloudProperties.java | 45 ------ .../ruoyi/oss/properties/QiniuProperties.java | 40 ----- .../impl/AliyunCloudStorageServiceImpl.java | 2 +- .../impl/MinioCloudStorageServiceImpl.java | 2 +- .../impl/QcloudCloudStorageServiceImpl.java | 2 +- .../impl/QiniuCloudStorageServiceImpl.java | 2 +- 9 files changed, 154 insertions(+), 169 deletions(-) delete mode 100644 ruoyi-oss/src/main/java/com/ruoyi/oss/properties/AliyunProperties.java delete mode 100644 ruoyi-oss/src/main/java/com/ruoyi/oss/properties/MinioProperties.java delete mode 100644 ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QcloudProperties.java delete mode 100644 ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QiniuProperties.java diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/AliyunProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/AliyunProperties.java deleted file mode 100644 index b642f9cc..00000000 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/AliyunProperties.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.oss.properties; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 阿里云 配置属性 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class AliyunProperties { - - /** - * 阿里云绑定的域名 - */ - private String endpoint; - - /** - * 阿里云路径前缀 - */ - private String prefix; - - /** - * 阿里云AccessKeyId - */ - private String accessKeyId; - - /** - * 阿里云AccessKeySecret - */ - private String accessKeySecret; - - /** - * 阿里云BucketName - */ - private String bucketName; - -} diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java index b8c38c11..0bf134f7 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java @@ -1,6 +1,7 @@ package com.ruoyi.oss.properties; import lombok.Data; +import lombok.NoArgsConstructor; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -22,4 +23,153 @@ public class CloudStorageProperties { private MinioProperties minio; + /** + * 阿里云 配置属性 + * + * @author Lion Li + */ + @Data + @NoArgsConstructor + public static class AliyunProperties { + + /** + * 阿里云绑定的域名 + */ + private String endpoint; + + /** + * 阿里云路径前缀 + */ + private String prefix; + + /** + * 阿里云AccessKeyId + */ + private String accessKeyId; + + /** + * 阿里云AccessKeySecret + */ + private String accessKeySecret; + + /** + * 阿里云BucketName + */ + private String bucketName; + + } + + /** + * Minio 配置属性 + * + * @author Lion Li + */ + @Data + @NoArgsConstructor + public static class MinioProperties { + + /** + * 七牛绑定的域名 + */ + private String endpoint; + + /** + * 七牛路径前缀 + */ + private String prefix; + + /** + * 七牛ACCESS_KEY + */ + private String accessKey; + + /** + * 七牛SECRET_KEY + */ + private String secretKey; + + /** + * 七牛存储空间名 + */ + private String bucketName; + + } + + /** + * 腾讯云COS 配置属性 + * + * @author Lion Li + */ + @Data + @NoArgsConstructor + public static class QcloudProperties { + + /** + * 腾讯云绑定的域名 + */ + private String domain; + + /** + * 腾讯云路径前缀 + */ + private String prefix; + + /** + * 腾讯云SecretId + */ + private String secretId; + + /** + * 腾讯云SecretKey + */ + private String secretKey; + + /** + * 腾讯云BucketName + */ + private String bucketName; + + /** + * 腾讯云COS所属地区 + */ + private String region; + + } + + /** + * 七牛云 配置属性 + * + * @author Lion Li + */ + @Data + @NoArgsConstructor + public class QiniuProperties { + + /** + * 七牛绑定的域名 + */ + private String domain; + + /** + * 七牛路径前缀 + */ + private String prefix; + + /** + * 七牛ACCESS_KEY + */ + private String accessKey; + + /** + * 七牛SECRET_KEY + */ + private String secretKey; + + /** + * 七牛存储空间名 + */ + private String bucketName; + + } + } diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/MinioProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/MinioProperties.java deleted file mode 100644 index 94313d45..00000000 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/MinioProperties.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.oss.properties; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Minio 配置属性 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class MinioProperties { - - /** - * 七牛绑定的域名 - */ - private String endpoint; - - /** - * 七牛路径前缀 - */ - private String prefix; - - /** - * 七牛ACCESS_KEY - */ - private String accessKey; - - /** - * 七牛SECRET_KEY - */ - private String secretKey; - - /** - * 七牛存储空间名 - */ - private String bucketName; - -} diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QcloudProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QcloudProperties.java deleted file mode 100644 index c6d17d9a..00000000 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QcloudProperties.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ruoyi.oss.properties; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 腾讯云COS 配置属性 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class QcloudProperties { - - /** - * 腾讯云绑定的域名 - */ - private String domain; - - /** - * 腾讯云路径前缀 - */ - private String prefix; - - /** - * 腾讯云SecretId - */ - private String secretId; - - /** - * 腾讯云SecretKey - */ - private String secretKey; - - /** - * 腾讯云BucketName - */ - private String bucketName; - - /** - * 腾讯云COS所属地区 - */ - private String region; - -} diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QiniuProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QiniuProperties.java deleted file mode 100644 index f671c5ab..00000000 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QiniuProperties.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.oss.properties; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 七牛云 配置属性 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class QiniuProperties { - - /** - * 七牛绑定的域名 - */ - private String domain; - - /** - * 七牛路径前缀 - */ - private String prefix; - - /** - * 七牛ACCESS_KEY - */ - private String accessKey; - - /** - * 七牛SECRET_KEY - */ - private String secretKey; - - /** - * 七牛存储空间名 - */ - private String bucketName; - -} diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java index a0782fee..7ac46e1d 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java @@ -6,8 +6,8 @@ import com.aliyun.oss.common.auth.DefaultCredentialProvider; import com.ruoyi.oss.enumd.CloudServiceEnumd; import com.ruoyi.oss.exception.OssException; import com.ruoyi.oss.factory.OssFactory; -import com.ruoyi.oss.properties.AliyunProperties; import com.ruoyi.oss.properties.CloudStorageProperties; +import com.ruoyi.oss.properties.CloudStorageProperties.AliyunProperties; import com.ruoyi.oss.service.abstractd.AbstractCloudStorageService; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java index 480f5e9e..61ed4bbd 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java @@ -4,7 +4,7 @@ import com.ruoyi.oss.enumd.CloudServiceEnumd; import com.ruoyi.oss.exception.OssException; import com.ruoyi.oss.factory.OssFactory; import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.properties.MinioProperties; +import com.ruoyi.oss.properties.CloudStorageProperties.MinioProperties; import com.ruoyi.oss.service.abstractd.AbstractCloudStorageService; import io.minio.MinioClient; import org.springframework.beans.factory.InitializingBean; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java index 4cc7bf21..2b1b0234 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java @@ -8,7 +8,7 @@ import com.qcloud.cos.region.Region; import com.ruoyi.oss.enumd.CloudServiceEnumd; import com.ruoyi.oss.factory.OssFactory; import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.properties.QcloudProperties; +import com.ruoyi.oss.properties.CloudStorageProperties.QcloudProperties; import com.ruoyi.oss.service.abstractd.AbstractCloudStorageService; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java index a8c93939..2f7a2466 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java @@ -10,7 +10,7 @@ import com.ruoyi.oss.enumd.CloudServiceEnumd; import com.ruoyi.oss.exception.OssException; import com.ruoyi.oss.factory.OssFactory; import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.properties.QiniuProperties; +import com.ruoyi.oss.properties.CloudStorageProperties.QiniuProperties; import com.ruoyi.oss.service.abstractd.AbstractCloudStorageService; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired;