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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

1
2
3
4
5
6
7
8
redis.addr=127.0.0.1 
redis.port=6379 
redis.auth=Yeshi2016@ 
redis.max_total=1024 
redis.max_idle=200 
redis.max_wait=10000 
redis.timeout=5000 
redis.test_on_borrow=true