Merge branch 'whx'

Change-Id: I3fac2645f2464d019c4c7d43efae263b5e1b58a7
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 899d736..8f97d3c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,13 +4,12 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.sql.init.mode=always
 #logging.level.root=DEBUG
-server.address=0.0.0.0
-server.port=8080
 
 mybatis-plus.mapper-locations=classpath*:/mapper/**/*.xml
 
 spring.data.redis.host = 127.0.0.1
-#spring.data.redis.host = redis
+
+//spring.data.redis.host = redis-server
 spring.data.redis.port = 6379
 
 spring.mail.host=smtp.qq.com