Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

fengxiang

2017-11-15 b8e86e2b44b796ced6f8fa557dfee532749dcc6c

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

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