From e23cb64f325b655ecf8d74bedd266754eb19864e Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 17 Nov 2022 12:02:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E4=BC=A0=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mdd/admin/config/WebMvcConfig.java | 4 ---- ...lication-pro-example.yml => application-dev-example.yml} | 0 server/like-admin/src/main/resources/application.yml | 6 ++++-- .../src/main/java/com/mdd/common/config/GlobalConfig.java | 5 +---- .../com/mdd/common/plugin/storage/engine/LocalStorage.java | 2 +- .../src/main/java/com/mdd/front/config/WebMvcConfig.java | 4 ---- ...lication-pro-example.yml => application-dev-example.yml} | 0 server/like-front/src/main/resources/application.yml | 4 ++++ 8 files changed, 10 insertions(+), 15 deletions(-) rename server/like-admin/src/main/resources/{application-pro-example.yml => application-dev-example.yml} (100%) rename server/like-front/src/main/resources/{application-pro-example.yml => application-dev-example.yml} (100%) diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java b/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java index 1a510c2b..5b8e4070 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java @@ -48,10 +48,6 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(@NotNull ResourceHandlerRegistry registry) { String directory = YmlUtil.get("like.upload-directory"); - if (directory == null || directory.equals("")) { - directory = GlobalConfig.uploadDirectory; - } - registry.addResourceHandler("/"+ GlobalConfig.publicPrefix +"/**") .addResourceLocations("file:" + directory); } diff --git a/server/like-admin/src/main/resources/application-pro-example.yml b/server/like-admin/src/main/resources/application-dev-example.yml similarity index 100% rename from server/like-admin/src/main/resources/application-pro-example.yml rename to server/like-admin/src/main/resources/application-dev-example.yml diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml index 0540c8a9..d079e679 100644 --- a/server/like-admin/src/main/resources/application.yml +++ b/server/like-admin/src/main/resources/application.yml @@ -1,8 +1,10 @@ +# 项目配置 +like: + upload-directory: /www/uploads/likeadmin-java/ # 上传目录 + # 服务配置 server: - # 启动端口 port: 8082 - # 路由前缀 servlet: context-path: / diff --git a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java index 08c81275..50aff0dd 100644 --- a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java +++ b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java @@ -12,7 +12,7 @@ public class GlobalConfig { public static Boolean isAddressEnabled = false; // 当前代码版本 - public static String version = "v1.3.3"; + public static String version = "v1.3.4"; // 系统加密字符 public static String secret = "UVTIyzCy"; @@ -29,9 +29,6 @@ public class GlobalConfig { // 资源访问前缀 public static String publicPrefix = "api/uploads"; - // 上传映射目录 - public static String uploadDirectory = "/www/uploads/likeadmin-java/"; - // 上传图片限制 public static Integer uploadImageSize = 1024 * 1024 * 10; diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java index 20c259ca..e7d00fcb 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java @@ -24,7 +24,7 @@ public class LocalStorage { // 映射目录 String directory = YmlUtil.get("like.upload-directory"); if (directory == null || directory.equals("")) { - directory = GlobalConfig.uploadDirectory; + throw new OperateException("请配置上传目录like.upload-directory"); } // 文件信息 diff --git a/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java b/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java index 22b3c8ba..5370579e 100644 --- a/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java +++ b/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java @@ -44,10 +44,6 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(@NonNull ResourceHandlerRegistry registry) { String directory = YmlUtil.get("like.upload-directory"); - if (directory == null || directory.equals("")) { - directory = GlobalConfig.uploadDirectory; - } - registry.addResourceHandler("/"+ GlobalConfig.publicPrefix +"/**") .addResourceLocations("file:" + directory); } diff --git a/server/like-front/src/main/resources/application-pro-example.yml b/server/like-front/src/main/resources/application-dev-example.yml similarity index 100% rename from server/like-front/src/main/resources/application-pro-example.yml rename to server/like-front/src/main/resources/application-dev-example.yml diff --git a/server/like-front/src/main/resources/application.yml b/server/like-front/src/main/resources/application.yml index 28722029..e67b2aaf 100644 --- a/server/like-front/src/main/resources/application.yml +++ b/server/like-front/src/main/resources/application.yml @@ -1,3 +1,7 @@ +# 项目配置 +like: + upload-directory: /www/uploads/likeadmin-java/ # 上传目录 + # 服务配置 server: port: 8084