From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java | 184 ++++++---------------------------------------
1 files changed, 26 insertions(+), 158 deletions(-)
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 64784a0..1c62ae2 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,9 +1,8 @@
package com.ruoyi.oss.properties;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
+
+import java.util.Date;
/**
* OSS浜戝瓨鍌� 閰嶇疆灞炴��
@@ -11,177 +10,46 @@
* @author Lion Li
*/
@Data
-@Component
-@ConfigurationProperties(prefix = "cloud-storage")
public class CloudStorageProperties {
- private Boolean previewListImage;
-
- private QiniuProperties qiniu;
-
- private AliyunProperties aliyun;
-
- private QcloudProperties qcloud;
-
- private MinioProperties minio;
+ /**
+ * 鍩熷悕
+ */
+ private String endpoint;
/**
- * 闃块噷浜� 閰嶇疆灞炴��
- *
- * @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;
-
- }
+ private String prefix;
/**
- * Minio 閰嶇疆灞炴��
- *
- * @author Lion Li
+ * ACCESS_KEY
*/
- @Data
- @NoArgsConstructor
- public static class MinioProperties {
-
- /**
- * minio鍩熷悕
- */
- private String endpoint;
-
- /**
- * minio ACCESS_KEY
- */
- private String accessKey;
-
- /**
- * minio SECRET_KEY
- */
- private String secretKey;
-
- /**
- * minio 瀛樺偍绌洪棿鍚�
- */
- private String bucketName;
-
- }
+ private String accessKey;
/**
- * 鑵捐浜慍OS 閰嶇疆灞炴��
- *
- * @author Lion Li
+ * SECRET_KEY
*/
- @Data
- @NoArgsConstructor
- public static class QcloudProperties {
-
- /**
- * 鑵捐浜戠粦瀹氱殑鍩熷悕
- */
- private String endpoint;
-
- /**
- * 鑵捐浜戣矾寰勫墠缂�
- */
- private String prefix;
-
- /**
- * 鑵捐浜慡ecretId
- */
- private String secretId;
-
- /**
- * 鑵捐浜慡ecretKey
- */
- private String secretKey;
-
- /**
- * 鑵捐浜態ucketName
- */
- private String bucketName;
-
- /**
- * 涓冪墰鏄惁浣跨敤https
- */
- private Boolean isHttps;
-
- /**
- * 鑵捐浜慍OS鎵�灞炲湴鍖�
- */
- private String region;
-
- }
+ private String secretKey;
/**
- * 涓冪墰浜� 閰嶇疆灞炴��
- *
- * @author Lion Li
+ * 瀛樺偍绌洪棿鍚�
*/
- @Data
- @NoArgsConstructor
- public static class QiniuProperties {
+ private String bucketName;
- /**
- * 涓冪墰缁戝畾鐨勫煙鍚�
- */
- private String domain;
+ /**
+ * 瀛樺偍鍖哄煙
+ */
+ private String region;
- /**
- * 涓冪墰璺緞鍓嶇紑
- */
- private String prefix;
+ /**
+ * 鏄惁https锛圷=鏄�,N=鍚︼級
+ */
+ private String isHttps;
- /**
- * 涓冪墰ACCESS_KEY
- */
- private String accessKey;
-
- /**
- * 涓冪墰SECRET_KEY
- */
- private String secretKey;
-
- /**
- * 涓冪墰瀛樺偍绌洪棿鍚�
- */
- private String bucketName;
-
- /**
- * 涓冪墰瀛樺偍鍖哄煙
- */
- private String region;
-
- /**
- * 涓冪墰鏄惁浣跨敤https
- */
- private Boolean isHttps;
-
- }
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private Date updateTime;
}
--
Gitblit v1.9.3