From 4a1f201703a5c03897e9ef34642b82478ddffc25 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 17 Aug 2022 16:08:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?404=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/admin/config/ErrorPageConfig.java | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 server/like-admin/src/main/java/com/hxkj/admin/config/ErrorPageConfig.java diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/ErrorPageConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/ErrorPageConfig.java deleted file mode 100644 index 727172cb..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/ErrorPageConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hxkj.admin.config; - -import org.springframework.boot.web.server.ErrorPage; -import org.springframework.boot.web.server.ErrorPageRegistrar; -import org.springframework.boot.web.server.ErrorPageRegistry; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; - -@Component -public class ErrorPageConfig implements ErrorPageRegistrar { - - @Override - public void registerErrorPages(ErrorPageRegistry registry) { - ErrorPage error404Page=new ErrorPage(HttpStatus.NOT_FOUND,"/index.html" ); - registry.addErrorPages(error404Page); - } - -} From 11a27e43fa2e5cd54a5c67f9110f5a3f31c7b8d4 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 17 Aug 2022 16:14:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AE=BF=E9=97=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/like-admin/src/main/resources/application.yml | 2 +- .../src/main/java/com/hxkj/common/config/GlobalConfig.java | 2 +- .../src/main/java/com/hxkj/common/utils/UrlUtil.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml index 5d2fa8cf..2287217d 100644 --- a/server/like-admin/src/main/resources/application.yml +++ b/server/like-admin/src/main/resources/application.yml @@ -11,7 +11,7 @@ spring: profiles: active: pro mvc: - static-path-pattern: /static/** + static-path-pattern: /api/static/** # 数据源配置 datasource: url: jdbc:mysql://localhost:3306/local_admin_java?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false diff --git a/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java b/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java index e46246b3..48eab3e3 100644 --- a/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java +++ b/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java @@ -24,7 +24,7 @@ public class GlobalConfig { public static String redisPrefix = "Like:"; // 资源访问前缀 - public static String publicPrefix = "uploads"; + public static String publicPrefix = "api/uploads"; // 上传映射目录 public static String uploadDirectory = "/www/like-admin/uploads/"; 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 878ad3ea..c814df09 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("/static/")) { + if (url.startsWith("/api/static/")) { return RequestUtil.uri() + url; } @@ -94,7 +94,10 @@ public class UrlUtil { } Map config = ConfigUtil.getMap("storage", engine); - return config.getOrDefault("domain", "") + "/"; + if (config != null) { + return config.getOrDefault("domain", "") + "/"; + } + return ""; } }