去掉无用代码
Merge branch 'master' of https://github.com/jinghai/xxyyzz