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

无关风月

2 天以前 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

 cloud-server-activity/src/main/resources/redis.properties

@@ -1,7 +1,5 @@
spring.redis.database=0

spring.redis.host=@redis.addr@

spring.redis.port=@redis.port@
spring.redis.password=@redis.password@
spring.redis.jedis.pool.max-active=1024