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 | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 50053e8..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;
@@ -102,17 +104,12 @@
/**
* 鑵捐浜戠粦瀹氱殑鍩熷悕
*/
- private String domain;
+ private String endpoint;
/**
* 鑵捐浜戣矾寰勫墠缂�
*/
private String prefix;
-
- /**
- * 鑵捐浜慳ppId
- */
- private String appId;
/**
* 鑵捐浜慡ecretId
@@ -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