Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 45db1ff89c6389a2e4b84b252870326d510049ba

1
2
3
4
5
6
7
8
# Redis settings
redis.host=101.37.22.173
redis.port=6379
redis.pass=redis_pass
redis.database=0
redis.maxIdle=300
redis.maxWait=3000
redis.testOnBorrow=true