Explorar el Código

优化jta动态数据源配置

zhou-hao hace 7 años
padre
commit
1e7884d7cf

+ 0 - 4
hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/AtomikosDataSourceAutoConfiguration.java

@@ -1,6 +1,5 @@
 package org.hswebframework.web.datasource.jta;
 
-import org.hswebframework.web.datasource.DynamicDataSourceService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean;
 import org.springframework.context.annotation.Bean;
@@ -11,8 +10,6 @@ import javax.sql.DataSource;
 import java.sql.SQLException;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 @Configuration
@@ -32,7 +29,6 @@ public class AtomikosDataSourceAutoConfiguration {
     }
 
     @Bean
-    @ConditionalOnMissingBean(DynamicDataSourceService.class)
     public JtaDynamicDataSourceService jtaDynamicDataSourceService(JtaDataSourceRepository jtaDataSourceRepository, DataSource dataSource) throws SQLException {
         return new JtaDynamicDataSourceService(jtaDataSourceRepository, dataSource);
     }

+ 1 - 0
hsweb-datasource/hsweb-datasource-jta/src/test/resources/application.yml

@@ -21,6 +21,7 @@ spring:
 logging:
   level:
       com.atomikos: WARN
+      org.hswebframework: DEBUG
 hsweb:
   dynamic:
     datasource: