交易市场平台（供应商）

baqing-admin/src/test/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializerTest.java

@@ -0,0 +1,45 @@
+package com.ruoyi.framework.config;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("FastJson2JsonRedisSerializer")
+class FastJson2JsonRedisSerializerTest
+{
+    private static final String LEGACY_LOGIN_USER_JSON =
+            "{\"@type\":\"com.ruoyi.common.core.domain.model.LoginUser\",\"browser\":\"Chrome 148\","
+                    + "\"deptId\":103L,\"expireTime\":1780467419148,\"ipaddr\":\"115.238.57.190\","
+                    + "\"loginLocation\":\"XX XX\",\"loginTime\":1780465619148,\"os\":\"Windows10\","
+                    + "\"permissions\":Set[\"*:*:*\"],\"token\":\"22e5d643-b819-4e3a-bb97-0fd65739ff51\","
+                    + "\"user\":{\"admin\":true,\"createBy\":\"admin\",\"createTime\":\"2026-05-09 10:26:46\","
+                    + "\"delFlag\":\"0\",\"dept\":{\"ancestors\":\"0,100,101\",\"children\":[],"
+                    + "\"deptId\":103L,\"deptName\":\"研发部门\",\"leader\":\"若依\",\"orderNum\":1,"
+                    + "\"params\":{\"@type\":\"java.util.HashMap\"},\"parentId\":101L,\"status\":\"0\"},"
+                    + "\"deptId\":103L,\"email\":\"ry@163.com\",\"loginDate\":\"2026-06-03 13:46:16\","
+                    + "\"loginIp\":\"115.238.57.190\",\"nickName\":\"超级管理员\","
+                    + "\"params\":{\"@type\":\"java.util.HashMap\"},\"phonenumber\":\"15888888888\","
+                    + "\"pwdUpdateDate\":\"2026-05-09 10:26:46\",\"remark\":\"管理员\","
+                    + "\"roles\":[{\"admin\":true,\"dataScope\":\"1\",\"deptCheckStrictly\":false,"
+                    + "\"flag\":false,\"menuCheckStrictly\":false,"
+                    + "\"params\":{\"@type\":\"java.util.HashMap\"},\"roleId\":1L,\"roleKey\":\"admin\","
+                    + "\"roleName\":\"超级管理员\",\"roleSort\":1,\"status\":\"0\"}],"
+                    + "\"sex\":\"1\",\"status\":\"0\",\"userId\":1L,\"userName\":\"admin\"},"
+                    + "\"userId\":1L,\"username\":\"admin\"}";
+
+    @Test
+    @DisplayName("反序列化含 admin 字段的历史 LoginUser 缓存")
+    void deserializeLegacyLoginUserWithAdminField()
+    {
+        FastJson2JsonRedisSerializer<LoginUser> serializer = new FastJson2JsonRedisSerializer<>(LoginUser.class);
+        LoginUser loginUser = serializer.deserialize(LEGACY_LOGIN_USER_JSON.getBytes(FastJson2JsonRedisSerializer.DEFAULT_CHARSET));
+        assertNotNull(loginUser);
+        assertEquals(1L, loginUser.getUserId());
+        assertNotNull(loginUser.getUser());
+        assertEquals("admin", loginUser.getUser().getUserName());
+        assertEquals("22e5d643-b819-4e3a-bb97-0fd65739ff51", loginUser.getToken());
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -84,6 +85,7 @@ public class SysRole extends BaseEntity
         this.roleId = roleId;
     }
 
+    @JSONField(serialize = false, deserialize = false)
     public boolean isAdmin()
     {
         return isAdmin(this.roleId);

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.xss.Xss;
 
@@ -116,6 +117,7 @@ public class SysUser extends BaseEntity
         this.userId = userId;
     }
 
+    @JSONField(serialize = false, deserialize = false)
     public boolean isAdmin()
     {
         return SecurityUtils.isAdmin(this.userId);

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,8 +73,7 @@ public class TokenService
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
-                LoginUser user = redisCache.getCacheObject(userKey);
-                return user;
+                return redisCache.getCacheObject(userKey);
             }
             catch (Exception e)
             {