From f8396ce2be068ec6502da3b15322106b946d28f8 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 14:13:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E6=9D=A5=E8=B7=AF=E5=BE=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxkj/common/utils/UrlUtil.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 + "/", ""); } /**