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

yujian

2020-04-26 8f84f110e635237eace24f0077e9ab8f6b53d480

1
2
3
4
5
6
7
8
9
10
11
redis.addr=192.168.1.253 
redis.port=6379
redis.auth=123456 
#redis.addr=193.112.34.40 
#redis.port=6379 
#redis.auth=weikou2014 
redis.max_total=1024
redis.max_idle=200 
redis.max_wait=10000 
redis.timeout=5000 
redis.test_on_borrow=true