From 2ddb557bcc4c73b11da089e95cec0f0576110a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 30 Dec 2025 14:41:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?nacos=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/src/main/resources/bootstrap.yml | 10 +++++++--- mhd-gateway/src/main/resources/bootstrap.yml | 6 +++--- .../mhd-system/src/main/resources/bootstrap.yml | 10 +++++++--- mhd-user-center/src/main/resources/bootstrap.yml | 10 +++++++--- mhd_finance/src/main/resources/bootstrap.yml | 10 +++++++--- mhd_product/src/main/resources/bootstrap.yml | 10 +++++++--- mhd_thrid_party/src/main/resources/bootstrap.yml | 10 +++++++--- mhd_transport/src/main/resources/bootstrap.yml | 13 +++++++------ 8 files changed, 52 insertions(+), 27 deletions(-) diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index 0e2deba8b..611e85cc4 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -14,17 +14,21 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index 06780ff0a..26e4f5ff7 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: # server-addr: 10.102.192.5:6848 # server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: mhd-nacos:8848 + server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: mhd-nacos:8848 + server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 # server-addr: 10.33.0.129:6010 @@ -34,4 +34,4 @@ spring: file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index b01b7d280..a62a6f77d 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -15,7 +15,9 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: @@ -23,11 +25,13 @@ spring: # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index fbb15bbd9..c2513c681 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -20,13 +20,17 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 @@ -40,4 +44,4 @@ spring: max-request-size: 50MB mybatis-plus: configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index 3845ee8d6..8132a55fb 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,18 +20,22 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # server-addr: 116.204.23.92:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index 10e613084..fab856199 100644 --- a/mhd_product/src/main/resources/bootstrap.yml +++ b/mhd_product/src/main/resources/bootstrap.yml @@ -20,17 +20,21 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index a0f470634..da96ce5bb 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -20,17 +20,21 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 5dfc4e3aa..1bdd007fd 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -21,13 +21,17 @@ spring: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 # server-addr: 10.33.0.129:6010r - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 - server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.5:6848 + username: nacos + password: manhuoda@2023 # server-addr: 10.33.0.129:6010 #线上正式环境 # server-addr: 10.102.192.105:6848 @@ -35,7 +39,4 @@ spring: file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - - - + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file From 6cb96410a222a6c4bd93d15c06068772d95450fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 31 Dec 2025 14:05:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=86=99=E6=95=8F=E6=84=9F;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/infrastructure/config/CamelCaseMapPlugin.java | 7 +++++-- .../mhd/user/infrastructure/config/CamelCaseMapPlugin.java | 7 +++++-- .../finance/infrastructure/config/CamelCaseMapPlugin.java | 7 +++++-- .../linke/product/domain/config/CamelCaseMapPlugin.java | 7 +++++-- mhd_product/src/main/resources/mapper/menu/MenuMapper.xml | 6 +++--- .../infrastructure/config/CamelCaseMapPlugin.java | 7 +++++-- .../infrastructure/config/CamelCaseMapPlugin.java | 7 +++++-- 7 files changed, 33 insertions(+), 15 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java index ba41cf91d..427f7cc40 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java @@ -1,3 +1,4 @@ +/* package com.mhd.basic.infrastructure.config; import com.mhd.basic.infrastructure.util.CamelCaseUtils; @@ -10,9 +11,11 @@ import java.util.List; import java.util.Map; import java.util.Properties; +*/ /** * MyBatis插件：拦截Map类型结果，转换Key为驼峰 - */ + *//* + @Intercepts({@Signature( type = ResultSetHandler.class, method = "handleResultSets", @@ -54,4 +57,4 @@ public class CamelCaseMapPlugin implements Interceptor { public void setProperties(Properties properties) { // 可配置参数，此处无需处理 } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java b/mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java index fd6b3fc2c..f5491ba6c 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java +++ b/mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java @@ -1,3 +1,4 @@ +/* package com.mhd.user.infrastructure.config; import com.mhd.user.infrastructure.util.CamelCaseUtils; @@ -10,9 +11,11 @@ import java.util.List; import java.util.Map; import java.util.Properties; +*/ /** * MyBatis插件：拦截Map类型结果，转换Key为驼峰 - */ + *//* + @Intercepts({@Signature( type = ResultSetHandler.class, method = "handleResultSets", @@ -54,4 +57,4 @@ public class CamelCaseMapPlugin implements Interceptor { public void setProperties(Properties properties) { // 可配置参数，此处无需处理 } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java b/mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java index 524382f43..3f20ff453 100644 --- a/mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java +++ b/mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java @@ -1,3 +1,4 @@ +/* package com.linke.finance.infrastructure.config; import com.linke.finance.infrastructure.util.CamelCaseUtils; @@ -10,9 +11,11 @@ import java.util.List; import java.util.Map; import java.util.Properties; +*/ /** * MyBatis插件：拦截Map类型结果，转换Key为驼峰 - */ + *//* + @Intercepts({@Signature( type = ResultSetHandler.class, method = "handleResultSets", @@ -54,4 +57,4 @@ public class CamelCaseMapPlugin implements Interceptor { public void setProperties(Properties properties) { // 可配置参数，此处无需处理 } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java b/mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java index c00d8d9f1..855081783 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java +++ b/mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java @@ -1,3 +1,4 @@ +/* package com.linke.product.domain.config; import com.linke.product.domain.util.CamelCaseUtils; @@ -10,9 +11,11 @@ import java.util.List; import java.util.Map; import java.util.Properties; +*/ /** * MyBatis插件：拦截Map类型结果，转换Key为驼峰 - */ + *//* + @Intercepts({@Signature( type = ResultSetHandler.class, method = "handleResultSets", @@ -54,4 +57,4 @@ public class CamelCaseMapPlugin implements Interceptor { public void setProperties(Properties properties) { // 可配置参数，此处无需处理 } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml index 2e49952ab..74055d799 100644 --- a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml @@ -273,8 +273,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT - menu_component AS menuComponent, - menu_redirect_path AS menuRedirectPath + menu_component, + menu_redirect_path FROM sys_menu where @@ -510,4 +510,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java b/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java index c54ec6831..a33af3b5e 100644 --- a/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java +++ b/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java @@ -1,4 +1,3 @@ -/* package com.linke.thirdParty.infrastructure.config; import com.linke.thirdParty.infrastructure.utils.CamelCaseUtils; @@ -11,11 +10,9 @@ import java.util.List; import java.util.Map; import java.util.Properties; -*/ /** * MyBatis插件：拦截Map类型结果，转换Key为驼峰 - *//* - + */ @Intercepts({@Signature( type = ResultSetHandler.class, method = "handleResultSets", @@ -57,4 +54,4 @@ public class CamelCaseMapPlugin implements Interceptor { public void setProperties(Properties properties) { // 可配置参数，此处无需处理 } -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/mhd_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java index b024b0d23..ef791c4bc 100644 --- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java +++ b/mhd_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java @@ -1,4 +1,3 @@ -/* package com.linke.transport.infrastructure.config; import com.linke.transport.infrastructure.util.CamelCaseUtils; @@ -11,11 +10,9 @@ import java.util.List; import java.util.Map; import java.util.Properties; -*/ /** * MyBatis插件：拦截Map类型结果，转换Key为驼峰 - *//* - + */ @Intercepts({@Signature( type = ResultSetHandler.class, method = "handleResultSets", @@ -57,4 +54,4 @@ public class CamelCaseMapPlugin implements Interceptor { public void setProperties(Properties properties) { // 可配置参数，此处无需处理 } -}*/ \ No newline at end of file +} \ No newline at end of file From 8d89f5ec27f9a79b7b1e656edd224611db5356c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 14 Jan 2026 16:46:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=BA=94=E6=94=B6=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E7=BB=93=E7=AE=97=E5=B8=81?= =?UTF-8?q?=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/src/main/resources/bootstrap.yml | 16 ++++++++-------- mhd-user-center/src/main/resources/bootstrap.yml | 14 ++++++++------ mhd_finance/src/main/resources/bootstrap.yml | 16 ++++++++++------ mhd_product/src/main/resources/bootstrap.yml | 16 ++++++++++------ mhd_thrid_party/src/main/resources/bootstrap.yml | 16 ++++++++++------ mhd_transport/src/main/resources/bootstrap.yml | 16 ++++++++++------ 6 files changed, 56 insertions(+), 38 deletions(-) diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index 70803d9fc..d0b615c93 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -14,19 +14,19 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 +# server-addr: 10.102.192.5:6848 +# username: nacos +# password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 3979a255a..098ff9621 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -20,17 +20,19 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 username: nacos password: manhuoda@2023 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index 8132a55fb..f0c89998d 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,18 +20,22 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # server-addr: 116.204.23.92:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index fab856199..b84e7b761 100644 --- a/mhd_product/src/main/resources/bootstrap.yml +++ b/mhd_product/src/main/resources/bootstrap.yml @@ -20,17 +20,21 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index da96ce5bb..7d859c01a 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -20,17 +20,21 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 1bdd007fd..82501b116 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -21,17 +21,21 @@ spring: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 # server-addr: 10.33.0.129:6010r - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 + #线上正式环境 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 # server-addr: 10.33.0.129:6010 #线上正式环境 # server-addr: 10.102.192.105:6848 From 536079a024fa558ff60bf7ee9983fb93a6c488de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 14 Jan 2026 22:28:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessDocumentApplicationService.java | 6 +++++- .../facade/IBusinessDocumentService.java | 5 ++++- .../repository/mapper/BusinessDocumentMapper.java | 6 +++++- .../persistence/BusinessDocumentImpl.java | 9 ++++++++- .../service/BusinessDocumentDomainService.java | 11 ++++++----- .../facade/reconciliation/ReconciliationApi.java | 15 ++++++++++++++- .../businessDocument/BusinessDocumentMapper.xml | 11 ++++++++++- 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java index b0f0922df..1bbc05a16 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java @@ -591,6 +591,10 @@ public class BusinessDocumentApplicationService { return businessDocumentDomainService.queryList(businessDocumentDO); } + public List> getFeeList(String invoiceId) { + return businessDocumentDomainService.getFeeList(invoiceId); + } + /** * 修改业务单据支付状态，同步网货修改支付状态 */ @@ -1659,4 +1663,4 @@ public class BusinessDocumentApplicationService { return true; } -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java index 0a71e15f3..5764ce24d 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java @@ -10,6 +10,7 @@ import com.linke.finance.domain.businessDocumentDetali.repository.po.BusinessDoc import com.linke.finance.domain.reconciliation.repository.po.ReconciliationPO; import java.util.List; +import java.util.Map; /** * 业务单据Service接口 @@ -24,6 +25,8 @@ public interface IBusinessDocumentService extends IService */ public List queryList(BusinessDocumentDO businessDocumentDO); + public List> getFeeList(String invoiceId); + /** * 新增业务单据 */ @@ -60,4 +63,4 @@ public interface IBusinessDocumentService extends IService List querySettlementList(BusinessDocumentDO businessDocumentDO); BusinessDocument getByWaybillNo(String waybillNo); -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java index 531cba8a3..f3b027f53 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java @@ -1,6 +1,8 @@ package com.linke.finance.domain.businessDocument.repository.mapper; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.linke.finance.domain.businessDocument.entity.BusinessDocument; import com.linke.finance.domain.businessDocument.repository.po.AccountsReceivableAppPO; @@ -24,6 +26,8 @@ public interface BusinessDocumentMapper extends BaseMapper */ public List queryList(BusinessDocumentDO businessDocumentDO); + List> getFeeList(@Param("invoiceId")String invoiceId); + /** * 查询申请开票业务单据列表 */ @@ -38,4 +42,4 @@ public interface BusinessDocumentMapper extends BaseMapper List queryListByReconciliation(BusinessDocumentDO businessDocumentDO); List querySettlementList(@Param("businessDocumentDO") BusinessDocumentDO businessDocumentDO); -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java index 4a12f17a0..35de19fb6 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 业务单据Service业务层处理 @@ -39,6 +40,12 @@ public class BusinessDocumentImpl extends ServiceImpl> getFeeList(String invoiceId) + { + return businessDocumentMapper.getFeeList(invoiceId); + } + /** * 新增业务单据 */ @@ -130,4 +137,4 @@ public class BusinessDocumentImpl extends ServiceImpl> getFeeList(String invoiceId) { + return businessDocumentService.getFeeList(invoiceId); + } + /** * 新增业务单据 @@ -202,4 +203,4 @@ public class BusinessDocumentDomainService { -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java index 4e3099400..6f718ae96 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java @@ -2,6 +2,7 @@ package com.linke.finance.interfaces.facade.reconciliation; import java.util.Date; import java.util.List; +import java.util.Map; import com.linke.finance.application.server.businessDocument.BusinessDocumentApplicationService; import com.linke.finance.application.server.reconciliation.ReconciliationApplicationService; @@ -11,6 +12,7 @@ import com.linke.finance.domain.reconciliation.entity.Reconciliation; import com.linke.finance.domain.reconciliation.repository.po.FinacialReconciliationListVO; import com.linke.finance.interfaces.assembler.businessDocument.BusinessDocumentAssembler; import com.mhd.common.core.domain.dto.BusinessDocumentDTO; +import com.mhd.common.core.domain.entity.R; import com.mhd.common.log.annotation.Log; import com.mhd.common.log.enums.BusinessType; import io.swagger.annotations.ApiOperation; @@ -193,6 +195,17 @@ public class ReconciliationApi extends BaseController{ return getDataTable(list); } + + /** + * 对账单详情 + */ + @GetMapping("/getFeeListByInvoiceId") + public R>> getFeeList(@RequestParam String invoiceId) + { + List> list = businessDocumentApplicationService.getFeeList(invoiceId); + return R.ok(list); + } + /** * 生成对账单（调账对账） */ @@ -297,4 +310,4 @@ public class ReconciliationApi extends BaseController{ } -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml b/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml index 5bb7cc317..e54fdc9ba 100644 --- a/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml +++ b/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml @@ -131,6 +131,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +