Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul.yml

@@ -40,7 +40,6 @@ spring:
   profiles:
     include: common-service
   redis:
-    database: 14
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}
@@ -103,8 +102,8 @@ global-auth:
 ribbon:
   eureka:
     enabled: true   # 为Ribbon禁用Eureka
-  ReadTimeout: 15000
-  ConnectTimeout: 15000
+  ReadTimeout: 5000
+  ConnectTimeout: 5000
   MaxAutoRetries: 1
   MaxAutoRetriesNextServer: 1
   MaxConnectionsPerHost: 5000