瀏覽代碼

local.yaml文件冲突

GouGengquan 1 年之前
父節點
當前提交
0abb674b80
共有 1 個文件被更改,包括 31 次插入13 次删除
  1. 31 13
      biz-base/src/main/resources/application-local.yml

+ 31 - 13
biz-base/src/main/resources/application-local.yml

@@ -3,19 +3,37 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
-    username: root
-    password: 914851221
-    initialSize: 10 #初始化连接数D
-    minIdle: 10 #最小空闲连接数
-    max-active: 100 #最大连接数
-    maxWait: 60000 #最大等待时间ms(获取不到连接后多久超时)
-    hikari:
-      minimum-idle: 5
-      maximum-pool-size: 200
-      connection-timeout: 30000
-      idle-timeout: 600000
-      max-lifetime: 1800000
+    dynamic:
+      primary: mbs
+      datasource:
+        mbs:
+          url: jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
+          username: root
+          password: 914851221
+          initialSize: 10 #初始化连接数D
+          minIdle: 10 #最小空闲连接数
+          max-active: 100 #最大连接数
+          maxWait: 60000 #最大等待时间ms(获取不到连接后多久超时)
+          hikari:
+            minimum-idle: 5
+            maximum-pool-size: 200
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
+        dyoa:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: 914851221
+          initialSize: 10 #初始化连接数D
+          minIdle: 10 #最小空闲连接数
+          max-active: 100 #最大连接数
+          maxWait: 60000 #最大等待时间ms(获取不到连接后多久超时)
+          hikari:
+            minimum-idle: 5
+            maximum-pool-size: 200
+            connection-timeout: 30000
+            idle-timeout: 600000
+            max-lifetime: 1800000
 
 
 dfs: