From 5d97b0934973737a903f45d1d89e095b2e255694 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 21 Aug 2020 10:12:36 +0800
Subject: [PATCH] 提交到Gitblit

---
 kidgrow-config/src/main/resources/application.properties |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kidgrow-config/src/main/resources/application.properties b/kidgrow-config/src/main/resources/application.properties
index 4038b2e..630270e 100644
--- a/kidgrow-config/src/main/resources/application.properties
+++ b/kidgrow-config/src/main/resources/application.properties
@@ -16,19 +16,27 @@
 
 ##### feign\u914D\u7F6E
 feign.sentinel.enabled=true
-feign.hystrix.enabled=false
+#\u542F\u52A8\u7194\u65AD\u673A\u5236
+feign.hystrix.enabled=true
+#\u542F\u7528OkHttp \u66FF\u6362 URLConnection
 feign.okhttp.enabled=true
+#\u542F\u7528\u66FF\u6362JDK\u539F\u751FURLConnection
 feign.httpclient.enabled=false
 feign.httpclient.max-connections=1000
 feign.httpclient.max-connections-per-route=100
 feign.client.config.feignName.connectTimeout=30000
 feign.client.config.feignName.readTimeout=30000
+feign.client.config.default.connect-timeout=20000
+feign.client.config.default.read-timeout=20000
 ## \u5F00\u542FFeign\u8BF7\u6C42\u54CD\u5E94\u538B\u7F29
 feign.compression.request.enabled=true
 feign.compression.response.enabled=true
 ## \u914D\u7F6E\u538B\u7F29\u6587\u6863\u7C7B\u578B\u53CA\u6700\u5C0F\u538B\u7F29\u7684\u6587\u6863\u5927\u5C0F
 feign.compression.request.mime-types=text/xml,application/xml,application/json
-feign.compression.request.min-request-size=2048
+feign.compression.request.min-request-size=2048 
+# hystrix.command.default.execution.timeout.enabled: false
+#\u8D85\u65F6\u65F6\u957F
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 10000
 
 ##### Redis\u914D\u7F6E
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09

--
Gitblit v1.8.0