升级spring-boot 2.0.1

Author: longtanfei

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.RELEASE'
+		springBootVersion = '2.0.1.RELEASE'
 	}
 	repositories {
         maven {url 'http://maven.aliyun.com/nexus/content/groups/public/'}

src/main/java/com/vincent/config/DataSourceAopAspect.java

@@ -7,18 +7,73 @@
 import org.springframework.stereotype.Component;
 
 /**
- * 通过 aop 切换datasource
+ *
+ * <a href = "https://my.oschina.net/guangshan/blog/1808373">在Spring中使用MyBatis的Mapper接口自动生成时，用一个自定义的注解标记在Mapper接口的方法中，<br/>
+ * 再利用@Aspect定义一个切面，拦截这个mapper中的增删改查注解实现数据源切换。<br/>
+ * 在Spring Boot 1.X(Spring Framework 4.x)中，并不能生效，<br/>
+ * 而在Spring Boot 2.X(Spring Framework 5.X)中却能生效。</a><br/>
+ *
+ * 通过 aop 切换 datasource
  */
 @Aspect
 @Component
 public class DataSourceAopAspect implements PriorityOrdered {
 
-    @Before(value = "execution(* com.vincent.dao.UserDao.get*(..))")
+    /**
+     * {@link org.apache.ibatis.annotations.Select} 切入点
+     */
+    private static final String SELECT_POINTCUT = "@annotation(org.apache.ibatis.annotations.Select)";
+
+    /**
+     * {@link org.apache.ibatis.annotations.SelectProvider} 切入点
+     */
+    private static final String SELECTPROVIDER_POINTCUT = "@annotation(org.apache.ibatis.annotations.SelectProvider)";
+
+    /**
+     * {@link org.apache.ibatis.annotations.Insert} 切入点
+     */
+    private static final String INSERT_POINTCUT = "@annotation(org.apache.ibatis.annotations.Insert)";
+
+    /**
+     * {@link org.apache.ibatis.annotations.InsertProvider} 切入点
+     */
+    private static final String INSERTPROVIDER_POINTCUT = "@annotation(org.apache.ibatis.annotations.InsertProvider)";
+
+    /**
+     * {@link org.apache.ibatis.annotations.Update} 切入点
+     */
+    private static final String UPDATE_POINTCUT = "@annotation(org.apache.ibatis.annotations.Update)";
+
+    /**
+     * {@link org.apache.ibatis.annotations.UpdateProvider} 切入点
+     */
+    private static final String UPDATEPROVIDER_POINTCUT = "@annotation(org.apache.ibatis.annotations.UpdateProvider)";
+
+    /**
+     * {@link org.apache.ibatis.annotations.Delete} 切入点
+     */
+    private static final String DELETE_POINTCUT = "@annotation(org.apache.ibatis.annotations.Delete)";
+
+    /**
+     * {@link org.apache.ibatis.annotations.DeleteProvider} 切入点
+     */
+    private static final String DeletePROVIDER_POINTCUT = "@annotation(org.apache.ibatis.annotations.DeleteProvider)";
+
+    /**
+     * 切换到读库
+     * @param point
+     */
+    @Before(value = SELECT_POINTCUT + " || " + SELECTPROVIDER_POINTCUT)
     public void setReadDataSource(JoinPoint point) {
         DataSourceContextHolder.setRead();
     }
 
-    @Before(value = "execution(* com.vincent.dao.UserDao.add*(..))")
+    /**
+     * 切换到写库
+     * @param point
+     */
+    @Before(value = INSERT_POINTCUT + " || " + INSERTPROVIDER_POINTCUT + " || " + UPDATE_POINTCUT + " || " + UPDATEPROVIDER_POINTCUT
+            + " || " + DELETE_POINTCUT + " || " + DeletePROVIDER_POINTCUT)
     public void setWriteDataSource(JoinPoint point) {
         DataSourceContextHolder.setWrite();
     }

src/main/java/com/vincent/config/DataSourceConfiguration.java

@@ -1,14 +1,9 @@
 package com.vincent.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.vincent.plugin.MyPlugin;
-import java.util.HashMap;
-import java.util.Map;
 import javax.sql.DataSource;
-import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;

src/test/java/com/vincent/dao/UserDaoTest.java

@@ -19,15 +19,15 @@ public class UserDaoTest {
     @Transactional
     public void add() {
         TUser user = new TUser();
-        user.setUserName("vicent.long");
+        user.setUserName("vicent.fly");
         user.setPassword("123456");
         user.setPhone("130202020");
         dao.add(user);
     }
 
     @Test
     public void getById() {
-        TUser user1 = dao.getById(1);
-        System.out.println("user" + user1);
+       TUser user1 = dao.getById(100);
+       System.out.println("user" + user1);
     }
 }