modify

spring-boot/springboot-druid-mybatis-multi/src/main/java/com/heibaiying/springboot/aop/DynamicDataSourceAspect.java

@@ -27,14 +27,14 @@ public class DynamicDataSourceAspect {
         Object[] args = point.getArgs();
 
         if (args == null || args.length < 1 || !Data.DATASOURCE2.equals(args[0])) {
-            DataSourceContextHolder.setDataKey(Data.DATASOURCE1);
+            DataSourceContextHolder.setDataSourceKey(Data.DATASOURCE1);
         } else {
-            DataSourceContextHolder.setDataKey(Data.DATASOURCE2);
+            DataSourceContextHolder.setDataSourceKey(Data.DATASOURCE2);
         }
     }
 
     @After(value = "dataSourcePointCut()")
     public void afterSwitchDS(JoinPoint point) {
-        DataSourceContextHolder.clearDataKey();
+        DataSourceContextHolder.clearDataSourceKey();
     }
 }

spring-boot/springboot-druid-mybatis-multi/src/main/java/com/heibaiying/springboot/config/CustomSqlSessionTemplate.java

@@ -79,7 +79,7 @@ public class CustomSqlSessionTemplate extends SqlSessionTemplate {
     @Override
     public SqlSessionFactory getSqlSessionFactory() {
 
-        String dataSourceKey = DataSourceContextHolder.getDataKey();
+        String dataSourceKey = DataSourceContextHolder.getDataSourceKey();
         log.info("当前会话工厂 : {}", dataSourceKey);
         SqlSessionFactory targetSqlSessionFactory = targetSqlSessionFactories.get(dataSourceKey);
         if (targetSqlSessionFactory != null) {

spring-boot/springboot-druid-mybatis-multi/src/main/java/com/heibaiying/springboot/config/DataSourceContextHolder.java

@@ -9,17 +9,17 @@ public class DataSourceContextHolder {
     private static final ThreadLocal<String> contextHolder = new ThreadLocal<>();
 
     // 设置数据源名
-    public static void setDataKey(String dbName) {
+    public static void setDataSourceKey(String dbName) {
         contextHolder.set(dbName);
     }
 
     // 获取数据源名
-    public static String getDataKey() {
+    public static String getDataSourceKey() {
         return (contextHolder.get());
     }
 
     // 清除数据源名
-    public static void clearDataKey() {
+    public static void clearDataSourceKey() {
         contextHolder.remove();
     }
 }

spring-boot/springboot-druid-mybatis-multi/src/main/java/com/heibaiying/springboot/config/DataSourceFactory.java

@@ -10,6 +10,7 @@ import org.mybatis.spring.annotation.MapperScan;
 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.core.io.support.PathMatchingResourcePatternResolver;
 
 import javax.sql.DataSource;
@@ -50,7 +51,7 @@ public class DataSourceFactory {
     }
 
     /**
-     * 创建支持XA事务的数据源1，不要用@Primary去修饰
+     * 创建支持XA事务的Atomikos数据源1，不要用@Primary去修饰
      */
     @Bean
     public DataSource dataSourceOne(DataSource DruidDataSourceOne) {
@@ -61,7 +62,7 @@ public class DataSourceFactory {
     }
 
     /**
-     * 创建支持XA事务的数据源2，不要用@Primary去修饰
+     * 创建支持XA事务的Atomikos数据源2，不要用@Primary去修饰
      */
     @Bean
     public DataSource dataSourceTwo(DataSource DruidDataSourceTwo) {

spring-boot/springboot-druid-mybatis-multi/src/main/java/com/heibaiying/springboot/config/DynamicDataSource.java

@@ -11,7 +11,7 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 public class DynamicDataSource extends AbstractRoutingDataSource {
     @Override
     protected Object determineCurrentLookupKey() {
-        log.info("当前数据库:{}",DataSourceContextHolder.getDataKey());
-        return DataSourceContextHolder.getDataKey();
+        log.info("当前数据库:{}",DataSourceContextHolder.getDataSourceKey());
+        return DataSourceContextHolder.getDataSourceKey();
     }
 }

spring-boot/springboot-druid-mybatis-multi/src/main/resources/application.yml

@@ -62,6 +62,7 @@ spring:
         removeAbandoned: true
         # 超时时间(以秒数为单位)
         remove-abandoned-timeout: 1800
+
       # WebStatFilter用于采集web-jdbc关联监控的数据。
       web-stat-filter:
         # 是否开启 WebStatFilter 默认是true