From 7713f6d8e629983d66fc32a8a9f1e3159d99b58e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=BF=98=E5=88=9D=E5=BF=83?= <191979737@qq.com>
Date: Fri, 9 Mar 2018 09:34:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?hystrix.command.default.execution.isolation?=
 =?UTF-8?q?.thread.timeoutInMilliseconds=EF=BC=9A=E6=96=AD=E8=B7=AF?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=A4=A7=E4=BA=8Eribbon=E7=9A=84=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E4=B8=8D=E7=84=B6=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E9=87=8D=E8=AF=95=E3=80=82=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=9A=E6=AD=A4=E6=97=B6=E5=A6=82=E6=9E=9Credis?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=8C=82=E6=8E=89=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=A4=B1=E8=B4=A5=E3=80=82=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E4=BC=9A=E6=89=93=E5=8D=B0=EF=BC=88=E2=80=9CThe=20Hys?=
 =?UTF-8?q?trix=20timeout=20of=2050000ms=20for=20the=20command=20ace-admin?=
 =?UTF-8?q?=20is=20set=20lower=20than=20the=20combination=20of=20the=20Rib?=
 =?UTF-8?q?bon=20read=20and=20connect=20timeout,=20120000ms.=E2=80=9D?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ace-modules/ace-admin/src/main/resources/application.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ace-modules/ace-admin/src/main/resources/application.yml b/ace-modules/ace-admin/src/main/resources/application.yml
index 7689d680..9e5d09d5 100644
--- a/ace-modules/ace-admin/src/main/resources/application.yml
+++ b/ace-modules/ace-admin/src/main/resources/application.yml
@@ -75,8 +75,8 @@ feign:
 ribbon:
   eureka:
     enabled: true
-  ReadTimeout: 120000
-  ConnectTimeout: 120000
+  ReadTimeout: 100000
+  ConnectTimeout: 100000
   MaxAutoRetries: 0
   MaxAutoRetriesNextServer: 1
   OkToRetryOnAllOperations: false
-- 
Gitee


From d9abc6e4fb199773cf3498c9c8e3edee3a22fa68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=BF=98=E5=88=9D=E5=BF=83?= <191979737@qq.com>
Date: Fri, 9 Mar 2018 09:44:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20application.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ace-auth/ace-auth-server/src/main/resources/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ace-auth/ace-auth-server/src/main/resources/application.yml b/ace-auth/ace-auth-server/src/main/resources/application.yml
index 5758e6d6..213a139f 100644
--- a/ace-auth/ace-auth-server/src/main/resources/application.yml
+++ b/ace-auth/ace-auth-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
         host: ${REDIS_HOST:localhost}
         port: ${REDIS_PORT:6379}
         pool:
-            max-active: 20
+        max-active: 20
     datasource:
       name: test
       url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/ag_auth_v1?useUnicode=true&characterEncoding=UTF8
-- 
Gitee