From dffcec437fd95727867192bef825617f65d027ce Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 19 二月 2024 11:20:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java
index 008f287..f84d8e1 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java
@@ -62,23 +62,23 @@
         //添加水印
         pdfDocument.addEventHandler(PdfDocumentEvent.END_PAGE, new WaterMarkEventHandler(waterMark));
 
-//        //添加页码
-//        //pdfDocument.addEventHandler(PdfDocumentEvent.END_PAGE,new PageEventHandler());
-//        //添加中文字体支持
-//        ConverterProperties properties = new ConverterProperties();
-//        FontProvider fontProvider = new FontProvider();
-//
-//        PdfFont sysFont = PdfFontFactory.createFont("STSongStd-Light", "UniGB-UCS2-H", false);
-//        fontProvider.addFont(sysFont.getFontProgram(), "UniGB-UCS2-H");
-//
-//        //添加自定义字体,例如微软雅黑
-//        /*if (StringUtils.isNotBlank(fontPath)){
-//            PdfFont microsoft = PdfFontFactory.createFont(fontPath, PdfEncodings.IDENTITY_H, false);
-//            fontProvider.addFont(microsoft.getFontProgram(), PdfEncodings.IDENTITY_H);
-//        }*/
-//
-//        properties.setFontProvider(fontProvider);
-        HtmlConverter.convertToPdf(htmlStream, pdfDocument);
+        //添加页码
+        //pdfDocument.addEventHandler(PdfDocumentEvent.END_PAGE,new PageEventHandler());
+        //添加中文字体支持
+        ConverterProperties properties = new ConverterProperties();
+        FontProvider fontProvider = new FontProvider();
+
+        PdfFont sysFont = PdfFontFactory.createFont("STSongStd-Light", "UniGB-UCS2-H", false);
+        fontProvider.addFont(sysFont.getFontProgram(), "UniGB-UCS2-H");
+
+        //添加自定义字体,例如微软雅黑
+        /*if (StringUtils.isNotBlank(fontPath)){
+            PdfFont microsoft = PdfFontFactory.createFont(fontPath, PdfEncodings.IDENTITY_H, false);
+            fontProvider.addFont(microsoft.getFontProgram(), PdfEncodings.IDENTITY_H);
+        }*/
+
+        properties.setFontProvider(fontProvider);
+        HtmlConverter.convertToPdf(htmlStream, pdfDocument, properties);
 
         pdfWriter.close();
         pdfDocument.close();

--
Gitblit v1.7.1