From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

---
 ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java |  162 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 162 insertions(+), 0 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 b8c38c1..64784a0 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;
 
@@ -14,6 +15,8 @@
 @ConfigurationProperties(prefix = "cloud-storage")
 public class CloudStorageProperties {
 
+	private Boolean previewListImage;
+
 	private QiniuProperties qiniu;
 
 	private AliyunProperties aliyun;
@@ -22,4 +25,163 @@
 
 	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 {
+
+		/**
+		 * minio鍩熷悕
+		 */
+		private String endpoint;
+
+		/**
+		 * minio ACCESS_KEY
+		 */
+		private String accessKey;
+
+		/**
+		 * minio SECRET_KEY
+		 */
+		private String secretKey;
+
+		/**
+		 * minio 瀛樺偍绌洪棿鍚�
+		 */
+		private String bucketName;
+
+	}
+
+	/**
+	 * 鑵捐浜慍OS 閰嶇疆灞炴��
+	 *
+	 * @author Lion Li
+	 */
+	@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;
+
+	}
+
+	/**
+	 * 涓冪墰浜� 閰嶇疆灞炴��
+	 *
+	 * @author Lion Li
+	 */
+	@Data
+	@NoArgsConstructor
+	public static class QiniuProperties {
+
+		/**
+		 * 涓冪墰缁戝畾鐨勫煙鍚�
+		 */
+		private String domain;
+
+		/**
+		 * 涓冪墰璺緞鍓嶇紑
+		 */
+		private String prefix;
+
+		/**
+		 * 涓冪墰ACCESS_KEY
+		 */
+		private String accessKey;
+
+		/**
+		 * 涓冪墰SECRET_KEY
+		 */
+		private String secretKey;
+
+		/**
+		 * 涓冪墰瀛樺偍绌洪棿鍚�
+		 */
+		private String bucketName;
+
+		/**
+		 * 涓冪墰瀛樺偍鍖哄煙
+		 */
+		private String region;
+
+		/**
+		 * 涓冪墰鏄惁浣跨敤https
+		 */
+		private Boolean isHttps;
+
+	}
+
 }

--
Gitblit v1.9.3