From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 1049a52..c2308e0 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -36,7 +36,9 @@
ignored-headers: Access-Control-Allow-Credentials,Access-Control-Allow-Origin,Access-Control-Allow-Methods
add-host-header: true
host:
- connectTimeoutMillis: 10000
+# connectTimeoutMillis: 10000
+ socket-timeout-millis: 100000
+ connect-timeout-millis: 100000
routes:
auth:
path: /api-uaa/**
@@ -196,7 +198,7 @@
execution:
isolation:
thread:
- timeoutInMilliseconds: 100000
+ timeoutInMilliseconds: 300000
kidgrow:
oauth2:
@@ -217,13 +219,20 @@
- /*/oauth/**
- /actuator/health
- /actuator/info
- - /api-sms/smsChangLan/send
+ - /api-file/smsChangLan/send
- /api-user/users/doctorUserReg
- /api-user/users/isRegUser
- /api-user/users/passwordByPhone
- /api-evaluation/evaluationxrayinfo/appUpload
- /api-evaluation/evaluationxrayinfo/appSave
- /api-file/baseUplaod
+ - /api-user/users/python
+ - /api-evaluation/evaluationxrayinfo/checkQRCode
+ - /api-opration/wxController/callback
+ - /api-opration/alipay/notify
+ - /api-opration/alipay/return
+ - /api-record/DiagnosticUnfinishedFegin/equipmentList
+ - /api-record/DiagnosticUnfinishedFegin/equipmentUpload
# - /api-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -248,14 +257,21 @@
/api-user/users-anon/**,
/login.html,
/user/login,
- /api-sms/smsChangLan/send,
+ /api-file/smsChangLan/send,
/api-user/users/doctorUserReg,
/api-file/files-upload,
/api-user/users/isRegUser,
/api-user/users/passwordByPhone,
/api-evaluation/evaluationxrayinfo/appUpload,
/api-evaluation/evaluationxrayinfo/appSave,
- /api-file/baseUplaod
+ /api-file/baseUplaod,
+ /api-user/users/python,
+ /api-evaluation/evaluationxrayinfo/checkQRCode,
+ /api-opration/wxController/callback,
+ /api-opration/alipay/return,
+ /api-opration/alipay/notify,
+ /api-record/DiagnosticUnfinishedFegin/equipmentList,
+ /api-record/DiagnosticUnfinishedFegin/equipmentUpload
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
@@ -276,6 +292,8 @@
/api-user/menus/current,
/api-user/users/current,
/api-log/requestStat
+ /wechatserver/Wechat/GetScreenCount
+ /wechatserver/news/LastestNews
#白名单，需要URL认证的应用ID
includeClientIds:
- webApp
@@ -298,4 +316,5 @@
butler:
auto-generate-from-zuul-routes: true
generate-routes: user,file,log,codegenerator,auth
- apiDocsPath: v2/api-docs
\ No newline at end of file
+ apiDocsPath: v2/api-docs
+
--
Gitblit v1.8.0