Merge remote-tracking branch 'origin/main'

# Conflicts:
#	qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/DynamicDataSourceConfig.java
#	qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/filters/DynamicDataSourceFilter.java
#	qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/DefaultDataSourceProperties.java
#	qiaoba-commons/qiaoba-common-datasource/src/main/resources/META-INF/spring.factories

qiaoba-application/src/main/java/com/qiaoba/application/QiaoBaApplication.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -14,6 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @version 1.0
  * @date 1/29/23 10:44 AM
  */
+@EnableConfigurationProperties
 @EnableScheduling
 @ComponentScan({"com.qiaoba.module.**", "com.qiaoba.application"})
 @MapperScan("com.qiaoba.module.**.mapper")

qiaoba-application/src/main/resources/application-dev.yml

@@ -30,3 +30,34 @@ qiaoba:
           max: 20
         is-use: false # 不使用该库
 
+qiaoba:
+  datasource:
+    master:
+      driver: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://121.5.136.69:3306/qiaoba-boot?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
+      username: root
+      password: LpYN7LUoL?l0OSpR2
+      pool:
+        init: 5 #连接池初始化大小
+        min: 10 #最小空闲连接数
+        max: 20 #最大连接数
+    slaves:
+      - url: jdbc:mysql://121.5.136.69:3306/qiaoba-boot?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
+        username: root
+        password: LpYN7LUoL?l0OSpR2
+        weight: 2
+        pool:
+          init: 5
+          min: 10
+          max: 20
+        use: true
+      - url: jdbc:mysql://121.5.136.69:3306/qiaoba-boot?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
+        username: root
+        password: LpYN7LUoL?l0OSpR2
+        weight:
+        pool:
+          init: 5 #连接池初始化大小
+          min: 10 #最小空闲连接数
+          max: 20 #最大连接数
+        is-use: false
+

qiaoba-application/src/main/resources/application.yml

@@ -17,7 +17,6 @@ spring:
     time-zone: GMT+8
 
 
-
 # springdoc-openapi项目配置
 springdoc:
   swagger-ui:
@@ -38,4 +37,3 @@ knife4j:
     enable-swagger-models: false
     enable-footer-custom: true
     footer-custom-content: create by ailanyin
-