合并分支 'dxy' 到 'qa'

src/main/resources/application-dev.yml

 spring:
 
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    #    url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true
+    dynamic:
+      primary: master  #设置默认的数据源或者数据源组,默认值即为master
+      strict: false    #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        master:
           url: jdbc:mysql://192.168.100.39:25301/promotion_dev?autoReconnect=true
+          password: Zt%68Dsuv&M
           username: root
+          driver-class-name: com.mysql.jdbc.Driver
+        bi:
+          url: jdbc:mysql://192.168.100.39:25301/market_bi?autoReconnect=true&useSSL=false&characterEncoding=utf8
           password: Zt%68Dsuv&M
+          username: root
+          driver-class-name: com.mysql.jdbc.Driver
+        sfa:
+          url: jdbc:mysql://192.168.100.39:25301/sfa_bus?autoReconnect=true
+          password: Zt%68Dsuv&M
+          username: root
+          driver-class-name: com.mysql.jdbc.Driver
   redis:
     port: 6379
     host: 192.168.100.40

src/main/resources/application-master.yml

 spring:
 
   datasource:
+    dynamic:
+      primary: master  #设置默认的数据源或者数据源组,默认值即为master
+      strict: false	#设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        sfa:
+          url: jdbc:mysql://rm-2ze28qp55mrm34g8b.mysql.rds.aliyuncs.com:3306/sfa_bus?autoReconnect=true
+          password: Wxl@325Pa91
+          username: sfabus
           driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://rm-2ze28qp55mrm34g8b.mysql.rds.aliyuncs.com:3306/promotion?autoReconnect=true
+        master:
+          url: jdbc:mysql://rm-2ze28qp55mrm34g8b.mysql.rds.aliyuncs.com:3306/promotion?autoReconnect=true&useSSL=false&characterEncoding=utf8
+          password: Wxl@325Pa91
           username: sfabus
+          driver-class-name: com.mysql.jdbc.Driver
+        bi:
+          url: jdbc:mysql://rm-2ze28qp55mrm34g8b.mysql.rds.aliyuncs.com:3306/market_bi?autoReconnect=true&useSSL=false&characterEncoding=utf8
           password: Wxl@325Pa91
+          username: sfabus
+          driver-class-name: com.mysql.jdbc.Driver
   redis:
     port: 6379
     host: r-2zehfktt1r34vn4qws.redis.rds.aliyuncs.com

src/main/resources/application-qa.yml

 spring:
 
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    #    url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true
+    dynamic:
+      primary: master  #设置默认的数据源或者数据源组,默认值即为master
+      strict: false    #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        master:
           url: jdbc:mysql://192.168.100.39:25301/promotion_dev?autoReconnect=true
+          password: Zt%68Dsuv&M
           username: root
+          driver-class-name: com.mysql.jdbc.Driver
+        bi:
+          url: jdbc:mysql://192.168.100.39:25301/market_bi?autoReconnect=true&useSSL=false&characterEncoding=utf8
           password: Zt%68Dsuv&M
+          username: root
+          driver-class-name: com.mysql.jdbc.Driver
+        sfa:
+          url: jdbc:mysql://192.168.100.39:25301/sfa_bus?autoReconnect=true
+          password: Zt%68Dsuv&M
+          username: root
+          driver-class-name: com.mysql.jdbc.Driver
   redis:
     port: 6379
     host: 192.168.100.40