modified:   src/main/java/com/flyhz/framework/lang/CacheRepository.java
	modified:   src/main/java/com/flyhz/framework/util/Constants.java
	modified:   src/main/java/com/flyhz/framework/util/UrlUtil.java
	renamed:    src/main/java/com/flyhz/shop/build/solr/PageModel.java -> src/main/java/com/flyhz/shop/build/solr/SolrPage.java
	modified:   src/main/java/com/flyhz/shop/persistence/RCacheRepository.java
	modified:   src/main/java/com/flyhz/shop/persistence/RedisRepositoryImpl.java
	modified:   src/main/java/com/flyhz/shop/persistence/dao/ProductDao.java
	modified:   src/main/java/com/flyhz/shop/service/BuildService.java
	modified:   src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   src/main/resources/mybatis/sqlMapConfig.xml
	modified:   src/main/resources/mybatis/sqlmap/ProductMapper.xml
	new file:   src/main/webapp/vm/layout/build.layout.vm
Merge branch 'master' of https://github.com/rememberlostcode/flyhz