修复动态切换数据源类注解不生效

Author: YuKongEr

chapter5/src/main/java/com/yukong/chapter5/aop/DynamicDataSourceAnnotationAdvisor.java

@@ -45,8 +45,11 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 
  private Pointcut buildPointcut() {
  Pointcut cpc = (Pointcut) new AnnotationMatchingPointcut(DataSource.class, true);
+ // 类注解
+ Pointcut clpc = (Pointcut) AnnotationMatchingPointcut.forClassAnnotation(DataSource.class);
+ // 方法注解
  Pointcut mpc = (Pointcut) AnnotationMatchingPointcut.forMethodAnnotation(DataSource.class);
- return new ComposablePointcut(cpc).union(mpc);
+ return new ComposablePointcut(cpc).union(clpc).union(mpc);
  }
 
 }

chapter5/src/main/java/com/yukong/chapter5/register/DynamicDataSourceRegister.java

@@ -132,7 +132,8 @@ private Class<? extends DataSource> getDataSourceType(String typeStr) {
  }
  return type;
  } catch (Exception e) {
- throw new IllegalArgumentException("can not resolve class with type: " + typeStr); //无法通过反射获取class对象的情况则抛出异常，该情况一般是写错了，所以此次抛出一个runtimeexception
+ //无法通过反射获取class对象的情况则抛出异常，该情况一般是写错了，所以此次抛出一个runtimeexception
+ throw new IllegalArgumentException("can not resolve class with type: " + typeStr);
  }
  }
 

chapter5/src/main/java/com/yukong/chapter5/repository/UserMapper.java

@@ -11,6 +11,7 @@
  * @Date: 2018/8/13 19:47
  * @Description: UserMapper接口
  */
+@DataSource("slave1")
 public interface UserMapper {
 
  /**
@@ -49,6 +50,5 @@ public interface UserMapper {
  * 查询所有用户信息
  * @return
  */
- @DataSource("slave2") //slave2
  List<User> selectAll();
 }

chapter5/src/main/java/com/yukong/chapter5/service/UserService.java

@@ -16,6 +16,7 @@ public class UserService {
 
  @Autowired
  private UserMapper userMapper;
+
  public void testTransactional() {
  User user = new User();
  user.setUsername("Transactional");