Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-test.yml

@@ -56,16 +56,16 @@ spring:
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.factorydata-zbom.master.url}
-          username: ${blade.datasource.factorydata-zbom.master.username}
-          password: ${blade.datasource.factorydata-zbom.master.password}
+          url: ${blade.datasource.factorydata-base.master.url}
+          username: ${blade.datasource.factorydata-base.master.username}
+          password: ${blade.datasource.factorydata-base.master.password}
         slave:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.factorydata-zbom.slave.url}
-          username: ${blade.datasource.factorydata-zbom.slave.username}
-          password: ${blade.datasource.factorydata-zbom.slave.password}
+          url: ${blade.datasource.factorydata-base.slave.url}
+          username: ${blade.datasource.factorydata-base.slave.username}
+          password: ${blade.datasource.factorydata-base.slave.password}
 

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-test.yml

@@ -56,16 +56,16 @@ spring:
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.factorydata-base.master.url}
-          username: ${blade.datasource.factorydata-base.master.username}
-          password: ${blade.datasource.factorydata-base.master.password}
+          url: ${blade.datasource.factorydata-zbom.master.url}
+          username: ${blade.datasource.factorydata-zbom.master.username}
+          password: ${blade.datasource.factorydata-zbom.master.password}
         slave:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.factorydata-base.slave.url}
-          username: ${blade.datasource.factorydata-base.slave.username}
-          password: ${blade.datasource.factorydata-base.slave.password}
+          url: ${blade.datasource.factorydata-zbom.slave.url}
+          username: ${blade.datasource.factorydata-zbom.slave.username}
+          password: ${blade.datasource.factorydata-zbom.slave.password}