Merge remote-tracking branch 'origin/master'

yujian

2019-06-11 0de49bbc0f8bef524a16a877a166ba656cf2e929

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