水印修复

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/WatermarkUtil.java

@@ -10,10 +10,6 @@ import org.dromara.common.core.utils.file.watermark.processor.PdfWatermarkProces
 
 import java.awt.*;
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -70,7 +66,7 @@ public class WatermarkUtil {
         // 获取文件扩展名
         String extension = getFileExtension(path).toLowerCase();
         if (StringUtils.equals(extension, "pdf")) {
-            return watermarkText.codePoints().anyMatch(c -> Character.UnicodeScript.of(c) == Character.UnicodeScript.HAN) ? "SimHei" : "Arial";
+            return watermarkText.codePoints().anyMatch(c -> Character.UnicodeScript.of(c) == Character.UnicodeScript.HAN) ? "simhei" : "arial";
         } else {
             return "宋体";
         }
@@ -86,45 +82,13 @@ public class WatermarkUtil {
 
     public static void main(String[] args) {
 
-
-        // 示例：给图片添加水印
-        Path sourceImagePath = Paths.get("D:\\1.jpg");
-        Path targetImagePath = Paths.get("D:\\output.jpg");
-
-        // 配置水印参数
-        WatermarkConfig imageConfig = new WatermarkConfig.Builder()
-            .watermarkText("测试水印PDF")
-            .fontName(getFontName(sourceImagePath.toFile().getPath(), "测试水印PDF"))
-            .fontSize(30)
-            .color(Color.RED)
-            .alpha(0.5f)
-            .angle(30)
-            .build();
-
-        // 验证源文件是否存在
-        if (!Files.exists(sourceImagePath)) {
-            System.err.println("源文件不存在: " + sourceImagePath);
-            return;
-        }
-
-        // 确保目标目录存在
-        try {
-            Files.createDirectories(targetImagePath.getParent());
-        } catch (IOException e) {
-            System.err.println("无法创建目标目录: " + e.getMessage());
-            return;
-        }
-
-
-        addTextWatermark(sourceImagePath.toFile(), targetImagePath.toFile(), imageConfig);
-
         // 示例：给PDF添加水印
         File pdfFile = new File("C:\\Users\\wenhe\\Downloads\\安盛保险-卓越个人基础版.pdf");
         File pdfOutputFile = FileUtil.touch(FileUtils.addFolderBeforeFileName(pdfFile.getPath(), "watermark"));
         // 配置PDF水印参数
         WatermarkConfig pdfConfig = new WatermarkConfig.Builder()
-            .watermarkText("测试水印")
-            .fontName(getFontName(pdfFile.getPath(),"测试水印"))
+            .watermarkText("PDF")
+            .fontName(getFontName(pdfFile.getPath(),"PDF"))
             .fontSize(30)
             .color(Color.RED)
             .alpha(0.3f)

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/watermark/processor/PdfWatermarkProcessor.java

@@ -148,6 +148,6 @@ public class PdfWatermarkProcessor implements WatermarkProcessor {
             }
             return paths[0];
         }
-        return null;
+        return fontPath;
     }
 }