From 0ed60f5200b61f1b4bfbf6e55d4601da97f3613f Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 13 Feb 2026 11:48:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(printer):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E9=85=8D=E7=BD=AEURL=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将水印图片URL配置从列表类型改为字符串类型
- 使用Collections.singletonList包装单个URL为列表
- 简化了水印配置的构建过程
- 保持了原有的水印功能实现
- 优化了配置项的数据结构设计
---
 .../basic/service/printer/impl/PrinterServiceImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
index 362ca3ef..c555e5d6 100644
--- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
@@ -1084,8 +1084,8 @@ public class PrinterServiceImpl implements PrinterService {
 
         String scenicText = scenicConfig.getString("print_watermark_scenic_text", "");
         String dateFormat = scenicConfig.getString("print_watermark_dt_format", "yyyy.MM.dd");
-        List<String> printWatermarkPUrlList = scenicConfig.getList("print_watermark_p_url", String.class);
-        List<String> printWatermarkLUrlList = scenicConfig.getList("print_watermark_l_url", String.class);
+        String printWatermarkPUrl = scenicConfig.getString("print_watermark_p_url", null);
+        String printWatermarkLUrl = scenicConfig.getString("print_watermark_l_url", null);
 
         return WatermarkConfig.builder()
                 .watermarkType(watermarkType)
@@ -1096,8 +1096,8 @@ public class PrinterServiceImpl implements PrinterService {
                 .edgeEnabled(true)
                 .qrcodeFile(qrCodeFile)
                 .scale(scale)
-                .printWatermarkPUrlList(printWatermarkPUrlList)
-                .printWatermarkLUrlList(printWatermarkLUrlList)
+                .printWatermarkPUrlList(Collections.singletonList(printWatermarkPUrl))
+                .printWatermarkLUrlList(Collections.singletonList(printWatermarkLUrl))
                 .build();
     }