Commit 4e7171c5 by 张宗强

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

parents 107a3135 dc9643d6
......@@ -28,6 +28,7 @@ ribbon:
enabled: true
ReadTimeout: 60000
ConnectTimeout: 60000
SocketTimeout: 60000
feign:
hystrix:
......@@ -48,7 +49,7 @@ feign:
# execution:
# isolation:
# thread:
# timeoutInMilliseconds: 600000
# timeoutInMilliseconds: 60000
hystrix:
command:
default:
......
......@@ -28,6 +28,7 @@ ribbon:
enabled: true
ReadTimeout: 60000
ConnectTimeout: 60000
SocketTimeout: 60000
feign:
hystrix:
......
......@@ -28,6 +28,7 @@ ribbon:
enabled: true
ReadTimeout: 60000
ConnectTimeout: 60000
SocketTimeout: 60000
feign:
hystrix:
......
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