++WebSocketUtil.java
Merge branch 'master' of https://github.com/02110917/XiaoServer

Conflicts:
	WebRoot/WEB-INF/classes/com/flying/xiao/bean/UserInfo.class
	WebRoot/WEB-INF/classes/com/flying/xiao/entity/XUserInfo.class
++