Commit efbff513eb0b95765dedeca5e4153ba643105b6e
Merge branch 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config
# Conflicts: # gateway.yml
Showing
3 changed files
with
18 additions
and
3 deletions
class-service.yml
| ... | ... | @@ -204,4 +204,9 @@ eureka: |
| 204 | 204 | registerWithEureka: true |
| 205 | 205 | fetchRegistry: false |
| 206 | 206 | serviceUrl: |
| 207 | - defaultZone: http://discovery:15200/eureka/ | |
| 208 | 207 | \ No newline at end of file |
| 208 | + defaultZone: http://discovery:15200/eureka/ | |
| 209 | + | |
| 210 | +# 一些公共的常量配置 | |
| 211 | +apiConfig: | |
| 212 | + resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com | |
| 213 | + usrLocalTomcatTempLocation: /usr/local/tomcat/temp | |
| 209 | 214 | \ No newline at end of file | ... | ... |
gateway.yml
| ... | ... | @@ -25,12 +25,22 @@ zuul: |
| 25 | 25 | #url: http://class-service:16200 |
| 26 | 26 | serviceId: class-service |
| 27 | 27 | |
| 28 | +hystrix: | |
| 29 | + command: | |
| 30 | + default: | |
| 31 | + execution: | |
| 32 | + isolation: | |
| 33 | + thread: | |
| 34 | + timeoutInMilliseconds: 10000 | |
| 35 | + | |
| 28 | 36 | #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建） |
| 29 | 37 | #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建） |
| 30 | 38 | ribbon: |
| 31 | 39 | eureka: |
| 32 | 40 | enabled: true |
| 33 | 41 | UseIPAddrForServer: true |
| 42 | + ReadTimeout: 5000 | |
| 43 | + ConnectTimeout: 10000 | |
| 34 | 44 | |
| 35 | 45 | |
| 36 | 46 | eureka: |
| ... | ... | @@ -152,4 +162,4 @@ cas: |
| 152 | 162 | ignorePattern: (^(/mvc/goto/)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$) |
| 153 | 163 | |
| 154 | 164 | tenant: |
| 155 | - tenantId: 991 | |
| 156 | 165 | \ No newline at end of file |
| 166 | + tenantId: 991 | ... | ... |