升级Spring Cloud相关组件到最新版本

RuoYi

2022-01-10 b40e5c19b2662204e7ffafa34b229e0f7d716d9a

升级Spring Cloud相关组件到最新版本

 pom.xml

@@ -17,17 +17,17 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <java.version>1.8</java.version>

        <spring-boot.version>2.5.8</spring-boot.version>

        <spring-cloud.version>2020.0.4</spring-cloud.version>

        <spring-boot.version>2.6.2</spring-boot.version>

        <spring-cloud.version>2021.0.0</spring-cloud.version>

        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>

        <alibaba.nacos.version>2.0.3</alibaba.nacos.version>

        <spring-boot-admin.version>2.5.4</spring-boot-admin.version>

        <spring-boot-admin.version>2.6.0</spring-boot-admin.version>

        <spring-boot.mybatis>2.2.0</spring-boot.mybatis>

        <swagger.fox.version>3.0.0</swagger.fox.version>

        <swagger.core.version>1.6.2</swagger.core.version>

        <tobato.version>1.27.2</tobato.version>

        <kaptcha.version>2.3.2</kaptcha.version>

        <pagehelper.boot.version>1.4.0</pagehelper.boot.version>

        <pagehelper.boot.version>1.4.1</pagehelper.boot.version>

        <druid.version>1.2.8</druid.version>

        <dynamic-ds.version>3.5.0</dynamic-ds.version>

        <commons.io.version>2.11.0</commons.io.version>

@@ -37,7 +37,6 @@
        <jjwt.version>0.9.1</jjwt.version>

        <minio.version>8.2.2</minio.version>

        <poi.version>4.1.2</poi.version>

        <common-pool.version>2.10.0</common-pool.version>

        <commons-collections.version>3.2.2</commons-collections.version>

        <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>

        <log4j2.version>2.17.1</log4j2.version>

@@ -182,13 +181,6 @@
                <groupId>com.alibaba</groupId>

                <artifactId>transmittable-thread-local</artifactId>

                <version>${transmittable-thread-local.version}</version>

            </dependency>



            <!-- 公共资源池 -->

            <dependency>

                <groupId>org.apache.commons</groupId>

                <artifactId>commons-pool2</artifactId>

                <version>${common-pool.version}</version>

            </dependency>



            <!-- log4j日志组件 -->


 ruoyi-common/ruoyi-common-core/pom.xml

@@ -47,12 +47,6 @@
            <artifactId>transmittable-thread-local</artifactId>

        </dependency>



        <!-- Apache Commons Pool2 -->

        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-pool2</artifactId>

        </dependency>



        <!-- Pagehelper -->

        <dependency>

            <groupId>com.github.pagehelper</groupId>


 ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/env/ApplicationSeataInitializer.java

New file
@@ -0,0 +1,26 @@
package com.ruoyi.common.datasource.env;



import org.springframework.boot.SpringApplication;

import org.springframework.boot.env.EnvironmentPostProcessor;

import org.springframework.core.Ordered;

import org.springframework.core.env.ConfigurableEnvironment;



/**

 * seata 在 springboot 2.6.x 存在循环引用问题的处理

 *

 * @author ruoyi

 */

public class ApplicationSeataInitializer implements EnvironmentPostProcessor, Ordered

{

    @Override

    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application)

    {

        System.setProperty("spring.main.allow-circular-references", "true");

    }



    @Override

    public int getOrder()

    {

        return Ordered.LOWEST_PRECEDENCE;

    }

}


 ruoyi-common/ruoyi-common-datasource/src/main/resources/META-INF/spring.factories

New file
@@ -0,0 +1,2 @@
org.springframework.boot.env.EnvironmentPostProcessor=\

    com.ruoyi.common.datasource.env.ApplicationSeataInitializer


 ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java

New file
@@ -0,0 +1,54 @@
package com.ruoyi.common.swagger.config;



import org.springframework.beans.BeansException;

import org.springframework.beans.factory.config.BeanPostProcessor;

import org.springframework.stereotype.Component;

import org.springframework.util.ReflectionUtils;

import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;

import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;

import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;

import java.lang.reflect.Field;

import java.util.List;

import java.util.stream.Collectors;



/**

 * swagger 在 springboot 2.6.x 不兼容问题的处理

 *

 * @author ruoyi

 */

@Component

public class SwaggerBeanPostProcessor implements BeanPostProcessor

