修改了所有long，并增加JUnit测试

JUnit跑不起来
Merge branch 'master' of https://github.com/WRKMNO4/System_Client

Conflicts:
	.classpath