带码异常做了修改，代码更精简了
Merge remote-tracking branch 'origin/master'