From a54a6225e98815bdaf3d04986029906b73e28b64 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Mon, 3 Nov 2025 14:45:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(portal):=20=E8=B0=83=E6=95=B4=E5=AF=86?=
 =?UTF-8?q?=E9=92=A5=E5=AD=97=E6=AE=B5=E7=9A=84JSON=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=8C=96=E8=A1=8C=E4=B8=BA=E5=B9=B6=E4=BC=98=E5=8C=96=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将密钥字段的注解从 @JsonIgnore 更改为 @JsonProperty(access = WRITE_ONLY)
- 在列表查询中统一隐藏密钥字段
- 在详情密钥字段，并查询中也隐藏保留原有文件地址隐藏逻辑
- 添加调试日志打印密钥值用于排查问题
- 注释掉不再使用的 Excel 导出密钥配置
---
 .../portal/controller/HwWebDocumentController.java    | 11 +++++++++--
 .../java/com/ruoyi/portal/domain/HwWebDocument.java   |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java
index a37c995..3236d02 100644
--- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java
+++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java
@@ -47,6 +47,8 @@ public class HwWebDocumentController extends BaseController
         startPage();
         List<HwWebDocument> list = hwWebDocumentService.selectHwWebDocumentList(hwWebDocument);
         for (HwWebDocument doc : list) {
+            // 隐藏密钥，若设置了密钥则隐藏文件地址
+            doc.setSecretKey(null);
             if (doc.getHasSecret()) {
                 doc.setDocumentAddress(null);
             }
@@ -75,8 +77,12 @@ public class HwWebDocumentController extends BaseController
     public AjaxResult getInfo(@PathVariable("documentId") String documentId)
     {
         HwWebDocument doc = hwWebDocumentService.selectHwWebDocumentByDocumentId(documentId);
-        if (doc != null && doc.getHasSecret()) {
-            doc.setDocumentAddress(null);
+        if (doc != null) {
+            // 隐藏密钥，若设置了密钥则隐藏文件地址
+            doc.setSecretKey(null);
+            if (doc.getHasSecret()) {
+                doc.setDocumentAddress(null);
+            }
         }
         return success(doc);
     }
@@ -100,6 +106,7 @@ public class HwWebDocumentController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody HwWebDocument hwWebDocument)
     {
+        System.out.println(hwWebDocument.getSecretKey());
         return toAjax(hwWebDocumentService.updateHwWebDocument(hwWebDocument));
     }
 
diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java
index fae5c1b..1368021 100644
--- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java
+++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java
@@ -4,7 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Hw资料文件对象 hw_web_document
@@ -32,8 +32,8 @@ public class HwWebDocument extends BaseEntity
     private String webCode;
 
     /** 密钥 */
-    @Excel(name = "密钥")
-    @JsonIgnore
+    // @Excel(name = "密钥")
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String secretKey;
 
     /** json */