remove 移除过期代码 多数据源切换

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

@@ -1,65 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.utils.StringUtils;
-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.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.Objects;
-
-/**
- * 多数据源处理
- *
- * @author Lion Li
- * @deprecated 3.6.0 移除 使用原生方法处理 功能更全
- */
-@Aspect
-@Order(-500)
-@Component
-@Deprecated
-public class DataSourceAspect {
-
-	@Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
-			+ "|| @within(com.ruoyi.common.annotation.DataSource)")
-	public void dsPointCut() {
-	}
-
-	@Around("dsPointCut()")
-	public Object around(ProceedingJoinPoint point) throws Throwable {
-		DataSource dataSource = getDataSource(point);
-
-		if (StringUtils.isNotNull(dataSource)) {
-			DynamicDataSourceContextHolder.poll();
-			String source = dataSource.value().getSource();
-			DynamicDataSourceContextHolder.push(source);
-		}
-
-		try {
-			return point.proceed();
-		} finally {
-			// 销毁数据源 在执行方法之后
-			DynamicDataSourceContextHolder.clear();
-		}
-	}
-
-	/**
-	 * 获取需要切换的数据源
-	 */
-	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);
-	}
-
-}