From 8797682a40691a2661956fc33e34e8adf14279cd Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 26 Oct 2020 10:40:45 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 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 dc61444..c2308e0 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -1,12 +1,18 @@
spring:
application:
name: zuul-server
+ #配置Redis
+ redis:
+ host: ${spring.redis.host}
+ port: ${spring.redis.port}
+ password: ${spring.redis.password}
+ timeout: ${spring.redis.timeout}
server:
tomcat:
uri-encoding: UTF-8
max-threads: 1000
min-spare-threads: 30
- port: 8887
+ port: 8888
eureka:
@@ -17,6 +23,7 @@
prefer-ip-address: true
client:
serviceUrl:
+# defaultZone: http://192.168.2.240:9001/eureka/
defaultZone: ${kidgrow.eureka.client.serviceUrl.defaultZone}
zuul:
@@ -29,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/**
@@ -85,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
@@ -94,6 +121,12 @@
search:
path: /api-search/**
service-id: searchcenter-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
+ oprationcenter:
+ path: /api-opration/**
+ service-id: oprationcenter-server
strip-prefix: true
sensitive-headers: '*'
custom-sensitive-headers: true
@@ -112,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
@@ -135,7 +198,7 @@
execution:
isolation:
thread:
- timeoutInMilliseconds: 100000
+ timeoutInMilliseconds: 300000
kidgrow:
oauth2:
@@ -156,6 +219,23 @@
- /*/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-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
# 忽略权限鉴定
authority-ignores:
- /*/authority/granted/me
@@ -176,7 +256,25 @@
/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-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
auth:
#开启时间戳验证
timestampenable: false
@@ -194,6 +292,8 @@
/api-user/menus/current,
/api-user/users/current,
/api-log/requestStat
+ /wechatserver/Wechat/GetScreenCount
+ /wechatserver/news/LastestNews
#白名单，需要URL认证的应用ID
includeClientIds:
- webApp
@@ -201,7 +301,7 @@
- kidgrow
renew:
#是否开启token自动续签（目前只有redis实现）
- enable: false
+ enable: true
#白名单
includeClientIds:
- webApp
@@ -217,5 +317,4 @@
auto-generate-from-zuul-routes: true
generate-routes: user,file,log,codegenerator,auth
apiDocsPath: v2/api-docs
-
--
Gitblit v1.8.0