dockerfile jdk修改

Merge branch 'test'
# Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-modules/mhd-system/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml # mhd_bms/src/main/resources/bootstrap.yml # mhd_finance/src/main/resources/bootstrap.yml # mhd_oms/src/main/resources/bootstrap.yml # mhd_product/src/main/resources/bootstrap.yml # mhd_thrid_party/src/main/resources/bootstrap.yml # mhd_transport/src/main/resources/bootstrap.yml # mhd_wms/src/main/resources/bootstrap.yml
2026-02-10 17:47:09 +08:00 · 2026-02-10 11:30:27 +08:00 · 2026-02-10 11:22:51 +08:00 · 2026-02-10 11:18:36 +08:00 · 2026-02-09 15:23:17 +08:00 · 2026-02-09 15:14:52 +08:00
16 changed files with 72 additions and 200 deletions
@@ -12,19 +12,13 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.5:6848
+        #线上正式环境
+        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.102.192.5:6848
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
        #线上正式环境
@@ -32,4 +26,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}
@@ -13,26 +13,17 @@ spring:
  cloud:
    nacos:
      discovery:
-#        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.5:6848
-#        server-addr: 10.33.0.129:6010
        #线上正式环境
-        server-addr: 127.0.0.1:8848
-#        server-addr: 10.102.192.5:6848
+        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: 127.0.0.1:8848
-#        server-addr: 10.102.192.5:6848
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
        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}
@@ -13,25 +13,17 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
-#        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
-        #线上正式环境
-#        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
+        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}
@@ -18,17 +18,13 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置 容器名+端口号
-        #        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
      config:
-        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-        #        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
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  kdvolder/jdk8
+FROM arm64v8/openjdk:8
 # author
 MAINTAINER manhuoda
 #指定东八区时区
@@ -10,8 +10,8 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
 # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp
 VOLUME /tmp
 #将当前jar 复制到容器根目录下
-ADD mhd_bms.jar mhd_bms.jar
+ADD target/mhd_bms.jar mhd_bms.jar
 #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
 EXPOSE 8019
 # 运行jar包
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_bms.jar"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_bms.jar"]
@@ -104,7 +104,7 @@
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.30</version>
            <scope>provided</scope>
        </dependency>
        <!--import mybatis plus 它会自动引入mybatis及mybatis spring切勿重复引用以免冲突-->
@@ -16,18 +16,18 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
+        #线上正式环境
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        # 锁定server端的配置文件（读取它的配置项）
-        namespace:   # 命名空间id
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 开启nacos自动刷新，如果这个配置没有或者为false会导致配置不能自动刷新
        # 允许nacos服务端向本地同步配置
        enable-remote-sync-config: true
-        refresh-enabled: true
-
-
-
+        refresh-enabled: true
@@ -110,9 +110,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
    private TmsReceiptMapper tmsReceiptMapper;
    //nc测试环境地址
    private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
-
+    private String zsurl="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
    //nc正式环境地址
-    private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
+    //private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
    /**
     * 查询对账单列表
     */
@@ -488,10 +488,13 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                item.setQuantity_de("0");
                                item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
                                item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight()));
-                                BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
-                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
+                                BigDecimal rate=tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100));
+                                BigDecimal taxRate=BigDecimal.ONE.add(rate);
+                              //  BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().divide(taxRate,2,BigDecimal.ROUND_HALF_UP);
+                                BigDecimal tax_de=notax_de.multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
                                item.setNotax_de(String.valueOf(notax_de));
-                                item.setLocal_tax_de(String.valueOf(notax_de));
+                                item.setLocal_tax_de(String.valueOf(tax_de));
                                item.setTax_de(String.valueOf(tax_de));
                                item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
                                item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
