优化CORS跨域实现

优化获取currentUserId代码

Author: saleson

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/GrayServerHolder.java

@@ -1,10 +1,12 @@
 package cn.springcloud.gray.server;
 
 import cn.springcloud.gray.server.module.user.UserModule;
+import cn.springcloud.gray.server.oauth2.Oauth2Service;
 
 public class GrayServerHolder {
 
     private static UserModule userModule;
+    private static Oauth2Service oauth2Service;
 
 
     public static UserModule getUserModule() {
@@ -14,4 +16,12 @@ public static UserModule getUserModule() {
     public static void setUserModule(UserModule userModule) {
         GrayServerHolder.userModule = userModule;
     }
+
+    public static Oauth2Service getOauth2Service() {
+        return oauth2Service;
+    }
+
+    public static void setOauth2Service(Oauth2Service oauth2Service) {
+        GrayServerHolder.oauth2Service = oauth2Service;
+    }
 }

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/GrayServerInitializer.java

@@ -4,6 +4,7 @@
 import cn.springcloud.gray.event.server.GrayEventObserver;
 import cn.springcloud.gray.event.server.GrayEventTrigger;
 import cn.springcloud.gray.server.module.user.UserModule;
+import cn.springcloud.gray.server.oauth2.Oauth2Service;
 import cn.springcloud.gray.utils.SpringApplicationContextUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
@@ -21,6 +22,7 @@ public class GrayServerInitializer implements ApplicationContextAware, Initializ
     @Override
     public void afterPropertiesSet() throws Exception {
         GrayServerHolder.setUserModule(SpringApplicationContextUtils.getBean("userModule", UserModule.class));
+        GrayServerHolder.setOauth2Service(SpringApplicationContextUtils.getBean("oauth2Service", Oauth2Service.class));
 
         bindGrayEventObservers();
     }

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/DBStorageConfiguration.java

@@ -22,7 +22,6 @@
 import cn.springcloud.gray.server.module.user.jpa.JPAAuthorityModule;
 import cn.springcloud.gray.server.module.user.jpa.JPAServiceManageModule;
 import cn.springcloud.gray.server.module.user.jpa.JPAUserModule;
-import cn.springcloud.gray.server.oauth2.Oauth2Service;
 import cn.springcloud.gray.server.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -89,8 +88,8 @@ public GrayServiceIdFinder grayServiceIdFinder(
 
         @Bean
         @ConditionalOnMissingBean
-        public UserModule userModule(UserService userService, Oauth2Service oauth2Service) {
-            return new JPAUserModule(userService, oauth2Service);
+        public UserModule userModule(UserService userService) {
+            return new JPAUserModule(userService);
         }
 
         @Bean

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/WebConfiguration.java

@@ -4,53 +4,59 @@
 import cn.springcloud.gray.server.resources.interceptor.AuthorityInterceptor;
 import cn.springcloud.gray.server.resources.interceptor.NamespaceInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * Created by saleson on 2017/7/5.
  */
 @Configuration
 @ComponentScan({"cn.springcloud.gray.server.resources"})
 @Import(Swagger2Configuration.class)
-public class WebConfiguration extends WebMvcConfigurerAdapter {
+public class WebConfiguration implements WebMvcConfigurer {
 
 
     @Autowired
     private AuthorityModule authorityModule;
 
-    @Bean
-    public FilterRegistrationBean filterRegistrationBean() {
-
-        CorsConfiguration corsConfiguration = new CorsConfiguration();
-        corsConfiguration.setAllowCredentials(true);
-        corsConfiguration.addAllowedOrigin("*");
-        corsConfiguration.addAllowedHeader("*");
-        corsConfiguration.addAllowedMethod("*");
-        corsConfiguration.setMaxAge(3600l);
-        corsConfiguration.addExposedHeader("X-Total-Count");
-        corsConfiguration.addExposedHeader("X-Pagination");
-        UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
-        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
-        new CorsFilter(urlBasedCorsConfigurationSource);
-
-        FilterRegistrationBean filterRegistrationBean =
-                new FilterRegistrationBean(new CorsFilter(urlBasedCorsConfigurationSource));
-        filterRegistrationBean.addUrlPatterns("/*");
-        return filterRegistrationBean;
+//    @Bean
+//    public FilterRegistrationBean filterRegistrationBean() {
+//
+//        CorsConfiguration corsConfiguration = new CorsConfiguration();
+//        corsConfiguration.setAllowCredentials(true);
+//        corsConfiguration.addAllowedOrigin("*");
+//        corsConfiguration.addAllowedHeader("*");
+//        corsConfiguration.addAllowedMethod("*");
+//        corsConfiguration.setMaxAge(3600l);
+//        corsConfiguration.addExposedHeader("X-Total-Count");
+//        corsConfiguration.addExposedHeader("X-Pagination");
+//        UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
+//        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
+//
+//        FilterRegistrationBean filterRegistrationBean =
+//                new FilterRegistrationBean(new CorsFilter(urlBasedCorsConfigurationSource));
+//        filterRegistrationBean.addUrlPatterns("/*");
+//        return filterRegistrationBean;
+//    }
+
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedHeaders("*")
+                .allowedMethods("*")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .exposedHeaders("X-Total-Count", "X-Pagination")
+                .maxAge(3600l);
     }
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        super.addInterceptors(registry);
         registry.addInterceptor(new NamespaceInterceptor(authorityModule))
                 .addPathPatterns("/**");
         registry.addInterceptor(new AuthorityInterceptor(authorityModule)).addPathPatterns("/**");

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/user/jpa/JPAUserModule.java

@@ -3,8 +3,8 @@
 import cn.springcloud.gray.server.module.user.UserModule;
 import cn.springcloud.gray.server.module.user.domain.UserInfo;
 import cn.springcloud.gray.server.module.user.domain.UserQuery;
-import cn.springcloud.gray.server.oauth2.Oauth2Service;
 import cn.springcloud.gray.server.service.UserService;
+import cn.springcloud.gray.server.utils.SessionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -13,11 +13,9 @@
 
 public class JPAUserModule implements UserModule {
 
-    private Oauth2Service oauth2Service;
     private UserService userService;
 
-    public JPAUserModule(UserService userService, Oauth2Service oauth2Service) {
-        this.oauth2Service = oauth2Service;
+    public JPAUserModule(UserService userService) {
         this.userService = userService;
     }
 
@@ -68,7 +66,7 @@ public Page<UserInfo> query(UserQuery userQuery, Pageable pageable) {
 
     @Override
     public String getCurrentUserId() {
-        return oauth2Service.getUserPrincipal();
+        return SessionUtils.currentUserId();
     }
 
     @Override

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/utils/SessionUtils.java

@@ -14,7 +14,7 @@
 public class SessionUtils {
 
     public static String currentUserId() {
-        return GrayServerHolder.getUserModule().getCurrentUserId();
+        return GrayServerHolder.getOauth2Service().getUserPrincipal();
     }
 
     public static String currentNamespace() {