聊天的进一步更改，明天准备加点干货
Merge branch 'master' of https://github.com/tcmaster/OurProject