Просмотр исходного кода

20230718(3)-BUG FIX 修复跨域拦截器和token拦截器冲突

iaun 3 лет назад
Родитель
Сommit
e61db62fc8

+ 0 - 17
src/main/java/cn/iaun/it/config/CorsConfig.java

@@ -1,17 +0,0 @@
-package cn.iaun.it.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-
-@Configuration
-public class CorsConfig extends WebMvcConfigurationSupport {
-    @Override
-    protected void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedHeaders("*")
-                .allowedMethods("*")
-                .allowedOrigins("*");
-        super.addCorsMappings(registry);
-    }
-}

+ 13 - 2
src/main/java/cn/iaun/it/config/InterceptorConfig.java → src/main/java/cn/iaun/it/config/WebMvcConfig.java

@@ -3,18 +3,29 @@ package cn.iaun.it.config;
 import cn.iaun.it.interceptor.TokenInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-// Web拦截器,用于认证
+// Web拦截器,用于认证+跨域
 @Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
+public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(getTokenInterceptor())
                 .addPathPatterns("/**")
                 .excludePathPatterns("/user/login");
+        WebMvcConfigurer.super.addInterceptors(registry);
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedHeaders("*")
+                .allowedMethods("*")
+                .allowedOrigins("*");
+        WebMvcConfigurer.super.addCorsMappings(registry);
     }
 
     @Bean