|
@@ -304,6 +304,7 @@ public class TokenService
|
|
|
Object accessToken = token.get("access_token");
|
|
|
r.setCode(SUCCESS_QR);
|
|
|
r.setMsg(LOGIN_SUCCESS_APP+accessToken);
|
|
|
+ //删除这个二维码信息
|
|
|
redisCache.deleteObject(uuid);
|
|
|
return r;
|
|
|
}
|
|
@@ -341,12 +342,13 @@ public class TokenService
|
|
|
loginUser.setUserEnv(userEnv);
|
|
|
loginUser.setLoginType("PC");
|
|
|
refreshToken(loginUser);
|
|
|
-
|
|
|
+ Map<String, Object> claims = new HashMap<>();
|
|
|
+ claims.put(Constants.LOGIN_USER_KEY, token);
|
|
|
// 保存或更新用户token
|
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
|
- map.put("access_token", token);
|
|
|
+ map.put("access_token", createToken(claims));
|
|
|
map.put("expires_in", EXPIRE_TIME);
|
|
|
- redisService.setCacheObject(ACCESS_TOKEN + token, loginUser, EXPIRE_TIME, TimeUnit.SECONDS);
|
|
|
+ //redisService.setCacheObject(ACCESS_TOKEN + token, loginUser, EXPIRE_TIME, TimeUnit.SECONDS);
|
|
|
return map;
|
|
|
}
|
|
|
|