diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java index e11b9492..ffb81367 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java @@ -1,13 +1,13 @@ package com.adc.da.main.config; import com.adc.da.filter.*; -import com.adc.da.util.filter.CorsFilter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; /** * Web配置,用于注入过滤器,拦截器等 @@ -63,21 +63,11 @@ public class WebConfig { return registration; } - /*@Bean + @Bean public CorsFilter corsFilter() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", buildConfig()); // 4 return new CorsFilter(source); - }*/ - - @Bean - public FilterRegistrationBean corsFilter() { - FilterRegistrationBean registration = new FilterRegistrationBean(); - registration.setFilter(new CorsFilter()); - registration.addUrlPatterns("/*"); - registration.setName("corsFilter"); - registration.setOrder(7); - return registration; } private CorsConfiguration buildConfig() {