From 2d2075f3aa5b1064a114936a3ccfc20b4d2bc7a8 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Thu, 29 Nov 2018 12:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E7=94=A8=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.properties             | 11 ++++++++++-
 .../src/main/resources/application-prod.properties            |  2 +-
 .../src/main/resources/application-test.properties            |  2 +-
 3 files changed, 12 insertions(+), 3 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 19dbd68..30cc83b 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -32,7 +32,7 @@ eureka.client.service-url.defaultZone=http://192.168.1.20:8000/eureka/,http://19
 
 #### 本机微服配置 ####
 #本服务主机ip（若多个网卡，则需要设置本服务ip）
-eureka.instance.ip-address=192.168.1.25
+eureka.instance.ip-address=192.168.1.20
 #本服务实例ID
 #eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 #本服务主机名
@@ -50,6 +50,15 @@ eureka.instance.lease-renewal-interval-in-seconds=20
 
 #打开feign的熔断
 feign.hystrix.enabled=true
+#读取数据时长
+ribbon.ReadTimeout=3000
+#连接时长
+ribbon.ConnectTimeout=3000
+#重试
+ribbon.maxAutoRetries=2
+#响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长）
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000
+
 #集群名
 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 dda671f..b488919 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@@ -1,5 +1,5 @@
 #项目端口
-server.port=8080
+server.port=8100
 
 #用户登陆路径
 filter.shiro.user.loginuri = /login
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 ccf06e4..751429c 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
@@ -1,5 +1,5 @@
 #项目端口
-server.port=51010
+server.port=58100
 
 #用户登陆路径
 filter.shiro.user.loginuri = /login