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

yj

2020-03-04 58ee87fd64efdb75d16e396c3d952d3522c3a747

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