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() .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 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 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 config = ConfigUtil.getMap("storage", engine); - return config.get("domain") + "/"; + return config.getOrDefault("domain", "") + "/"; } }