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

admin

2020-02-23 121c5ee5345d366ae4aadf7901af9b0678dbb7a8

 fanli/src/main/resource/env-dev/redis.properties

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

redis.port=6379
redis.auth=123456

#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