Merge remote-tracking branch 'origin/dev' into dev

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

@@ -32,16 +32,14 @@ spring:
             #validation-query: select 1 from dual
           url: ${blade.datasource.report.master.url}
           username: ${blade.datasource.report.master.username}
-#          password: ${blade.datasource.report.master.password}
+          password: ${blade.datasource.report.master.password}
-          password: 12345678
+        627683:
-        slave:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.report.slave.url}
+          url: ${blade.datasource.report.627683.url}
-          username: ${blade.datasource.report.slave.username}
+          username: ${blade.datasource.report.627683.username}
-#          password: ${blade.datasource.report.slave.password}
+          password: ${blade.datasource.report.627683.password}
-          password: 12345678
 

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

@@ -33,13 +33,13 @@ spring:
           url: ${blade.datasource.report.master.url}
           username: ${blade.datasource.report.master.username}
           password: ${blade.datasource.report.master.password}
-        slave:
+        627683:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.report.slave.url}
+          url: ${blade.datasource.report.627683.url}
-          username: ${blade.datasource.report.slave.username}
+          username: ${blade.datasource.report.627683.username}
-          password: ${blade.datasource.report.slave.password}
+          password: ${blade.datasource.report.627683.password}