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

baqing-shop/src/test/java/com/ruoyi/web/FastJson2OpenStatsCacheTest.java

@@ -51,4 +51,23 @@ class FastJson2OpenStatsCacheTest
         Object cached = serializer.deserialize(serializer.serialize(vo));
         Assertions.assertTrue(cached instanceof CategorySalesVO);
     }
+
+    @Test
+    void deserializeJsonWithJavaLongLiteralSuffix()
+    {
+        String legacy = CATEGORY_SALES_JSON.replace(":15L", ":15").replace(":1L", ":1");
+        String withLongSuffix = legacy.replace("\"qty\":15", "\"qty\":15L").replace("\"categoryId\":1", "\"categoryId\":1L");
+        FastJson2JsonRedisSerializer<Object> serializer = new FastJson2JsonRedisSerializer<>(Object.class);
+        Object cached = serializer.deserialize(withLongSuffix.getBytes(StandardCharsets.UTF_8));
+        Assertions.assertTrue(cached instanceof CategorySalesVO);
+    }
+
+    @Test
+    void deserializeJacksonFormatWithoutTypeHint()
+    {
+        String jacksonJson = "{\"statYear\":2026,\"totalQty\":15,\"items\":[{\"categoryId\":1,\"categoryName\":\"兽药\",\"qty\":15,\"ratio\":100.0}]}";
+        FastJson2JsonRedisSerializer<Object> serializer = new FastJson2JsonRedisSerializer<>(Object.class);
+        Object cached = serializer.deserialize(jacksonJson.getBytes(StandardCharsets.UTF_8));
+        Assertions.assertNotNull(cached);
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -11,7 +11,10 @@ import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.serializer.SerializationException;
 import org.springframework.stereotype.Component;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * spring redis 工具类
@@ -22,6 +25,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class RedisCache
 {
+    private static final Logger log = LoggerFactory.getLogger(RedisCache.class);
+
     @Autowired
     public RedisTemplate redisTemplate;
 
@@ -105,7 +110,16 @@ public class RedisCache
     public <T> T getCacheObject(final String key)
     {
         ValueOperations<String, T> operation = redisTemplate.opsForValue();
-        return operation.get(key);
+        try
+        {
+            return operation.get(key);
+        }
+        catch (SerializationException ex)
+        {
+            log.warn("Redis 缓存反序列化失败，已删除损坏 key={}，原因={}", key, ex.getMessage());
+            deleteObject(key);
+            return null;
+        }
     }
 
     /**

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

@@ -4,7 +4,9 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -41,12 +43,24 @@ public class DictUtils
      */
     public static List<SysDictData> getDictCache(String key)
     {
-        JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-        if (StringUtils.isNotNull(arrayCache))
+        Object arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
+        if (StringUtils.isNull(arrayCache))
         {
-            return arrayCache.toList(SysDictData.class);
+            return null;
         }
-        return null;
+        if (arrayCache instanceof List)
+        {
+            return JSON.parseArray(JSON.toJSONString(arrayCache), SysDictData.class);
+        }
+        if (arrayCache instanceof JSONArray)
+        {
+            return ((JSONArray) arrayCache).toList(SysDictData.class);
+        }
+        if (arrayCache instanceof JSONObject)
+        {
+            return JSON.parseArray(JSON.toJSONString(arrayCache), SysDictData.class);
+        }
+        return JSON.parseArray(JSON.toJSONString(arrayCache), SysDictData.class);
     }
 
     /**

ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java

@@ -1,6 +1,7 @@
 package com.ruoyi.framework.config;
 
 import java.nio.charset.Charset;
+import java.util.regex.Pattern;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
 import com.alibaba.fastjson2.JSON;
@@ -8,6 +9,8 @@ import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.filter.Filter;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.constant.Constants;
 
 /**
@@ -21,6 +24,11 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
 
     static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(Constants.JSON_WHITELIST_STR);
 
+    private static final Pattern LONG_LITERAL = Pattern.compile("(\\d+)L(?=[,\\}\\]\\s])");
+
+    private static final ObjectMapper JACKSON = new ObjectMapper()
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
     private Class<T> clazz;
 
     public FastJson2JsonRedisSerializer(Class<T> clazz)
@@ -46,7 +54,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
         {
             return null;
         }
-        String str = normalizeLegacyCollectionSyntax(new String(bytes, DEFAULT_CHARSET));
+        String str = unwrapNestedJsonString(normalizeLegacyCollectionSyntax(new String(bytes, DEFAULT_CHARSET)));
         try
         {
             Object parsed = JSON.parseObject(str, clazz, AUTO_TYPE_FILTER, JSONReader.Feature.SupportAutoType);
@@ -66,9 +74,52 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
             }
             catch (Exception fallbackEx)
             {
-                throw new SerializationException("Could not deserialize: " + ex.getMessage(), ex);
+                try
+                {
+                    return readWithJackson(str);
+                }
+                catch (Exception jacksonEx)
+                {
+                    throw new SerializationException("Could not deserialize: " + ex.getMessage(), ex);
+                }
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private T readWithJackson(String str) throws Exception
+    {
+        if (clazz == Object.class || clazz == null)
+        {
+            return (T) JACKSON.readValue(str, Object.class);
+        }
+        return JACKSON.readValue(str, clazz);
+    }
+
+    /** 外层被 FastJSON 再包一层引号时解包 */
+    private static String unwrapNestedJsonString(String str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        String trimmed = str.trim();
+        if (trimmed.length() >= 2 && trimmed.startsWith("\"") && trimmed.endsWith("\""))
+        {
+            try
+            {
+                String inner = JSON.parseObject(trimmed, String.class);
+                if (inner != null && (inner.startsWith("{") || inner.startsWith("[")))
+                {
+                    return inner;
+                }
+            }
+            catch (Exception ignored)
+            {
+                // keep original
             }
         }
+        return str;
     }
 
     @SuppressWarnings("unchecked")
@@ -112,6 +163,12 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
         {
             return str;
         }
-        return str.replace("LinkedHashSet[", "[").replace("HashSet[", "[").replace("Set[", "[");
+        return LONG_LITERAL.matcher(str
+                .replace("LinkedHashSet[", "[")
+                .replace("HashSet[", "[")
+                .replace("TreeSet[", "[")
+                .replace("Set[", "[")
+                .replace("ArrayList[", "[")
+                .replace("LinkedList[", "[")).replaceAll("$1");
     }
 }