From 40bba563d698adc125d16217a180b21f71aabe54 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: Tue, 22 Jun 2021 13:43:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=A4=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90aop=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/enums/DataSourceType.java    | 30 +++++++++++--------
 .../framework/aspectj/DataSourceAspect.java   |  6 ++--
 2 files changed, 22 insertions(+), 14 deletions(-)

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 0d945be5..d5f54653 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
@@ -1,19 +1,25 @@
 package com.ruoyi.common.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * 数据源
- * 
- * @author ruoyi
+ *
+ * @author Lion Li
  */
-public enum DataSourceType
-{
-    /**
-     * 主库
-     */
-    MASTER,
+@AllArgsConstructor
+public enum DataSourceType {
+	/**
+	 * 主库
+	 */
+	MASTER("master"),
 
-    /**
-     * 从库
-     */
-    SLAVE
+	/**
+	 * 从库
+	 */
+	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
index 3167934a..f82b2ae4 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
@@ -20,7 +20,7 @@ import java.util.Objects;
  * @author ruoyi
  */
 @Aspect
-@Order(1)
+@Order(-500)
 @Component
 public class DataSourceAspect {
 
@@ -34,7 +34,9 @@ public class DataSourceAspect {
 		DataSource dataSource = getDataSource(point);
 
 		if (Validator.isNotNull(dataSource)) {
-			DynamicDataSourceContextHolder.push(dataSource.value().name());
+			DynamicDataSourceContextHolder.poll();
+			String source = dataSource.value().getSource();
+			DynamicDataSourceContextHolder.push(source);
 		}
 
 		try {