From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java
similarity index 73%
rename from ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java
rename to ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java
index 7bba1f4..b5236bf 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java
@@ -8,7 +8,7 @@
  *
  * @author Lion Li
  */
-public class CloudConstant {
+public class OssConstant {
 
 	/**
 	 * OSS妯″潡KEY
@@ -18,12 +18,12 @@
 	/**
 	 * 瀵硅薄瀛樺偍閰嶇疆KEY
 	 */
-	public static final String CLOUD_STORAGE_CONFIG_KEY = "CloudStorageConfig";
+	public static final String OSS_CONFIG_KEY = "OssConfig";
 
 	/**
 	 * 缂撳瓨閰嶇疆KEY
 	 */
-	public static final String CACHE_CONFIG_KEY = SYS_OSS_KEY + CLOUD_STORAGE_CONFIG_KEY;
+	public static final String CACHE_CONFIG_KEY = SYS_OSS_KEY + OSS_CONFIG_KEY;
 
 	/**
 	 * 棰勮鍒楄〃璧勬簮寮�鍏矺ey

--
Gitblit v1.9.3