升级dynamic-datasource-spring-boot-starter版本号

jeecgboot · Oct 12, 2023 · 9af268f · 9af268f
1 parent e2d5c29
commit 9af268f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...ingsphere/src/main/java/org/jeecg/boot/shardingsphere/config/DataSourceConfiguration.java b/...ingsphere/src/main/java/org/jeecg/boot/shardingsphere/config/DataSourceConfiguration.java
@@ -1,9 +1,10 @@
 package org.jeecg.boot.shardingsphere.config;
 
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
+import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;
 import com.baomidou.dynamic.datasource.provider.AbstractDataSourceProvider;
 import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
 import org.springframework.boot.SpringBootConfiguration;
@@ -37,15 +38,20 @@ public class DataSourceConfiguration {
     @Lazy
     @Resource
     DataSource shardingDataSource;
-
+
+    @Lazy
+    @Resource
+    DefaultDataSourceCreator dataSourceCreator;
+
+
     /**
      * 将shardingDataSource放到了多数据源（dataSourceMap）中
      * 注意有个版本的bug，3.1.1版本 不会进入loadDataSources 方法，这样就一直造成数据源注册失败
      */
     @Bean
     public DynamicDataSourceProvider dynamicDataSourceProvider() {
         Map<String, DataSourceProperty> datasourceMap = dynamicDataSourceProperties.getDatasource();
-        return new AbstractDataSourceProvider() {
+        return new AbstractDataSourceProvider(dataSourceCreator) {
             @Override
             public Map<String, DataSource> loadDataSources() {
                 Map<String, DataSource> dataSourceMap = createDataSourceMap(datasourceMap);

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
         <!-- 分布式锁、xxljob、分库分表 -->
         <redisson.version>3.16.1</redisson.version>
         <xxl-job-core.version>2.2.0</xxl-job-core.version>
-        <dynamic-datasource-spring-boot-starter.version>3.5.2</dynamic-datasource-spring-boot-starter.version>
+        <dynamic-datasource-spring-boot-starter.version>4.1.3</dynamic-datasource-spring-boot-starter.version>
 
         <!-- SpringCloud -->
         <spring-cloud.version>2021.0.3</spring-cloud.version>