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

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

1
2
3
4
5
6
7
8
redis.addr=172.16.16.15 
redis.port=6379 
redis.auth=crs-43yhgz0i:Yeshi2016@ 
redis.max_active=1024 
redis.max_idle=200 
redis.max_wait=10000 
redis.timeout=5000 
redis.test_on_borrow=true