From 60279fca4c8e7d5250b88aa19b3d0875e7cabecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 6 Feb 2026 00:49:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(cache):=20=E8=A7=A3=E5=86=B3=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E4=B8=ADJSON=20null=E5=80=BC=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加对历史缓存中JSON "null" 字符串的兼容处理
- 当缓存解析出null值时清理缓存并回源数据库
- 在CmsWebsiteServiceImpl中增加缓存清理逻辑
- 在ShopWebsiteServiceImpl中统一缓存异常处理机制
- 添加单元测试验证JSON null值场景的正确回退行为
---
 .../service/impl/CmsWebsiteServiceImpl.java   | 11 +++-
 .../service/impl/ShopWebsiteServiceImpl.java  |  3 +
 .../impl/CmsWebsiteServiceImplCacheTest.java  | 66 +++++++++++++++++++
 3 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplCacheTest.java

diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
index 0bc0566..348d3e5 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
@@ -337,9 +337,16 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
     if (StrUtil.isNotBlank(siteInfo)) {
       log.info("从缓存获取网站信息，租户ID: {}", tenantId);
       try {
-        return JSONUtil.parseObject(siteInfo, ShopVo.class);
+        // 兼容历史缓存：JSON "null" 会被解析为 null；此时应视为未命中并回源数据库。
+        ShopVo cacheVo = JSONUtil.parseObject(siteInfo, ShopVo.class);
+        if (cacheVo != null) {
+          return cacheVo;
+        }
+        log.warn("网站信息缓存命中但内容为空(null)，清理缓存后回源数据库，租户ID: {}", tenantId);
+        redisUtil.delete(cacheKey);
       } catch (Exception e) {
-        log.warn("缓存解析失败，从数据库重新获取: {}", e.getMessage());
+        log.warn("缓存解析失败，清理缓存后从数据库重新获取: {}", e.getMessage());
+        redisUtil.delete(cacheKey);
       }
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopWebsiteServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopWebsiteServiceImpl.java
index d111c10..0d92e1e 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopWebsiteServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopWebsiteServiceImpl.java
@@ -51,6 +51,9 @@ public class ShopWebsiteServiceImpl implements ShopWebsiteService {
                     log.info("从缓存获取商城信息，租户ID: {}", tenantId);
                     return cacheVo;
                 }
+                // 兼容历史缓存：JSON "null" 会被解析为 null；此时清理缓存并回源。
+                log.warn("商城信息缓存命中但内容为空(null)，清理缓存后回源数据库，租户ID: {}", tenantId);
+                redisUtil.delete(cacheKey);
             } catch (Exception e) {
                 log.warn("商城缓存解析失败，清理缓存后重新获取: {}", e.getMessage());
                 redisUtil.delete(cacheKey);
diff --git a/src/test/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplCacheTest.java b/src/test/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplCacheTest.java
new file mode 100644
index 0000000..bb7f5ff
--- /dev/null
+++ b/src/test/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplCacheTest.java
@@ -0,0 +1,66 @@
+package com.gxwebsoft.cms.service.impl;
+
+import com.gxwebsoft.cms.entity.CmsWebsite;
+import com.gxwebsoft.cms.mapper.CmsWebsiteMapper;
+import com.gxwebsoft.cms.service.CmsNavigationService;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.shop.vo.ShopVo;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class CmsWebsiteServiceImplCacheTest {
+
+    @Test
+    void getSiteInfo_cacheValueIsJsonNull_shouldFallbackToDb() throws Exception {
+        Integer tenantId = 1;
+
+        RedisUtil redisUtil = mock(RedisUtil.class);
+        CmsNavigationService cmsNavigationService = mock(CmsNavigationService.class);
+        CmsWebsiteMapper cmsWebsiteMapper = mock(CmsWebsiteMapper.class);
+
+        // 历史缓存可能存在字符串 "null"；Jackson 解析后会得到 null，需回源 DB。
+        when(redisUtil.get("SiteInfo:" + tenantId)).thenReturn("null");
+        when(cmsNavigationService.listRel(any())).thenReturn(Collections.emptyList());
+
+        CmsWebsite website = new CmsWebsite();
+        website.setTenantId(tenantId);
+        website.setTenantName("tenant");
+        website.setWebsiteName("site");
+        when(cmsWebsiteMapper.getByTenantId(tenantId)).thenReturn(website);
+
+        CmsWebsiteServiceImpl service = new CmsWebsiteServiceImpl();
+        setField(service, "redisUtil", redisUtil);
+        setField(service, "cmsNavigationService", cmsNavigationService);
+        setField(service, "baseMapper", cmsWebsiteMapper);
+
+        ShopVo vo = service.getSiteInfo(tenantId);
+
+        assertNotNull(vo);
+        verify(redisUtil).delete("SiteInfo:" + tenantId);
+        verify(cmsWebsiteMapper).getByTenantId(tenantId);
+    }
+
+    private static void setField(Object target, String fieldName, Object value) throws Exception {
+        Class<?> c = target.getClass();
+        while (c != null) {
+            try {
+                Field f = c.getDeclaredField(fieldName);
+                f.setAccessible(true);
+                f.set(target, value);
+                return;
+            } catch (NoSuchFieldException ignored) {
+                c = c.getSuperclass();
+            }
+        }
+        throw new NoSuchFieldException(fieldName);
+    }
+}
+