From a9488ba3c9c1e951264a349d4b191887b450ad31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Wed, 8 Dec 2021 13:50:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A0=87=E6=B3=A8=E8=BF=87=E6=9C=9F=203.6.0?=
 =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=20=E6=8E=A8=E8=8D=90=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=8E=9F=E7=94=9F=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-common/pom.xml                                       | 7 +++++++
 .../main/java/com/ruoyi/common/annotation/DataSource.java  | 2 ++
 .../main/java/com/ruoyi/common/enums/DataSourceType.java   | 2 ++
 .../com/ruoyi/demo/service/impl/TestTreeServiceImpl.java   | 6 +++---
 ruoyi-framework/pom.xml                                    | 5 -----
 .../java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 2 ++
 .../ruoyi/system/service/impl/SysConfigServiceImpl.java    | 2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 2111510a7..08d173150 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -95,6 +95,13 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
         </dependency>
+
+        <!-- dynamic-datasource 多数据源-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
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
index e7d2250a6..9bbc8125e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
@@ -10,11 +10,13 @@ import java.lang.annotation.*;
  * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
  *
  * @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 {
     /**
      * 切换数据源名称
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
index d6fe72864..afa4e14f0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
@@ -7,8 +7,10 @@ import lombok.Getter;
  * 数据源
  *
  * @author Lion Li
+ * @deprecated 3.6.0 移除
  */
 @AllArgsConstructor
+@Deprecated
 public enum DataSourceType {
     /**
      * 主库
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
index 2cb93ad27..daff12bd1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * @author Lion Li
  * @date 2021-07-26
  */
-//@DataSource(DataSourceType.SLAVE) // 切换从库查询
+// @DS("slave") // 切换从库查询
 @Service
 public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {
 
@@ -32,8 +32,8 @@ public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTre
 		return getVoById(id);
 	}
 
-//	@DataSource(DataSourceType.SLAVE) // 切换从库查询
-	@DataScope(isUser = true)
+//	@DS("slave") // 切换从库查询
+    @DataScope(isUser = true)
 	@Override
 	public List<TestTreeVo> queryList(TestTreeBo bo) {
         LambdaQueryWrapper<TestTree> lqw = buildQueryWrapper(bo);
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index a368e5e26..3f0065ffe 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -46,11 +46,6 @@
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
 
-        <!-- dynamic-datasource 多数据源-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-        </dependency>
         <!-- sql性能分析插件 -->
         <dependency>
             <groupId>p6spy</groupId>
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
index 45ffe3bca..0b1c898b3 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
@@ -18,10 +18,12 @@ 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)"
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 99966da66..1888068d0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -53,7 +53,7 @@ public class SysConfigServiceImpl extends ServicePlusImpl<SysConfigMapper, SysCo
      * @return 参数配置信息
      */
     @Override
-    @DataSource(DataSourceType.MASTER)
+    @DS("master")
     public SysConfig selectConfigById(Long configId) {
         return baseMapper.selectById(configId);
     }