Merge branch 'master' of http://192.168.1.25:3000/lbyzx123/huimv-baqing

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

@@ -0,0 +1,65 @@
+package com.ruoyi.framework.config;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+
+/**
+ * 复现 sys_normal_disable 字典 Redis 缓存 Fastjson2 反序列化失败。
+ */
+@DisplayName("SysDictData Redis 序列化")
+class SysDictDataRedisSerializerTest
+{
+    @Test
+    @DisplayName("Object.class 序列化字典列表不含 default 布尔字段")
+    void dictListRoundTripAsObjectClass()
+    {
+        SysDictData row = new SysDictData();
+        row.setDictCode(1L);
+        row.setDictSort(1L);
+        row.setDictLabel("正常");
+        row.setDictValue("0");
+        row.setDictType("sys_normal_disable");
+        row.setListClass("primary");
+        row.setIsDefault("Y");
+        row.setStatus("0");
+        List<SysDictData> list = Collections.singletonList(row);
+
+        FastJson2JsonRedisSerializer<Object> serializer = new FastJson2JsonRedisSerializer<>(Object.class);
+        byte[] bytes = serializer.serialize(list);
+        String json = new String(bytes, FastJson2JsonRedisSerializer.DEFAULT_CHARSET);
+        assertFalse(json.contains("\"default\":"), () -> "不应序列化 getDefault() 为 default 字段：" + json);
+
+        Object raw = assertDoesNotThrow(() -> serializer.deserialize(bytes));
+        assertNotNull(raw);
+        JSONArray array = (JSONArray) raw;
+        assertTrue(array.size() > 0);
+        SysDictData restored = array.getObject(0, SysDictData.class);
+        assertNotNull(restored);
+        assertTrue("正常".equals(restored.getDictLabel()));
+    }
+
+    @Test
+    @DisplayName("兼容含 legacy default:false 的历史缓存")
+    void deserializeLegacyDictCacheWithDefaultField()
+    {
+        String legacyJson =
+                "[{\"@type\":\"com.ruoyi.common.core.domain.entity.SysDictData\",\"dictCode\":1,"
+                        + "\"dictLabel\":\"正常\",\"dictValue\":\"0\",\"dictType\":\"sys_normal_disable\","
+                        + "\"isDefault\":\"Y\",\"default\":false,\"listClass\":\"primary\",\"status\":\"0\"}]";
+        FastJson2JsonRedisSerializer<Object> serializer = new FastJson2JsonRedisSerializer<>(Object.class);
+        Object raw = assertDoesNotThrow(
+                () -> serializer.deserialize(legacyJson.getBytes(FastJson2JsonRedisSerializer.DEFAULT_CHARSET)));
+        assertNotNull(raw);
+    }
+}

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

@@ -4,6 +4,8 @@ import javax.validation.constraints.NotBlank;
 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.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.constant.UserConstants;
@@ -129,11 +131,20 @@ public class SysDictData extends BaseEntity
         this.listClass = listClass;
     }
 
+    @JSONField(serialize = false, deserialize = false)
+    @JsonIgnore
     public boolean getDefault()
     {
         return UserConstants.YES.equals(this.isDefault);
     }
 
+    /** 兼容历史 Redis 缓存中的 default 字段，反序列化时忽略 */
+    @JSONField(serialize = false, deserialize = false)
+    @JsonIgnore
+    public void setDefault(boolean ignored)
+    {
+    }
+
     public String getIsDefault()
     {
         return isDefault;

ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -4,6 +4,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson2.JSONArray;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -17,6 +19,8 @@ import com.ruoyi.common.utils.spring.SpringUtils;
  */
 public class DictUtils
 {
+    private static final Logger log = LoggerFactory.getLogger(DictUtils.class);
+
     /**
      * 分隔符
      */
@@ -41,10 +45,19 @@ public class DictUtils
      */
     public static List<SysDictData> getDictCache(String key)
     {
-        JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-        if (StringUtils.isNotNull(arrayCache))
+        String cacheKey = getCacheKey(key);
+        try
+        {
+            JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(cacheKey);
+            if (StringUtils.isNotNull(arrayCache))
+            {
+                return arrayCache.toList(SysDictData.class);
+            }
+        }
+        catch (RuntimeException ex)
         {
-            return arrayCache.toList(SysDictData.class);
+            log.warn("字典缓存反序列化失败，已清除并回源数据库：key={}, cause={}", cacheKey, ex.getMessage());
+            SpringUtils.getBean(RedisCache.class).deleteObject(cacheKey);
         }
         return null;
     }