basic func end
Merge branch 'master' of https://github.com/guozhenhong/chatRoom