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

yujian

2020-04-26 8f84f110e635237eace24f0077e9ab8f6b53d480

1
2
3
4
5
6
7
8
redis.addr=172.16.16.15 
redis.port=6379 
redis.auth=crs-43yhgz0i:Yeshi2016@ 
redis.max_total=1024 
redis.max_idle=200 
redis.max_wait=10000 
redis.timeout=5000 
redis.test_on_borrow=true