From d7abb6e7ba3fd0ff19e1205c032cb7960f320cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E9=BE=99=E5=B0=91?= <sdvdxl@163.com>
Date: Sun, 19 Apr 2020 11:00:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=B1=BB=E4=B8=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BC=98=E5=85=88?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E5=85=88=E6=A0=B9=E6=8D=AE=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=A0=B9=E6=8D=AE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/annotation/DataSource.java   |  2 ++
 .../framework/aspectj/DataSourceAspect.java   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
index a272a5b7..bba1c059 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
@@ -10,6 +10,8 @@ import com.ruoyi.common.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解
+ *
+ * 优先级： 先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
  * 
  * @author ruoyi
  */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
index 4f13ddb3..cb516460 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
@@ -1,6 +1,7 @@
 package com.ruoyi.framework.aspectj;
 
 import java.lang.reflect.Method;
+import java.util.Objects;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -8,6 +9,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.annotation.DataSource;
@@ -16,7 +18,7 @@ import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 多数据源处理
- * 
+ *
  * @author ruoyi
  */
 @Aspect
@@ -60,17 +62,14 @@ public class DataSourceAspect
     public DataSource getDataSource(ProceedingJoinPoint point)
     {
         MethodSignature signature = (MethodSignature) point.getSignature();
-        Class<? extends Object> targetClass = point.getTarget().getClass();
-        DataSource targetDataSource = targetClass.getAnnotation(DataSource.class);
-        if (StringUtils.isNotNull(targetDataSource))
+        // point.getTarget().getClass(); 这个获取的是动态代理的class，上面获取不到自定义注解
+        // 先获取方法上的，获取不到啊再从class上找
+        DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
+        if (Objects.nonNull(dataSource))
         {
-            return targetDataSource;
-        }
-        else
-        {
-            Method method = signature.getMethod();
-            DataSource dataSource = method.getAnnotation(DataSource.class);
             return dataSource;
         }
+
+        return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
     }
 }