From 06944747fd52b98f21337274678325ff62d10beb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 27 七月 2021 12:42:41 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 0bf134f..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
@@ -15,6 +15,8 @@
@ConfigurationProperties(prefix = "cloud-storage")
public class CloudStorageProperties {
+ private Boolean previewListImage;
+
private QiniuProperties qiniu;
private AliyunProperties aliyun;
@@ -69,27 +71,22 @@
public static class MinioProperties {
/**
- * 涓冪墰缁戝畾鐨勫煙鍚�
+ * minio鍩熷悕
*/
private String endpoint;
/**
- * 涓冪墰璺緞鍓嶇紑
- */
- private String prefix;
-
- /**
- * 涓冪墰ACCESS_KEY
+ * minio ACCESS_KEY
*/
private String accessKey;
/**
- * 涓冪墰SECRET_KEY
+ * minio SECRET_KEY
*/
private String secretKey;
/**
- * 涓冪墰瀛樺偍绌洪棿鍚�
+ * minio 瀛樺偍绌洪棿鍚�
*/
private String bucketName;
@@ -107,7 +104,7 @@
/**
* 鑵捐浜戠粦瀹氱殑鍩熷悕
*/
- private String domain;
+ private String endpoint;
/**
* 鑵捐浜戣矾寰勫墠缂�
@@ -130,6 +127,11 @@
private String bucketName;
/**
+ * 涓冪墰鏄惁浣跨敤https
+ */
+ private Boolean isHttps;
+
+ /**
* 鑵捐浜慍OS鎵�灞炲湴鍖�
*/
private String region;
@@ -143,7 +145,7 @@
*/
@Data
@NoArgsConstructor
- public class QiniuProperties {
+ public static class QiniuProperties {
/**
* 涓冪墰缁戝畾鐨勫煙鍚�
@@ -170,6 +172,16 @@
*/
private String bucketName;
+ /**
+ * 涓冪墰瀛樺偍鍖哄煙
+ */
+ private String region;
+
+ /**
+ * 涓冪墰鏄惁浣跨敤https
+ */
+ private Boolean isHttps;
+
}
}
--
Gitblit v1.9.3