升级springboot版本至2.6.16

升级springcloud alibaba版本至2021.0.5.0
升级springcloud版本至2021.0.5
移除ribbon,使用spring cloud loadbalancer

sop-common/sop-service-common/pom.xml

@@ -12,12 +12,12 @@
         <java.version>1.8</java.version>
 
         <!-- springboot 版本-->
-        <spring-boot.version>2.3.2.RELEASE</spring-boot.version>
+        <spring-boot.version>2.6.15</spring-boot.version>
         <!-- spring cloud 版本 -->
-        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+        <spring-cloud.version>2021.0.5</spring-cloud.version>
         <!-- spring cloud alibaba 版本 -->
         <!-- 具体版本对应关系见：https://github.com/alibaba/spring-cloud-alibaba/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E -->
-        <spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
 
         <!-- Logging -->
         <logback.version>1.2.3</logback.version>
@@ -35,8 +35,8 @@
         <fastmybatis.version>1.9.1</fastmybatis.version>
         <guava.version>29.0-jre</guava.version>
         <swagger.version>1.5.21</swagger.version>
-        <springfox-spring-web.version>2.9.2</springfox-spring-web.version>
-        <springfox-swagger2.version>2.9.2</springfox-swagger2.version>
+        <springfox-spring-web.version>3.0.0</springfox-spring-web.version>
+        <springfox-swagger2.version>3.0.0</springfox-swagger2.version>
         <easyopen.version>1.16.9</easyopen.version>
         <pagehelper.version>5.2.0</pagehelper.version>
         <asm.version>6.2</asm.version>
@@ -129,6 +129,10 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/ServiceConfiguration.java

@@ -37,7 +37,7 @@ public class ServiceConfiguration extends SpringmvcConfiguration {
         // 在元数据中新增启动时间，不能修改这个值，不然网关拉取接口会有问题
         // 如果没有这个值，网关会忽略这个服务
         metadata.put("server.startup-time", String.valueOf(System.currentTimeMillis()));
-        return new NacosWatch(nacosServiceManager, nacosDiscoveryProperties, taskScheduler);
+        return new NacosWatch(nacosServiceManager, nacosDiscoveryProperties);
     }
 
 }

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/swagger/CustomModelToSwaggerMapper.java

@@ -1,20 +0,0 @@
-package com.gitee.sop.servercommon.swagger;
-
-import io.swagger.models.parameters.Parameter;
-import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2MapperImpl;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class CustomModelToSwaggerMapper extends ServiceModelToSwagger2MapperImpl {
-
-    @Override
-    protected List<Parameter> parameterListToParameterList(List<springfox.documentation.service.Parameter> list) {
-        // list需要根据order|postion排序
-        list = list.stream()
-                .sorted(Comparator.comparingInt(springfox.documentation.service.Parameter::getOrder))
-                .collect(Collectors.toList());
-        return super.parameterListToParameterList(list);
-    }
-}

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/swagger/CustomSwaggerParameterBuilder.java

@@ -1,7 +1,6 @@
 package com.gitee.sop.servercommon.swagger;
 
 import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +23,7 @@ import springfox.documentation.swagger.schema.ApiModelProperties;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import static springfox.documentation.swagger.common.SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER;
 
@@ -66,7 +66,7 @@ public class CustomSwaggerParameterBuilder implements ExpandedParameterBuilderPl
     private void fromApiParam(ParameterExpansionContext context, ApiParam apiParam) {
         String allowableProperty = Strings.emptyToNull(apiParam.allowableValues());
         AllowableValues allowable = allowableValues(
-                Optional.fromNullable(allowableProperty),
+                Optional.ofNullable(allowableProperty),
                 context.getFieldType().getErasedType());
 
         maybeSetParameterName(context, apiParam.name())
@@ -88,7 +88,7 @@ public class CustomSwaggerParameterBuilder implements ExpandedParameterBuilderPl
     private void fromApiModelProperty(ParameterExpansionContext context, ApiModelProperty apiModelProperty) {
         String allowableProperty = Strings.emptyToNull(apiModelProperty.allowableValues());
         AllowableValues allowable = allowableValues(
-                Optional.fromNullable(allowableProperty),
+                Optional.ofNullable(allowableProperty),
                 context.getFieldType().getErasedType());
 
         maybeSetParameterName(context, apiModelProperty.name())

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/swagger/DocumentationPluginsManagerExt.java

@@ -6,7 +6,6 @@ import com.fasterxml.classmate.members.RawField;
 import com.gitee.sop.servercommon.annotation.BizCode;
 import com.gitee.sop.servercommon.annotation.Open;
 import com.gitee.sop.servercommon.bean.ServiceConfig;
-import com.google.common.base.Optional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -24,10 +23,7 @@ import springfox.documentation.spring.web.plugins.DocumentationPluginsManager;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/swagger/SwaggerSupport.java

@@ -29,12 +29,6 @@ public abstract class SwaggerSupport {
         return new DocumentationPluginsManagerExt();
     }
 
-    @Bean
-    @Primary
-    public CustomModelToSwaggerMapper customModelToSwaggerMapper() {
-        return new CustomModelToSwaggerMapper();
-    }
-
     @Bean
     @Primary
     public CustomSwaggerParameterBuilder customSwaggerParameterBuilder(