Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

1
2
3
4
5
6
7
8
redis.addr=192.168.1.253 
redis.port=6379
redis.auth=123456 
redis.max_total=1024
redis.max_idle=200 
redis.max_wait=10000 
redis.timeout=5000 
redis.test_on_borrow=true