Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 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