diff --git a/server/like-common/src/main/java/com/hxkj/common/utils/RequestUtil.java b/server/like-common/src/main/java/com/hxkj/common/utils/RequestUtil.java index 7c7c8cec..0ccfc8cf 100644 --- a/server/like-common/src/main/java/com/hxkj/common/utils/RequestUtil.java +++ b/server/like-common/src/main/java/com/hxkj/common/utils/RequestUtil.java @@ -41,6 +41,22 @@ public class RequestUtil { return ""; } + /** + * 获取带端口的请求地址 + * 示例: https://127.0.0.1:8082 + * + * @author fzr + * @return String + */ + public static String uri() { + String domain = RequestUtil.domain(); + if (!Arrays.asList(443,80,0).contains(RequestUtil.port())) { + domain += ":" + RequestUtil.port(); + } + + return domain; + } + /** * 获取请求路由 * 示例: /api/system/menu/menus @@ -56,6 +72,21 @@ public class RequestUtil { return ""; } + /** + * 获取请求端口 + * 示例: 443/80 + * + * @author fzr + * @return Integer + */ + public static Integer port() { + HttpServletRequest request = RequestUtil.handler(); + if (request != null) { + return request.getServerPort(); + } + return 0; + } + /** * 获取请求域名 * 示例: https://127.0.0.1 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 9334d5da..a677f82d 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 @@ -35,7 +35,7 @@ public class UrlUtil { String engine = ConfigUtil.get("storage", "default", "local"); engine = engine.equals("") ? "local" : engine; if (engine.equals("local")) { - return RequestUtil.domain() + "/" + uploadPrefix + url; + return RequestUtil.uri() + "/" + uploadPrefix + url; } Map config = ConfigUtil.getMap("storage", engine); @@ -59,7 +59,7 @@ public class UrlUtil { String engine = ConfigUtil.get("storage", "default", "local"); engine = engine.equals("") ? "local" : engine; if (engine.equals("local")) { - return url.replace(RequestUtil.domain() + "/" + uploadPrefix + "/", ""); + return url.replace(RequestUtil.uri() + "/" + uploadPrefix + "/", ""); } Map config = ConfigUtil.getMap("storage", engine); @@ -77,7 +77,7 @@ public class UrlUtil { String engine = ConfigUtil.get("storage", "default", "local"); engine = engine.equals("") ? "local" : engine; if (engine.equals("local")) { - return RequestUtil.domain() + "/"; + return RequestUtil.uri() + "/"; } Map config = ConfigUtil.getMap("storage", engine);