From c52d80c1230d7ff3cb1d462b707f25245c8a9d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= <admin@cxcp.com>
Date: Thu, 16 Apr 2026 11:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B0=B4=E5=8D=B0=E5=92=8C?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=20=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/main/resources/web/pdf.ftl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/src/main/resources/web/pdf.ftl b/server/src/main/resources/web/pdf.ftl
index 068ef8f1..39ca6e4c 100644
--- a/server/src/main/resources/web/pdf.ftl
+++ b/server/src/main/resources/web/pdf.ftl
@@ -53,15 +53,17 @@
         url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url)) + "&key=${kkkey}";
     }
     var viewerUrl = baseUrl + "pdfjs/web/viewer.html?file=" + encodeURIComponent(url);
+	var watermarkEncoded = encodeURIComponent('${watermarkTxt?js_string}');
+    var highlightEncoded = encodeURIComponent('${highlightall?js_string}');
     viewerUrl += "&disablepresentationmode=${pdfPresentationModeDisable}";
     viewerUrl += "&disableopenfile=${pdfOpenFileDisable}";
     viewerUrl += "&disableprint=${pdfPrintDisable}";
     viewerUrl += "&disabledownload=${pdfDownloadDisable}";
     viewerUrl += "&disablebookmark=${pdfBookmarkDisable}";
     viewerUrl += "&disableediting=${pdfDisableEditing}";
-    viewerUrl += "&pdfhighlightall=${highlightall}";
-    viewerUrl += "&watermarktxt=${watermarkTxt}";
-    viewerUrl += "#page=${page?js_string}"; 
+    viewerUrl += "&watermarktxt=" + watermarkEncoded;
+    viewerUrl += "&pdfhighlightall=" + highlightEncoded;
+    viewerUrl += "#page=${page}";   // ?c 确保数字不包含千位分隔符
 	viewerUrl += "&pagemode=thumbs";     
     var iframe = document.getElementById('pdfFrame');
     iframe.src = viewerUrl;