🐯 优化cors升级hutool 4.6.10

Author: springboot-plus

CHANGELOG.md

@@ -32,6 +32,7 @@
 ### 🔨 Dependency Upgrades
 - Upgrade to `spring-boot` 2.1.9.RELEASE
 - Upgrade to `Fastjson` 1.2.62
+- Upgrade to `hutool` 4.6.10
 - Add `commons-text` 1.8
 
 ## [V1.3.0-RELEASE] 2019.10.06

pom.xml

@@ -64,7 +64,7 @@
         <reflections.version>0.9.11</reflections.version>
         <jansi.version>1.18</jansi.version>
         <lombok.version>1.18.8</lombok.version>
-        <hutool.version>4.6.4</hutool.version>
+        <hutool.version>4.6.10</hutool.version>
         <junit.version>4.12</junit.version>
         <ini4j.version>0.5.4</ini4j.version>
         <mapstruct.version>1.3.0.Final</mapstruct.version>

src/main/java/io/geekidea/springbootplus/core/config/SpringBootPlusConfig.java

@@ -16,20 +16,15 @@
 package io.geekidea.springbootplus.core.config;
 
 import io.geekidea.springbootplus.aop.LogAop;
-import io.geekidea.springbootplus.interceptor.PermissionInterceptor;
 import io.geekidea.springbootplus.core.properties.*;
+import io.geekidea.springbootplus.interceptor.PermissionInterceptor;
 import io.geekidea.springbootplus.resource.interceptor.DownloadInterceptor;
 import io.geekidea.springbootplus.resource.interceptor.ResourceInterceptor;
 import io.geekidea.springbootplus.resource.interceptor.UploadInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
 
 /**
  * spring-boot-plus配置
@@ -49,29 +44,6 @@
 })
 public class SpringBootPlusConfig {
 
-    /**
-     * CORS跨域设置
-     *
-     * @return
-     */
-    @Bean
-    public FilterRegistrationBean corsFilter(SpringBootPlusCorsProperties corsProperties) {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        CorsConfiguration corsConfiguration = new CorsConfiguration();
-        // 跨域配置
-        corsConfiguration.setAllowedOrigins(corsProperties.getAllowedOrigins());
-        corsConfiguration.setAllowedHeaders(corsProperties.getAllowedHeaders());
-        corsConfiguration.setAllowedMethods(corsProperties.getAllowedMethods());
-        corsConfiguration.setAllowCredentials(corsProperties.isAllowCredentials());
-        corsConfiguration.setExposedHeaders(corsProperties.getExposedHeaders());
-        source.registerCorsConfiguration(corsProperties.getPath(), corsConfiguration);
-
-        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
-        bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
-        bean.setEnabled(corsProperties.isEnable());
-        return bean;
-    }
-
     /**
      * 配置日志AOP
      *

src/main/java/io/geekidea/springbootplus/core/config/SpringBootPlusCorsConfig.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2019-2029 geekidea(https://github.com/geekidea)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.geekidea.springbootplus.core.config;
+
+import io.geekidea.springbootplus.core.properties.SpringBootPlusCorsProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * 跨域配置
+ *
+ * @author geekidea
+ * @date 2019/10/14
+ * @since 1.3.1.RELEASE
+ */
+@Slf4j
+@Configuration
+public class SpringBootPlusCorsConfig {
+
+    /**
+     * CORS跨域设置
+     *
+     * @return
+     */
+    @Bean
+    public FilterRegistrationBean corsFilter(SpringBootPlusCorsProperties corsProperties) {
+        log.debug("corsProperties:{}", corsProperties);
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 跨域配置
+        corsConfiguration.setAllowedOrigins(corsProperties.getAllowedOrigins());
+        corsConfiguration.setAllowedHeaders(corsProperties.getAllowedHeaders());
+        corsConfiguration.setAllowedMethods(corsProperties.getAllowedMethods());
+        corsConfiguration.setAllowCredentials(corsProperties.isAllowCredentials());
+        corsConfiguration.setExposedHeaders(corsProperties.getExposedHeaders());
+        corsConfiguration.setMaxAge(corsConfiguration.getMaxAge());
+
+        source.registerCorsConfiguration(corsProperties.getPath(), corsConfiguration);
+        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+        bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
+        bean.setEnabled(corsProperties.isEnable());
+        return bean;
+    }
+
+}

src/main/java/io/geekidea/springbootplus/core/properties/SpringBootPlusCorsProperties.java

@@ -67,6 +67,11 @@ public class SpringBootPlusCorsProperties {
     /**
      * 允许响应的头
      */
-    private List<String> exposedHeaders = Arrays.asList("content-type", "token");
+    private List<String> exposedHeaders = Arrays.asList("token");
+
+    /**
+     * 该响应的有效时间默认为30分钟，在有效时间内，浏览器无须为同一请求再次发起预检请求
+     */
+    private Long maxAge = 1800L;
 
 }

src/main/resources/config/application.yml

@@ -100,7 +100,10 @@ spring-boot-plus:
     # 允许访问的请求方式
     allowed-methods: OPTION,GET,POST
     # 允许响应的头
-    exposed-headers: content-type,token
+    exposed-headers: token
+    # 该响应的有效时间默认为30分钟，在有效时间内，浏览器无须为同一请求再次发起预检请求
+    max-age: 1800
+
   ############################ CORS end ##############################
 
   ########################## Resource start ##########################