update 优化多数据源aop顺序问题

疯狂的狮子li

2021-06-22 40bba563d698adc125d16217a180b21f71aabe54

update 优化多数据源aop顺序问题

 ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java

@@ -1,19 +1,25 @@
package com.ruoyi.common.enums;

import lombok.AllArgsConstructor;
import lombok.Getter;

/**
 * 数据源
 * 
 * @author ruoyi
 * @author Lion Li
 */
public enum DataSourceType
{
@AllArgsConstructor
public enum DataSourceType {
    /**
     * 主库
     */
    MASTER,
    MASTER("master"),

    /**
     * 从库
     */
    SLAVE
    SLAVE("slave");

    @Getter
    private final String source;
}

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

@@ -20,7 +20,7 @@
 * @author ruoyi
 */
@Aspect
@Order(1)
@Order(-500)
@Component
public class DataSourceAspect {

@@ -34,7 +34,9 @@
        DataSource dataSource = getDataSource(point);

        if (Validator.isNotNull(dataSource)) {
            DynamicDataSourceContextHolder.push(dataSource.value().name());
            DynamicDataSourceContextHolder.poll();
            String source = dataSource.value().getSource();
            DynamicDataSourceContextHolder.push(source);
        }

        try {