升级spring-boot到2.5.14

Author: zhult13

pom.xml

@@ -14,7 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>8</java.version>
         <spring-cloud-alibaba-dependencies.version>2021.1</spring-cloud-alibaba-dependencies.version>
-        <spring-boot-dependencies.version>2.5.13</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.5.14</spring-boot-dependencies.version>
         <spring-cloud-dependencies.version>2020.0.5</spring-cloud-dependencies.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <swagger.butler.version>2.0.1</swagger.butler.version>

zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/CustomErrorWebFluxAutoConfiguration.java

@@ -4,8 +4,8 @@
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.web.ResourceProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.reactive.error.ErrorAttributes;
@@ -35,26 +35,26 @@
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @ConditionalOnClass(WebFluxConfigurer.class)
 @AutoConfigureBefore(WebFluxAutoConfiguration.class)
-@EnableConfigurationProperties({ServerProperties.class, ResourceProperties.class})
+@EnableConfigurationProperties({ServerProperties.class, WebProperties.class})
 public class CustomErrorWebFluxAutoConfiguration {
     private final ServerProperties serverProperties;
 
     private final ApplicationContext applicationContext;
 
-    private final ResourceProperties resourceProperties;
+    private final WebProperties webProperties;
 
     private final List<ViewResolver> viewResolvers;
 
     private final ServerCodecConfigurer serverCodecConfigurer;
 
     public CustomErrorWebFluxAutoConfiguration(ServerProperties serverProperties,
-                                               ResourceProperties resourceProperties,
+                                               WebProperties webProperties,
                                                ObjectProvider<List<ViewResolver>> viewResolversProvider,
                                                ServerCodecConfigurer serverCodecConfigurer,
                                                ApplicationContext applicationContext) {
         this.serverProperties = serverProperties;
         this.applicationContext = applicationContext;
-        this.resourceProperties = resourceProperties;
+        this.webProperties = webProperties;
         this.viewResolvers = viewResolversProvider.getIfAvailable(Collections::emptyList);
         this.serverCodecConfigurer = serverCodecConfigurer;
     }
@@ -64,7 +64,7 @@ public CustomErrorWebFluxAutoConfiguration(ServerProperties serverProperties,
     public ErrorWebExceptionHandler errorWebExceptionHandler(ErrorAttributes errorAttributes) {
         JsonErrorWebExceptionHandler exceptionHandler = new JsonErrorWebExceptionHandler(
                 errorAttributes,
-                this.resourceProperties,
+                this.webProperties.getResources(),
                 this.serverProperties.getError(),
                 this.applicationContext);
         exceptionHandler.setViewResolvers(this.viewResolvers);

zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java

@@ -1,7 +1,7 @@
 package com.central.gateway.error;
 
 import org.springframework.boot.autoconfigure.web.ErrorProperties;
-import org.springframework.boot.autoconfigure.web.ResourceProperties;
+import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.boot.autoconfigure.web.reactive.error.DefaultErrorWebExceptionHandler;
 import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.reactive.error.ErrorAttributes;
@@ -23,7 +23,7 @@
  * Github: https://github.com/zlt2000
  */
 public class JsonErrorWebExceptionHandler extends DefaultErrorWebExceptionHandler {
-    public JsonErrorWebExceptionHandler(ErrorAttributes errorAttributes, ResourceProperties resourceProperties,
+    public JsonErrorWebExceptionHandler(ErrorAttributes errorAttributes, WebProperties.Resources resourceProperties,
                                         ErrorProperties errorProperties, ApplicationContext applicationContext) {
         super(errorAttributes, resourceProperties, errorProperties, applicationContext);
     }