Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-watero

# Conflicts:
#	watero-wechat-web/src/main/webapp/WEB-INF/web.xml

watero-wechat-web/src/main/java/com/iamberry/wechat/utils/AdminUtils.java

@@ -2,8 +2,8 @@ package com.iamberry.wechat.utils;
 import com.auth0.jwt.JWTSigner;
 import com.auth0.jwt.JWTVerifier;
 import com.iamberry.jwt.AES;
+import com.iamberry.jwt.TokenUtil;
 import com.iamberry.sys.Admin;
-import com.iamberry.wechat.utils.token.TokenUtil;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;