Merge branch 'hz_master' into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -234,4 +234,14 @@ public class AuthController {
         return JsonResultUtil.createSuccessResultWithObj(authService.loginImiWithToken());
     }
 
+    /**
+     * 检查token是否失效
+     * @param token
+     * @return
+     */
+    @RequestMapping(value = "checkToken", method = RequestMethod.GET)
+    public ObjectRestResponse checkToken(String token){
+        return authService.checkToken(token);
+    }
+
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java

@@ -37,4 +37,6 @@ public interface AuthService {
     JSONObject appletRegistry(String username,String headimgurl,String nickname,Integer  userid);
 
     String loginImiWithToken();
+
+    ObjectRestResponse checkToken(String token);
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.auth.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
 import com.github.wxiaoqi.security.api.vo.user.UserInfo;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
 import com.github.wxiaoqi.security.auth.feign.IUserService;
 import com.github.wxiaoqi.security.auth.service.AuthService;
@@ -11,6 +12,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -117,4 +119,22 @@ public class AppAuthServiceImpl implements AuthService {
         return userService.loginImiWithToken();
     }
 
+    @Override
+    public ObjectRestResponse checkToken(String token) {
+        try {
+            if (StringUtils.isEmpty(token)){
+                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+            }
+            IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
+            if (ijwtInfo==null){
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            }
+            return ObjectRestResponse.succ();
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"网络异常,稍后重试");
+        }
+
+    }
+
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.auth.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.api.vo.user.UserInfo;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
 import com.github.wxiaoqi.security.auth.feign.IUserService;
 import com.github.wxiaoqi.security.auth.service.AuthService;
@@ -10,6 +11,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -113,4 +115,22 @@ public class AuthServiceImpl implements AuthService {
     public String loginImiWithToken() {
         return userService.loginImiWithToken();
     }
+
+    @Override
+    public ObjectRestResponse checkToken(String token) {
+        try {
+            if (StringUtils.isEmpty(token)){
+                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+            }
+            IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
+            if (ijwtInfo==null){
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            }
+            return ObjectRestResponse.succ();
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"网络异常,稍后重试");
+        }
+
+    }
 }