修复存储引擎

This commit is contained in:
TinyAnts 2022-06-23 16:10:10 +08:00
parent d1b02d2c89
commit 2f7361c2dd
2 changed files with 10 additions and 7 deletions

View File

@ -33,12 +33,13 @@ public class UrlUtil {
} }
String engine = ConfigUtil.get("storage", "default", "local"); String engine = ConfigUtil.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) { if (engine.equals("local")) {
return RequestUtil.domain() + "/" + uploadPrefix + url; return RequestUtil.domain() + "/" + uploadPrefix + url;
} }
Map<String, String> config = ConfigUtil.getMap("storage", engine); Map<String, String> 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"); String engine = ConfigUtil.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) { if (engine.equals("local")) {
return url.replace(RequestUtil.domain() + "/" + uploadPrefix + "/", ""); return url.replace(RequestUtil.domain() + "/" + uploadPrefix + "/", "");
} }
Map<String, String> config = ConfigUtil.getMap("storage", engine); Map<String, String> 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() { public static String domain() {
String engine = ConfigUtil.get("storage", "default", "local"); String engine = ConfigUtil.get("storage", "default", "local");
engine = engine.equals("") ? "local" : engine;
if (engine.equals("local")) { if (engine.equals("local")) {
return RequestUtil.domain() + "/"; return RequestUtil.domain() + "/";
} }
Map<String, String> config = ConfigUtil.getMap("storage", engine); Map<String, String> config = ConfigUtil.getMap("storage", engine);
return config.get("domain") + "/"; return config.getOrDefault("domain", "") + "/";
} }
} }