Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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