From db2412261a825653ca9eccc1fca0569f6745f1d7 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 21 Aug 2020 19:57:47 +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 | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 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 6a4e638..1c4c1b3 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: 60000
+ connect-timeout-millis: 60000
routes:
auth:
path: /api-uaa/**
@@ -91,6 +94,24 @@
strip-prefix: true
sensitive-headers: '*'
custom-sensitive-headers: true
+ record-center:
+ path: /api-record/**
+ service-id: recordcenter-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
+ record-bicenter:
+ path: /api-bicenter/**
+ service-id: bicenter-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
+ sms:
+ path: /api-sms/**
+ service-id: sms-service-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
log:
path: /api-log/**
service-id: logcenter-server
@@ -124,6 +145,36 @@
client-service-routes:
path: /clienttest/**
service-id: client-service
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
+ reportcenter-server-routes:
+ path: /reportcenter-server/**
+ service-id: reportcenter-server
+ 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
@@ -168,6 +219,17 @@
- /*/oauth/**
- /actuator/health
- /actuator/info
+ - /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-user/syshospital/findAllByMap
+# - /api-user/sysdictionaries/findAll
+# - /api-user/sysdepartment/findListByHospitalId
# 忽略权限鉴定
authority-ignores:
- /*/authority/granted/me
@@ -188,7 +250,19 @@
/api-uaa/js/**,
/api-user/users-anon/**,
/login.html,
- /user/login
+ /user/login,
+ /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-user/syshospital/findAllByMap,
+# /api-user/sysdictionaries/findAll,
+# /api-user/sysdepartment/findListByHospitalId
auth:
#开启时间戳验证
timestampenable: false
@@ -206,6 +280,8 @@
/api-user/menus/current,
/api-user/users/current,
/api-log/requestStat
+ /wechatserver/Wechat/GetScreenCount
+ /wechatserver/news/LastestNews
#白名单，需要URL认证的应用ID
includeClientIds:
- webApp
@@ -213,7 +289,7 @@
- kidgrow
renew:
#是否开启token自动续签（目前只有redis实现）
- enable: false
+ enable: true
#白名单
includeClientIds:
- webApp
@@ -228,4 +304,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