mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复路径转换工具

This commit is contained in:
TinyAnts 2022-08-16 14:31:56 +08:00
parent de952a1b0d
commit 7bc79d26f4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java
View File

@ -75,6 +75,8 @@ public class IndexServiceImpl implements IIndexService {
Map<String, String> website = ConfigUtil.get("website"); Map<String, String> website = ConfigUtil.get("website");
String copyright = ConfigUtil.get("website", "copyright", ""); 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<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("webName", website.getOrDefault("name", "")); map.put("webName", website.getOrDefault("name", ""));
map.put("webLogo", UrlUtil.toAbsoluteUrl(website.getOrDefault("logo", ""))); map.put("webLogo", UrlUtil.toAbsoluteUrl(website.getOrDefault("logo", "")));

11
server/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java
View File

@ -32,7 +32,7 @@ public class UrlUtil {
url = "/" + url; url = "/" + url;
} }
if (url.startsWith(YmlUtil.get("/static/"))) { if (url.startsWith("/static/")) {
return RequestUtil.uri() + url; return RequestUtil.uri() + url;
} }
@ -66,14 +66,17 @@ public class UrlUtil {
String engine = ConfigUtil.get("storage", "default", "local"); String engine = ConfigUtil.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine; engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) { if (engine.equals("local")) {
return url.replace(RequestUtil.uri() + "/" + uploadPrefix + "/", ""); return url.replace(RequestUtil.uri(), "")
.replace("/" + uploadPrefix + "/", "");
} }
Map<String, String> config = ConfigUtil.getMap("storage", engine); Map<String, String> config = ConfigUtil.getMap("storage", engine);
if (config != null) { if (config != null) {
return url.replace(config.getOrDefault("domain", "") + "/" + uploadPrefix + "/", ""); return url.replace(config.getOrDefault("domain", ""), "")
.replace( "/" + uploadPrefix + "/", "");
} }
return url.replace("/" + uploadPrefix + "/", "");
return url;
} }
/** /**