From 76db434373791347a54daa4fca88826d86e68699 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 18 九月 2021 18:52:51 +0800
Subject: [PATCH] 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空
---
src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 36 +++---------------------------------
1 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
index bc85073..7b29267 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
@@ -1,17 +1,12 @@
package com.ruoyi.framework.aspectj;
-import java.util.Objects;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
-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.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
@@ -27,22 +22,11 @@
{
protected Logger logger = LoggerFactory.getLogger(getClass());
- @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"
- + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")
- public void dsPointCut()
+ @Around("@annotation(dataSource) || @within(dataSource)")
+ public Object around(ProceedingJoinPoint point, DataSource dataSource) throws Throwable
{
- }
-
- @Around("dsPointCut()")
- public Object around(ProceedingJoinPoint point) throws Throwable
- {
- DataSource dataSource = getDataSource(point);
-
- if (StringUtils.isNotNull(dataSource))
- {
- DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
- }
+ DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
try
{
@@ -55,18 +39,4 @@
}
}
- /**
- * 鑾峰彇闇�瑕佸垏鎹㈢殑鏁版嵁婧�
- */
- public DataSource getDataSource(ProceedingJoinPoint point)
- {
- MethodSignature signature = (MethodSignature) point.getSignature();
- DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
- if (Objects.nonNull(dataSource))
- {
- return dataSource;
- }
-
- return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
- }
}
--
Gitblit v1.9.3