Skip to content

C
config-center
Commit 4e7171c5 by 张宗强
Options

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

parents 107a3135 dc9643d6
Showing with 4 additions and 1 deletions
application-dev.yml
...@@ -28,6 +28,7 @@ ribbon: ...@@ -28,6 +28,7 @@ ribbon:
enabled: true enabled: true
ReadTimeout: 60000 ReadTimeout: 60000
ConnectTimeout: 60000 ConnectTimeout: 60000
SocketTimeout: 60000
feign: feign:
hystrix: hystrix:
...@@ -48,7 +49,7 @@ feign: ...@@ -48,7 +49,7 @@ feign:
# execution: # execution:
# isolation: # isolation:
# thread: # thread:
# timeoutInMilliseconds: 600000 # timeoutInMilliseconds: 60000
hystrix: hystrix:
command: command:
default: default:
......
application-prd.yml
...@@ -28,6 +28,7 @@ ribbon: ...@@ -28,6 +28,7 @@ ribbon:
enabled: true enabled: true
ReadTimeout: 60000 ReadTimeout: 60000
ConnectTimeout: 60000 ConnectTimeout: 60000
SocketTimeout: 60000
feign: feign:
hystrix: hystrix:
......
application-test.yml
...@@ -28,6 +28,7 @@ ribbon: ...@@ -28,6 +28,7 @@ ribbon:
enabled: true enabled: true
ReadTimeout: 60000 ReadTimeout: 60000
ConnectTimeout: 60000 ConnectTimeout: 60000
SocketTimeout: 60000
feign: feign:
hystrix: 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