修改当前工作面判断
增加安全判断
Merge branch 'master' of https://github.com/2014-2/001.git