Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

1
2
3
4
5
6
7
8
# Redis settings
redis.host=r-bp1672d21a422a14.redis.rds.aliyuncs.com
redis.port=6379
redis.pass=KtElFcI1sYm9NP3
redis.database=0
redis.maxIdle=300
redis.maxWait=3000
redis.testOnBorrow=true