From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
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 79cd191..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
@@ -1,28 +1,25 @@
package com.ruoyi.common.annotation;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
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 })
+@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
-public @interface DataSource
-{
+@Deprecated
+public @interface DataSource {
/**
* 鍒囨崲鏁版嵁婧愬悕绉�
*/
- public DataSourceType value() default DataSourceType.MASTER;
+ DataSourceType value() default DataSourceType.MASTER;
}
--
Gitblit v1.9.3