dockerfile jdk修改

# 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

mhd-auth/src/main/resources/bootstrap.yml

@@ -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
         #线上正式环境

mhd-gateway/src/main/resources/bootstrap.yml

@@ -13,22 +13,13 @@ 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: 10.102.192.5:6848
-        #线上正式环境
-        server-addr: 127.0.0.1:8848
-#        server-addr: 10.102.192.5:6848
         username: nacos
         password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置

mhd-modules/mhd-system/src/main/resources/bootstrap.yml

@@ -13,23 +13,15 @@ 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
         # 共享配置

mhd-user-center/src/main/resources/bootstrap.yml

@@ -18,17 +18,13 @@ 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: 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，如果使用默认分组可以不配置

mhd_bms/Dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  kdvolder/jdk8
+FROM arm64v8/openjdk:8
 # author
 MAINTAINER manhuoda
 #指定东八区时区
@@ -10,7 +10,7 @@ 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包

mhd_bms/pom.xml

@@ -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切勿重复引用以免冲突-->

mhd_bms/src/main/resources/bootstrap.yml

@@ -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-addr: 10.102.192.5:6848
-        # 锁定server端的配置文件（读取它的配置项）
+        username: nacos
-        namespace:   # 命名空间id
+        password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
         file-extension: yml   #默认properties
         # 开启nacos自动刷新，如果这个配置没有或者为false会导致配置不能自动刷新
         # 允许nacos服务端向本地同步配置
         enable-remote-sync-config: true
         refresh-enabled: true
-
-
-

mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java

@@ -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 rate=tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100));
-                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
+                                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 rate=reconciliationAccount.getRate().divide(BigDecimal.valueOf(100));
-                                            BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
+                                            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()));

mhd_finance/src/main/resources/bootstrap.yml

@@ -18,34 +18,15 @@ 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
-#        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
         username: nacos
         password: manhuoda@2023
-        #线上正式环境
-#        server-addr: 10.102.192.105:6848
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
         file-extension: yml   #默认properties
         # 共享配置

mhd_oms/Dockerfile

@@ -10,7 +10,7 @@ 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包

mhd_oms/src/main/resources/bootstrap.yml

@@ -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
-
-
-

mhd_product/src/main/resources/bootstrap.yml

@@ -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
         # 共享配置

mhd_thrid_party/src/main/resources/bootstrap.yml

@@ -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
         # 共享配置

mhd_transport/src/main/resources/bootstrap.yml

@@ -18,31 +18,15 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        #线上正式环境
-        # 线上测试环境配置使用ip+端口号
+        server-addr: 10.102.192.5:6848
-#        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
-        #线上正式环境
-#        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
         # 共享配置

mhd_wms/Dockerfile

@@ -10,7 +10,7 @@ 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包

mhd_wms/src/main/resources/bootstrap.yml

@@ -13,35 +13,15 @@ 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
         # 共享配置