优化数据源配置

hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceAutoConfiguration.java

@@ -41,7 +41,7 @@ public class DynamicDataSourceAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean(DynamicDataSourceConfigRepository.class)
-    public InSpringDynamicDataSourceConfigRepository inSpringDynamicDataSourceConfigRepository() {
+    public DynamicDataSourceConfigRepository inSpringDynamicDataSourceConfigRepository() {
         return new InSpringDynamicDataSourceConfigRepository();
     }
 

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

@@ -29,7 +29,7 @@ public class AtomikosDataSourceAutoConfiguration {
 
     @ConditionalOnMissingBean(DynamicDataSourceConfigRepository.class)
     @Bean
-    public InMemoryAtomikosDataSourceRepository memoryJtaDataSourceStore() {
+    public DynamicDataSourceConfigRepository inMemoryAtomikosDataSourceRepository() {
         return new InMemoryAtomikosDataSourceRepository();
     }
 

hsweb-system/hsweb-system-datasource/hsweb-system-datasource-starter/src/main/java/org/hswebframework/web/datasource/starter/InDBDynamicDataSourceAutoConfiguration.java

@@ -21,8 +21,10 @@ package org.hswebframework.web.datasource.starter;
 import org.hswebframework.web.datasource.DynamicDataSourceAutoConfiguration;
 import org.hswebframework.web.datasource.DynamicDataSourceProxy;
 import org.hswebframework.web.datasource.DynamicDataSourceService;
+import org.hswebframework.web.datasource.config.DynamicDataSourceConfigRepository;
 import org.hswebframework.web.service.datasource.DataSourceConfigService;
 import org.hswebframework.web.service.datasource.simple.InDBDataSourceRepository;
+import org.hswebframework.web.service.datasource.simple.InDBDynamicDataSourceConfig;
 import org.hswebframework.web.service.datasource.simple.InDBDynamicDataSourceService;
 import org.hswebframework.web.service.datasource.simple.InDBJtaDynamicDataSourceService;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -41,18 +43,19 @@ import javax.sql.DataSource;
 @Configuration
 @ComponentScan({"org.hswebframework.web.service.datasource.simple"
         , "org.hswebframework.web.controller.datasource"})
-@AutoConfigureBefore(DynamicDataSourceAutoConfiguration.class)
+@AutoConfigureBefore(value = DynamicDataSourceAutoConfiguration.class, name = "org.hswebframework.web.datasource.jta.AtomikosDataSourceAutoConfiguration")
+@SuppressWarnings("all")
 public class InDBDynamicDataSourceAutoConfiguration {
 
     @Bean
     @Primary
-    public InDBDataSourceRepository inDBDataSourceRepository(DataSourceConfigService dataSourceConfigService) {
+    public DynamicDataSourceConfigRepository inDBDataSourceRepository(DataSourceConfigService dataSourceConfigService) {
         return new InDBDataSourceRepository(dataSourceConfigService);
     }
 
     @Bean
     @ConditionalOnMissingClass("org.hswebframework.web.datasource.jta.JtaDynamicDataSourceService")
-    public DynamicDataSourceService inDBDynamicDataSourceService(InDBDataSourceRepository repository,
+    public DynamicDataSourceService inDBDynamicDataSourceService(DynamicDataSourceConfigRepository repository,
                                                                  DataSource dataSource) {
         return new InDBDynamicDataSourceService(repository, new DynamicDataSourceProxy("dataSource", dataSource));
     }
@@ -61,7 +64,7 @@ public class InDBDynamicDataSourceAutoConfiguration {
     @ConditionalOnClass(org.hswebframework.web.datasource.jta.JtaDynamicDataSourceService.class)
     public static class InDBJtaDynamicDataSourceServiceAutoConfiguration {
         @Bean
-        public DynamicDataSourceService inDBJtaDynamicDataSourceService(InDBDataSourceRepository repository,
+        public DynamicDataSourceService inDBJtaDynamicDataSourceService(DynamicDataSourceConfigRepository repository,
                                                                         DataSource dataSource) {
             return new InDBJtaDynamicDataSourceService(repository, new DynamicDataSourceProxy("dataSource", dataSource));
         }