config: config set

src/main/java/com/xit/core/config/WebCommonConfig.java

@@ -1,8 +1,10 @@
 package com.xit.core.config;
 
 import com.xit.core.constant.XitConstants;
+import com.xit.core.oauth2.config.properties.CorsProperties;
 import com.xit.core.oauth2.oauth.AuthInterceptor;
 import com.xit.core.support.RestTemplateLoggingRequestInterceptor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -51,8 +53,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Configuration
 @EnableSpringDataWebSupport
-//@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
+@RequiredArgsConstructor
-//@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
 public class WebCommonConfig extends AsyncConfigurerSupport implements WebMvcConfigurer {
     private static final String[] EXCLUDE_LOCALE_CHANGE_LIST = {
             "/resources/**",
@@ -74,6 +75,8 @@ public class WebCommonConfig extends AsyncConfigurerSupport implements WebMvcCon
     @Value("${xit.locale}")
     private String locale;
 
+    private final CorsProperties corsProperties;
+
     //---------------------------------------------------------------------------
     // Locale Resolver Setting : Cookie
     //---------------------------------------------------------------------------
@@ -168,22 +171,22 @@ public class WebCommonConfig extends AsyncConfigurerSupport implements WebMvcCon
     //---------------------------------------------------------------------------
 
 
-//    /**
+    /**
-//     * CORS 설정
+     * CORS 설정
-//     * TODO :: SecurityConfig#corsConfigurationSource 설정이 안돼는 경우 적용
+     * TODO :: SecurityConfig#corsConfigurationSource 설정이 안돼는 경우 적용
-//     * @param registry CorsRegistry
+     * @param registry CorsRegistry
-//     *
+     *
-//     * @see SecurityConfig#corsConfigurationSource()
+     * @see SecurityConfig#corsConfigurationSource()
-//     */
+     */
-//    @Override
+    @Override
-//    public void addCorsMappings(CorsRegistry registry) {
+    public void addCorsMappings(CorsRegistry registry) {
-//        registry.addMapping("/**")
+        registry.addMapping("/**")
-//                .allowedOrigins("")
+                .allowedOrigins(corsProperties.getAllowedOrigins())
-//                .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
+                .allowedMethods(corsProperties.getAllowedMethods())
-//                .allowedHeaders("*")
+                .allowedHeaders(corsProperties.getAllowedHeaders())
-//                .allowCredentials(true)
+                .allowCredentials(true)
-//                .maxAge(3600);
+                .maxAge(3600);
-//    }
+    }
 
     //---------------------------------------------------------------------------
     // yaml type Message loading