reset dataSourceAspect

RuoYi

2021-09-20 dbc4616dc648d25b3a1e3792f2e53b125ccfdc00

reset dataSourceAspect

 src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java

@@ -1,12 +1,17 @@
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;



@@ -22,11 +27,22 @@
{

    protected Logger logger = LoggerFactory.getLogger(getClass());



    @Around("@annotation(dataSource) || @within(dataSource)")

    public Object around(ProceedingJoinPoint point, DataSource dataSource) throws Throwable

    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"

            + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")

    public void dsPointCut()

    {



    }



    @Around("dsPointCut()")

    public Object around(ProceedingJoinPoint point) throws Throwable

    {

        DataSource dataSource = getDataSource(point);



        if (StringUtils.isNotNull(dataSource))

        {

        DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());

        }



        try

        {

@@ -39,4 +55,18 @@
        }

    }



    /**

     * 获取需要切换的数据源

     */

    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);

    }

}