删除test不用的包，将junit通过pom引入，修改代码中引入错误包的问题
log update
Merge branch 'master' of https://github.com/arebya/eserver.git

Conflicts:
	logs/emenu.log