Merge remote-tracking branch 'origin/master'

沈斌

2017-11-28 70c4207810e4348ad9c125c44cbb6842ecd8b4b7

 src/main/resources/redis/redis-config.properties

@@ -1,7 +1,7 @@
# Redis settings
redis.host=r-bp1672d21a422a14.redis.rds.aliyuncs.com
redis.host=47.96.19.115
redis.port=6379
redis.pass=KtElFcI1sYm9NP3
redis.pass=redis_pass
redis.database=0
redis.maxIdle=300
redis.maxWait=3000