modified:   src/main/java/com/dms/common/util/SystemInterceptor.java
	modified:   src/main/java/com/dms/test/controller/SysUserController.java
	modified:   src/main/webapp/WEB-INF/dms-servlet.xml
	modified:   src/main/webapp/WEB-INF/jsp/layout/basic-theme.jsp
	modified:   src/main/webapp/WEB-INF/jsp/sysUser.jsp
	new file:   src/main/webapp/WEB-INF/jsp/underwork.jsp
	new file:   src/main/webapp/WEB-INF/jsp/welcome.jsp
	modified:   target/classes/com/dms/common/util/SystemInterceptor.class
	modified:   target/classes/com/dms/test/controller/SysUserController.class
	modified:   target/d1.war
	new file:   target/d1/WEB-INF/classes/com/dms/common/util/Encryption.class
	new file:   target/d1/WEB-INF/classes/com/dms/common/util/SystemInterceptor.class
	modified:   target/d1/WEB-INF/classes/com/dms/test/controller/SysUserController.class
	modified:   target/d1/WEB-INF/classes/com/dms/test/dao/SysUserDAO.class
	modified:   target/d1/WEB-INF/classes/com/dms/test/dao/SysUserDAOImpl.class
	modified:   target/d1/WEB-INF/classes/com/dms/test/model/SysUser.class
	modified:   target/d1/WEB-INF/classes/com/dms/test/service/SysUserService.class
	modified:   target/d1/WEB-INF/classes/com/dms/test/service/SysUserServiceImpl.class
	new file:   target/d1/WEB-INF/classes/com/dms/test/validator/LoginValidator.class
	new file:   target/d1/WEB-INF/classes/log4j.properties
	new file:   target/d1/WEB-INF/classes/messages_zh_CN.properties
	new file:   target/d1/WEB-INF/css/bootstrap-responsive.css
	new file:   target/d1/WEB-INF/css/bootstrap-responsive.min.css
	new file:   target/d1/WEB-INF/css/bootstrap.css
	new file:   target/d1/WEB-INF/css/bootstrap.min.css
	new file:   target/d1/WEB-INF/decorators.xml
	modified:   target/d1/WEB-INF/dms-servlet.xml
	new file:   target/d1/WEB-INF/img/glyphicons-halflings-white.png
	new file:   target/d1/WEB-INF/img/glyphicons-halflings.png
	modified:   target/d1/WEB-INF/jdbc.properties
	new file:   target/d1/WEB-INF/js/bootstrap.js
	new file:   target/d1/WEB-INF/js/bootstrap.min.js
	new file:   target/d1/WEB-INF/jsp/layout/basic-theme.jsp
	new file:   target/d1/WEB-INF/jsp/login.jsp
	new file:   target/d1/WEB-INF/jsp/sysUser.jsp
	new file:   target/d1/WEB-INF/jsp/welcome.jsp
	new file:   target/d1/WEB-INF/lib/log4j-1.2.16.jar
	new file:   target/d1/WEB-INF/lib/sitemesh-2.4.2.jar
	new file:   target/d1/WEB-INF/lib/slf4j-log4j12-1.5.5.jar
	modified:   target/d1/WEB-INF/web.xml
	modified:   target/maven-archiver/pom.properties
	modified:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/layout/basic_002dtheme_jsp.class
	modified:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/layout/basic_002dtheme_jsp.java
	modified:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/login_jsp.class
	modified:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/login_jsp.java
	modified:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/sysUser_jsp.class
	modified:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/sysUser_jsp.java
	new file:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/underwork_jsp.class
	new file:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/underwork_jsp.java
	new file:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/welcome_jsp.class
	new file:   target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/welcome_jsp.java
Merge branch 'master' of https://github.com/dingyi216/d1