From 78149e19dc95d2e905e5993e2df04b69300422c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 四月 2021 17:54:33 +0800
Subject: [PATCH] !17 同步 ruoyi Merge pull request !17 from 疯狂的狮子li/dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 cdb0c8b..919882b 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,10 +1,12 @@
package com.ruoyi.framework.config;
import feign.*;
+import feign.hystrix.HystrixFeign;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.openfeign.FeignAutoConfiguration;
import org.springframework.cloud.openfeign.support.SpringMvcContract;
import org.springframework.context.annotation.Bean;
@@ -12,6 +14,7 @@
import java.util.concurrent.TimeUnit;
+@EnableFeignClients
@Configuration
@ConditionalOnClass(Feign.class)
@AutoConfigureBefore(FeignAutoConfiguration.class)
@@ -29,7 +32,7 @@
@Bean
public Feign.Builder feignBuilder() {
- return Feign.builder();
+ return HystrixFeign.builder();
}
@Bean
--
Gitblit v1.9.3