Explorar o código

Merge branch 'develop-v3.0.0' of http://39.106.8.246:3003/FM-dev/fm-basics into develop-v3.0.0

lixing %!s(int64=4) %!d(string=hai) anos
pai
achega
49c41ee6a0

+ 1 - 1
fm-common/src/main/java/com/persagy/fm/common/config/CommonWebConfigurer.java

@@ -26,7 +26,7 @@ public class CommonWebConfigurer implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 设置拦截的路径、不拦截的路径、优先级等等
-        registry.addInterceptor(appContextHandler()).addPathPatterns("/**");
+        registry.addInterceptor(appContextHandler()).order(10).addPathPatterns("/**");
     }
 
 }

+ 2 - 2
fm-mybatis/src/main/java/com/persagy/fm/mybatis/config/MyBatisWebConfigurer.java

@@ -23,7 +23,7 @@ public class MyBatisWebConfigurer implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        // 设置拦截的路径、不拦截的路径、优先级等等
-        registry.addInterceptor(dynamicDataSourceHandler()).addPathPatterns("/**");
+        // 设置拦截的路径、不拦截的路径、优先级等等 -- 在contextHandler之后执行
+        registry.addInterceptor(dynamicDataSourceHandler()).order(20).addPathPatterns("/**");
     }
 }

+ 1 - 2
fm-mybatis/src/main/java/com/persagy/fm/mybatis/handler/DynamicDataSourceHandler.java

@@ -16,7 +16,6 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
-import java.sql.SQLException;
 
 /**
  * 动态数据源拦截器
@@ -50,7 +49,7 @@ public class DynamicDataSourceHandler extends HandlerInterceptorAdapter {
     /**
      * 多租户处理,数据源切换
      */
-    private void resetDataSource() throws SQLException {
+    public void resetDataSource() {
         // 是否启用多数据源
         boolean isDynamic = SpringHelper.getBoolean("spring.datasource.dynamic.enabled", false);
         if(!isDynamic) {