优化了代码，增加了一些处理逻辑
Merge branch 'master' of https://github.com/tcmaster/OurProject