From 9a18aa1ec467a6bfbdf11f957f5c40e6326284cd Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 15 Sep 2020 11:53:33 +0800
Subject: [PATCH] 获取到期时间的接口，添加判断条件
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 32 ++++++++++++++++++++++++++------
1 files changed, 26 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 c6a4a69..39f2b2f 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -23,6 +23,7 @@
prefer-ip-address: true
client:
serviceUrl:
+# defaultZone: http://192.168.2.240:9001/eureka/
defaultZone: ${kidgrow.eureka.client.serviceUrl.defaultZone}
zuul:
@@ -35,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/**
@@ -169,6 +172,12 @@
strip-prefix: true
sensitive-headers: '*'
custom-sensitive-headers: true
+ api-smartbox:
+ path: /api-smart/**
+ service-id: smartbox-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
ssl-hostname-validation-enabled: false
@@ -189,7 +198,7 @@
execution:
isolation:
thread:
- timeoutInMilliseconds: 100000
+ timeoutInMilliseconds: 300000
kidgrow:
oauth2:
@@ -210,11 +219,15 @@
- /*/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-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -239,12 +252,16 @@
/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/appUpload,
+ /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
@@ -265,6 +282,8 @@
/api-user/menus/current,
/api-user/users/current,
/api-log/requestStat
+ /wechatserver/Wechat/GetScreenCount
+ /wechatserver/news/LastestNews
#白名单，需要URL认证的应用ID
includeClientIds:
- webApp
@@ -287,4 +306,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