Merge branch 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config

# Conflicts: # gateway.yml

Merge branch 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config
# Conflicts: # gateway.yml
lixzh
2 parents 98e3a717 41bd1e78
Showing 3 changed files with 18 additions and 3 deletions
class-service.yml
gateway.yml
user-service.yml
@@ -204,4 +204,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:
@@ -152,4 +162,4 @@ cas:
   ignorePattern: (^(/mvc/goto/)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)
 tenant:
-  tenantId: 991
 \ No newline at end of file
+  tenantId: 991
@@ -24,7 +24,7 @@ spring:
       max-wait: 100000
     sentinel:
       master: mymaster1
-      nodes: redis1:16379,redis2:16379
+      nodes: redis-server:16379,redis-server:16379
 mybatis:
   mapperLocations: classpath:/mybatis/*.xml