|
@@ -26,6 +26,7 @@ import io.jsonwebtoken.Jwts;
|
|
|
import io.jsonwebtoken.SignatureAlgorithm;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
+import org.springframework.security.access.AccessDeniedException;
|
|
|
import org.springframework.security.authentication.AuthenticationManager;
|
|
|
import org.springframework.security.authentication.BadCredentialsException;
|
|
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
|
@@ -33,7 +34,10 @@ import org.springframework.security.core.Authentication;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import javax.servlet.ServletException;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.io.IOException;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
@@ -81,8 +85,7 @@ public class WxTokenService
|
|
|
*
|
|
|
* @return 用户信息
|
|
|
*/
|
|
|
- public ClientLoginUser getLoginUser(HttpServletRequest request)
|
|
|
- {
|
|
|
+ public ClientLoginUser getLoginUser(HttpServletRequest request) {
|
|
|
//测试用户
|
|
|
String test_token = request.getHeader("X-Auth-Token");
|
|
|
if("test".equals(test_token)){
|
|
@@ -96,7 +99,7 @@ public class WxTokenService
|
|
|
// 解析对应的权限以及用户信息
|
|
|
String uuid = (String) claims.get(Constants.WX_LOGIN_USER_KEY);
|
|
|
if(!iUserLoginKeyService.queryByUserKey(uuid)){
|
|
|
- throw new BaseException(null,"409",null,"已被踢下线");
|
|
|
+ return null;
|
|
|
}
|
|
|
String userKey = getTokenKey(uuid);
|
|
|
ClientLoginUser user = redisCache.getCacheObject(userKey);
|