luotong / huike-eaas-config · Commits

Commit 4f0351b7f8814108dc6acaba8a0b7de3f251c879

Authored by luotong
2 parents 29af957d fee81f35

Merge branch 'master' into 'master' 

gatway test和production配置超时时间



See merge request !19
Inline Side-by-side
Showing 1 changed file with 24 additions and 0 deletions
gateway.yml
  View file @4f0351b
@@ -92,12 +92,24 @@ zuul: @@ -92,12 +92,24 @@ zuul:
92 #url: http://class-service:16200 92 #url: http://class-service:16200
93 serviceId: class-service 93 serviceId: class-service
94 94
  95 +hystrix:
  96 + command:
  97 + default:
  98 + execution:
  99 + timeout:
  100 + enabled: true
  101 + isolation:
  102 + thread:
  103 + timeoutInMilliseconds: 10000
  104 +
95 #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建） 105 #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
96 #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建） 106 #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
97 ribbon: 107 ribbon:
98 eureka: 108 eureka:
99 enabled: true 109 enabled: true
100 UseIPAddrForServer: true 110 UseIPAddrForServer: true
  111 + ReadTimeout: 5000
  112 + ConnectTimeout: 10000
101 113
102 114
103 eureka: 115 eureka:
@@ -147,9 +159,21 @@ zuul: @@ -147,9 +159,21 @@ zuul:
147 #url: http://class-service:16200 159 #url: http://class-service:16200
148 serviceId: class-service 160 serviceId: class-service
149 161
  162 +hystrix:
  163 + command:
  164 + default:
  165 + execution:
  166 + timeout:
  167 + enabled: true
  168 + isolation:
  169 + thread:
  170 + timeoutInMilliseconds: 10000
  171 +
150 ribbon: 172 ribbon:
151 eureka: 173 eureka:
152 enabled: false 174 enabled: false
  175 + ReadTimeout: 5000
  176 + ConnectTimeout: 10000
153 177
154 eureka: 178 eureka:
155 instance: 179 instance: