Merge remote-tracking branch 'origin/master'

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -100,10 +100,10 @@ zuul:
   ignored-services: eureka-server
   #重试
   retryable: false
-  #请求处理超时
-  ReadTimeout: 600000
-  #连接超时
-  ConnectTimeout: 100000
+  host: 
+    #连接超时
+    connectTimeoutMillis: 600000
+  ribbon-isolation-strategy: SEMAPHORE
   sensitiveHeaders:
 
 hystrix:
@@ -111,6 +111,7 @@ hystrix:
     default:
       execution:
         isolation:
+          strategy: SEMAPHORE
           thread:
             #发生熔断的超时时间
             timeoutInMilliseconds: 90000