From 6818a7fb0aa3421912974b61794015bb4ff093fe Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 04 Sep 2020 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index 1c4c1b3..39f2b2f 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -37,8 +37,8 @@
add-host-header: true
host:
# connectTimeoutMillis: 10000
- socket-timeout-millis: 60000
- connect-timeout-millis: 60000
+ socket-timeout-millis: 100000
+ connect-timeout-millis: 100000
routes:
auth:
path: /api-uaa/**
@@ -198,7 +198,7 @@
execution:
isolation:
thread:
- timeoutInMilliseconds: 100000
+ timeoutInMilliseconds: 300000
kidgrow:
oauth2:
@@ -227,6 +227,7 @@
- /api-evaluation/evaluationxrayinfo/appSave
- /api-file/baseUplaod
- /api-user/users/python
+ - /api-evaluation/evaluationxrayinfo/checkQRCode
# - /api-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -259,7 +260,8 @@
/api-evaluation/evaluationxrayinfo/appUpload,
/api-evaluation/evaluationxrayinfo/appSave,
/api-file/baseUplaod,
- /api-user/users/python
+ /api-user/users/python,
+ /api-evaluation/evaluationxrayinfo/checkQRCode
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
--
Gitblit v1.8.0