modified:   smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   smile/src/main/resources/exception.properties
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	smile/src/main/resources/exception.properties

	modified:   avengers/pom.xml
	new file:   avengers/src/assemble/distribution.xml
	new file:   avengers/src/assemble/filter.properties
	modified:   avengers/src/main/java/com/flyhz/avengers/Avengers.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/AvengersAction.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/AvengersEvent.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/AvengersEventRegister.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/AvengersObject.java
	new file:   avengers/src/main/java/com/flyhz/avengers/Client.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/Config.java
	modified:   avengers/src/main/java/com/flyhz/avengers/RecursiveDemo.java
	modified:   avengers/src/main/java/com/flyhz/avengers/TestAll.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/framework/ResultFilter.java -> avengers/src/main/java/com/flyhz/avengers/domains/ResultFilter.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/parser/CoachParser.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/CoachParser.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/parser/CoachUrlParser.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/CoachUrlParser.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/template/CoachDetailTemplate.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/template/CoachDetailTemplate.java
	new file:   avengers/src/main/java/com/flyhz/avengers/domains/coach/template/CoachProductDetailTemplate.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/template/CoachUrlTemplate.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/template/CoachUrlTemplate.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/template/NuaaTemplate.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/template/NuaaTemplate.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/template/impl/BaseUrlFilter.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/template/impl/BaseUrlFilter.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/template/impl/RecursiveCall.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/template/impl/RecursiveCall.java
	new file:   avengers/src/main/java/com/flyhz/avengers/domains/coach/template/impl/coach/CoachTemplateImpl.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/template/impl/coach/CoachUrlFilterImpl.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/template/impl/coach/CoachUrlFilterImpl.java
	new file:   avengers/src/main/java/com/flyhz/avengers/domains/coach/template/impl/coach/CoachUrlParserImpl.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/template/impl/coach/ResultFilterImpl.java -> avengers/src/main/java/com/flyhz/avengers/domains/coach/template/impl/coach/ResultFilterImpl.java
	new file:   avengers/src/main/java/com/flyhz/avengers/domains/coach/template/impl/nuaa/NuaaTemplateImpl.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/dto/NuaaPersonDto.java -> avengers/src/main/java/com/flyhz/avengers/domains/dto/NuaaPersonDto.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/dto/ProductDto.java -> avengers/src/main/java/com/flyhz/avengers/domains/dto/ProductDto.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/dto/RtnResult.java -> avengers/src/main/java/com/flyhz/avengers/domains/dto/RtnResult.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/parser/NuaaParser.java -> avengers/src/main/java/com/flyhz/avengers/domains/nuaa/NuaaParser.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/parser/BaseParser.java -> avengers/src/main/java/com/flyhz/avengers/domains/parser/BaseParser.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/Analyze.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/AvengersAppMaster.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/AvengersExecutor.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/Crawl.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/DSConstants.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/Event.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/Fetch.java
	modified:   avengers/src/main/java/com/flyhz/avengers/framework/Template.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/framework/UrlFilter.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/framework/UrlParser.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/AvengersConfiguration.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/xml/Domain.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/xml/Domains.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/xml/Event.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/xml/Filter.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/xml/ObjectFactory.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/xml/Template.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/config/xml/package-info.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/framework/core/AvengersConfiguration.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/event/DataFilterEvent.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/event/TemplateApplyEvent.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/event/URLCrawlEvent.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/AvengersDataUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/AvengersDataUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/Constants.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/Constants.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/DateUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/DateUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/HbaseUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/HbaseUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/MD5.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/MD5.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/RandomString.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/RandomString.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/ReflectHelper.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/ReflectHelper.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/RegexUtils.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/RegexUtils.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/StringUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/StringUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/UrlUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/UrlUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/ValidateUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/ValidateUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/WebClientUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/WebClientUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/XmlUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/XmlUtil.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/util/filter/URLFilterUtil.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/image/Image.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/image/Image.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/image/ImageConsole.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/image/ImageConsole.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/image/ImageMitiThread.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/image/ImageMitiThread.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/image/ImagePool.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/image/ImagePool.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/image/ImageThread.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/image/ImageThread.java
	renamed:    avengers/src/main/java/com/flyhz/avengers/util/image/ImageUtil.java -> avengers/src/main/java/com/flyhz/avengers/framework/util/image/ImageUtil.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/util/parse/URLParseUtil.java
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/util/persister/HbaseShell.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/framework/xml/Avengers.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/framework/xml/Domain.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/framework/xml/ObjectFactory.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/framework/xml/package-info.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/template/impl/coach/CoachTemplateImpl.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/template/impl/coach/CoachUrlParserImpl.java
	deleted:    avengers/src/main/java/com/flyhz/avengers/template/impl/nuaa/NuaaTemplateImpl.java
	deleted:    avengers/src/main/resources/applicationContext-core.xml
	modified:   avengers/src/main/resources/avengers.properties
	modified:   avengers/src/main/resources/avengers.xml
	modified:   avengers/src/main/resources/avengers.xsd
	modified:   avengers/src/main/resources/log4j.properties
	new file:   avengers/src/main/resources/yarn-site.xml
	modified:   avengers/src/test/java/com/flyhz/avengers/parser/CoachParserTest.java
	modified:   avengers/src/test/java/com/flyhz/avengers/parser/CoachUrlParserTest.java
	modified:   avengers/src/test/java/com/flyhz/avengers/parser/NuaaParserTest.java
	modified:   smile/src/main/java/com/flyhz/framework/lang/SolrData.java
	modified:   smile/src/main/java/com/flyhz/framework/util/Constants.java
	deleted:    smile/src/main/java/com/flyhz/framework/util/HttpUtil.java
	modified:   smile/src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/build/solr/SolrPage.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/RedisRepositoryImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/dao/BrandDao.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/dao/CategoryDao.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/IdcardServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   smile/src/main/resources/exception.properties
	modified:   smile/src/main/resources/mybatis/sqlmap/ProductMapper.xml
	new file:   smile_android/res/drawable-hdpi/alipay.png
	new file:   smile_android/res/drawable-hdpi/icon_delete.png
	modified:   smile_android/res/layout/footer.xml
	modified:   smile_android/res/layout/order_list.xml
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrdersAdapter.java
	modified:   smile_android/src/com/holding/smile/myview/MyLinearLayout.java
	modified:   smile_android/src/com/holding/smile/myview/PullToRefreshView.java
	modified:   smile_android/src/com/holding/smile/service/DataService.java
	modified:   smile_android/src/com/holding/smile/service/LoginService.java
	modified:   smile_android/src/com/holding/smile/tools/CommonUtil.java
	modified:   smile_android/src/com/holding/smile/tools/FileHelper.java
	modified:   smile_android/src/com/holding/smile/tools/ImgUtil.java
	modified:   smile_android/src/com/holding/smile/tools/JSONUtil.java
	deleted:    smile_android/src/com/holding/smile/tools/SetExpandableListViewListViewHeight.java
	modified:   smile_nodejs/requestHandlers.js