解决冲突
Merge branch 'master' of https://github.com/zzwell/hhit-openfire

Conflicts:
	src/main/java/com/web/controller/LoginController.java