reset dataSourceAspect
This commit is contained in:
parent
0823273df7
commit
1a0b2cc2c0
@ -1,12 +1,17 @@
|
|||||||
package com.ruoyi.framework.aspectj;
|
package com.ruoyi.framework.aspectj;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
import org.aspectj.lang.ProceedingJoinPoint;
|
import org.aspectj.lang.ProceedingJoinPoint;
|
||||||
import org.aspectj.lang.annotation.Around;
|
import org.aspectj.lang.annotation.Around;
|
||||||
import org.aspectj.lang.annotation.Aspect;
|
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.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.core.annotation.AnnotationUtils;
|
||||||
import org.springframework.core.annotation.Order;
|
import org.springframework.core.annotation.Order;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
|
import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
|
||||||
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
|
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
|
||||||
|
|
||||||
@ -22,11 +27,22 @@ public class DataSourceAspect
|
|||||||
{
|
{
|
||||||
protected Logger logger = LoggerFactory.getLogger(getClass());
|
protected Logger logger = LoggerFactory.getLogger(getClass());
|
||||||
|
|
||||||
@Around("@annotation(dataSource) || @within(dataSource)")
|
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"
|
||||||
public Object around(ProceedingJoinPoint point, DataSource dataSource) throws Throwable
|
+ "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")
|
||||||
|
public void dsPointCut()
|
||||||
{
|
{
|
||||||
|
|
||||||
DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
|
}
|
||||||
|
|
||||||
|
@Around("dsPointCut()")
|
||||||
|
public Object around(ProceedingJoinPoint point) throws Throwable
|
||||||
|
{
|
||||||
|
DataSource dataSource = getDataSource(point);
|
||||||
|
|
||||||
|
if (StringUtils.isNotNull(dataSource))
|
||||||
|
{
|
||||||
|
DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -39,4 +55,18 @@ public class DataSourceAspect
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取需要切换的数据源
|
||||||
|
*/
|
||||||
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user