modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/webapp/vm/layout/layout_default.vm
	renamed:    main/webapp/vm/screen/register2.vm -> main/webapp/vm/screen/register.vm
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/framework/util/StringUtil.java
	modified:   main/java/com/flyhz/shop/persistence/dao/UserDao.java
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/resources/mybatis/sqlmap/UserMapper.xml
	modified:   main/webapp/vm/layout/layout_default.vm
	new file:   main/webapp/vm/layout/register.layout.vm
	modified:   main/webapp/vm/screen/register.vm
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

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

	modified:   ../pom.xml
	renamed:    main/java/com/flyhz/framework/redis/CacheRepository.java -> main/java/com/flyhz/framework/lang/CacheRepository.java
	modified:   main/java/com/flyhz/framework/lang/content/FinderJsonView.java
	new file:   main/java/com/flyhz/framework/util/MD5.java
	new file:   main/java/com/flyhz/framework/util/RandomString.java
	renamed:    main/java/com/flyhz/framework/solr/Fraction.java -> main/java/com/flyhz/shop/build/solr/Fraction.java
	renamed:    main/java/com/flyhz/framework/solr/PageModel.java -> main/java/com/flyhz/shop/build/solr/PageModel.java
	renamed:    main/java/com/flyhz/framework/solr/ProductFraction.java -> main/java/com/flyhz/shop/build/solr/ProductFraction.java
	new file:   main/java/com/flyhz/shop/build/solr/ProductFractionImpl.java
	new file:   main/java/com/flyhz/shop/build/solr/SolrServer.java
	modified:   main/java/com/flyhz/shop/dto/UserDto.java
	renamed:    main/java/com/flyhz/framework/redis/impl/RCacheRepository.java -> main/java/com/flyhz/shop/persistence/RCacheRepository.java
	modified:   main/java/com/flyhz/shop/persistence/dao/ProductDao.java
	modified:   main/java/com/flyhz/shop/persistence/entity/UserModel.java
	modified:   main/java/com/flyhz/shop/service/UserService.java
	modified:   main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   main/resources/mybatis/sqlMapConfig.xml
	modified:   main/resources/mybatis/sqlmap/UserMapper.xml
	modified:   main/resources/spring/applicationContext-service.xml
	modified:   main/webapp/WEB-INF/tools.xml
	new file:   main/webapp/vm/screen/build.vm
	modified:   ../../smile_nodejs/.idea/workspace.xml