若依 3.0

RuoYi

2020-07-19 cee572f237cb293e4a9070ef458356bc6daa2105

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java 修改
@@ -11,8 +11,8 @@
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.aspectj.lang.annotation.DataSource;

import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;



/**

@@ -27,8 +27,8 @@
{

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



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

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

    @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"

            + "|| @within(com.ruoyi.common.annotation.DataSource)")

    public void dsPointCut()

    {