Merge remote-tracking branch 'origin/master'

application-dev.yml

@@ -28,9 +28,9 @@ ribbon:
     enabled: false
   OkHttp:
     enabled: true
-  ReadTimeout: 180000
-  ConnectTimeout: 180000
-  SocketTimeout: 180000
+  ReadTimeout: 1800000
+  ConnectTimeout: 1800000
+  SocketTimeout: 1800000
 
 feign:
   hystrix:
@@ -42,8 +42,8 @@ feign:
   client:
     config:
       feignName:
-        connectTimeout: 180000
-        readTimeout: 180000  
+        connectTimeout: 1800000
+        readTimeout: 1800000
 
 hystrix:
   command:

proudkids-gateway-dev.yml

@@ -24,24 +24,6 @@ spring:
       enabled: true
       force: true
       
-hystrix:
-  command:
-    default:
-      execution:
-        timeout: #配置命令的执行，是否会超时
-          enabled: false
-        isolation: #命令的执行超时时间  超时将执行回退
-          thread:
-            timeoutInMilliseconds: 1800000
-ribbon:
-  Httpclient:
-    enabled: true
-  OkHttp:
-    enabled: true
-  ReadTimeout: 180000
-  ConnectTimeout: 180000
-  SocketTimeout: 180000
-              
 zuul:
   servlet-path: /zuul
   ignoredServices: '*'