Commit 978e7a28 by 张宗强

Merge branch 'master' of git@60.205.210.36:proudkids-pub/config-center.git

parents a0e9cb67 38b48bcb
...@@ -13,9 +13,20 @@ spring: ...@@ -13,9 +13,20 @@ spring:
sleuth: sleuth:
sampler: sampler:
percentage: 0.5 percentage: 0.5
http:
encoding:
charset: UTF-8
enabled: true
force: true
zuul: zuul:
servlet-path: /zuul
ignoredServices: '*' ignoredServices: '*'
#ignoredPatterns: /, /**/swagger-ui.html/**
host: host:
connect-timeout-millis: 30000 connect-timeout-millis: 30000
socket-timeout-millis: 30000 socket-timeout-millis: 30000
...@@ -89,6 +100,8 @@ urls: ...@@ -89,6 +100,8 @@ urls:
- /swagger/api-docs - /swagger/api-docs
- /webjars/** - /webjars/**
- /aom/lesson/downloadZip/* - /aom/lesson/downloadZip/*
#- /zuul/aom/lesson/courseware/upload
- /ruser/v1/ruserChannel/installRuser/** - /ruser/v1/ruserChannel/installRuser/**
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml
...@@ -15,6 +15,7 @@ spring: ...@@ -15,6 +15,7 @@ spring:
percentage: 0.5 percentage: 0.5
zuul: zuul:
servlet-path: /
ignoredServices: '*' ignoredServices: '*'
host: host:
connect-timeout-millis: 30000 connect-timeout-millis: 30000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment