Merge remote-tracking branch 'origin/div' into div

yujian

2019-11-20 0f9a0a76b170bceac867dd5cd009e518ac6646e4

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