From 21c1a691e7018967a429c276e6642c17e61ed778 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 22 四月 2022 14:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
sandu-common/src/main/java/com/sandu/common/security/token/RedisTokenProvider.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sandu-common/src/main/java/com/sandu/common/security/token/RedisTokenProvider.java b/sandu-common/src/main/java/com/sandu/common/security/token/RedisTokenProvider.java
index a1da728..7030307 100644
--- a/sandu-common/src/main/java/com/sandu/common/security/token/RedisTokenProvider.java
+++ b/sandu-common/src/main/java/com/sandu/common/security/token/RedisTokenProvider.java
@@ -27,8 +27,8 @@
String token = IdUtil.simpleUUID();
loginUserInfo.setToken(token);
loginUserInfo.setCreateTimestamp(System.currentTimeMillis());
- redisService.set(UserModel.USER_TOKEN.key(token), loginUserInfo.getUserId(), UserModel.USER_TOKEN.expireSeconds());
- redisService.set(UserModel.USER_INFO.key(loginUserInfo.getUserId().toString()), loginUserInfo);
+ redisService.set(UserModel.USER_TOKEN.key(token), loginUserInfo, UserModel.USER_TOKEN.expireSeconds());
+ redisService.set(UserModel.USER_INFO.key(loginUserInfo.getUserId().toString() + loginUserInfo.getAdministratorType()), loginUserInfo);
return token;
}
@@ -37,11 +37,12 @@
if (token == null) {
return null;
}
- Long userId = (Long) redisService.get(UserModel.USER_TOKEN.key(token));
- if (userId == null) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) redisService.get(UserModel.USER_TOKEN.key(token));
+ if (loginUserInfo == null) {
return null;
}
- LoginUserInfo userInfo = (LoginUserInfo) redisService.get(UserModel.USER_INFO.key(userId.toString()));
+ LoginUserInfo userInfo
+ = (LoginUserInfo) redisService.get(UserModel.USER_INFO.key(loginUserInfo.getUserId().toString() + loginUserInfo.getAdministratorType().toString()));
if (userInfo != null) {
if (redisService.getExpire(token) < UserModel.USER_TOKEN.expireSeconds()) {
redisService.expire(token, UserModel.USER_TOKEN.expireSeconds());
--
Gitblit v1.9.3