modified:
	src/main/java/com/flyhz/framework/util/TaobaoTokenUtil.java
	modified:   src/main/java/com/flyhz/shop/web/controller/IndexController.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz