Merge branch 'pre-production' into dev

blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -44,10 +44,10 @@ public class LauncherServiceImpl implements LauncherService {
 
 
 		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
 		// dubbo注册
 		PropsUtil.setProperty(props, "dubbo.application.name", appName);
 		PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false");

blade-service/logpm-aftersales/src/main/resources/application-test.yml

@@ -29,3 +29,7 @@ spring:
           url: ${blade.datasource.aftersales.627683.url}
           username: ${blade.datasource.aftersales.627683.username}
           password: ${blade.datasource.aftersales.627683.password}
+        695224:
+          url: ${blade.datasource.aftersales.695224.url}
+          username: ${blade.datasource.aftersales.695224.username}
+          password: ${blade.datasource.aftersales.695224.password}

blade-service/logpm-basic/src/main/resources/application-test.yml

@@ -43,3 +43,22 @@ spring:
           username: ${blade.datasource.basic.627683.username}
           password: ${blade.datasource.basic.627683.password}
 
+        695224:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.basic.695224.url}
+          username: ${blade.datasource.basic.695224.username}
+          password: ${blade.datasource.basic.695224.password}
+
+        645789:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.basic.645789.url}
+          username: ${blade.datasource.basic.645789.username}
+          password: ${blade.datasource.basic.645789.password}

blade-service/logpm-basicdata/src/main/resources/application-test.yml

@@ -42,3 +42,11 @@ spring:
           url: ${blade.datasource.basicdata.627683.url}
           username: ${blade.datasource.basicdata.627683.username}
           password: ${blade.datasource.basicdata.627683.password}
+        695224:
+          url: ${blade.datasource.basicdata.695224.url}
+          username: ${blade.datasource.basicdata.695224.username}
+          password: ${blade.datasource.basicdata.695224.password}
+        645789:
+          url: ${blade.datasource.basicdata.645789.url}
+          username: ${blade.datasource.basicdata.645789.username}
+          password: ${blade.datasource.basicdata.645789.password}

blade-service/logpm-business/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 17020
+  port: 16010
 
 #数据源配置
 #spring:

blade-service/logpm-business/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 17020
+  port: 16010
 
 #数据源配置
 #spring:

blade-service/logpm-business/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 17020
+  port: 16010
 
 #数据源配置
 #spring:
@@ -22,13 +22,22 @@ spring:
       primary: master
       datasource:
         master:
-          url: ${blade.datasource.warehouse.master.url}
-          username: ${blade.datasource.warehouse.master.username}
-          password: ${blade.datasource.warehouse.master.password}
+          url: ${blade.datasource.business.master.url}
+          username: ${blade.datasource.business.master.username}
+          password: ${blade.datasource.business.master.password}
         627683:
-          url: ${blade.datasource.warehouse.627683.url}
-          username: ${blade.datasource.warehouse.627683.username}
-          password: ${blade.datasource.warehouse.627683.password}
+          url: ${blade.datasource.business.627683.url}
+          username: ${blade.datasource.business.627683.username}
+          password: ${blade.datasource.business.627683.password}
+        645789:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.business.645789.url}
+          username: ${blade.datasource.business.645789.username}
+          password: ${blade.datasource.business.645789.password}
   #rabbitmq配置
   rabbitmq:
     host: 192.168.2.110

blade-service/logpm-distribution/src/main/resources/application-test.yml

@@ -69,3 +69,21 @@ spring:
           url: ${blade.datasource.distribution.627683.url}
           username: ${blade.datasource.distribution.627683.username}
           password: ${blade.datasource.distribution.627683.password}
+        695224:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.distribution.695224.url}
+          username: ${blade.datasource.distribution.695224.username}
+          password: ${blade.datasource.distribution.695224.password}
+        645789:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.distribution.645789.url}
+          username: ${blade.datasource.distribution.645789.username}
+          password: ${blade.datasource.distribution.645789.password}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java

@@ -98,6 +98,7 @@ public class AdvanceToLoadListener {
 					loadIds.add(carsLoadScanEntity.getLoadId());
 					DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 					parcelListEntity.setWarehouseEntryTimeEnd(CommonUtil.addDate(createTime,-60));
+					parcelListEntity.setTenantId(tenantId);
 					parcelListEntity.setUpdateUser(createUser);
 					parcelListEntity.setCreateUser(createUser);
 					parcelListEntity.setCreateDept(createDept);

blade-service/logpm-trunkline/src/main/resources/application-test.yml

@@ -10,6 +10,32 @@ server:
 #    password: ${blade.datasource.test.password}
 
 spring:
+  #rabbitmq配置
+  rabbitmq:
+    host: 192.168.2.110
+    port: 5672
+    username: admin
+    password: Slwk@123654
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /
+    #确认消息已发送到队列(Queue)
+    publisher-returns: true
+    publisher-confirm-type: correlated
+    # 手动提交消息
+    listener:
+      simple:
+        acknowledge-mode: auto
+        default-requeue-rejected: false
+        retry:
+          enabled: true # 开启消费者失败重试
+          initial-interval: 1000 # 初识的失败等待时长为1秒
+          multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval
+          max-attempts: 3 # 最大重试次数
+          stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false
+      direct:
+        acknowledge-mode: manual
+    template:
+      mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
@@ -29,3 +55,11 @@ spring:
           url: ${blade.datasource.trunkline.627683.url}
           username: ${blade.datasource.trunkline.627683.username}
           password: ${blade.datasource.trunkline.627683.password}
+        695224:
+          url: ${blade.datasource.trunkline.695224.url}
+          username: ${blade.datasource.trunkline.695224.username}
+          password: ${blade.datasource.trunkline.695224.password}
+        645789:
+          url: ${blade.datasource.trunkline.645789.url}
+          username: ${blade.datasource.trunkline.645789.username}
+          password: ${blade.datasource.trunkline.645789.password}

blade-service/logpm-warehouse/src/main/resources/application-test.yml

@@ -29,6 +29,14 @@ spring:
           url: ${blade.datasource.warehouse.627683.url}
           username: ${blade.datasource.warehouse.627683.username}
           password: ${blade.datasource.warehouse.627683.password}
+        695224:
+          url: ${blade.datasource.warehouse.695224.url}
+          username: ${blade.datasource.warehouse.695224.username}
+          password: ${blade.datasource.warehouse.695224.password}
+        645789:
+          url: ${blade.datasource.warehouse.645789.url}
+          username: ${blade.datasource.warehouse.645789.username}
+          password: ${blade.datasource.warehouse.645789.password}
   #rabbitmq配置
   rabbitmq:
     host: 192.168.2.110