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 a677f82d..81963807 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 @@ -32,6 +32,10 @@ public class UrlUtil { url = "/" + url; } + if (url.startsWith(YmlUtil.get("/static/"))) { + return RequestUtil.uri() + url; + } + String engine = ConfigUtil.get("storage", "default", "local"); engine = engine.equals("") ? "local" : engine; if (engine.equals("local")) { @@ -39,7 +43,10 @@ public class UrlUtil { } Map config = ConfigUtil.getMap("storage", engine); - return config.getOrDefault("domain", "") + url; + if (config != null) { + return config.getOrDefault("domain", "") + url; + } + return url; } /** @@ -63,7 +70,10 @@ public class UrlUtil { } Map config = ConfigUtil.getMap("storage", engine); - return url.replace(config.getOrDefault("domain", "") + "/" + uploadPrefix + "/", ""); + if (config != null) { + return url.replace(config.getOrDefault("domain", "") + "/" + uploadPrefix + "/", ""); + } + return url.replace("/" + uploadPrefix + "/", ""); } /**