From 5ccd9877b4ebdb5c17eae6d8b66e91872fb877b5 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 18 Sep 2021 18:47:06 +0800
Subject: [PATCH] !325 update 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空 Merge pull request !325 from 疯狂的狮子Li/master
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 36 +++---------------------------------
1 files changed, 3 insertions(+), 33 deletions(-)
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 4648fcd..54bd4dd 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,18 +1,13 @@
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.annotation.DataSource;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
/**
@@ -27,22 +22,11 @@
{
protected Logger logger = LoggerFactory.getLogger(getClass());
- @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
- + "|| @within(com.ruoyi.common.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.2