From 2678348540e132e50592824252402313a8f3d761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 12 Aug 2025 15:46:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(cms):=20=E4=BF=AE=E5=A4=8D=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 优化网站信息获取接口返回结构
- 移除不必要的打印语句
-修正导航目标窗口转换逻辑，提高安全性
- 注释掉过期时间处理代码
---
 .../cms/controller/CmsWebsiteController.java  |  1 +
 .../impl/CmsArticleContentServiceImpl.java    |  1 -
 .../service/impl/CmsWebsiteServiceImpl.java   |  4 +--
 .../impl/CmsWebsiteServiceImplHelper.java     | 29 ++++++++++++++++++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
index dfb22d0..ff52b48 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
@@ -169,6 +169,7 @@ public class CmsWebsiteController extends BaseController {
             }
 
             CmsWebsiteVO websiteVO = cmsWebsiteService.getSiteInfo(tenantId);
+
             return success(websiteVO);
         } catch (IllegalArgumentException e) {
             return fail(e.getMessage(), null);
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleContentServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleContentServiceImpl.java
index d39ffe6..a2a0faf 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleContentServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleContentServiceImpl.java
@@ -138,7 +138,6 @@ public class CmsArticleContentServiceImpl extends ServiceImpl<CmsArticleContentM
             target.setRecommend(article.getRecommend());
             target.setOverview(article.getOverview());
             target.setContent(article.getContent());
-            System.out.println("target = " + target);
             cmsArticleService.updateById(target);
             this.update(new LambdaUpdateWrapper<CmsArticleContent>().eq(CmsArticleContent::getArticleId, target.getArticleId()).set(CmsArticleContent::getContent,target.getContent()));
           }
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 5378ee8..10f345c 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
@@ -249,13 +249,11 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
           final List<CmsNavigation> navigations = cmsNavigationMapper.selectListAllRel(cmsNavigationParam);
               navigations.forEach(c -> {
                 cmsArticleParam.setCategoryId(c.getNavigationId());
-                System.out.println("c.getNavigationId() = " + c.getNavigationId());
                 c.setParentId(d.getNavigationId());
                 c.setTenantId(loginUser.getTenantId());
                 c.setUserId(loginUser.getUserId());
                 cmsNavigationService.save(c);
                 cmsNavigationService.saveAsync(c);
-                System.out.println("c2.getNavigationId() = " + c.getNavigationId());
                 // 复制子栏目文章
                 final List<CmsArticle> articles2 = cmsArticleMapper.selectListAllRel(cmsArticleParam);
                 articles2.forEach(a2 -> {
@@ -343,7 +341,7 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
     buildCompleteWebsiteInfo(website);
 
     // 处理过期时间
-    CmsWebsiteServiceImplHelper.processExpirationTime(website);
+//    CmsWebsiteServiceImplHelper.processExpirationTime(website);
 
     // 转换为VO对象
     CmsWebsiteVO websiteVO = CmsWebsiteServiceImplHelper.convertToVO(website);
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java
index 7dfa998..896efb3 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java
@@ -90,6 +90,32 @@ public class CmsWebsiteServiceImplHelper {
         return vo;
     }
 
+    /**
+     * 安全转换 target 字段为整数
+     * @param target 字符串类型的 target 值
+     * @return 对应的整数值
+     */
+    private static Integer convertTargetToInteger(String target) {
+        if (target == null) {
+            return 0; // 默认值：当前窗口
+        }
+
+        switch (target.toLowerCase()) {
+            case "_self":
+                return 0; // 当前窗口
+            case "_blank":
+                return 1; // 新窗口
+            default:
+                // 如果是数字字符串，尝试直接转换
+                try {
+                    return Integer.valueOf(target);
+                } catch (NumberFormatException e) {
+                    // 转换失败时返回默认值
+                    return 0;
+                }
+        }
+    }
+
     /**
      * 转换导航列表为VO
      */
@@ -109,7 +135,8 @@ public class CmsWebsiteServiceImplHelper {
             navVO.setSort(nav.getSortNumber()); // 修复：使用 sortNumber 字段
             navVO.setHide(nav.getHide());
             navVO.setTop(nav.getTop());
-            navVO.setTarget(Integer.valueOf(nav.getTarget()));
+            // 安全转换 target 字段：将字符串值映射为整数
+            navVO.setTarget(convertTargetToInteger(nav.getTarget()));
             navVO.setNavigationType(nav.getModel()); // 修复：使用 model 字段
 
             // 递归处理子导航