From 1d562258956c2e24ac5b53e26a34e4d481aa28a8 Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Wed, 30 Oct 2024 22:16:03 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96sql=20fix=20=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=9B=BE=E7=89=87path=20=E9=94=99=E8=AF=AF=E7=9A=84bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mdd/admin/config/WebMvcConfig.java | 2 +- .../java/com/mdd/admin/service/impl/FileServiceImpl.java | 2 +- .../main/java/com/mdd/common/config/GlobalConfig.java | 1 + sql/install_v1.9.0.sql | 9 +++++---- 4 files changed, 8 insertions(+), 6 deletions(-) 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 696e36d9..ae1d4d3c 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,7 +48,7 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(@NotNull ResourceHandlerRegistry registry) { String directory = YmlUtils.get("like.upload-directory"); - registry.addResourceHandler("/"+ GlobalConfig.publicPrefix +"/**") + registry.addResourceHandler("/"+ GlobalConfig.adminPublicPrefix +"/**") .addResourceLocations("file:" + directory); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java index 673f9d0c..972c2ebd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FileServiceImpl.java @@ -84,7 +84,7 @@ public class FileServiceImpl implements IFileService { vo.setUrl(UrlUtils.toAbsoluteUrl(file.getUri())); if (engine.equals("local")) { - vo.setUri(GlobalConfig.publicPrefix + "/" + file.getUri()); + vo.setUri(GlobalConfig.adminPublicPrefix + "/" + file.getUri()); } else { vo.setUri(file.getUri()); } 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 d050178f..b197b864 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 @@ -25,6 +25,7 @@ public class GlobalConfig { // 资源访问前缀 public static String publicPrefix = "api/uploads"; + public static String adminPublicPrefix = "adminapi/uploads"; // 上传图片限制 public static Integer uploadImageSize = 1024 * 1024 * 10; diff --git a/sql/install_v1.9.0.sql b/sql/install_v1.9.0.sql index 6e178d9a..f6ce9ae5 100644 --- a/sql/install_v1.9.0.sql +++ b/sql/install_v1.9.0.sql @@ -221,9 +221,9 @@ CREATE TABLE `la_dev_pay_config` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `la_dev_pay_config` (`id`, `name`, `pay_way`, `config`, `icon`, `sort`, `remark`) VALUES -(1, '余额支付', 1, '', '/api/static/balance_pay.png', 128, '余额支付备注'), -(2, '微信支付', 2, '{\"interface_version\":\"v3\",\"merchant_type\":\"ordinary_merchant\",\"mch_id\":\"\",\"pay_sign_key\":\"\",\"apiclient_cert\":\"\",\"apiclient_key\":\"\"}', '/api/static/wechat_pay.png', 123, '微信支付备注'), -(3, '支付宝支付', 3, '{\"mode\":\"normal_mode\",\"merchant_type\":\"ordinary_merchant\",\"app_id\":\"\",\"private_key\":\"\",\"ali_public_key\":\"\"}', '/api/static/ali_pay.png', 123, '支付宝支付'); +(1, '余额支付', 1, '', '/resource/image/adminapi/default/balance_pay.png', 128, '余额支付备注'), +(2, '微信支付', 2, '{\"interface_version\":\"v3\",\"merchant_type\":\"ordinary_merchant\",\"mch_id\":\"**\",\"pay_sign_key\":\"**\",\"apiclient_cert\":\"**\",\"apiclient_key\":\"**\"}', 'resource/image/adminapi/default/wechat_pay.png', 123, '微信支付备注'), +(3, '支付宝支付', 3, '{\"mode\":\"normal_mode\",\"merchant_type\":\"ordinary_merchant\",\"app_id\":\"**\",\"private_key\":\"**\",\"ali_public_key\":\"**\"}', 'resource/image/adminapi/default/ali_pay.png', 123, '支付宝支付'); DROP TABLE IF EXISTS `la_dev_pay_way`; CREATE TABLE `la_dev_pay_way` ( @@ -242,7 +242,8 @@ INSERT INTO `la_dev_pay_way` (`id`, `pay_config_id`, `scene`, `is_default`, `sta (4, 2, 2, 1, 1), (5, 1, 3, 0, 1), (6, 2, 3, 1, 1), -(7, 3, 3, 0, 1); +(7, 3, 3, 0, 1), +(8, 3, 1, 0, 1); DROP TABLE IF EXISTS `la_dict_data`; CREATE TABLE `la_dict_data` (