- 新建 mall-spring-boot 项目，用于提供通用组件的自动配置

admin-web/src/utils/request.js

@@ -137,7 +137,8 @@ export default function request(url, option) {
 
   // 将登陆的 accessToken 放到 header
   const loginToken = getLoginToken();
-  if (loginToken && loginToken.accessToken) {
+  if (loginToken && loginToken.accessToken
+    && url.indexOf('/passport/login') === -1) { // TODO 芋艿，临时这么加，可能不是很优雅
     const headers = {
       ...newOptions.headers,
       Authorization: `Bearer ${loginToken.accessToken}`,

common/mall-spring-boot/pom.xml

@@ -11,5 +11,42 @@
 
     <artifactId>mall-spring-boot</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>common-framework</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>system-sdk</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>user-sdk</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
 
 </project>

common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/constant/RootRequestPath.java

+package cn.iocoder.mall.spring.boot.constant;
+
+/**
+ * 全局请求路径枚举类，用于定义不同用户类型的根请求路径
+ */
+public interface RootRequestPath {
+
+    /**
+     * 管理员
+     */
+    String ADMIN = "/admins";
+    /**
+     * 用户
+     */
+    String USER = "/users";
+
+}

common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCConfiguration.java

+package cn.iocoder.mall.spring.boot.web;
+
+import cn.iocoder.mall.admin.sdk.interceptor.AdminAccessLogInterceptor;
+import cn.iocoder.mall.admin.sdk.interceptor.AdminSecurityInterceptor;
+import cn.iocoder.mall.spring.boot.constant.RootRequestPath;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.DispatcherServlet;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) // TODO 芋艿，未来可能考虑 REACTIVE
+@ConditionalOnClass({DispatcherServlet.class, WebMvcConfigurer.class, // 有 Spring MVC 容器
+        AdminSecurityInterceptor.class, AdminAccessLogInterceptor.class}) // 有引入 system-sdk
+public class AdminMVCConfiguration implements WebMvcConfigurer {
+
+    @Bean
+    @ConditionalOnMissingBean(AdminSecurityInterceptor.class)
+    public AdminSecurityInterceptor adminSecurityInterceptor() {
+        return new AdminSecurityInterceptor();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(AdminAccessLogInterceptor.class)
+    public AdminAccessLogInterceptor adminAccessLogInterceptor() {
+        return new AdminAccessLogInterceptor();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(adminAccessLogInterceptor()).addPathPatterns(RootRequestPath.ADMIN + "/**");
+        registry.addInterceptor(adminSecurityInterceptor()).addPathPatterns(RootRequestPath.ADMIN + "/**");
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping(RootRequestPath.USER + "/**")
+                .allowedOrigins("*")
+                .allowedMethods("*")
+                .allowedHeaders("*")
+                .allowCredentials(true).maxAge(1800);
+    }
+
+}

common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/UserMVCConfiguration.java

+package cn.iocoder.mall.spring.boot.web;
+
+import cn.iocoder.mall.spring.boot.constant.RootRequestPath;
+import cn.iocoder.mall.user.sdk.interceptor.UserAccessLogInterceptor;
+import cn.iocoder.mall.user.sdk.interceptor.UserSecurityInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.DispatcherServlet;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) // TODO 芋艿，未来可能考虑 REACTIVE
+@ConditionalOnClass({DispatcherServlet.class, WebMvcConfigurer.class, // 有 Spring MVC 容器
+        UserSecurityInterceptor.class, UserAccessLogInterceptor.class}) // 有引入 system-sdk
+public class UserMVCConfiguration implements WebMvcConfigurer {
+
+    @Bean
+    @ConditionalOnMissingBean(UserAccessLogInterceptor.class)
+    public UserAccessLogInterceptor userAccessLogInterceptor() {
+        return new UserAccessLogInterceptor();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(UserSecurityInterceptor.class)
+    public UserSecurityInterceptor userSecurityInterceptor() {
+        return new UserSecurityInterceptor();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userAccessLogInterceptor()).addPathPatterns(RootRequestPath.USER + "/**");
+        registry.addInterceptor(userSecurityInterceptor()).addPathPatterns(RootRequestPath.USER + "/**");
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping(RootRequestPath.USER + "/**")
+                .allowedOrigins("*")
+                .allowedMethods("*")
+                .allowedHeaders("*")
+                .allowCredentials(true).maxAge(1800);
+    }
+
+}

common/mall-spring-boot/src/main/resources/META-INF/spring.factories

+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  cn.iocoder.mall.spring.boot.web.AdminMVCConfiguration, \
+  cn.iocoder.mall.spring.boot.web.UserMVCConfiguration

order/order-application/src/main/java/cn/iocoder/mall/order/application/config/MVCConfiguration.java

@@ -49,21 +49,6 @@ public class MVCConfiguration implements WebMvcConfigurer {
         return registrationBean;
     }
 
-//    @Override
-//    public void addViewControllers(ViewControllerRegistry registry) {
-//        registry.addRedirectViewController("/api/v2/api-docs", "/v2/api-docs");
-//        registry.addRedirectViewController("/api/swagger-resources/configuration/ui", "/swagger-resources/configuration/ui");
-//        registry.addRedirectViewController("/api/swagger-resources/configuration/security", "/swagger-resources/configuration/security");
-//        registry.addRedirectViewController("/api/swagger-resources", "/swagger-resources");
-//    }
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 解决 swagger-ui.html 的访问，参考自 https://stackoverflow.com/questions/43545540/swagger-ui-no-mapping-found-for-http-request 解决
-        registry.addResourceHandler("swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
-        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
     // TODO 芋艿，允许跨域
     @Override
     public void addCorsMappings(CorsRegistry registry) {

pay/pay-application/src/main/java/cn/iocoder/mall/pay/application/config/MVCConfiguration.java

@@ -5,7 +5,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @EnableWebMvc
@@ -28,13 +27,6 @@ public class MVCConfiguration implements WebMvcConfigurer {
 //                .excludePathPatterns("/admins/passport/login"); // 排除登陆接口
 //    }
 
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 解决 swagger-ui.html 的访问，参考自 https://stackoverflow.com/questions/43545540/swagger-ui-no-mapping-found-for-http-request 解决
-        registry.addResourceHandler("swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
-        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
     // TODO 芋艿，允许跨域
     @Override
     public void addCorsMappings(CorsRegistry registry) {

product/product-application/src/main/java/cn/iocoder/mall/product/application/config/MVCConfiguration.java

@@ -11,7 +11,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @EnableWebMvc
@@ -32,13 +31,6 @@ public class MVCConfiguration implements WebMvcConfigurer {
         registry.addInterceptor(adminSecurityInterceptor).addPathPatterns("/admins/**");
     }
 
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 解决 swagger-ui.html 的访问，参考自 https://stackoverflow.com/questions/43545540/swagger-ui-no-mapping-found-for-http-request 解决
-        registry.addResourceHandler("swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
-        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
     @Bean
     public FilterRegistrationBean<CorsFilter> corsFilter() {
         FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();

promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/config/MVCConfiguration.java

@@ -13,7 +13,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @EnableWebMvc
@@ -46,13 +45,6 @@ public class MVCConfiguration implements WebMvcConfigurer {
         registry.addInterceptor(adminSecurityInterceptor).addPathPatterns("/admins/**");
     }
 
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 解决 swagger-ui.html 的访问，参考自 https://stackoverflow.com/questions/43545540/swagger-ui-no-mapping-found-for-http-request 解决
-        registry.addResourceHandler("swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
-        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
     @Bean
     public FilterRegistrationBean<CorsFilter> corsFilter() {
         FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();

search/search-application/src/main/java/cn/iocoder/mall/search/application/config/MVCConfiguration.java

@@ -8,7 +8,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @EnableWebMvc
@@ -41,13 +40,6 @@ public class MVCConfiguration implements WebMvcConfigurer {
 //        registry.addInterceptor(adminSecurityInterceptor).addPathPatterns("/admins/**");
     }
 
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 解决 swagger-ui.html 的访问，参考自 https://stackoverflow.com/questions/43545540/swagger-ui-no-mapping-found-for-http-request 解决
-        registry.addResourceHandler("swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
-        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
     @Bean
     public FilterRegistrationBean<CorsFilter> corsFilter() {
         FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();

system/system-application/pom.xml

@@ -17,6 +17,11 @@
             <artifactId>common-framework</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>mall-spring-boot</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>cn.iocoder.mall</groupId>

system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java

-package cn.iocoder.mall.admin.application.config;
-
-import cn.iocoder.common.framework.config.GlobalExceptionHandler;
-import cn.iocoder.common.framework.servlet.CorsFilter;
-import cn.iocoder.mall.admin.sdk.interceptor.AdminAccessLogInterceptor;
-import cn.iocoder.mall.admin.sdk.interceptor.AdminSecurityInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.Set;
-
-@EnableWebMvc
-@Configuration
-@Import(value = {GlobalExceptionHandler.class,  // 统一全局返回
-        AdminAccessLogInterceptor.class,
-        AdminSecurityInterceptor.class
-})
-public class MVCConfiguration implements WebMvcConfigurer {
-
-//    @Autowired
-//    private UserSecurityInterceptor securityInterceptor;
-
-    @Autowired
-    private AdminSecurityInterceptor adminSecurityInterceptor;
-    @Autowired
-    private AdminAccessLogInterceptor adminAccessLogInterceptor;
-
-    @Value("${auth.ignore-urls}")
-    private Set<String> ignoreUrls;
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(adminAccessLogInterceptor).addPathPatterns("/admins/**");
-        registry.addInterceptor(adminSecurityInterceptor.setIgnoreUrls(ignoreUrls)).addPathPatterns("/admins/**")
-                .excludePathPatterns("/admins/passport/login"); // 排除登陆接口
-    }
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 解决 swagger-ui.html 的访问，参考自 https://stackoverflow.com/questions/43545540/swagger-ui-no-mapping-found-for-http-request 解决
-        registry.addResourceHandler("swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
-        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
-    @Bean
-    public FilterRegistrationBean<CorsFilter> corsFilter() {
-        FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();
-        registrationBean.setFilter(new CorsFilter());
-        registrationBean.addUrlPatterns("/*");
-        return registrationBean;
-    }
-
-}

system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java

@@ -18,6 +18,7 @@ import cn.iocoder.mall.admin.application.vo.AdminPageVO;
 import cn.iocoder.mall.admin.application.vo.AdminRoleVO;
 import cn.iocoder.mall.admin.application.vo.AdminVO;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
+import cn.iocoder.mall.spring.boot.constant.RootRequestPath;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -29,7 +30,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping("admins/admin")
+@RequestMapping(RootRequestPath.ADMIN + "/admin")
 @Api("管理员模块")
 public class AdminController {
 

system/system-application/src/main/resources/application.yaml

@@ -8,9 +8,9 @@ server:
   servlet:
     context-path: /admin-api/
 
-# auth
-auth:
-  ignore-urls: /admin-api/admins/admin/passport/login, /admin-api/admins/file/get_qiniu_token
+admins:
+  security:
+    ignore_urls: /admin-api/admins/passport/login, /admin-api/admins/file/get_qiniu_token
 
 # qiniu
 qiniu:

system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java

@@ -9,6 +9,7 @@ import cn.iocoder.mall.admin.api.constant.AdminErrorCodeEnum;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContext;
 import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder;
 import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -24,9 +25,11 @@ public class AdminSecurityInterceptor extends HandlerInterceptorAdapter {
 
     @Reference(validation = "true", version = "${dubbo.consumer.OAuth2Service.version:1.0.0}")
     private OAuth2Service oauth2Service;
+
     /**
      * 忽略的 URL 集合，即无需经过认证
      */
+    @Value("${admins.security.ignore_url:#{null}}")
     private Set<String> ignoreUrls;
 
     public AdminSecurityInterceptor setIgnoreUrls(Set<String> ignoreUrls) {
@@ -67,7 +70,7 @@ public class AdminSecurityInterceptor extends HandlerInterceptorAdapter {
         }
         // 校验是否需要已授权
         // TODO sin 暂时不校验
-         checkPermission(request, authentication);
+        // checkPermission(request, authentication);
         // 返回成功
         return super.preHandle(request, response, handler);
     }

user/user-application/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>common-framework</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>mall-spring-boot</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>cn.iocoder.mall</groupId>

user/user-application/src/main/java/cn/iocoder/mall/user/application/UserApplication.java

@@ -2,6 +2,7 @@ package cn.iocoder.mall.user.application;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @SpringBootApplication(scanBasePackages = {"cn.iocoder.mall.user"})
 public class UserApplication {

user/user-application/src/main/java/cn/iocoder/mall/user/application/config/MVCConfiguration.java

-package cn.iocoder.mall.user.application.config;
-
-import cn.iocoder.common.framework.config.GlobalExceptionHandler;
-import cn.iocoder.common.framework.servlet.CorsFilter;
-import cn.iocoder.mall.admin.sdk.interceptor.AdminSecurityInterceptor;
-import cn.iocoder.mall.user.sdk.interceptor.UserAccessLogInterceptor;
-import cn.iocoder.mall.user.sdk.interceptor.UserSecurityInterceptor;
-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.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.servlet.config.annotation.*;
-
-@EnableWebMvc
-@Configuration
-@Import(value = {GlobalExceptionHandler.class,  // 统一全局返回
-        UserSecurityInterceptor.class, UserAccessLogInterceptor.class,
-        AdminSecurityInterceptor.class}) // 安全拦截器，实现认证和授权功能。
-public class MVCConfiguration implements WebMvcConfigurer {
-
-    @Autowired
-    private UserSecurityInterceptor userSecurityInterceptor;
-    @Autowired
-    private UserAccessLogInterceptor userAccessLogInterceptor;
-    @Autowired
-    private AdminSecurityInterceptor adminSecurityInterceptor;
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        // 用户
-        registry.addInterceptor(userAccessLogInterceptor).addPathPatterns("/users/**");
-        registry.addInterceptor(userSecurityInterceptor).addPathPatterns("/users/**"); // 只拦截我们定义的接口
-        // 管理员
-        registry.addInterceptor(adminSecurityInterceptor).addPathPatterns("/admins/**"); // 只拦截我们定义的接口
-    }
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 解决 swagger-ui.html 的访问，参考自 https://stackoverflow.com/questions/43545540/swagger-ui-no-mapping-found-for-http-request 解决
-        registry.addResourceHandler("swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
-        registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
-    @Bean
-    public FilterRegistrationBean<CorsFilter> corsFilter() {
-        FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();
-        registrationBean.setFilter(new CorsFilter());
-        registrationBean.addUrlPatterns("/*");
-        return registrationBean;
-    }
-
-}