fix:统一配置;

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/CorsConfig.java

@@ -15,23 +15,23 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
-//@Configuration
+@Configuration
 public class CorsConfig {
     private CorsConfiguration buildConfig() {
         CorsConfiguration corsConfiguration = new CorsConfiguration();
 
         // 可以自行筛选
-        corsConfiguration.addAllowedOrigin("*");
         corsConfiguration.addAllowedOrigin("http://devpartner.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("http://testm.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("http://testh5.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("http://m.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("https://devpartner.zhengzai.tv");
 
+        corsConfiguration.setAllowCredentials(true);
         corsConfiguration.addAllowedHeader("*");
         corsConfiguration.addAllowedMethod("*");
+        corsConfiguration.addAllowedOrigin("*");
 
-        corsConfiguration.setAllowCredentials(true);
 
         return corsConfiguration;
     }

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/WebMvcConfig.java

 package com.liquidnet.common.web.config;
 
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
+import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 @Configuration
 public class WebMvcConfig extends WebMvcConfigurationSupport {
+    @Autowired
+    GlobalAuthorityInterceptor globalAuthorityInterceptor;
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -26,6 +29,14 @@ public class WebMvcConfig extends WebMvcConfigurationSupport {
         super.addResourceHandlers(registry);
     }
 
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(globalAuthorityInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns("/*/v2/api-docs*", "/*/swagger-resources/**", "/*/webjars/**", "/*/doc.html");
+        super.addInterceptors(registry);
+    }
+
 //    @Bean
 //    public FilterRegistrationBean domainCrossFilterBean(){
 //        FilterRegistrationBean registrationBean = new FilterRegistrationBean();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/config/AdamCorsConfig.java

-package com.liquidnet.service.adam.config;
-
-import com.liquidnet.common.web.config.CorsConfig;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AdamCorsConfig extends CorsConfig {
-}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/config/AdamWebMvcConfig.java

-package com.liquidnet.service.adam.config;
-
-import com.liquidnet.common.web.config.WebMvcConfig;
-import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-
-@Configuration
-public class AdamWebMvcConfig extends WebMvcConfig {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
-
-    @Override
-    protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor)
-                .addPathPatterns("/**")
-                .excludePathPatterns("/*/v2/api-docs*", "/*/swagger-resources/**", "/*/webjars/**", "/doc.html");
-        super.addInterceptors(registry);
-    }
-}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/config/KylinCorsConfig.java

-package com.liquidnet.service.kylin.config;
-
-import com.liquidnet.common.web.config.CorsConfig;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class KylinCorsConfig extends CorsConfig {
-}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/config/KylinWebMvcConfig.java

-package com.liquidnet.service.kylin.config;
-
-import com.liquidnet.common.web.config.WebMvcConfig;
-import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-
-@Configuration
-public class KylinWebMvcConfig extends WebMvcConfig {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
-
-    @Override
-    protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
-        super.addInterceptors(registry);
-    }
-}