Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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