|
@@ -26,7 +26,6 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.Objects;
|
|
|
-import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -65,7 +64,7 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
|
|
|
UserUtil.setUser(userInfo);
|
|
|
String uuid = UUIDutils.getUUID();
|
|
|
//token为key,id为value。过期时间30天
|
|
|
- redisUtils.set(RedisKey.USER_TOKEN_ID + ":" + uuid, one.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
|
|
|
+ redisUtils.set(RedisKey.USER_TOKEN_ID + ":" + uuid, one.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME);
|
|
|
//异地登录状态
|
|
|
if (redisUtils.exists(RedisKey.USER_ID_TOKEN + ":" + one.getId())) {
|
|
|
//有key,value为null的情况;就把key删掉
|
|
@@ -78,7 +77,7 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
|
|
|
}
|
|
|
;
|
|
|
//登录状态
|
|
|
- redisUtils.set(RedisKey.USER_ID_TOKEN + ":" + one.getId(), uuid, BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
|
|
|
+ redisUtils.set(RedisKey.USER_ID_TOKEN + ":" + one.getId(), uuid, BaseFinal.REDIS_USER_EXPIRE_TIME);
|
|
|
LoginRes build = LoginRes.builder()
|
|
|
.token(uuid)
|
|
|
.id(one.getId())
|
|
@@ -139,8 +138,8 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
|
|
|
UserInfo userInfo = getById(uid.toString());
|
|
|
if (userInfo != null) {
|
|
|
//刷新token
|
|
|
- redisUtils.set(RedisKey.USER_TOKEN_ID + ":" + req.getToken(), userInfo.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
|
|
|
- redisUtils.set(RedisKey.USER_ID_TOKEN + ":" + userInfo.getId(), req.getToken(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
|
|
|
+ redisUtils.set(RedisKey.USER_TOKEN_ID + ":" + req.getToken(), userInfo.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME);
|
|
|
+ redisUtils.set(RedisKey.USER_ID_TOKEN + ":" + userInfo.getId(), req.getToken(), BaseFinal.REDIS_USER_EXPIRE_TIME);
|
|
|
}
|
|
|
return userInfo;
|
|
|
}
|