Merge remote-tracking branch 'origin/master'

沈斌

2017-11-28 70c4207810e4348ad9c125c44cbb6842ecd8b4b7

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