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
redis.addr=172.16.16.3 
redis.port=6379
redis.auth=weikou2014 
#控制一个pool可分配多少个jedis实例, 
redis.max_total=-1
redis.max_idle=200 
redis.max_wait=10000 
redis.timeout=5000 
redis.test_on_borrow=true