From 7bc79d26f45d8887542920fa8392897fc5443f30 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 14:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/common/impl/IndexServiceImpl.java | 2 ++ .../src/main/java/com/hxkj/common/utils/UrlUtil.java | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java index 774a737a..605f2e39 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java @@ -75,6 +75,8 @@ public class IndexServiceImpl implements IIndexService { Map website = ConfigUtil.get("website"); String copyright = ConfigUtil.get("website", "copyright", ""); + System.out.println(UrlUtil.toRelativeUrl("http://127.0.0.1:8082/uploads/image/20220426/8984bec1-57d6-4635-a110-fb4b26335879.png")); + Map map = new LinkedHashMap<>(); map.put("webName", website.getOrDefault("name", "")); map.put("webLogo", UrlUtil.toAbsoluteUrl(website.getOrDefault("logo", ""))); 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 81963807..878ad3ea 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,7 +32,7 @@ public class UrlUtil { url = "/" + url; } - if (url.startsWith(YmlUtil.get("/static/"))) { + if (url.startsWith("/static/")) { return RequestUtil.uri() + url; } @@ -66,14 +66,17 @@ public class UrlUtil { String engine = ConfigUtil.get("storage", "default", "local"); engine = engine.equals("") ? "local" : engine; if (engine.equals("local")) { - return url.replace(RequestUtil.uri() + "/" + uploadPrefix + "/", ""); + return url.replace(RequestUtil.uri(), "") + .replace("/" + uploadPrefix + "/", ""); } Map config = ConfigUtil.getMap("storage", engine); if (config != null) { - return url.replace(config.getOrDefault("domain", "") + "/" + uploadPrefix + "/", ""); + return url.replace(config.getOrDefault("domain", ""), "") + .replace( "/" + uploadPrefix + "/", ""); } - return url.replace("/" + uploadPrefix + "/", ""); + + return url; } /**