update 优化多数据源aop顺序问题

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
+@AllArgsConstructor
-{
+public enum DataSourceType {
-    /**
+	/**
-     * 主库
+	 * 主库
-     */
+	 */
-    MASTER,
+	MASTER("master"),
+
+	/**
+	 * 从库
+	 */
+	SLAVE("slave");
 
-    /**
+	@Getter
-     * 从库
+	private final String source;
-     */
-    SLAVE
 }

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 {