diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
deleted file mode 100644
index 9bbc8125..00000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import com.ruoyi.common.enums.DataSourceType;
-
-import java.lang.annotation.*;
-
-/**
- * 自定义多数据源切换注解
- * <p>
- * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
- *
- * @author ruoyi
- * @deprecated 3.6.0 移除 使用原生注解处理 方法更全 {@link com.baomidou.dynamic.datasource.annotation.DS}
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Deprecated
-public @interface DataSource {
-    /**
-     * 切换数据源名称
-     */
-    DataSourceType value() default DataSourceType.MASTER;
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
deleted file mode 100644
index afa4e14f..00000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 数据源
- *
- * @author Lion Li
- * @deprecated 3.6.0 移除
- */
-@AllArgsConstructor
-@Deprecated
-public enum DataSourceType {
-    /**
-     * 主库
-     */
-    MASTER("master"),
-
-    /**
-     * 从库
-     */
-    SLAVE("slave");
-
-    @Getter
-    private final String source;
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
deleted file mode 100644
index 0b1c898b..00000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ /dev/null
@@ -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);
-	}
-
-}