Merge remote-tracking branch 'origin/pre-production' into pre-production

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,12 @@ 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}

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

@@ -42,3 +42,7 @@ 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}

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

@@ -69,3 +69,12 @@ 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}

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

@@ -55,3 +55,7 @@ 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}

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

@@ -29,6 +29,10 @@ 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}
   #rabbitmq配置
   rabbitmq:
     host: 192.168.2.110