解决版本升级后启动报错的问题,留下一个历史遗留问题任没解决: 多数据源切换的事务问题

JavaCodeMing · JavaCodeMing · commit b1e6b359bb46 · 2020-05-05T13:16:50.000+08:00
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/controller/DataSourceController.java b/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/controller/DataSourceController.java
@@ -2,7 +2,9 @@
 
 import com.example.multidatasource.service.StudentService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -20,13 +22,23 @@ public DataSourceController(StudentService studentService) {
         this.studentService = studentService;
     }
 
-    @RequestMapping("/querystudentsfromoracle")
+    @GetMapping("/querystudentsfromoracle")
     public List<Map<String, Object>> queryStudentsFromOracle() {
-        return this.studentService.getAllStudentsFromSlave();
+        return studentService.getAllStudentsFromSlave();
     }
 
-    @RequestMapping("/querystudentsfrommysql")
+    @PostMapping("/updateStudent/{sno}/{sname}")
+    public String updateStudent(@PathVariable("sno") int sno, @PathVariable("sname") String sname) {
+        int i = studentService.updateStudent(sno, sname);
+        if (i == -1) {
+            return "failure";
+        } else {
+            return "success";
+        }
+    }
+
+    @GetMapping("/querystudentsfrommysql")
     public List<Map<String, Object>> queryStudentsFromMysql() {
-        return this.studentService.getAllStudentsFromMaster();
+        return studentService.getAllStudentsFromMaster();
     }
 }
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/dao/StudentMapper.java b/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/dao/StudentMapper.java
@@ -1,6 +1,7 @@
 package com.example.multidatasource.dao;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,4 +14,5 @@
 @Mapper
 public interface StudentMapper {
     List<Map<String, Object>> getAllStudents();
+    int updateStudent(@Param("sno") int sno, @Param("sname") String sname);
 }
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/datasourceConfig/DynamicDataSource.java b/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/datasourceConfig/DynamicDataSource.java
@@ -15,7 +15,7 @@ public class DynamicDataSource extends AbstractRoutingDataSource {
     protected Object determineCurrentLookupKey() {
         /*
          * DynamicDataSourceContextHolder代码中使用setDataSourceType 设置当前的数据源，
-         * 在路由类中使用getDataSourceType进行获取，交给AbstractRoutingDataSource进行注入使用。
+         * 在路由类中使用getDataSourceType进行获取，交给AbstractRoutingDataSource进行注入使用
          */
         return DynamicDataSourceContextHolder.getDataSourceType();
     }
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/datasourceConfig/DynamicDataSourceAspect.java b/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/datasourceConfig/DynamicDataSourceAspect.java
@@ -4,6 +4,8 @@
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
@@ -13,9 +15,13 @@
  * Created by dengzhiming on 2019/3/29
  */
 @Aspect
-@Order(Ordered.HIGHEST_PRECEDENCE)//保证该AOP在@Transactional之前执行
+//1.保证该AOP在@Transactional之前执行;
+//2.保证拦截器ExposeInvocationInterceptor在拦截链开头,其优先级为HIGHEST_PRECEDENCE+1
+@Order(Ordered.HIGHEST_PRECEDENCE + 2)
 @Component
 public class DynamicDataSourceAspect {
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
     /*
      * @Before("@annotation(ds)")的意思是：
      *  @Before：在方法执行之前进行执行：
@@ -25,20 +31,20 @@ public class DynamicDataSourceAspect {
     public void changeDataSource(JoinPoint point, TargetDataSource targetDataSource) throws Throwable {
         //获取当前的指定的数据源;
         String dsId = targetDataSource.value();
-        //如果不在我们注入的所有的数据源范围之内，那么输出警告信息，系统自动使用默认的数据源。
+        //如果不在配置的数据源范围之内,则输出警告信息,且系统自动使用默认的数据源
         if (!DynamicDataSourceContextHolder.containsDataSource(dsId)) {
-            System.err.println("数据源[{}]不存在，使用默认数据源 > {}" + targetDataSource.value() + point.getSignature());
+            log.info("数据源[{}]不存在，使用默认数据源 > {}", targetDataSource.value(), point.getSignature());
         } else {
-            System.out.println("Use DataSource : {} > {}" + targetDataSource.value() + point.getSignature());
-            //找到的话，那么设置到动态数据源上下文中。
-            DynamicDataSourceContextHolder.setDataSourceType(targetDataSource.value());
+            log.info("Use DataSource : {} > {}", targetDataSource.value(), point.getSignature());
+            //找到的话,那么设置到动态数据源上下文中
+            DynamicDataSourceContextHolder.setDataSourceType(dsId);
         }
     }
 
     @After("@annotation(targetDataSource)")
     public void restoreDataSource(JoinPoint point, TargetDataSource targetDataSource) {
-        System.out.println("Revert DataSource : {} > {}" + targetDataSource.value() + point.getSignature());
-        //方法执行完毕之后，销毁当前数据源信息，进行垃圾回收。
+        log.info("Revert DataSource : {} > {}", targetDataSource.value(), point.getSignature());
+        //方法执行完毕之后,销毁当前数据源信息,进行垃圾回收
         DynamicDataSourceContextHolder.clearDataSourceType();
     }
 }
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/datasourceConfig/DynamicDataSourceRegister.java b/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/datasourceConfig/DynamicDataSourceRegister.java
@@ -6,13 +6,13 @@
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
-import org.springframework.boot.context.properties.source.ConfigurationPropertyNameAliases;
 import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
 import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.util.StringUtils;
 
 import javax.sql.DataSource;
 import java.util.HashMap;
@@ -24,22 +24,13 @@
  */
 public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar, EnvironmentAware {
 
-    //指定默认数据源(springboot2.0默认数据源是hikari如何想使用其他数据源可以自己配置)
+    //指定默认数据源(springboot2.0默认数据源是hikari如果想使用其他数据源可以自己配置)
     private static final String DATASOURCE_TYPE_DEFAULT = "com.zaxxer.hikari.HikariDataSource";
     //默认数据源
     private DataSource defaultDataSource;
     //用户自定义数据源
     private Map<String, DataSource> slaveDataSources = new HashMap<>();
 
-    private final static ConfigurationPropertyNameAliases aliases = new ConfigurationPropertyNameAliases(); //别名
-
-    static {
-        //由于部分数据源配置不同，所以在此处添加别名，避免切换数据源出现某些参数无法注入的情况
-        aliases.addAliases("url", "jdbc-url");
-        aliases.addAliases("username", "user");
-    }
-
-
     @Override
     public void setEnvironment(Environment environment) {
         initDefaultDataSource(environment);
@@ -49,14 +40,14 @@ public void setEnvironment(Environment environment) {
     private void initDefaultDataSource(Environment env) {
         // 读取主数据源
         Binder binder = Binder.get(env);
-        Map dsMap = binder.bind("spring.datasource.druid.master", Map.class).get();
+        Map dsMap = binder.bind("spring.datasource.druid.master", HashMap.class).get();
         defaultDataSource = buildDataSource(dsMap);
     }
 
     private void initslaveDataSources(Environment env) {
         // 读取配置文件获取更多数据源
         Binder binder = Binder.get(env);
-        HashMap map = binder.bind("spring.datasource.druid.slave", HashMap.class).get();
+        Map map = binder.bind("spring.datasource.druid.slave", HashMap.class).get();
         for (Object o : map.entrySet()) {
             Map.Entry entry = (Map.Entry) o;
             String dsPrefix = (String) entry.getKey();
@@ -68,9 +59,9 @@ private void initslaveDataSources(Environment env) {
 
     @Override
     public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry beanDefinitionRegistry) {
-        Map<Object, Object> targetDataSources = new HashMap<>();
+        Map<String, DataSource> targetDataSources = new HashMap<>();
         //添加默认数据源
-        targetDataSources.put("dataSource", this.defaultDataSource);
+        targetDataSources.put("dataSource", defaultDataSource);
         DynamicDataSourceContextHolder.dataSourceIds.add("dataSource");
         //添加其他数据源
         targetDataSources.putAll(slaveDataSources);
@@ -85,17 +76,25 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD
         mpv.addPropertyValue("targetDataSources", targetDataSources);
         //注册 - BeanDefinitionRegistry
         beanDefinitionRegistry.registerBeanDefinition("dataSource", beanDefinition);
+        /*for (String key : slaveDataSources.keySet()) {
+            GenericBeanDefinition transactionManagerDefinition = new GenericBeanDefinition();
+            transactionManagerDefinition.setBeanClass(DataSourceTransactionManager.class);
+            transactionManagerDefinition.setSynthetic(true);
+            MutablePropertyValues propertyValues = transactionManagerDefinition.getPropertyValues();
+            propertyValues.addPropertyValue("dataSource", slaveDataSources.get(key));
+            beanDefinitionRegistry.registerBeanDefinition(key + "TransactionManager",transactionManagerDefinition);
+        }*/
     }
 
     private DataSource buildDataSource(Map dataSourceMap) {
         try {
-            Object type = dataSourceMap.get("type");
-            if (type == null) {
-                type = DATASOURCE_TYPE_DEFAULT;// 默认DataSource
+            String type = dataSourceMap.get("type").toString();
+            if (StringUtils.isEmpty(type)) {
+                type = DATASOURCE_TYPE_DEFAULT;
             }
-            Class<? extends DataSource> dataSourceType = (Class<? extends DataSource>) Class.forName((String) type);
+            Class<? extends DataSource> dataSourceType = (Class<? extends DataSource>) Class.forName(type);
             ConfigurationPropertySource source = new MapConfigurationPropertySource(dataSourceMap);
-            Binder binder = new Binder(source.withAliases(aliases));
+            Binder binder = new Binder(source);
             //通过类型绑定参数并获得实例对象
             return binder.bind(ConfigurationPropertyName.EMPTY, Bindable.of(dataSourceType)).get();
         } catch (ClassNotFoundException e) {
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/service/StudentService.java b/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/service/StudentService.java
@@ -10,4 +10,6 @@ public interface StudentService {
     List<Map<String, Object>> getAllStudentsFromMaster();
 
     List<Map<String, Object>> getAllStudentsFromSlave();
-}
+
+    int updateStudent(int sno,String sname);
+}
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/service/impl/StudentServiceImpl.java b/Spring-Boot-MultiDS2-Switch/src/main/java/com/example/multidatasource/service/impl/StudentServiceImpl.java
@@ -23,14 +23,24 @@ public StudentServiceImpl(StudentMapper studentMapper) {
     }
 
     @Override
+    @Transactional
     public List<Map<String, Object>> getAllStudentsFromMaster() {
-        return this.studentMapper.getAllStudents();
+        return studentMapper.getAllStudents();
     }
 
     @Override
     @TargetDataSource("ds1")
-    @Transactional
     public List<Map<String, Object>> getAllStudentsFromSlave() {
-        return this.studentMapper.getAllStudents();
+        return studentMapper.getAllStudents();
+    }
+
+    @Override
+    @TargetDataSource("ds1")
+    @Transactional
+    public int updateStudent(int sno, String sname) {
+        int i = -1;
+        i = studentMapper.updateStudent(sno, sname);
+        int j = 1/0;
+        return i;
     }
 }
diff --git a/Spring-Boot-MultiDS2-Switch/src/main/resources/mapper/StudentMapper.xml b/Spring-Boot-MultiDS2-Switch/src/main/resources/mapper/StudentMapper.xml
@@ -5,4 +5,7 @@
     <select id="getAllStudents" resultType="java.util.Map">
         select * from student
     </select>
-</mapper>
+    <update id="updateStudent">
+        update student set sname = #{sname} where sno = #{sno}
+    </update>
+</mapper>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class DynamicDataSource extends AbstractRoutingDataSource {`
`15`	`15`	`protected Object determineCurrentLookupKey() {`
`16`	`16`	`/*`
`17`	`17`	`* DynamicDataSourceContextHolder代码中使用setDataSourceType 设置当前的数据源，`
`18`		`- * 在路由类中使用getDataSourceType进行获取，交给AbstractRoutingDataSource进行注入使用。`
	`18`	`+ * 在路由类中使用getDataSourceType进行获取，交给AbstractRoutingDataSource进行注入使用`
`19`	`19`	`*/`
`20`	`20`	`return DynamicDataSourceContextHolder.getDataSourceType();`
`21`	`21`	`}`