Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

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