图片上传的七牛云配置，集成
Merge remote-tracking branch 'origin/master'