From 41799c10f0c72bfc91e5b79f3e4df6e585cc5715 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 19 五月 2020 11:00:47 +0800
Subject: [PATCH] 修改数据源类型优先级，先根据方法，再根据类
---
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 16 ++++++----------
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java | 4 +++-
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
index 5bdff86..bc85073 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
@@ -1,6 +1,6 @@
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 +8,7 @@
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.utils.StringUtils;
@@ -60,17 +61,12 @@
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))
+ 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);
}
}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
index 4df29ff..15a1d82 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
@@ -10,7 +10,9 @@
/**
* 鑷畾涔夊鏁版嵁婧愬垏鎹㈡敞瑙�
- *
+ *
+ * 浼樺厛绾э細鍏堟柟娉曪紝鍚庣被锛屽鏋滄柟娉曡鐩栦簡绫讳笂鐨勬暟鎹簮绫诲瀷锛屼互鏂规硶鐨勪负鍑嗭紝鍚﹀垯浠ョ被涓婄殑涓哄噯
+ *
* @author ruoyi
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
--
Gitblit v1.9.3