update 更新OSS配置类 使用内部类结构

ruoyi-oss/src/main/java/com/ruoyi/oss/properties/AliyunProperties.java

@@ -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;
-
-}

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;
+
+	}
+
 }

ruoyi-oss/src/main/java/com/ruoyi/oss/properties/MinioProperties.java

@@ -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;
-
-}

ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QcloudProperties.java

@@ -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;
-
-}

ruoyi-oss/src/main/java/com/ruoyi/oss/properties/QiniuProperties.java

@@ -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;
-
-}

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;

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;

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;

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;