{

    @Override

    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException

    {

        if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider)

        {

            customizeSpringfoxHandlerMappings(getHandlerMappings(bean));

        }

        return bean;

    }



    private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings)

    {

        List<T> copy = mappings.stream().filter(mapping -> mapping.getPatternParser() == null)

                .collect(Collectors.toList());

        mappings.clear();

        mappings.addAll(copy);

    }



    @SuppressWarnings("unchecked")

    private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean)

    {

        try

        {

            Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");

            field.setAccessible(true);

            return (List<RequestMappingInfoHandlerMapping>) field.get(bean);

        }

        catch (IllegalArgumentException | IllegalAccessException e)

        {

            throw new IllegalStateException(e);

        }

    }

}


 ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\

  com.ruoyi.common.swagger.config.SwaggerAutoConfiguration,\

  com.ruoyi.common.swagger.config.SwaggerWebConfiguration
  com.ruoyi.common.swagger.config.SwaggerWebConfiguration,\

  com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor

 ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -11,6 +11,7 @@
    # 环境配置

    active: dev

  main:

    allow-circular-references: true

    allow-bean-definition-overriding: true

  cloud:

    nacos:


 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java

@@ -121,7 +121,7 @@
     */

    public static boolean whiteList(String invokeTarget)

    {

        String packageName = StringUtils.substringBefore(invokeTarget, ")");

        String packageName = StringUtils.substringBefore(invokeTarget, "(");

        int count = StringUtils.countMatches(packageName, ".");

        if (count > 1)

        {


 sql/ry_config_20220110.sql

File was renamed from sql/ry_config_20211118.sql
@@ -32,7 +32,7 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';

insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema) values 
(1,'application-dev.yml','DEFAULT_GROUP','spring:\n  main:\n    allow-bean-definition-overriding: true\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n','760986157e62a0c1e0dadf9d2a6acf40','2019-11-29 16:31:20','2021-11-16 12:03:58','','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','null'),
(1,'application-dev.yml','DEFAULT_GROUP','spring:\n  main:\n    allow-circular-references: true\n    allow-bean-definition-overriding: true\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  cloud:\n    sentinel:\n      filter:\n        # sentinel 在 springboot 2.6.x 不兼容问题的处理\n        enabled: false\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n','2c34ea2fd8e5393644f25e52a308e57c','2020-05-20 12:00:00','2022-01-10 06:38:19',NULL,'0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','null'),
(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n  redis:\n    host: localhost\n    port: 6379\n    password: \n  cloud:\n    gateway:\n      discovery:\n        locator:\n          lowerCaseServiceId: true\n          enabled: true\n      routes:\n        # 认证中心\n        - id: ruoyi-auth\n          uri: lb://ruoyi-auth\n          predicates:\n            - Path=/auth/**\n          filters:\n            # 验证码处理\n            - CacheRequestFilter\n            - ValidateCodeFilter\n            - StripPrefix=1\n        # 代码生成\n        - id: ruoyi-gen\n          uri: lb://ruoyi-gen\n          predicates:\n            - Path=/code/**\n          filters:\n            - StripPrefix=1\n        # 定时任务\n        - id: ruoyi-job\n          uri: lb://ruoyi-job\n          predicates:\n            - Path=/schedule/**\n          filters:\n            - StripPrefix=1\n        # 系统模块\n        - id: ruoyi-system\n          uri: lb://ruoyi-system\n          predicates:\n            - Path=/system/**\n          filters:\n            - StripPrefix=1\n        # 文件服务\n        - id: ruoyi-file\n          uri: lb://ruoyi-file\n          predicates:\n            - Path=/file/**\n          filters:\n            - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /csrf\n','2f5a6b5a4ccf20b5801c5cf842456ec6','2020-05-14 14:17:55','2021-07-30 09:07:14',NULL,'0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','null'),
(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring: \r\n  redis:\r\n    host: localhost\r\n    port: 6379\r\n    password: \r\n','b7354e1eb62c2d846d44a796d9ec6930','2020-11-20 00:00:00','2021-02-28 21:06:58',NULL,'0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','null'),
(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\r\nspring: \r\n  security:\r\n    user:\r\n      name: ruoyi\r\n      password: 123456\r\n  boot:\r\n    admin:\r\n      ui:\r\n        title: 若依服务状态监控\r\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','null'),