From f8633f8c4ee38a6ae9fa51f7c76729bf8b17e9e5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 四月 2021 17:38:47 +0800
Subject: [PATCH] fix Feign 熔断不生效 bug
---
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 3 +--
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java | 5 ++++-
ruoyi-admin/src/main/resources/application.yml | 2 ++
ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java | 7 ++++++-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 4c87cc8..6be5918 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -3,14 +3,13 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.openfeign.EnableFeignClients;
/**
* 鍚姩绋嬪簭
*
* @author ruoyi
*/
-@EnableFeignClients
+
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
{
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 963614d..3bc738d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -207,4 +207,6 @@
response:
enabled: true
okhttp:
+ enabled: true
+ hystrix:
enabled: true
\ No newline at end of file
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java
index f2012f9..9e49701 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java
@@ -2,11 +2,16 @@
import com.ruoyi.demo.feign.FeignTestService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+@Slf4j
+@Component
public class FeignTestFallback implements FeignTestService {
@Override
public String search(String wd) {
- return null;
+ log.error("fallback");
+ return "鎶ラ敊鍟�";
}
}
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