Merge remote-tracking branch 'origin/dev'

疯狂的狮子li

2021-07-28 eb2be90e74adfa06ee251f80c08243d0301ce467

 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java

@@ -20,7 +20,7 @@
 * @author ruoyi
 */
@Aspect
@Order(1)
@Order(-500)
@Component
public class DataSourceAspect {

@@ -34,7 +34,9 @@
      DataSource dataSource = getDataSource(point);

      if (Validator.isNotNull(dataSource)) {
         DynamicDataSourceContextHolder.push(dataSource.value().name());
         DynamicDataSourceContextHolder.poll();
         String source = dataSource.value().getSource();
         DynamicDataSourceContextHolder.push(source);
      }

      try {