modified:   src/main/java/com/flyhz/shop/web/controller/UserController.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   .classpath
	modified:   .project
	modified:   .settings/org.eclipse.jdt.core.prefs
	deleted:    .settings/org.eclipse.m2e.core.prefs
	new file:   bin/pom.xml
	new file:   bin/src/main/java/com/flyhz/avengers/Avengers.class
	new file:   bin/src/main/java/com/flyhz/avengers/AvengersAction.class
	new file:   bin/src/main/java/com/flyhz/avengers/AvengersEvent.class
	new file:   bin/src/main/java/com/flyhz/avengers/AvengersEventRegister$Singleton.class
	new file:   bin/src/main/java/com/flyhz/avengers/AvengersEventRegister.class
	new file:   bin/src/main/java/com/flyhz/avengers/AvengersObject.class
	new file:   bin/src/main/java/com/flyhz/avengers/Config.class
	new file:   bin/src/main/java/com/flyhz/avengers/dto/ProductModel.class
	new file:   bin/src/main/java/com/flyhz/avengers/parser/CoachParser.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/Constants$OrderStateCode.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/Constants.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/DateUtil.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/ExcelUtil.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/HtmlParserUtils.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/HttpUtil$Browser.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/HttpUtil.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/JSONUtil.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/MD5.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/RandomString.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/ReflectHelper.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/RegexUtils.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/StringUtil.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/UrlUtil.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/ValidateUtil.class
	new file:   bin/src/main/java/com/flyhz/avengers/util/WebClientUtil.class
	new file:   bin/src/main/resources/contentType.properties
	new file:   bin/src/main/resources/logback.xml
	new file:   bin/src/main/resources/velocity/layout_default.vm
	new file:   bin/src/main/resources/velocity/layout_do_not_use.vm
	new file:   bin/src/main/resources/velocity/macro.vm
	new file:   bin/src/main/resources/velocity/macro_default.vm
	new file:   bin/src/main/resources/velocity/tools.xml
	new file:   bin/src/main/resources/velocity/velocity.properties
	new file:   bin/src/main/webapp/WEB-INF/tools.xml
	new file:   bin/src/main/webapp/WEB-INF/web.xml
	new file:   bin/src/main/webapp/index.jsp
	new file:   bin/src/main/webapp/static/404.html
	new file:   bin/src/main/webapp/static/500.html
	new file:   bin/src/main/webapp/static/js/jquery-1.8.3.js
	new file:   bin/src/main/webapp/vm/layout/build.layout.vm
	new file:   bin/src/main/webapp/vm/layout/index.layout.vm
	new file:   bin/src/main/webapp/vm/layout/index/search.layout.vm
	new file:   bin/src/main/webapp/vm/layout/layout_default.vm
	new file:   bin/src/main/webapp/vm/layout/layout_do_not_use.vm
	new file:   bin/src/main/webapp/vm/layout/register.layout.vm
	new file:   bin/src/main/webapp/vm/screen/build.vm
	new file:   bin/src/main/webapp/vm/screen/index.vm
	new file:   bin/src/main/webapp/vm/screen/index/search.vm
	new file:   bin/src/main/webapp/vm/screen/register.vm
	new file:   bin/src/main/webapp/vm/screen/test/register.vm
	new file:   bin/src/test/java/com/data/parser/CoachParserTest.class
	new file:   bin/src/test/java/com/data/system/IStart.class
	new file:   bin/src/test/resources/logback-test.xml
	new file:   bin/target/classes/contentType.properties
	new file:   bin/target/classes/logback.xml
	new file:   bin/target/classes/velocity/layout_default.vm
	new file:   bin/target/classes/velocity/layout_do_not_use.vm
	new file:   bin/target/classes/velocity/macro.vm
	new file:   bin/target/classes/velocity/macro_default.vm
	new file:   bin/target/classes/velocity/tools.xml
	new file:   bin/target/classes/velocity/velocity.properties
	new file:   bin/target/test-classes/logback-test.xml
	new file:   src/main/java/com/flyhz/avengers/dto/ProductModel.java
	modified:   src/main/java/com/flyhz/avengers/parser/CoachParser.java
	deleted:    src/main/java/com/flyhz/avengers/util/ExcelUtil.java
	deleted:    src/main/java/com/flyhz/avengers/util/HtmlParserUtils.java
	deleted:    src/main/java/com/flyhz/avengers/util/HttpUtil.java
	deleted:    src/main/java/com/flyhz/avengers/util/JSONUtil.java
	deleted:    src/main/resources/mybatis/sqlMapConfig.xml
	deleted:    src/main/resources/mybatis/sqlmap/BrandMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/CartItemMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/CategoryMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/ConsigneeMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/IdcardMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/OrderMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/ProductMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/SalesvolumeMapper.xml
	deleted:    src/main/resources/mybatis/sqlmap/UserMapper.xml
	deleted:    src/main/resources/spring/applicationContext-controller.xml
	deleted:    src/main/resources/spring/applicationContext-core.xml
	deleted:    src/main/resources/spring/applicationContext-dao.xml
	deleted:    src/main/resources/spring/applicationContext-service.xml
deleted:    src/main/resources/spring/applicationContext-transaction.xml#	deleted:    src/main/resources/spring/finder-lang.xml
	deleted:    src/main/resources/spring/finder-servlet-context.xml
	deleted:    src/main/resources/spring/finder-timer.xml
	deleted:    src/test/java/com/data/system/IStart.java
	renamed:    src/test/java/com/data/parser/CoachParserTest.java -> src/test/java/com/flyhz/avengers/parser/CoachParserTest.java