@@ -686,16 +689,20 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                        item.setMoney_de(String.valueOf(reconciliationAccount.getAmount()));
                                        item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
                                        if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){
-                                            BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
-                                            BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
+                                            BigDecimal rate=reconciliationAccount.getRate().divide(BigDecimal.valueOf(100));
+                                            BigDecimal taxRate=BigDecimal.ONE.add(rate);
+                                            //  BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+                                            BigDecimal notax_de=reconciliationAccount.getAmount().divide(taxRate,2,BigDecimal.ROUND_HALF_UP);
+                                            BigDecimal tax_de=notax_de.multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+
                                            item.setNotax_de(String.valueOf(notax_de));
-                                            item.setLocal_tax_de(String.valueOf(notax_de));
+                                            item.setLocal_tax_de(String.valueOf(tax_de));
                                            item.setTax_de(String.valueOf(tax_de));
                                        }else{
                                            BigDecimal tax_de=BigDecimal.ZERO;
                                            BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
                                            item.setNotax_de(String.valueOf(notax_de));
-                                            item.setLocal_tax_de(String.valueOf(notax_de));
+                                            item.setLocal_tax_de(String.valueOf(tax_de));
                                            item.setTax_de(String.valueOf(tax_de));
                                        }
                                        item.setPrice(String.valueOf(reconciliationAccount.getAmount()));
@@ -1208,4 +1215,4 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
        }
        return true;
    }
-}
+}
@@ -18,36 +18,17 @@ spring:
  cloud:
    nacos:
      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: 127.0.0.1:8848
-#        server-addr: 10.102.192.5:6848
+        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: 127.0.0.1:8848
-#        server-addr: 10.102.192.5:6848
+        # 线上测试环境配置 容器名+端口号
+        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}
@@ -10,8 +10,8 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
 # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp
 VOLUME /tmp
 #将当前mhd_special_logistics.jar 复制到容器根目录下
-ADD mhd_oms.jar mhd_oms.jar
+ADD target/mhd_oms.jar mhd_oms.jar
 #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
 EXPOSE 8017
 # 运行jar包
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_oms.jar"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_oms.jar"]
@@ -16,39 +16,14 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
+        #线上正式环境
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        # 演示环境
-        #        server-addr: 47.92.229.169:8848
-        # 测试开发环境
-#        server-addr: 192.168.10.18:8848
-        # Saas环境
-      #        server-addr: 8.130.64.92:8848
-      #        ip: 118.25.4.55
-        # 大运通泰生产环境
-#        server-addr: 39.107.137.158:8848
-        # 线上测试环境
-#        server-addr: 116.204.23.92:8848
      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        # 演示环境
-        #        server-addr: 47.92.229.169:8848
-        # 测试开发环境
-#        server-addr: 192.168.10.18:8848
-        # Saas环境
-        #        server-addr: 8.130.64.92:8848
-        # 大运通泰生产环境
-#        server-addr: 39.107.137.158:8848
-        # 线上测试环境
-#        server-addr: 116.204.23.92:8848
-        # 锁定server端的配置文件（读取它的配置项）
-        namespace:   # 命名空间id
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
-        file-extension: yml   #默认properties
-
-
-
+        file-extension: yml   #默认properties
@@ -18,29 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.5:6848
+        #线上正式环境
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        #线上正式环境
-        #        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
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        #线上正式环境
-        #        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
        # 共享配置
@@ -18,29 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.5:6848
+        #线上正式环境
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        #线上正式环境
-        #        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
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        #线上正式环境
-        #        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
        # 共享配置
@@ -18,31 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置使用ip+端口号
-#        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
-        #线上正式环境
-        #        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        #线上正式环境
-        #        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
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -10,8 +10,8 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
 # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp
 VOLUME /tmp
 #将当前mhd_special_logistics.jar 复制到容器根目录下
-ADD mhd_wms.jar mhd_wms.jar
+ADD target/mhd_wms.jar mhd_wms.jar
 #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
 EXPOSE 8017
 # 运行jar包
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_wms.jar"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_wms.jar"]
@@ -13,37 +13,17 @@ spring:
  cloud:
    nacos:
      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        #线上正式环境
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        # 演示环境
-#        server-addr: 47.92.229.169:8848
-        # 测试开发环境
-#        server-addr: 192.168.10.18:8848
-        # Saas环境
-#        server-addr: 8.130.64.92:8848
-        # 大运通泰生产环境
-#        server-addr: 39.107.137.158:8848
-        # 线上测试环境
-#        server-addr: 116.204.23.92:8848
      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
