From f4cf8d589454b654eed78e0e2e3bfddae8ce97e1 Mon Sep 17 00:00:00 2001
From: liuke <123456>
Date: Thu, 29 Oct 2020 09:42:33 +0800
Subject: [PATCH] 修改  基础配置

---
 kidgrow-config/src/main/resources/application.properties |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/kidgrow-config/src/main/resources/application.properties b/kidgrow-config/src/main/resources/application.properties
index 9e6ce7a..76fdd97 100644
--- a/kidgrow-config/src/main/resources/application.properties
+++ b/kidgrow-config/src/main/resources/application.properties
@@ -3,9 +3,9 @@
 ## \u4ECE\u6CE8\u518C\u4E2D\u5FC3\u5237\u65B0servelist\u7684\u65F6\u95F4 \u9ED8\u8BA430\u79D2\uFF0C\u5355\u4F4Dms
 ribbon.ServerListRefreshInterval=15000
 ## \u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 \u9ED8\u8BA41\u79D2\uFF0C\u5355\u4F4Dms
-ribbon.ConnectTimeout=30000
+ribbon.ConnectTimeout=300000
 ## \u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 \u9ED8\u8BA41\u79D2\uFF0C\u5355\u4F4Dms
-ribbon.ReadTimeout=30000
+ribbon.ReadTimeout=300000
 ## \u5BF9\u6240\u6709\u64CD\u4F5C\u8BF7\u6C42\u90FD\u8FDB\u884C\u91CD\u8BD5,\u4E0D\u914D\u7F6E\u8FD9\u4E2AMaxAutoRetries\u4E0D\u8D77\u4F5C\u7528 \u9ED8\u8BA4false
 #ribbon.OkToRetryOnAllOperations=true
 ## \u5BF9\u5F53\u524D\u5B9E\u4F8B\u7684\u91CD\u8BD5\u6B21\u6570 \u9ED8\u8BA40
@@ -16,19 +16,29 @@
 
 ##### 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.feignName.connectTimeout=300000
+feign.client.config.feignName.readTimeout=300000
+feign.client.config.default.connect-timeout=300000
+feign.client.config.default.read-timeout=300000
 ## \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: 300000
+#\u9694\u79BB\u7EA7\u522B
+hystrix.command.default.execution.isolation.strategy: SEMAPHORE
 
 ##### Redis\u914D\u7F6E
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
@@ -93,4 +103,8 @@
 mybatis-plus.global-config.db-config.logic-not-delete-value=0
 # \u539F\u751F\u914D\u7F6E
 mybatis-plus.configuration.map-underscore-to-camel-case=true
-mybatis-plus.configuration.cache-enabled=false
\ No newline at end of file
+mybatis-plus.configuration.cache-enabled=false
+#\u6587\u4EF6\u4E0A\u4F20\u5927\u5C0F\u8BBE\u7F6E
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=1000MB
+

--
Gitblit v1.8.0