From 81e00cd2e26e387d8ab2077ccd982072d6eb865b Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:40:31 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/java/com/matrix/system/common/init/UserCacheManager.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/init/UserCacheManager.java b/zq-erp/src/main/java/com/matrix/system/common/init/UserCacheManager.java
index 6c91e95..18b0ae8 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/init/UserCacheManager.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/init/UserCacheManager.java
@@ -13,7 +13,7 @@
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.UUIDUtil;
import com.matrix.core.tools.WebUtil;
-import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.hive.bean.SysVipInfo;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -94,7 +94,7 @@
public <T> T getLoginUser() {
String userToken = getUserToken();
if (userToken != null) {
- T user = LocalCache.get(userToken,new TypeReference<SysUsers>(){});
+ T user = LocalCache.get(userToken,new TypeReference<SysVipInfo>(){});
if (Objects.nonNull(user)) {
//重新设置key过期时间
LocalCache.resetExpire(userToken);
--
Gitblit v1.9.1