From 627c3b27ce469b1cae4c7fa4dca4808cac46471e Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Mon, 1 Aug 2022 16:16:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/setting/impl/StorageServiceImpl.java |  4 ++++
 .../com/hxkj/common/plugin/storage/StorageDriver.java  | 10 +++++++++-
 .../common/plugin/storage/engine/QiniuStorage.java     |  6 +++---
 .../main/java/com/hxkj/common/utils/ConfigUtil.java    |  6 +++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java
index daf547ec..5c70df42 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java
@@ -26,24 +26,28 @@ public class StorageServiceImpl implements IStorageService {
         List<Map<String, Object>> list = new LinkedList<>();
 
         Map<String, Object> local = new LinkedHashMap<>();
+        local.put("name", "本地存储");
         local.put("alias", "local");
         local.put("describe", "存储在本地服务器");
         local.put("status", engine.equals("local") ? 1 : 0);
         list.add(local);
 
         Map<String, Object> qiniu = new LinkedHashMap<>();
+        qiniu.put("name", "七牛云存储");
         qiniu.put("alias", "qiniu");
         qiniu.put("describe", "存储在七牛云，请前往七牛云开通存储服务");
         qiniu.put("status", engine.equals("qiniu") ? 1 : 0);
         list.add(qiniu);
 
         Map<String, Object> aliyun = new LinkedHashMap<>();
+        aliyun.put("name", "阿里云才能出");
         aliyun.put("alias", "aliyun");
         aliyun.put("describe", "存储在阿里云，请前往阿里云开通存储服务");
         aliyun.put("status", engine.equals("aliyun") ? 1 : 0);
         list.add(aliyun);
 
         Map<String, Object> qcloud = new LinkedHashMap<>();
+        qcloud.put("name", "腾讯云存储");
         qcloud.put("alias", "qcloud");
         qcloud.put("describe", "存储在腾讯云，请前往腾讯云开通存储服务");
         qcloud.put("status", engine.equals("qcloud") ? 1 : 0);
diff --git a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java
index afc40f84..9345e35b 100644
--- a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java
+++ b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java
@@ -7,6 +7,7 @@ import com.hxkj.common.plugin.storage.engine.LocalStorage;
 import com.hxkj.common.plugin.storage.engine.QcloudStorage;
 import com.hxkj.common.plugin.storage.engine.QiniuStorage;
 import com.hxkj.common.utils.ConfigUtil;
+import com.hxkj.common.utils.StringUtil;
 import com.hxkj.common.utils.TimeUtil;
 import com.hxkj.common.utils.UrlUtil;
 import org.springframework.web.multipart.MultipartFile;
@@ -30,7 +31,14 @@ public class StorageDriver {
      */
     public StorageDriver() {
         this.engine = ConfigUtil.get("storage", "default", "local");
-        this.config = ConfigUtil.getMap("storage", this.engine);
+
+        Map<String, String> config1;
+        config1 = ConfigUtil.getMap("storage", this.engine);
+        if (config1 == null) {
+            config1 = new HashMap<>();
+        }
+
+        this.config = config1;
     }
 
     /**
diff --git a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java
index 00a8d242..42b48b36 100644
--- a/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java
+++ b/server/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java
@@ -37,9 +37,9 @@ public class QiniuStorage {
      * @return String
      */
     public String upToken() {
-        String accessKey = this.config.get("accessKey");
-        String secretKey = this.config.get("secretKey");
-        String bucket    = this.config.get("bucket");
+        String accessKey = this.config.getOrDefault("accessKey", "");
+        String secretKey = this.config.getOrDefault("secretKey", "");
+        String bucket    = this.config.getOrDefault("bucket", "");
         Auth auth = Auth.create(accessKey, secretKey);
         return auth.uploadToken(bucket);
     }
diff --git a/server/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java b/server/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java
index b7eed5bc..5a503ab0 100644
--- a/server/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java
+++ b/server/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java
@@ -97,7 +97,11 @@ public class ConfigUtil {
                         .eq("type", type)
                         .eq("name", name));
 
-        if (config.getValue().equals("") || config.getValue().equals("[]")) {
+        if (config == null) {
+            return null;
+        }
+
+        if (config.getValue().equals("") || config.getValue().equals("[]") || config.getValue().equals("{}")) {
             return new LinkedHashMap<>();
         }