From 1b9b5a4416cf3c9944f9231369da9cebdea12703 Mon Sep 17 00:00:00 2001
From: xyiege <xc@xyiege.com>
Date: Mon, 11 Jul 2022 23:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=A8=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/configure/ChWebMvcConfigurer.java    |  7 ++++++
 .../cn/chjyj/szwh/configure/FilterConfig.java | 25 -------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java b/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java
index 9e00ef7..c482a9a 100644
--- a/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java
+++ b/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java
@@ -4,6 +4,7 @@ import cn.chjyj.szwh.Interceptor.ChInterceptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 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;
 
@@ -23,4 +24,10 @@ public class ChWebMvcConfigurer  implements WebMvcConfigurer {
         registry.addInterceptor(new ChInterceptor()).addPathPatterns("/**");
         log.debug("拦截器注册:"+registry.toString());
     }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry){
+        registry.addMapping("/**")
+                .allowedMethods("POST","GET");
+    }
 }
diff --git a/src/main/java/cn/chjyj/szwh/configure/FilterConfig.java b/src/main/java/cn/chjyj/szwh/configure/FilterConfig.java
index 46d6259..667fbd0 100644
--- a/src/main/java/cn/chjyj/szwh/configure/FilterConfig.java
+++ b/src/main/java/cn/chjyj/szwh/configure/FilterConfig.java
@@ -4,9 +4,6 @@ import cn.chjyj.szwh.xss.XssFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
 
 
 import javax.servlet.DispatcherType;
@@ -28,26 +25,4 @@ public class FilterConfig {
         return registration;
     }
 
-    /**
-     * 跨域访问控制
-     * @return
-     */
-    @Bean
-    public CorsFilter corsFilter(){
-        CorsConfiguration config = new CorsConfiguration();
-        config.addAllowedOrigin("*");
-        config.setAllowCredentials(true);
-        // 开放的请求方式
-        config.addAllowedMethod("GET");
-        config.addAllowedMethod("POST");
-        config.addAllowedHeader("*");
-        //暴露头部信息
-        config.addExposedHeader("*");
-
-        //添加映射路径
-        UrlBasedCorsConfigurationSource configsoure =new UrlBasedCorsConfigurationSource();
-        configsoure.registerCorsConfiguration("/**",config);
-
-        return new CorsFilter(configsoure);
-    }
 }