瀏覽代碼

修复jta配置顺序问题

zhou-hao 7 年之前
父節點
當前提交
5394c6fbb5

+ 6 - 1
hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/AtomikosDataSourceAutoConfiguration.java

@@ -1,6 +1,9 @@
 package org.hswebframework.web.datasource.jta;
 
+import org.hswebframework.web.datasource.DynamicDataSourceAutoConfiguration;
+import org.hswebframework.web.datasource.DynamicDataSourceService;
 import org.hswebframework.web.datasource.config.DynamicDataSourceConfigRepository;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean;
 import org.springframework.context.annotation.Bean;
@@ -14,6 +17,7 @@ import java.sql.SQLException;
  * @author zhouhao
  */
 @Configuration
+@AutoConfigureBefore(DynamicDataSourceAutoConfiguration.class)
 public class AtomikosDataSourceAutoConfiguration {
 
     //默认数据源
@@ -30,7 +34,8 @@ public class AtomikosDataSourceAutoConfiguration {
     }
 
     @Bean
-    public JtaDynamicDataSourceService jtaDynamicDataSourceService(DynamicDataSourceConfigRepository<AtomikosDataSourceConfig> repository
+    @Primary
+    public DynamicDataSourceService jtaDynamicDataSourceService(DynamicDataSourceConfigRepository<AtomikosDataSourceConfig> repository
             , DataSource dataSource) throws SQLException {
         return new JtaDynamicDataSourceService(repository, dataSource);
     }