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

fengxiang

2017-11-13 999d8a80d9a1c1f20033c29e7e2a08951766bee8

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