-        # 演示环境
-#        server-addr: 47.92.229.169:8848
-        # 测试开发环境
-#        server-addr: 192.168.10.18:8848
-        # Saas环境
-#        server-addr: 8.130.64.92:8848
-        # 大运通泰生产环境
-#        server-addr: 39.107.137.158:8848
-        # 线上测试环境
-#        server-addr: 116.204.23.92:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
Author	SHA1	Message	Date
王奎兴	4a0ac011b9	dockerfile jdk修改	2026-02-10 17:47:09 +08:00
王奎兴	0363e6fdc5	Merge branch 'test' # Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-modules/mhd-system/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml # mhd_bms/src/main/resources/bootstrap.yml # mhd_finance/src/main/resources/bootstrap.yml # mhd_oms/src/main/resources/bootstrap.yml # mhd_product/src/main/resources/bootstrap.yml # mhd_thrid_party/src/main/resources/bootstrap.yml # mhd_transport/src/main/resources/bootstrap.yml # mhd_wms/src/main/resources/bootstrap.yml	2026-02-10 11:30:27 +08:00
王奎兴	ee873473fb	nacos配置修改;	2026-02-10 11:22:51 +08:00
王奎兴	b7233d4052	Merge branch 'dev' # Conflicts: # mhd_finance/src/main/resources/bootstrap.yml	2026-02-10 11:18:36 +08:00
王奎兴	afc47230df	bms nacos配置修改;	2026-02-09 15:23:17 +08:00
王奎兴	4917dcb154	修改dockerfile jar包位置	2026-02-09 15:14:52 +08:00
王奎兴	b136e6a55e	bms及bms达梦配置修改;	2026-02-09 14:58:07 +08:00
王奎兴	1eb2f4c816	测试环境nacos配置修改;	2026-02-09 14:46:28 +08:00
王奎兴	8ca0b289fa	Merge branch 'dev' into test	2026-02-09 14:45:24 +08:00
王奎兴	457fceb0b1	测试环境nacos配置修改;	2026-02-09 14:44:40 +08:00
王奎兴	4f16713c03	Merge branch 'dev' into test # Conflicts: # mhd-user-center/src/main/resources/bootstrap.yml # mhd_finance/src/main/resources/bootstrap.yml	2026-02-09 14:40:57 +08:00
赵辉	98c4c08a8f	修改密码修正	2026-02-06 18:51:54 +08:00
赵辉	5170a2d96f	Merge branch 'dev' into test	2026-02-06 18:50:42 +08:00
赵辉	d1e982b9d4	Merge branch 'dev' into test	2026-02-06 15:26:00 +08:00
赵辉	c0c75e2db0	Merge branch 'dev' into test # Conflicts: # mhd_finance/src/main/resources/bootstrap.yml	2026-02-06 14:20:05 +08:00
赵辉	8f8bda4a87	yml修改	2026-02-06 14:19:37 +08:00
王奎兴	a2e3f23798	nc推送地址修改	2026-01-20 16:04:51 +08:00
王奎兴	7a45568be6	nc推送地址修改	2026-01-20 14:03:38 +08:00
王奎兴	8ba0c64b62	nc推送地址修改	2026-01-20 14:01:13 +08:00
hjx	22d5a1ea3f	nc组装报文修改	2026-01-19 20:53:49 +08:00
hjx	258417cac7	nc改成测试环境	2026-01-19 18:59:52 +08:00
hjx	a7b7e2c82d	nc改成测试环境	2026-01-19 18:58:56 +08:00
hjx	88ac989ced	南歧nc推送税费金额修改	2026-01-19 16:55:50 +08:00