From e83190b3e5667962fcdf845b5ce7d821dc0f863d Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Wed, 02 Sep 2020 14:30:50 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 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 a9ab5fc..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/**
@@ -151,6 +154,30 @@
strip-prefix: true
sensitive-headers: '*'
custom-sensitive-headers: true
+ demo-aspnet-server-routes:
+ path: /demoaspnetserver/**
+ service-id: demo-aspnet-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
+ wechat-server-routes:
+ path: /wechatserver/**
+ service-id: wechat-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
+ api-evaluation:
+ path: /api-evaluation/**
+ service-id: boneage-evaluationcenter-server
+ 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
@@ -171,7 +198,7 @@
execution:
isolation:
thread:
- timeoutInMilliseconds: 100000
+ timeoutInMilliseconds: 300000
kidgrow:
oauth2:
@@ -192,8 +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
@@ -218,8 +252,16 @@
/api-user/users-anon/**,
/login.html,
/user/login,
- /api-sms/smsChangLan/send,
- /api-user/users/doctorUserReg
+ /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-user/users/python,
+ /api-evaluation/evaluationxrayinfo/checkQRCode
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
@@ -240,6 +282,8 @@
/api-user/menus/current,
/api-user/users/current,
/api-log/requestStat
+ /wechatserver/Wechat/GetScreenCount
+ /wechatserver/news/LastestNews
#白名单，需要URL认证的应用ID
includeClientIds:
- webApp
@@ -247,7 +291,7 @@
- kidgrow
renew:
#是否开启token自动续签（目前只有redis实现）
- enable: false
+ enable: true
#白名单
includeClientIds:
- webApp
@@ -262,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