Upd:修复多数据源切换无效问题

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.0.40</version>
+    <version>1.1.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java

@@ -6,9 +6,12 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 多数据源配置类
@@ -21,15 +24,29 @@ public class DataSourceConfiguration {
     private Class<? extends DataSource> dataSourceType;
 
     @Bean(name = "masterDataSource")
-    @Primary
     @ConfigurationProperties(prefix = "spring.datasource.master")
-    public DataSource masterDataSource(){
+    public DataSource masterDataSource() {
         return DataSourceBuilder.create().type(dataSourceType).build();
     }
 
     @Bean(name = "slaveDataSource")
     @ConfigurationProperties(prefix = "spring.datasource.slave")
-    public DataSource slaveDataSource1(){
+    public DataSource slaveDataSource() {
         return DataSourceBuilder.create().type(dataSourceType).build();
     }
+
+
+    @Bean("routingDataSource")
+    @Primary
+    public AbstractRoutingDataSource roundRobinDataSouceProxy() {
+        ReadWriteSplitRoutingDataSource proxy = new ReadWriteSplitRoutingDataSource();
+        Map<Object, Object> targetDataResources = new HashMap<>();
+        DataSource masterDataSource = masterDataSource();
+        targetDataResources.put(DbContextHolder.DbType.MASTER, masterDataSource);
+        DataSource slaveDataSource = slaveDataSource();
+        targetDataResources.put(DbContextHolder.DbType.SLAVE, slaveDataSource);
+        proxy.setDefaultTargetDataSource(masterDataSource);//默认源
+        proxy.setTargetDataSources(targetDataResources);
+        return proxy;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/pos/datasource/MybatisConfiguration.java

@@ -1,63 +0,0 @@
-package au.com.royalpay.payment.manage.pos.datasource;
-
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ibatis.mapping.DatabaseIdProvider;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.aspectj.apache.bcel.util.ClassLoaderRepository;
-import org.mybatis.spring.boot.autoconfigure.ConfigurationCustomizer;
-import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.mybatis.spring.boot.autoconfigure.MybatisProperties;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by Dulingling on 2019/8/7
- */
-@Configuration
-@AutoConfigureAfter({DataSourceConfiguration.class})
-public class MybatisConfiguration extends MybatisAutoConfiguration {
-
-
-    private static Log logger = LogFactory.getLog(MybatisConfiguration.class);
-
-    @Resource(name = "masterDataSource")
-    private DataSource masterDataSource;
-    @Resource(name = "slaveDataSource")
-    private DataSource slaveDataSource;
-
-    public MybatisConfiguration(MybatisProperties properties, ObjectProvider<Interceptor[]> interceptorsProvider, ResourceLoader resourceLoader, ObjectProvider<DatabaseIdProvider> databaseIdProvider, ObjectProvider<List<ConfigurationCustomizer>> configurationCustomizersProvider) {
-        super(properties, interceptorsProvider, resourceLoader, databaseIdProvider, configurationCustomizersProvider);
-    }
-
-    @Bean
-    public SqlSessionFactory sqlSessionFactory() throws Exception {
-        return super.sqlSessionFactory(roundRobinDataSouceProxy());
-    }
-
-    public AbstractRoutingDataSource roundRobinDataSouceProxy(){
-        ReadWriteSplitRoutingDataSource proxy = new ReadWriteSplitRoutingDataSource();
-        Map<Object,Object> targetDataResources = new ClassLoaderRepository.SoftHashMap();
-        targetDataResources.put(DbContextHolder.DbType.MASTER,masterDataSource);
-        targetDataResources.put(DbContextHolder.DbType.SLAVE,slaveDataSource);
-        proxy.setDefaultTargetDataSource(masterDataSource);//默认源
-        proxy.setTargetDataSources(targetDataResources);
-        return proxy;
-    }
-
-    public void test(){
-
-    }
-}
-