Explorar o código

优化动态数据源支持

zhouhao %!s(int64=8) %!d(string=hai) anos
pai
achega
0b19ad16b3

+ 6 - 0
hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml

@@ -32,6 +32,12 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.hsweb</groupId>
+            <artifactId>hsweb-web-datasource</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- mybatis start-->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

+ 4 - 1
hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceAutoConfiguration.java

@@ -20,6 +20,7 @@ import com.atomikos.icatch.jta.UserTransactionImp;
 import com.atomikos.icatch.jta.UserTransactionManager;
 import com.atomikos.jdbc.AtomikosDataSourceBean;
 import org.hsweb.web.core.datasource.DynamicDataSource;
+import org.hsweb.web.core.datasource.DynamicDataSourceHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -58,7 +59,9 @@ public class DynamicDataSourceAutoConfiguration {
 
     @Bean(name = "dynamicDataSource")
     public DynamicXaDataSourceImpl dynamicXaDataSource(@Qualifier("dataSource") DataSource dataSource) {
-        return new DynamicXaDataSourceImpl(dataSource);
+        DynamicXaDataSourceImpl dynamicXaDataSource = new DynamicXaDataSourceImpl(dataSource);
+        DynamicDataSourceHolder.install(dynamicXaDataSource);
+        return dynamicXaDataSource;
     }
 
     @Bean

+ 0 - 1
hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceSqlExecutorService.java

@@ -138,5 +138,4 @@ public class DynamicDataSourceSqlExecutorService extends AbstractJdbcSqlExecutor
         SimpleSQL sql1 = new SimpleSQL(sql, param);
         return sql1;
     }
-
 }