From 2f7361c2dd71b63844d80818565b29e112d74284 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Thu, 23 Jun 2022 16:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=82=A8=E5=BC=95?=
 =?UTF-8?q?=E6=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/system/impl/SystemAdminServiceImpl.java      | 8 ++++----
 .../src/main/java/com/hxkj/common/utils/UrlUtil.java     | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java
index 167235e7..bb7c91cb 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java
@@ -121,10 +121,10 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
         // 管理员信息
         SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
                 .select(SystemAdmin.class, info->
-                        !info.getColumn().equals("salt") &&
-                                !info.getColumn().equals("password") &&
-                                !info.getColumn().equals("is_delete") &&
-                                !info.getColumn().equals("delete_time"))
+                    !info.getColumn().equals("salt") &&
+                    !info.getColumn().equals("password") &&
+                    !info.getColumn().equals("is_delete") &&
+                    !info.getColumn().equals("delete_time"))
                 .eq("is_delete", 0)
                 .eq("id", adminId)
                 .last("limit 1"));
diff --git a/server/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java b/server/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java
index 71551f98..9334d5da 100644
--- a/server/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java
+++ b/server/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java
@@ -33,12 +33,13 @@ public class UrlUtil {
         }
 
         String engine = ConfigUtil.get("storage", "default", "local");
+        engine = engine.equals("") ? "local" : engine;
         if (engine.equals("local")) {
             return RequestUtil.domain() + "/" + uploadPrefix + url;
         }
 
         Map<String, String> config = ConfigUtil.getMap("storage", engine);
-        return config.get("domain") + url;
+        return config.getOrDefault("domain", "") + url;
     }
 
     /**
@@ -56,12 +57,13 @@ public class UrlUtil {
         }
 
         String engine = ConfigUtil.get("storage", "default", "local");
+        engine = engine.equals("") ? "local" : engine;
         if (engine.equals("local")) {
             return url.replace(RequestUtil.domain() + "/" + uploadPrefix + "/", "");
         }
 
         Map<String, String> config = ConfigUtil.getMap("storage", engine);
-        return url.replace(config.get("domain") + "/" + uploadPrefix + "/", "");
+        return url.replace(config.getOrDefault("domain", "") + "/" + uploadPrefix + "/", "");
     }
 
     /**
@@ -73,12 +75,13 @@ public class UrlUtil {
      */
     public static String domain() {
         String engine = ConfigUtil.get("storage", "default", "local");
+        engine = engine.equals("") ? "local" : engine;
         if (engine.equals("local")) {
             return RequestUtil.domain() + "/";
         }
 
         Map<String, String> config = ConfigUtil.getMap("storage", engine);
-        return config.get("domain") + "/";
+        return config.getOrDefault("domain", "") + "/";
     }
 
 }