Changes to be committed:
 	new file:   avengers/.classpath
 	new file:   avengers/.project
 	new file:   avengers/.settings/org.eclipse.jdt.core.prefs
 	new file:   avengers/.settings/org.eclipse.m2e.core.prefs
 	new file:   avengers/pom.xml
 	new file:   avengers/src/main/java/com/flyhz/avengers/Avengers.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/AvengersAction.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/AvengersEvent.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/AvengersEventRegister.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/AvengersObject.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/Config.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/parser/CoachParser.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/Constants.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/DateUtil.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/ExcelUtil.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/HtmlParserUtils.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/HttpUtil.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/JSONUtil.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/MD5.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/RandomString.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/ReflectHelper.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/RegexUtils.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/StringUtil.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/UrlUtil.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/ValidateUtil.java
 	new file:   avengers/src/main/java/com/flyhz/avengers/util/WebClientUtil.java
 	new file:   avengers/src/main/resources/contentType.properties
 	new file:   avengers/src/main/resources/logback.xml
 	new file:   avengers/src/main/resources/mybatis/sqlMapConfig.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/BrandMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/CartItemMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/CategoryMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/ConsigneeMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/IdcardMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/OrderMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/ProductMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/SalesvolumeMapper.xml
 	new file:   avengers/src/main/resources/mybatis/sqlmap/UserMapper.xml
 	new file:   avengers/src/main/resources/spring/applicationContext-controller.xml
 	new file:   avengers/src/main/resources/spring/applicationContext-core.xml
 	new file:   avengers/src/main/resources/spring/applicationContext-dao.xml
 	new file:   avengers/src/main/resources/spring/applicationContext-service.xml
 	new file:   avengers/src/main/resources/spring/applicationContext-transaction.xml
 	new file:   avengers/src/main/resources/spring/finder-lang.xml
 	new file:   avengers/src/main/resources/spring/finder-servlet-context.xml
 	new file:   avengers/src/main/resources/spring/finder-timer.xml
 	new file:   avengers/src/main/resources/velocity/layout_default.vm
 	new file:   avengers/src/main/resources/velocity/layout_do_not_use.vm
 	new file:   avengers/src/main/resources/velocity/macro.vm
 	new file:   avengers/src/main/resources/velocity/macro_default.vm
 	new file:   avengers/src/main/resources/velocity/tools.xml
 	new file:   avengers/src/main/resources/velocity/velocity.properties
 	new file:   avengers/src/main/webapp/WEB-INF/tools.xml
 	new file:   avengers/src/main/webapp/WEB-INF/web.xml
 	new file:   avengers/src/main/webapp/index.jsp
 	new file:   avengers/src/main/webapp/static/404.html
 	new file:   avengers/src/main/webapp/static/500.html
 	new file:   avengers/src/main/webapp/static/js/jquery-1.8.3.js
 	new file:   avengers/src/main/webapp/vm/layout/build.layout.vm
 	new file:   avengers/src/main/webapp/vm/layout/index.layout.vm
 	new file:   avengers/src/main/webapp/vm/layout/index/search.layout.vm
 	new file:   avengers/src/main/webapp/vm/layout/layout_default.vm
 	new file:   avengers/src/main/webapp/vm/layout/layout_do_not_use.vm
 	new file:   avengers/src/main/webapp/vm/layout/register.layout.vm
 	new file:   avengers/src/main/webapp/vm/screen/build.vm
 	new file:   avengers/src/main/webapp/vm/screen/index.vm
 	new file:   avengers/src/main/webapp/vm/screen/index/search.vm
 	new file:   avengers/src/main/webapp/vm/screen/register.vm
 	new file:   avengers/src/main/webapp/vm/screen/test/register.vm
 	new file:   avengers/src/test/java/com/data/parser/CoachParserTest.java
 	new file:   avengers/src/test/java/com/data/system/IStart.java
 	new file:   avengers/src/test/resources/logback-test.xml
 	new file:   avengers/target/classes/com/data/framework/FinderConfig.class
 	new file:   avengers/target/classes/com/data/framework/FinderServlet.class
 	new file:   avengers/target/classes/com/data/framework/auth/Authenticate.class
 	new file:   avengers/target/classes/com/data/framework/auth/EntityDto.class
 	new file:   avengers/target/classes/com/data/framework/auth/IAuth.class
 	new file:   avengers/target/classes/com/data/framework/auth/Identify.class
 	new file:   avengers/target/classes/com/data/framework/auth/IdentifyArgumentResolver.class
 	new file:   avengers/target/classes/com/data/framework/auth/ManagementSystem.class
 	new file:   avengers/target/classes/com/data/framework/auth/Menu.class
 	new file:   avengers/target/classes/com/data/framework/auth/Module.class
 	new file:   avengers/target/classes/com/data/framework/auth/ModuleParam.class
 	new file:   avengers/target/classes/com/data/framework/auth/Service.class
 	new file:   avengers/target/classes/com/data/framework/auth/WebUser.class
 	new file:   avengers/target/classes/com/data/framework/lang/AccessInterceptor.class
 	new file:   avengers/target/classes/com/data/framework/lang/CacheRepository.class
 	new file:   avengers/target/classes/com/data/framework/lang/EncodingFilter.class
 	new file:   avengers/target/classes/com/data/framework/lang/FinderExceptionHandler.class
 	new file:   avengers/target/classes/com/data/framework/lang/Protocol.class
 	new file:   avengers/target/classes/com/data/framework/lang/ValidateException.class
 	new file:   avengers/target/classes/com/data/framework/lang/content/FinderJsonView.class
 	new file:   avengers/target/classes/com/data/framework/lang/file/FileCopyStatus.class
 	new file:   avengers/target/classes/com/data/framework/lang/file/FileRepository.class
 	new file:   avengers/target/classes/com/data/framework/lang/file/FileRepositoryImpl.class
 	new file:   avengers/target/classes/com/data/framework/lang/file/FileUploadCancelException.class
 	new file:   avengers/target/classes/com/data/framework/lang/file/FileUtil.class
 	new file:   avengers/target/classes/com/data/framework/lang/log/PropDto.class
 	new file:   avengers/target/classes/com/data/framework/lang/mail/MailRepository.class
 	new file:   avengers/target/classes/com/data/framework/lang/mail/MailRepositoryImpl.class
 	new file:   avengers/target/classes/com/data/framework/lang/multipart/FileUpload.class
 	new file:   avengers/target/classes/com/data/framework/lang/multipart/FileUploadStatus.class
 	new file:   avengers/target/classes/com/data/framework/lang/multipart/FileUploadValidateStatus.class
 	new file:   avengers/target/classes/com/data/framework/lang/multipart/LostMultipartResolver.class
 	new file:   avengers/target/classes/com/data/framework/lang/page/Pager.class
 	new file:   avengers/target/classes/com/data/framework/lang/page/Pagination.class
 	new file:   avengers/target/classes/com/data/framework/lang/page/PaginationArgumentResolver.class
 	new file:   avengers/target/classes/com/data/framework/lang/page/ToolConstants.class
 	new file:   avengers/target/classes/com/data/framework/lang/velocity/LostVelocityEngine.class
 	new file:   avengers/target/classes/com/data/framework/lang/velocity/LostVelocityLayoutView.class
 	new file:   avengers/target/classes/com/data/framework/lang/velocity/LostVelocityLayoutViewResolver.class
 	new file:   avengers/target/classes/com/data/framework/lang/velocity/Slf4jLogChute.class
 	new file:   avengers/target/classes/com/data/framework/util/Constants$OrderStateCode.class
 	new file:   avengers/target/classes/com/data/framework/util/Constants.class
 	new file:   avengers/target/classes/com/data/framework/util/DateUtil.class
 	new file:   avengers/target/classes/com/data/framework/util/ExcelUtil.class
 	new file:   avengers/target/classes/com/data/framework/util/HtmlParserUtils.class
 	new file:   avengers/target/classes/com/data/framework/util/HttpUtil$Browser.class
 	new file:   avengers/target/classes/com/data/framework/util/HttpUtil.class
 	new file:   avengers/target/classes/com/data/framework/util/JSONUtil.class
 	new file:   avengers/target/classes/com/data/framework/util/MD5.class
 	new file:   avengers/target/classes/com/data/framework/util/RandomString.class
 	new file:   avengers/target/classes/com/data/framework/util/ReflectHelper.class
 	new file:   avengers/target/classes/com/data/framework/util/RegexUtils.class
 	new file:   avengers/target/classes/com/data/framework/util/StringUtil.class
 	new file:   avengers/target/classes/com/data/framework/util/UrlUtil.class
 	new file:   avengers/target/classes/com/data/framework/util/ValidateUtil.class
 	new file:   avengers/target/classes/com/data/framework/util/WebClientUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/Avengers.class
 	new file:   avengers/target/classes/com/flyhz/avengers/AvengersAction.class
 	new file:   avengers/target/classes/com/flyhz/avengers/AvengersEvent.class
 	new file:   avengers/target/classes/com/flyhz/avengers/AvengersEventRegister$Singleton.class
 	new file:   avengers/target/classes/com/flyhz/avengers/AvengersEventRegister.class
 	new file:   avengers/target/classes/com/flyhz/avengers/AvengersObject.class
 	new file:   avengers/target/classes/com/flyhz/avengers/Config.class
 	new file:   avengers/target/classes/com/flyhz/avengers/parser/CoachParser.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/Constants$OrderStateCode.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/Constants.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/DateUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/ExcelUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/HtmlParserUtils.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/HttpUtil$Browser.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/HttpUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/JSONUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/MD5.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/RandomString.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/ReflectHelper.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/RegexUtils.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/StringUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/UrlUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/ValidateUtil.class
 	new file:   avengers/target/classes/com/flyhz/avengers/util/WebClientUtil.class
 	new file:   avengers/target/classes/contentType.properties
 	new file:   avengers/target/classes/logback.xml
 	new file:   avengers/target/classes/mybatis/sqlMapConfig.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/BrandMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/CartItemMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/CategoryMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/ConsigneeMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/IdcardMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/OrderMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/ProductMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/SalesvolumeMapper.xml
 	new file:   avengers/target/classes/mybatis/sqlmap/UserMapper.xml
 	new file:   avengers/target/classes/spring/applicationContext-controller.xml
 	new file:   avengers/target/classes/spring/applicationContext-core.xml
 	new file:   avengers/target/classes/spring/applicationContext-dao.xml
 	new file:   avengers/target/classes/spring/applicationContext-service.xml
 	new file:   avengers/target/classes/spring/applicationContext-transaction.xml
 	new file:   avengers/target/classes/spring/finder-lang.xml
 	new file:   avengers/target/classes/spring/finder-servlet-context.xml
 	new file:   avengers/target/classes/spring/finder-timer.xml
 	new file:   avengers/target/classes/velocity/layout_default.vm
 	new file:   avengers/target/classes/velocity/layout_do_not_use.vm
 	new file:   avengers/target/classes/velocity/macro.vm
 	new file:   avengers/target/classes/velocity/macro_default.vm
 	new file:   avengers/target/classes/velocity/tools.xml
 	new file:   avengers/target/classes/velocity/velocity.properties
 	new file:   avengers/target/test-classes/com/data/parser/CoachParserTest.class
 	new file:   avengers/target/test-classes/com/data/system/IStart.class
 	new file:   avengers/target/test-classes/logback-test.xml

  Changes not staged for commit:
 	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
 	modified:   smile_android/src/com/holding/smile/service/DataService.java
 	modified:   smile_android/src/com/holding/smile/tools/JSONUtil.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	deleted:    key