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

无关风月

昨天 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java

@@ -10,7 +10,7 @@
@Configuration
@PropertySource("classpath:redis.properties")
public class RedisConfig {
    @Value("192.168.110.106")
    @Value("${spring.redis.host}")
    private String host;

    @Value("${spring.redis.port}")