From ca580bb600d9ee02bcd80674e8b2a2c551aa1884 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 4 Feb 2020 20:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=88=B1=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E6=A8=A1=E5=9D=97Feign=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fallback/JobFeignClientFallback.java | 2 ++ .../fallback/UserInfoFeignClientFallback.java | 2 ++ .../src/main/resources/application.yml | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java index 361d84639..2f7bb69e3 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java @@ -7,10 +7,12 @@ import com.elink.esua.epdc.dto.ScheduleJobDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.modules.feign.JobFeignClient; import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; +import org.springframework.stereotype.Component; /** * @author 86185 */ +@Component public class JobFeignClientFallback implements JobFeignClient { @Override diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java index 65058a7ab..d7bf074f7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java @@ -5,10 +5,12 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; +import org.springframework.stereotype.Component; /** * @author 86185 */ +@Component public class UserInfoFeignClientFallback implements UserInfoFeignClient { @Override public Result getUserInfoById(String userId) { diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml index 0c57b2502..d0994ac88 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml @@ -23,6 +23,8 @@ server: context-path: /heart spring: + main: + allow-bean-definition-overriding: true application: name: epdc-heart-server # 环境 dev|test|prod @@ -62,6 +64,23 @@ spring: # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1 probability: 1.0 +feign: + hystrix: + enabled: true + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 management: endpoints: