before chat
Merge branch 'master' of github.com:liyonghelpme/wangServer2