update springboot 2.3.11 => 2.4.7 update springboot-admin 2.3.1 => 2.4.1 up...

疯狂的狮子li

2021-06-21 dcd95d013ff52aa630505fc7dec2ca7412d59ef3

update springboot 2.3.11 => 2.4.7
update springboot-admin 2.3.1 => 2.4.1
update feign 2.2.6 => 3.0.3
update hutool 5.7.1 => 5.7.2

 pom.xml

@@ -14,7 +14,7 @@

    <properties>
        <ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
        <spring-boot.version>2.3.11.RELEASE</spring-boot.version>
        <spring-boot.version>2.4.7</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
@@ -25,10 +25,10 @@
        <velocity.version>1.7</velocity.version>
        <jwt.version>0.9.1</jwt.version>
        <mybatis-plus.version>3.4.3</mybatis-plus.version>
        <hutool.version>5.7.1</hutool.version>
        <feign.version>2.2.6.RELEASE</feign.version>
        <hutool.version>5.7.2</hutool.version>
        <feign.version>3.0.3</feign.version>
        <feign-okhttp.version>11.0</feign-okhttp.version>
        <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
        <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
        <redisson.version>3.15.2</redisson.version>
    </properties>


 ruoyi-admin/src/main/resources/application.yml

@@ -253,7 +253,7 @@
      enabled: true
  okhttp:
    enabled: true
  hystrix:
  circuitbreaker:
    enabled: true

--- # 定时任务配置

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java

@@ -1,7 +1,6 @@
package com.ruoyi.framework.config;

import feign.*;
import feign.hystrix.HystrixFeign;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -36,11 +35,6 @@
    }

    @Bean
    public Feign.Builder feignBuilder() {
        return HystrixFeign.builder();
    }

    @Bean
    public Contract feignContract() {
        return new SpringMvcContract();
    }
@@ -60,4 +54,4 @@
        return new Retryer.Default();
    }

}
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -50,7 +50,7 @@
        CorsConfiguration config = new CorsConfiguration();
        config.setAllowCredentials(true);
        // 设置访问源地址
        config.addAllowedOrigin("*");
        config.addAllowedOriginPattern("*");
        // 设置访问源请求头
        config.addAllowedHeader("*");
        // 设置访问源请求方法