修改爱心互助模块Feign配置

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

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<UserDTO> getUserInfoById(String userId) {

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: