Commit e5017061 by zhangy@proudkids.cn

Merge remote-tracking branch 'origin/master'

parents bf71ff80 d825161f
...@@ -28,9 +28,9 @@ ribbon: ...@@ -28,9 +28,9 @@ ribbon:
enabled: false enabled: false
OkHttp: OkHttp:
enabled: true enabled: true
ReadTimeout: 180000 ReadTimeout: 1800000
ConnectTimeout: 180000 ConnectTimeout: 1800000
SocketTimeout: 180000 SocketTimeout: 1800000
feign: feign:
hystrix: hystrix:
...@@ -42,8 +42,8 @@ feign: ...@@ -42,8 +42,8 @@ feign:
client: client:
config: config:
feignName: feignName:
connectTimeout: 180000 connectTimeout: 1800000
readTimeout: 180000 readTimeout: 1800000
hystrix: hystrix:
command: command:
......
...@@ -24,24 +24,6 @@ spring: ...@@ -24,24 +24,6 @@ spring:
enabled: true enabled: true
force: true force: true
hystrix:
command:
default:
execution:
timeout: #配置命令的执行,是否会超时
enabled: false
isolation: #命令的执行超时时间 超时将执行回退
thread:
timeoutInMilliseconds: 1800000
ribbon:
Httpclient:
enabled: true
OkHttp:
enabled: true
ReadTimeout: 180000
ConnectTimeout: 180000
SocketTimeout: 180000
zuul: zuul:
servlet-path: /zuul servlet-path: /zuul
ignoredServices: '*' ignoredServices: '*'
......
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