From 969593ea90a18531555f6ce9104a3de55389a5e7 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 05 Mar 2021 15:02:37 +0800
Subject: [PATCH] 修改扣费的条件判断
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 31 +++++++++++++++++++++++++++----
1 files changed, 27 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 c05a29b..a6da7f1 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:
@@ -224,7 +226,16 @@
- /api-evaluation/evaluationxrayinfo/appUpload
- /api-evaluation/evaluationxrayinfo/appSave
- /api-file/baseUplaod
+ - /api-file/feignUploadHosIdAndDepId
- /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-opration/wxController/getOpenId
+ - /api-record/DiagnosticUnfinishedFegin/recordChildInterworking
# - /api-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -252,12 +263,21 @@
/api-file/smsChangLan/send,
/api-user/users/doctorUserReg,
/api-file/files-upload,
+ /api-file/feignUploadHosIdAndDepId,
/api-user/users/isRegUser,
/api-user/users/passwordByPhone,
/api-evaluation/evaluationxrayinfo/appUpload,
/api-evaluation/evaluationxrayinfo/appSave,
/api-file/baseUplaod,
- /api-user/users/python
+ /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-opration/wxController/getOpenId,
+ /api-record/DiagnosticUnfinishedFegin/recordChildInterworking
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
@@ -278,6 +298,8 @@
/api-user/menus/current,
/api-user/users/current,
/api-log/requestStat
+ /wechatserver/Wechat/GetScreenCount
+ /wechatserver/news/LastestNews
#白名单，需要URL认证的应用ID
includeClientIds:
- webApp
@@ -300,4 +322,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