更新项目配置
Merge remote-tracking branch 'remotes/origin/master'
增加出错处理demo