modified:   ../smile/src/main/java/com/flyhz/framework/util/Constants.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
	new file:   ../smile/src/main/java/com/flyhz/shop/build/solr/SolrTimer.java
	modified:   ../smile/src/main/java/com/flyhz/shop/dto/ProductBuildDto.java
	new file:   ../smile/src/main/java/com/flyhz/shop/dto/RProductDto.java
	new file:   ../smile/src/main/java/com/flyhz/shop/dto/Result.java
	modified:   ../smile/src/main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	new file:   ../smile/src/main/java/com/flyhz/shop/persistence/dao/SalesvolumeDao.java
	new file:   ../smile/src/main/java/com/flyhz/shop/persistence/entity/SalesvolumeModel.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   ../smile/src/main/resources/mybatis/sqlMapConfig.xml
	modified:   ../smile/src/main/resources/mybatis/sqlmap/OrderMapper.xml
	modified:   ../smile/src/main/resources/mybatis/sqlmap/ProductMapper.xml
	new file:   ../smile/src/main/resources/mybatis/sqlmap/SalesvolumeMapper.xml
	modified:   ../smile/src/main/resources/spring/applicationContext-controller.xml
	modified:   ../smile/src/main/resources/spring/applicationContext-dao.xml
	deleted:    bin/AndroidManifest.xml
	deleted:    bin/classes.dex
	deleted:    bin/classes/com/holding/smile/BuildConfig.class
	deleted:    bin/classes/com/holding/smile/R$attr.class
	deleted:    bin/classes/com/holding/smile/R$dimen.class
	deleted:    bin/classes/com/holding/smile/R$drawable.class
	deleted:    bin/classes/com/holding/smile/R$id.class
	deleted:    bin/classes/com/holding/smile/R$layout.class
	deleted:    bin/classes/com/holding/smile/R$menu.class
	deleted:    bin/classes/com/holding/smile/R$string.class
	deleted:    bin/classes/com/holding/smile/R$style.class
	deleted:    bin/classes/com/holding/smile/R.class
	deleted:    bin/classes/com/holding/smile/activity/BaseActivity$1.class
	deleted:    bin/classes/com/holding/smile/activity/BaseActivity$2.class
	deleted:    bin/classes/com/holding/smile/activity/BaseActivity$LoadTask.class
	deleted:    bin/classes/com/holding/smile/activity/BaseActivity.class
	deleted:    bin/classes/com/holding/smile/activity/GoodsDetailActivity.class
	deleted:    bin/classes/com/holding/smile/activity/MainActivity$1.class
	deleted:    bin/classes/com/holding/smile/activity/MainActivity$2.class
	deleted:    bin/classes/com/holding/smile/activity/MainActivity.class
	deleted:    bin/classes/com/holding/smile/activity/MainTwoActivity$1.class
	deleted:    bin/classes/com/holding/smile/activity/MainTwoActivity$2.class
	deleted:    bin/classes/com/holding/smile/activity/MainTwoActivity$3.class
	deleted:    bin/classes/com/holding/smile/activity/MainTwoActivity.class
	deleted:    bin/classes/com/holding/smile/activity/MyApplication$1.class
	deleted:    bin/classes/com/holding/smile/activity/MyApplication$BitmapWorkerTask.class
	deleted:    bin/classes/com/holding/smile/activity/MyApplication.class
	deleted:    bin/classes/com/holding/smile/activity/SearchGoodsActivity$1.class
	deleted:    bin/classes/com/holding/smile/activity/SearchGoodsActivity$2.class
	deleted:    bin/classes/com/holding/smile/activity/SearchGoodsActivity$3.class
	deleted:    bin/classes/com/holding/smile/activity/SearchGoodsActivity$4.class
	deleted:    bin/classes/com/holding/smile/activity/SearchGoodsActivity$5.class
	deleted:    bin/classes/com/holding/smile/activity/SearchGoodsActivity$6.class
	deleted:    bin/classes/com/holding/smile/activity/SearchGoodsActivity.class
	deleted:    bin/classes/com/holding/smile/adapter/HistorySearchAdapter.class
	deleted:    bin/classes/com/holding/smile/adapter/HorizontalGridViewAdapter$1.class
	deleted:    bin/classes/com/holding/smile/adapter/HorizontalGridViewAdapter$ViewHolder.class
	deleted:    bin/classes/com/holding/smile/adapter/HorizontalGridViewAdapter.class
	deleted:    bin/classes/com/holding/smile/adapter/ImageAdapter.class
	deleted:    bin/classes/com/holding/smile/adapter/MyJGoodsAdapter$1.class
	deleted:    bin/classes/com/holding/smile/adapter/MyJGoodsAdapter$ViewHolder.class
	deleted:    bin/classes/com/holding/smile/adapter/MyJGoodsAdapter.class
	deleted:    bin/classes/com/holding/smile/adapter/VerticalListAdapter$1.class
	deleted:    bin/classes/com/holding/smile/adapter/VerticalListAdapter$ViewHolder.class
	deleted:    bin/classes/com/holding/smile/adapter/VerticalListAdapter.class
	deleted:    bin/classes/com/holding/smile/dto/BrandJGoods.class
	deleted:    bin/classes/com/holding/smile/dto/RtnGoodsDto.class
	deleted:    bin/classes/com/holding/smile/dto/RtnValueDto.class
	deleted:    bin/classes/com/holding/smile/dto/ValidateDto.class
	deleted:    bin/classes/com/holding/smile/entity/JGoods.class
	deleted:    bin/classes/com/holding/smile/entity/SolrGood.class
	deleted:    bin/classes/com/holding/smile/myview/MyGridView.class
	deleted:    bin/classes/com/holding/smile/myview/MyListView.class
	deleted:    bin/classes/com/holding/smile/myview/PullToRefreshView$1.class
	deleted:    bin/classes/com/holding/smile/myview/PullToRefreshView$OnFooterRefreshListener.class
	deleted:    bin/classes/com/holding/smile/myview/PullToRefreshView$OnHeaderRefreshListener.class
	deleted:    bin/classes/com/holding/smile/myview/PullToRefreshView.class
	deleted:    bin/classes/com/holding/smile/service/DataService.class
	new file:   ../smile_nodejs/.gitignore
	deleted:    ../smile_nodejs/.idea/workspace.xml
	new file:   ../smile_nodejs/node_modules/redis/.npmignore
	new file:   ../smile_nodejs/node_modules/redis/README.md
	new file:   ../smile_nodejs/node_modules/redis/benches/buffer_bench.js
	new file:   ../smile_nodejs/node_modules/redis/benches/hiredis_parser.js
	new file:   ../smile_nodejs/node_modules/redis/benches/re_sub_test.js
	new file:   ../smile_nodejs/node_modules/redis/benches/reconnect_test.js
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/codec.js
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/pubsub/pub.js
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/pubsub/run
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/pubsub/server.js
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/rpushblpop/pub.js
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/rpushblpop/run
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/rpushblpop/server.js
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/speed/00
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/speed/plot
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/speed/size-rate.png
	new file:   ../smile_nodejs/node_modules/redis/benches/stress/speed/speed.js
	new file:   ../smile_nodejs/node_modules/redis/benches/sub_quit_test.js
	modified:   ../smile_nodejs/requestHandlers.js
	modified:   ../smile_nodejs/server.js
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/gen/com/holding/smile/R.java

	modified:   smile_android/AndroidManifest.xml
	new file:   smile_android/gen/com/holding/smile/R.java
	modified:   smile_android/res/layout/goods_detail_view.xml
	modified:   smile_android/res/layout/header.xml
	modified:   smile_android/res/layout/horizontallistview.xml
	modified:   smile_android/res/layout/horizontallistview_item.xml
	new file:   smile_android/res/layout/recommend_good_item.xml
	modified:   smile_android/res/layout/smile_main.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/GoodsDetailActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainTwoActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MyApplication.java
	modified:   smile_android/src/com/holding/smile/adapter/HorizontalGridViewAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/ImageAdapter.java
	new file:   smile_android/src/com/holding/smile/adapter/RecommendGoodsAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/VerticalListAdapter.java
	modified:   smile_android/src/com/holding/smile/dto/BrandJGoods.java
	modified:   smile_android/src/com/holding/smile/myview/MyListView.java
	modified:   smile_android/src/com/holding/smile/service/DataService.java
	modified:   smile_android/src/testdata/brandJGoodsInitJson.json