测试

7cc56ecb · 刘志敏 · 513415ff · 7cc56ecb
Commit 7cc56ecb authored Aug 21, 2018 by 刘志敏
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

application-dev.yml
+11 -3

No files found.
--- a/application-dev.yml
+++ b/application-dev.yml
@@ -42,14 +42,22 @@ feign:
        connectTimeout: 30000
        readTimeout: 30000  

+#hystrix:
+#  command:
+#    default:
+#      execution:
+#        isolation:
+#          thread:
+#            timeoutInMilliseconds: 600000
 hystrix:
  command:
    default:
      execution:
-        isolation:
+        timeout: #配置命令的执行，是否会超时
+          enabled: false
+        isolation: #命令的执行超时时间  超时将执行回退
          thread:
-            timeoutInMilliseconds: 600000
-    
+            timeoutInMilliseconds: 60000
 #监控短点配置
 management:
  security: