From bf0a665f99dd7ae4536942b44d8931f54c5499a0 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Sat, 12 Jan 2019 16:14:10 +0800
Subject: [PATCH] =?UTF-8?q?Cloud=20=E7=86=94=E6=96=AD=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=2030s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.properties            | 12 ++++++------
 .../src/main/resources/application-prod.properties           | 10 +++++-----
 .../src/main/resources/application-test.properties           | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
index ce37a0f..734b8da 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -1,7 +1,7 @@
 #项目端口
 server.port=8100
 #本机ip
-impp.server.ip=192.168.1.56
+impp.server.ip=192.168.1.40
 #console控制台服务（zipkin追踪全路径）
 impp.console.ip=http://csd.estsh.com
 
@@ -63,14 +63,14 @@ eureka.instance.lease-renewal-interval-in-seconds=20
 
 #打开feign的熔断
 feign.hystrix.enabled=true
-#读取数据时长
-ribbon.ReadTimeout=3000
-#连接时长
-ribbon.ConnectTimeout=3000
 #重试
 ribbon.maxAutoRetries=2
+#读取数据时长
+ribbon.ReadTimeout=30000
+#连接时长
+ribbon.ConnectTimeout=30000
 #响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长）
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=35000
 
 #集群名
 eureka.instance.metadata-map.cluster=impp_cluster
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
index 07fc220..4b3bc09 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@@ -58,14 +58,14 @@ eureka.instance.lease-renewal-interval-in-seconds=20
 
 #打开feign的熔断
 feign.hystrix.enabled=true
-#读取数据时长
-ribbon.ReadTimeout=3000
-#连接时长
-ribbon.ConnectTimeout=3000
 #重试
 ribbon.maxAutoRetries=2
+#读取数据时长
+ribbon.ReadTimeout=30000
+#连接时长
+ribbon.ConnectTimeout=30000
 #响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长）
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=35000
 
 #集群名
 eureka.instance.metadata-map.cluster=impp_cluster
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
index 3da4b58..97ede48 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
@@ -63,14 +63,14 @@ eureka.instance.lease-renewal-interval-in-seconds=20
 
 #打开feign的熔断
 feign.hystrix.enabled=true
-#读取数据时长
-ribbon.ReadTimeout=3000
-#连接时长
-ribbon.ConnectTimeout=3000
 #重试
 ribbon.maxAutoRetries=2
+#读取数据时长
+ribbon.ReadTimeout=30000
+#连接时长
+ribbon.ConnectTimeout=30000
 #响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长）
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=35000
 
 #集群名
 eureka.instance.metadata-map.cluster=impp_cluster