modified:   smile/src/main/java/com/flyhz/framework/util/RandomString.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/TaobaoController.java
	modified:   smilecms/src/main/java/com/flyhz/shop/service/ProductService.java
	modified:   smilecms/src/main/java/com/flyhz/shop/service/impl/ProductServiceImpl.java
Merge branch 'master' of http://github.com/rememberlostcode/flyhz
Merge branch 'master' of http://github.com/rememberlostcode/flyhz
Merge branch 'master' of http://github.com/rememberlostcode/flyhz
	modified:   src/main/java/com/flyhz/framework/lang/file/FileRepository.java
	modified:   src/main/java/com/flyhz/framework/lang/file/FileRepositoryImpl.java
	modified:   src/main/java/com/flyhz/shop/service/ProductService.java
	modified:   src/main/java/com/flyhz/shop/service/impl/ProductServiceImpl.java
	modified:   src/main/webapp/WEB-INF/tools.xml
	modified:   src/main/webapp/static/css/images/blue/topframe_bg.jpg
	renamed:    src/main/webapp/static/css/images/blue/topframe_bg.jpg -> src/main/webapp/static/css/images/blue/topframe_bg.jpg.bak
	modified:   src/main/webapp/static/css/product.css
	modified:   src/main/webapp/static/css/public.css
	modified:   src/main/webapp/static/css/skin_blue.css
	modified:   src/main/webapp/vm/screen/product/list.vm
	modified:   src/main/webapp/vm/screen/product/show.vm