From 98941acd2aadf435058412b4abe61fb6437433e8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 五月 2020 09:15:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 ae3d8e3..c2bb892 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);
}
}
--
Gitblit v1.9.3