Commit 52019398 by zhangy@proudkids.cn

Merge remote-tracking branch 'origin/master'

parents 79ad969c 8fad538d
......@@ -26,8 +26,8 @@ ribbon:
enabled: false
OkHttp:
enabled: true
ReadTimeout: 30000
ConnectTimeout: 30000
ReadTimeout: 60000
ConnectTimeout: 60000
feign:
hystrix:
......@@ -42,14 +42,22 @@ feign:
connectTimeout: 30000
readTimeout: 30000
#hystrix:
# command:
# default:
# execution:
# isolation:
# thread:
# timeoutInMilliseconds: 600000
hystrix:
command:
default:
execution:
isolation:
timeout: #配置命令的执行,是否会超时
enabled: false
isolation: #命令的执行超时时间 超时将执行回退
thread:
timeoutInMilliseconds: 60000
#监控短点配置
management:
security:
......
......@@ -26,8 +26,8 @@ ribbon:
enabled: false
OkHttp:
enabled: true
ReadTimeout: 30000
ConnectTimeout: 30000
ReadTimeout: 60000
ConnectTimeout: 60000
feign:
hystrix:
......@@ -42,11 +42,20 @@ feign:
connectTimeout: 30000
readTimeout: 30000
#hystrix:
# command:
# default:
# execution:
# isolation:
# thread:
# timeoutInMilliseconds: 600000
hystrix:
command:
default:
execution:
isolation:
timeout: #配置命令的执行,是否会超时
enabled: false
isolation: #命令的执行超时时间 超时将执行回退
thread:
timeoutInMilliseconds: 60000
......
......@@ -26,8 +26,8 @@ ribbon:
enabled: false
OkHttp:
enabled: true
ReadTimeout: 30000
ConnectTimeout: 30000
ReadTimeout: 60000
ConnectTimeout: 60000
feign:
hystrix:
......@@ -42,11 +42,20 @@ feign:
connectTimeout: 30000
readTimeout: 30000
#hystrix:
# command:
# default:
# execution:
# isolation:
# thread:
# timeoutInMilliseconds: 600000
hystrix:
command:
default:
execution:
isolation:
timeout: #配置命令的执行,是否会超时
enabled: false
isolation: #命令的执行超时时间 超时将执行回退
thread:
timeoutInMilliseconds: 60000
......
......@@ -83,6 +83,7 @@ zuul:
quota: 100
refresh-interval: 3
security:
validate:
code: true
......
......@@ -79,6 +79,7 @@ zuul:
quota: 100
refresh-interval: 3
security:
validate:
code: true
......
......@@ -58,7 +58,6 @@ zuul:
sensitiveHeaders:
ratelimit:
key-prefix: proudkids-ratelimite
enabled: true
......
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