From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:58:47 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/java/com/matrix/component/redis/RedisUserLoginUtils.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/component/redis/RedisUserLoginUtils.java b/zq-erp/src/main/java/com/matrix/component/redis/RedisUserLoginUtils.java index 9eb6eb0..9d904da 100644 --- a/zq-erp/src/main/java/com/matrix/component/redis/RedisUserLoginUtils.java +++ b/zq-erp/src/main/java/com/matrix/component/redis/RedisUserLoginUtils.java @@ -7,10 +7,8 @@ import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.UUIDUtil; import com.matrix.core.tools.WebUtil; -import com.matrix.system.hive.plugin.message.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; /** @@ -20,7 +18,6 @@ * @email 935090232@qq.com * @date 2018年1月19日 */ -@Component public class RedisUserLoginUtils { @Autowired @@ -120,10 +117,14 @@ * @date:2018年1月19日下午3:17:14 */ public void loginOut() { - String toke = getUserToken(); - redisClient.removeObject(toke); + String token = getUserToken(); + redisClient.removeObject(token); } - + public void updateUserInfo(Object obj) { + String token = getUserToken(); + redisClient.saveValue(token, obj); + LogUtil.debug("更新redis用户"); + } } -- Gitblit v1.9.1