From dcd95d013ff52aa630505fc7dec2ca7412d59ef3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 六月 2021 12:43:23 +0800
Subject: [PATCH] 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
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 2 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java | 8 +-------
pom.xml | 8 ++++----
ruoyi-admin/src/main/resources/application.yml | 2 +-
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 967354c..355d59e 100644
--- a/pom.xml
+++ b/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>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 563931b..8de6569 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -253,7 +253,7 @@
enabled: true
okhttp:
enabled: true
- hystrix:
+ circuitbreaker:
enabled: true
--- # 瀹氭椂浠诲姟閰嶇疆
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
index 478a450..f10769b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
+++ b/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();
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index c0f0817..c3cdc94 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/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("*");
// 璁剧疆璁块棶婧愯姹傛柟娉�
--
Gitblit v1.9.3