From a9488ba3c9c1e951264a349d4b191887b450ad31 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 09 十二月 2021 11:50:25 +0800
Subject: [PATCH] update 多数据源切换标注过期 3.6.0 移除 推荐使用原生注解
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java | 2 ++
ruoyi-framework/pom.xml | 5 -----
ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java | 2 ++
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java | 6 +++---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 2 ++
ruoyi-common/pom.xml | 7 +++++++
ruoyi-system/src/main/java/com/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 2111510..08d1731 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 e7d2250..9bbc812 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 @@
* 浼樺厛绾э細鍏堟柟娉曪紝鍚庣被锛屽鏋滄柟娉曡鐩栦簡绫讳笂鐨勬暟鎹簮绫诲瀷锛屼互鏂规硶鐨勪负鍑嗭紝鍚﹀垯浠ョ被涓婄殑涓哄噯
*
* @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 d6fe728..afa4e14 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 @@
* 鏁版嵁婧�
*
* @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 2cb93ad..daff12b 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 @@
* @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 @@
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 a368e5e..3f0065f 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 45ffe3b..0b1c898 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 @@
* 澶氭暟鎹簮澶勭悊
*
* @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 99966da..1888068 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 @@
* @return 鍙傛暟閰嶇疆淇℃伅
*/
@Override
- @DataSource(DataSourceType.MASTER)
+ @DS("master")
public SysConfig selectConfigById(Long configId) {
return baseMapper.selectById(configId);
}
--
Gitblit v1.9.3