记得上下班打卡 | git大法好,push需谨慎

Commit d3dd4074 authored by 张国柄's avatar 张国柄

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

parents 55cc0b18 e078d0cd
...@@ -40,7 +40,6 @@ spring: ...@@ -40,7 +40,6 @@ spring:
profiles: profiles:
include: common-service include: common-service
redis: redis:
database: 14
port: ${liquidnet.redis.port} port: ${liquidnet.redis.port}
host: ${liquidnet.redis.host} host: ${liquidnet.redis.host}
password: ${liquidnet.redis.password} password: ${liquidnet.redis.password}
...@@ -103,8 +102,8 @@ global-auth: ...@@ -103,8 +102,8 @@ global-auth:
ribbon: ribbon:
eureka: eureka:
enabled: true # 为Ribbon禁用Eureka enabled: true # 为Ribbon禁用Eureka
ReadTimeout: 15000 ReadTimeout: 5000
ConnectTimeout: 15000 ConnectTimeout: 5000
MaxAutoRetries: 1 MaxAutoRetries: 1
MaxAutoRetriesNextServer: 1 MaxAutoRetriesNextServer: 1
MaxConnectionsPerHost: 5000 MaxConnectionsPerHost: 5000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment