1. 修复资源路径下读取不到字体问题

xsx · xsx · commit b74fd31585fa · 2021-08-12T16:35:59.000+08:00
2. 生成pdf时，根据传入路径，自动创建不存在的目录
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,5 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/target/
+/src/main/java/wiki/xsx/core/pdf/Test.java
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>wiki.xsx</groupId>
     <artifactId>x-easypdf</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
     <packaging>jar</packaging>
     <name>x-easypdf</name>
     <url>http://www.xsx.wiki</url>
@@ -55,19 +55,6 @@
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
@@ -128,6 +115,19 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfBaseLine.java b/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfBaseLine.java
@@ -198,6 +198,15 @@ public PDFont getFont() {
         return this.param.getFont();
     }
 
+    /**
+     * 获取线条宽度
+     * @return 返回线条宽度
+     */
+    @Override
+    public float getLineWidth() {
+        return this.param.getLineWidth();
+    }
+
     /**
      * 绘制
      * @param document pdf文档
diff --git a/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfDottedSplitLine.java b/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfDottedSplitLine.java
@@ -224,6 +224,15 @@ public PDFont getFont() {
         return this.param.getFont();
     }
 
+    /**
+     * 获取线条宽度
+     * @return 返回线条宽度
+     */
+    @Override
+    public float getLineWidth() {
+        return this.param.getLineWidth();
+    }
+
     /**
      * 绘制
      * @param document pdf文档
diff --git a/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfLine.java b/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfLine.java
@@ -78,4 +78,10 @@ public interface XEasyPdfLine extends XEasyPdfComponent {
      * @return 返回pdfBox字体
      */
     PDFont getFont();
+
+    /**
+     * 获取线条宽度
+     * @return 返回线条宽度
+     */
+    float getLineWidth();
 }
diff --git a/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfLineParam.java b/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfLineParam.java
@@ -38,6 +38,10 @@ class XEasyPdfLineParam {
      * 字体路径
      */
     private String fontPath;
+    /**
+     * 字体路径(资源路径)
+     */
+    private String fontPathForResource;
     /**
      * 字体
      */
diff --git a/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfSolidSplitLine.java b/src/main/java/wiki/xsx/core/pdf/component/line/XEasyPdfSolidSplitLine.java
@@ -197,6 +197,15 @@ public PDFont getFont() {
         return this.param.getFont();
     }
 
+    /**
+     * 获取线条宽度
+     * @return 返回线条宽度
+     */
+    @Override
+    public float getLineWidth() {
+        return this.param.getLineWidth();
+    }
+
     /**
      * 绘制
      * @param document pdf文档
diff --git a/src/main/java/wiki/xsx/core/pdf/component/table/XEasyPdfCell.java b/src/main/java/wiki/xsx/core/pdf/component/table/XEasyPdfCell.java
@@ -3,6 +3,7 @@
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import wiki.xsx.core.pdf.component.XEasyPdfComponent;
 import wiki.xsx.core.pdf.component.image.XEasyPdfImage;
+import wiki.xsx.core.pdf.component.line.XEasyPdfLine;
 import wiki.xsx.core.pdf.component.text.XEasyPdfText;
 import wiki.xsx.core.pdf.doc.XEasyPdfDocument;
 import wiki.xsx.core.pdf.handler.XEasyPdfHandler;
@@ -271,11 +272,17 @@ void doDraw(XEasyPdfDocument document, XEasyPdfPage page, XEasyPdfRow row) throw
             if (component instanceof XEasyPdfText) {
                 // 写入文本
                 this.writeText(document, page, row, (XEasyPdfText) component);
-                // 如果组件属于图片组件，则写入图片
-            }else if (component instanceof XEasyPdfImage) {
+            }
+            // 如果组件属于图片组件，则写入图片
+            else if (component instanceof XEasyPdfImage) {
                 // 写入图片
                 this.writeImage(document, page, row, (XEasyPdfImage) component);
             }
+            // 如果组件属于线条组件，则写入线条
+            else if (component instanceof XEasyPdfLine) {
+                // 写入线条
+                this.writeLine(document, page, row, (XEasyPdfLine) component);
+            }
             // TODO 后续有需要，再加入其他组件
         }
         // 重置为当前行X轴原始坐标
@@ -358,4 +365,21 @@ private void writeImage(XEasyPdfDocument document, XEasyPdfPage page, XEasyPdfRo
                     page.getParam().getPageY() - row.getParam().getMarginTop() - image.getMarginTop() - image.getHeight(document, page) - this.param.getBorderWidth() / 2
              ).draw(document, page);
     }
+
+    /**
+     * 写入分割线
+     * @param document pdf文档
+     * @param page pdf页面
+     * @param row pdf表格行
+     * @param line pdf线条
+     * @throws IOException IO异常
+     */
+    private void writeLine(XEasyPdfDocument document, XEasyPdfPage page, XEasyPdfRow row, XEasyPdfLine line) throws IOException {
+        line.setContentMode(this.param.getContentMode())
+                .setWidth(this.param.getWidth() - this.param.getBorderWidth() * 2)
+                .setPosition(
+                        row.getParam().getBeginX() + this.param.getBorderWidth() / 2,
+                        page.getParam().getPageY() - row.getParam().getMarginTop() - line.getLineWidth() - this.param.getBorderWidth() / 2
+                ).draw(document, page);
+    }
 }
diff --git a/src/main/java/wiki/xsx/core/pdf/component/text/XEasyPdfText.java b/src/main/java/wiki/xsx/core/pdf/component/text/XEasyPdfText.java
@@ -525,6 +525,11 @@ private void doDraw(XEasyPdfDocument document, XEasyPdfPage page) throws IOExcep
                 page.getParam().setPageY(this.param.getBeginY());
             }
         }
+        // 如果不允许页面重置定位，则进行重置
+        if (!page.getParam().isAllowResetPosition()) {
+            // 开启页面自动重置定位
+            page.enablePosition();
+        }
         // 完成标记
         this.param.setDraw(true);
     }
diff --git a/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocument.java b/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocument.java
@@ -1,11 +1,9 @@
 package wiki.xsx.core.pdf.doc;
 
-import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdfwriter.COSWriter;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
-import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
@@ -18,6 +16,7 @@
 import wiki.xsx.core.pdf.mark.XEasyPdfWatermark;
 import wiki.xsx.core.pdf.page.XEasyPdfPage;
 import wiki.xsx.core.pdf.page.XEasyPdfPageParam;
+import wiki.xsx.core.pdf.util.XEasyPdfFileUtil;
 import wiki.xsx.core.pdf.util.XEasyPdfFontUtil;
 
 import javax.print.PrintServiceLookup;
@@ -64,6 +63,7 @@ public class XEasyPdfDocument {
      * 无参构造
      */
     public XEasyPdfDocument() {
+        // 设置模板文档
         this.param.setSource(new PDDocument());
     }
 
@@ -438,7 +438,7 @@ public XEasyPdfDocumentExtractor extractor() {
      * @throws IOException IO异常
      */
     public XEasyPdfDocument save(String outputPath) throws IOException {
-        try (OutputStream outputStream = Files.newOutputStream(Paths.get(outputPath))) {
+        try (OutputStream outputStream = Files.newOutputStream(XEasyPdfFileUtil.createDirectories(Paths.get(outputPath)))) {
             return this.save(outputStream);
         }
     }
@@ -665,14 +665,6 @@ private void fillForm() throws IOException {
             PDAcroForm acroForm = this.getTarget().getDocumentCatalog().getAcroForm();
             // 如果pdfBox表单不为空，则进行填充
             if (acroForm!=null) {
-                // 定义pdfBox数据源
-                PDResources resources = new PDResources();
-                // 内置默认字体名称
-                final String defaultCosName = "AdobeSongStd-Light";
-                // 设置字体
-                resources.put(COSName.getPDFName(defaultCosName), this.getFont());
-                // 设置pdfBox表单默认的数据源
-                acroForm.setDefaultResources(resources);
                 // 获取表单字典键值集合
                 Set<Map.Entry<String, String>> entrySet = formMap.entrySet();
                 // 遍历表单字典
diff --git a/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentImager.java b/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentImager.java
@@ -4,6 +4,7 @@
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import wiki.xsx.core.pdf.component.image.XEasyPdfImageType;
+import wiki.xsx.core.pdf.util.XEasyPdfFileUtil;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -89,7 +90,7 @@ public XEasyPdfDocumentImager image(String outputPath, XEasyPdfImageType imageTy
             // 构建文件名称
             fileNameBuilder.append(outputPath).append(File.separator).append(prefix).append(i + 1).append('.').append(imageTypeName);
             // 获取输出流
-            try (OutputStream outputStream = Files.newOutputStream(Paths.get(fileNameBuilder.toString()))) {
+            try (OutputStream outputStream = Files.newOutputStream(XEasyPdfFileUtil.createDirectories(Paths.get(fileNameBuilder.toString())))) {
                 // 初始化pdfBox文档渲染器
                 PDFRenderer renderer = new PDFRenderer(this.document);
                 // 渲染图片
diff --git a/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentParam.java b/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentParam.java
@@ -5,9 +5,9 @@
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.font.PDFont;
+import wiki.xsx.core.pdf.component.image.XEasyPdfImage;
 import wiki.xsx.core.pdf.footer.XEasyPdfFooter;
 import wiki.xsx.core.pdf.header.XEasyPdfHeader;
-import wiki.xsx.core.pdf.component.image.XEasyPdfImage;
 import wiki.xsx.core.pdf.mark.XEasyPdfWatermark;
 import wiki.xsx.core.pdf.page.XEasyPdfPage;
 import wiki.xsx.core.pdf.util.XEasyPdfFontUtil;
diff --git a/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentSplitter.java b/src/main/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentSplitter.java
@@ -6,6 +6,7 @@
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 import wiki.xsx.core.pdf.util.XEasyPdfConvertUtil;
+import wiki.xsx.core.pdf.util.XEasyPdfFileUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -101,7 +102,7 @@ public XEasyPdfDocumentSplitter split(String outputPath, String prefix) throws I
                 // 构建文件名称
                 fileNameBuilder.append(outputPath).append(File.separator).append(prefix).append(i + 1).append(".pdf");
                 // 获取输出流
-                try(OutputStream outputStream = Files.newOutputStream(Paths.get(fileNameBuilder.toString()))) {
+                try(OutputStream outputStream = Files.newOutputStream(XEasyPdfFileUtil.createDirectories(Paths.get(fileNameBuilder.toString())))) {
                     // 拆分文档
                     this.split(outputStream, XEasyPdfConvertUtil.toInt(this.documentList.get(i)));
                 }
@@ -119,7 +120,7 @@ public XEasyPdfDocumentSplitter split(String outputPath, String prefix) throws I
                 // 构建文件名称
                 fileNameBuilder.append(outputPath).append(File.separator).append(prefix).append(index).append(".pdf");
                 // 获取输出流
-                try(OutputStream outputStream = Files.newOutputStream(Paths.get(fileNameBuilder.toString()))) {
+                try(OutputStream outputStream = Files.newOutputStream(XEasyPdfFileUtil.createDirectories(Paths.get(fileNameBuilder.toString())))) {
                     // 设置文档信息及保护策略
                     this.pdfDocument.setInfoAndPolicy(target);
                     // 保存文档
diff --git a/src/main/java/wiki/xsx/core/pdf/util/XEasyPdfFileUtil.java b/src/main/java/wiki/xsx/core/pdf/util/XEasyPdfFileUtil.java
@@ -0,0 +1,47 @@
+package wiki.xsx.core.pdf.util;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * 文件工具
+ * @author xsx
+ * @date 2021/7/14
+ * @since 1.8
+ * <p>
+ * Copyright (c) 2020 xsx All Rights Reserved.
+ * x-easypdf is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ * </p>
+ */
+public class XEasyPdfFileUtil {
+
+    /**
+     * 创建目录
+     * @param path 路径
+     * @return 返回路径
+     */
+    public static Path createDirectories(Path path) {
+        if (!Files.exists(path)) {
+            try {
+                Path directoryPath;
+                if (!Files.isDirectory(path)) {
+                    directoryPath = path.getParent();
+                }else {
+                    directoryPath = path;
+                }
+                Files.createDirectories(directoryPath);
+            } catch (IOException e) {
+                throw new RuntimeException("create directory fail");
+            }
+        }
+        return path;
+    }
+}
diff --git a/src/main/java/wiki/xsx/core/pdf/util/XEasyPdfFontUtil.java b/src/main/java/wiki/xsx/core/pdf/util/XEasyPdfFontUtil.java
diff --git a/src/test/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentTest.java b/src/test/java/wiki/xsx/core/pdf/doc/XEasyPdfDocumentTest.java
diff --git a/update/v2.3.3 b/update/v2.3.3

Original file line number	Diff line number	Diff line change
`@@ -525,6 +525,11 @@ private void doDraw(XEasyPdfDocument document, XEasyPdfPage page) throws IOExcep`
`525`	`525`	`page.getParam().setPageY(this.param.getBeginY());`
`526`	`526`	`}`
`527`	`527`	`}`
	`528`	`+ // 如果不允许页面重置定位，则进行重置`
	`529`	`+ if (!page.getParam().isAllowResetPosition()) {`
	`530`	`+ // 开启页面自动重置定位`
	`531`	`+ page.enablePosition();`
	`532`	`+ }`
`528`	`533`	`// 完成标记`
`529`	`534`	`this.param.setDraw(true);`
`530`	`535`	`}`