From f847f67982293993599cd5f32c835adf5c4af55c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 18 七月 2021 18:41:47 +0800
Subject: [PATCH] update 更新OSS配置类 使用内部类结构
---
/dev/null | 40 ----------
ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java | 150 +++++++++++++++++++++++++++++++++++++
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java | 2
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java | 2
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java | 2
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java | 2
6 files changed, 154 insertions(+), 44 deletions(-)
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 b642f9c..0000000
--- 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;
-
- /**
- * 闃块噷浜慉ccessKeyId
- */
- private String accessKeyId;
-
- /**
- * 闃块噷浜慉ccessKeySecret
- */
- private String accessKeySecret;
-
- /**
- * 闃块噷浜態ucketName
- */
- 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 b8c38c1..0bf134f 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 @@
private MinioProperties minio;
+ /**
+ * 闃块噷浜� 閰嶇疆灞炴��
+ *
+ * @author Lion Li
+ */
+ @Data
+ @NoArgsConstructor
+ public static class AliyunProperties {
+
+ /**
+ * 闃块噷浜戠粦瀹氱殑鍩熷悕
+ */
+ private String endpoint;
+
+ /**
+ * 闃块噷浜戣矾寰勫墠缂�
+ */
+ private String prefix;
+
+ /**
+ * 闃块噷浜慉ccessKeyId
+ */
+ private String accessKeyId;
+
+ /**
+ * 闃块噷浜慉ccessKeySecret
+ */
+ private String accessKeySecret;
+
+ /**
+ * 闃块噷浜態ucketName
+ */
+ 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;
+
+ }
+
+ /**
+ * 鑵捐浜慍OS 閰嶇疆灞炴��
+ *
+ * @author Lion Li
+ */
+ @Data
+ @NoArgsConstructor
+ public static class QcloudProperties {
+
+ /**
+ * 鑵捐浜戠粦瀹氱殑鍩熷悕
+ */
+ private String domain;
+
+ /**
+ * 鑵捐浜戣矾寰勫墠缂�
+ */
+ private String prefix;
+
+ /**
+ * 鑵捐浜慡ecretId
+ */
+ private String secretId;
+
+ /**
+ * 鑵捐浜慡ecretKey
+ */
+ private String secretKey;
+
+ /**
+ * 鑵捐浜態ucketName
+ */
+ private String bucketName;
+
+ /**
+ * 鑵捐浜慍OS鎵�灞炲湴鍖�
+ */
+ 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 94313d4..0000000
--- 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 c6d17d9..0000000
--- 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;
-
-/**
- * 鑵捐浜慍OS 閰嶇疆灞炴��
- *
- * @author Lion Li
- */
-@Data
-@NoArgsConstructor
-public class QcloudProperties {
-
- /**
- * 鑵捐浜戠粦瀹氱殑鍩熷悕
- */
- private String domain;
-
- /**
- * 鑵捐浜戣矾寰勫墠缂�
- */
- private String prefix;
-
- /**
- * 鑵捐浜慡ecretId
- */
- private String secretId;
-
- /**
- * 鑵捐浜慡ecretKey
- */
- private String secretKey;
-
- /**
- * 鑵捐浜態ucketName
- */
- private String bucketName;
-
- /**
- * 鑵捐浜慍OS鎵�灞炲湴鍖�
- */
- 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 f671c5a..0000000
--- 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 a0782fe..7ac46e1 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.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 480f5e9..61ed4bb 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.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 4cc7bf2..2b1b023 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.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 a8c9393..2f7a246 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.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;
--
Gitblit v1.9.3