Merge branch 'master' into 'master'

gateway添加zuul 超时时间 See merge request !17

Merge branch 'master' into 'master'
gateway添加zuul 超时时间 See merge request !17
luotong
2 parents fc3a9aeb 9c59ca07
Showing 2 changed files with 20 additions and 2 deletions
class-service.yml
gateway.yml
@@ -138,4 +138,9 @@ eureka:
     registerWithEureka: true
     fetchRegistry: false
     serviceUrl:
-      defaultZone: http://discovery:15200/eureka/
 \ No newline at end of file
+      defaultZone: http://discovery:15200/eureka/
+
+# 一些公共的常量配置
+apiConfig:
+  resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com
+  usrLocalTomcatTempLocation: /usr/local/tomcat/temp
 \ No newline at end of file
@@ -25,12 +25,22 @@ zuul:
       #url: http://class-service:16200
       serviceId: class-service
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 10000
+
 #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
 #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
 ribbon:
   eureka:
     enabled: true
   UseIPAddrForServer: true
+  ReadTimeout: 5000
+  ConnectTimeout: 10000
 eureka:
@@ -95,4 +105,7 @@ cas:
   casServerUrlPrefix: https://cas.gaoxiaobang.com/
   casServerLoginUrl: https://cas.gaoxiaobang.com/login
   casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
-  ignorePattern: (^(/mvc/goto/)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)
 \ No newline at end of file
+  ignorePattern: (^(/mvc/goto/)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)
+
+tenant:
+  tenantId: 438