modified:   .gitignore
	modified:   html/js/base.js
	new file:   html/js/git-json.js
	modified:   nuaajava/src/main/java/com/school/xnew/biz/service/impl/SolrRedisDataImpl.java
	modified:   nuaajava/src/main/java/com/school/xnew/web/controller/SystemLoginController.java
	modified:   nuaajava/src/main/resources/mybatis/sqlmap/ReportMapper.xml
	modified:   nuaajava/src/main/webapp/WEB-INF/tools.xml
	modified:   nuaanode/.idea/workspace.xml
	modified:   nuaanode/requestHandlers.js
	modified:   nuaanode/requestHandlers.js