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/FeignConfig.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
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 426b084..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;
@@ -14,7 +13,12 @@
import java.util.concurrent.TimeUnit;
-@EnableFeignClients("com.ruoyi.**.feign")
+/**
+ * openfeign閰嶇疆绫�
+ *
+ * @author Lion Li
+ */
+@EnableFeignClients("${feign.package}")
@Configuration
@ConditionalOnClass(Feign.class)
@AutoConfigureBefore(FeignAutoConfiguration.class)
@@ -28,11 +32,6 @@
.writeTimeout(120, TimeUnit.SECONDS)
.connectionPool(new ConnectionPool())
.build();
- }
-
- @Bean
- public Feign.Builder feignBuilder() {
- return HystrixFeign.builder();
}
@Bean
@@ -55,4 +54,4 @@
return new Retryer.Default();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3