Merge remote-tracking branch 'origin/master'

yujian

2019-05-30 ebce479a2d0634c90e5f80045e204248336b410d

Merge remote-tracking branch 'origin/master'

 fanli/src/main/resource/env-pro-job/redis.properties

@@ -1,6 +1,6 @@
redis.addr=192.168.1.253

redis.addr=172.16.16.15

redis.port=6379

redis.auth=123456

redis.auth=crs-43yhgz0i:Yeshi2016@

redis.max_active=1024

redis.max_idle=200

redis.max_wait=10000