Merge pull request liumapp#6 from niezhiliang/master

pdf编辑jar找不到字体目录bug修复

Author: liumapp

README.md

@@ -76,7 +76,7 @@ windows跟Mac同样可以在上述文章中拿到下载链接
 <dependency>
   <groupId>com.liumapp.workable.converter</groupId>
   <artifactId>workable-converter</artifactId>
-  <version>v1.2.0</version>
+  <version>v1.4.2</version>
 </dependency>
 ````
 * Gradle
@@ -320,6 +320,8 @@ itext7编辑pdf策略为TextConverter
 
 编辑pdf注意事项
 
+* 请在配置文件添加 com.liumapp.workable-converter=fontsPath: 字体文件目录，resources文件下有所需字体文件
+
 * 请确保输入源文件后缀为PDF，输出源文件后缀也为PDF
 
 * 编辑pdf参数需要new一个TextRequire来设置

data/txt2.pdf

@@ -4,7 +4,7 @@
 
   <groupId>com.liumapp.workable.converter</groupId>
   <artifactId>workable-converter</artifactId>
-  <version>v1.4.1</version>
+  <version>v1.4.2</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -195,20 +195,20 @@
           <stagingProgressTimeoutMinutes>20</stagingProgressTimeoutMinutes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.6</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+<!--      <plugin>-->
+<!--        <groupId>org.apache.maven.plugins</groupId>-->
+<!--        <artifactId>maven-gpg-plugin</artifactId>-->
+<!--        <version>1.6</version>-->
+<!--        <executions>-->
+<!--          <execution>-->
+<!--            <id>sign-artifacts</id>-->
+<!--            <phase>verify</phase>-->
+<!--            <goals>-->
+<!--              <goal>sign</goal>-->
+<!--            </goals>-->
+<!--          </execution>-->
+<!--        </executions>-->
+<!--      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>

pom.xml

@@ -5,9 +5,11 @@
 import com.liumapp.workable.converter.core.Converter;
 import com.liumapp.workable.converter.core.Parameter;
 import com.liumapp.workable.converter.decorators.CheckPrefixFormatDecorator;
+import com.liumapp.workable.converter.decorators.CheckingParamsForTextConverterDecorator;
 import com.liumapp.workable.converter.decorators.ConnectAndStartLocalLibreOfficeDecorator;
 import com.liumapp.workable.converter.exceptions.ConvertFailedException;
 import com.liumapp.workable.converter.factory.ConverterConfigManager;
+import com.liumapp.workable.converter.strategies.TextConverter;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -36,7 +38,12 @@ public WorkableConverter() {
      */
     @Override
     public boolean convert(Parameter require) throws ConvertFailedException {
-        Converter converter = new ConnectAndStartLocalLibreOfficeDecorator(new CheckPrefixFormatDecorator(converterType));
+        Converter converter;
+        if (converterType instanceof TextConverter) {
+            converter = new ConnectAndStartLocalLibreOfficeDecorator(new CheckPrefixFormatDecorator(new CheckingParamsForTextConverterDecorator(converterType)));
+        } else {
+            converter = new ConnectAndStartLocalLibreOfficeDecorator(new CheckPrefixFormatDecorator(converterType));
+        }
         return converter.convert(require);
     }
 }

src/main/java/com/liumapp/workable/converter/WorkableConverter.java

@@ -41,7 +41,8 @@ public ConverterConfig loadConfig(ConfigurationNode node) throws NullPointerExce
         ConverterConfig converterConfig = new ConverterConfig(
                 node.getNode("com", "liumapp", "workable-converter", "libreofficePath").getString(),
                 node.getNode("com", "liumapp", "workable-converter", "libreofficePort").getInt(),
-                node.getNode("com", "liumapp", "workable-converter", "tmpPath").getString()
+                node.getNode("com", "liumapp", "workable-converter", "tmpPath").getString(),
+                node.getNode("com","liumapp","workable-converter","fontsPath").getString()
         );
         return converterConfig;
     }

src/main/java/com/liumapp/workable/converter/config/BasicLoadingConfigService.java

@@ -13,4 +13,9 @@ public class TextRequire implements Parameter, Serializable {
      * pdf模板表单数据
      */
     private List<PdfEditDTO> pdfEditDTOList;
+
+    /**
+     * 字体文件路径
+     */
+    private String fontsPath;
 }

src/main/java/com/liumapp/workable/converter/config/TextRequire.java

@@ -0,0 +1,72 @@
+package com.liumapp.workable.converter.decorators;
+
+import com.liumapp.workable.converter.config.ConvertRequire;
+import com.liumapp.workable.converter.core.Converter;
+import com.liumapp.workable.converter.core.Parameter;
+import com.liumapp.workable.converter.exceptions.ConvertFailedException;
+import com.liumapp.workable.converter.factory.ConverterConfigManager;
+import com.liumapp.workable.converter.templates.ConverterStrategyTemplates;
+
+import java.io.IOException;
+
+/**
+ * file CheckingParamsForTextConverterDecorator.java
+ * author liumapp
+ * github https://github.com/liumapp
+ * email [email protected]
+ * homepage http://www.liumapp.com
+ * date 2019/5/9
+ */
+public class CheckingParamsForTextConverterDecorator extends ConverterStrategyTemplates {
+
+
+    public CheckingParamsForTextConverterDecorator(Converter converterStrategy) {
+        super(converterStrategy);
+    }
+
+    @Override
+    protected boolean accordingRequire(ConvertRequire require) throws ConvertFailedException {
+        return super.accordingRequire(require);
+    }
+
+    @Override
+    public boolean byFilePath(ConvertRequire require) throws ConvertFailedException {
+        return false;
+    }
+
+
+    @Override
+    public boolean byFileFolder(ConvertRequire require) throws ConvertFailedException {
+        return false;
+    }
+
+    @Override
+    public boolean byStream(ConvertRequire require) throws ConvertFailedException {
+        return false;
+    }
+
+    @Override
+    public boolean byBase64(ConvertRequire require) throws ConvertFailedException {
+        return false;
+    }
+
+    @Override
+    protected String saveTmpFileByBase64(String fileBase64, String prefix) throws IOException {
+        return super.saveTmpFileByBase64(fileBase64, prefix);
+    }
+
+    @Override
+    protected String saveTmpFileByBytes(byte[] fileBytes, String prefix) throws IOException {
+        return super.saveTmpFileByBytes(fileBytes, prefix);
+    }
+
+    @Override
+    public boolean convert(Parameter require) throws ConvertFailedException {
+        String ttfPath = ConverterConfigManager.getInstance().getParams().getFontPath();
+
+        if (ttfPath == null) {
+            throw new ConvertFailedException("fonts path must need");
+        }
+        return super.convert(require);
+    }
+}

src/main/java/com/liumapp/workable/converter/decorators/CheckingParamsForTextConverterDecorator.java

@@ -38,7 +38,7 @@ public boolean convert(Parameter require) throws ConvertFailedException {
     }
 
     @Override
-    protected boolean byFilePath (ConvertRequire require) throws ConvertFailedException {
+    public boolean byFilePath (ConvertRequire require) throws ConvertFailedException {
         logger.info("input file path is : " + require.getWaitingFilePath());
         logger.info("output file path is : " + require.getResultFilePath());
         File inputFile = new File(require.getWaitingFilePath());
@@ -54,12 +54,12 @@ protected boolean byFilePath (ConvertRequire require) throws ConvertFailedExcept
 
     // todo
     @Override
-    protected boolean byFileFolder(ConvertRequire require) throws ConvertFailedException {
+    public boolean byFileFolder(ConvertRequire require) throws ConvertFailedException {
         throw new ConvertFailedException("common converter do not support convert by file to folder pattern right now");
     }
 
     @Override
-    protected boolean byStream (ConvertRequire require) throws ConvertFailedException {
+    public boolean byStream (ConvertRequire require) throws ConvertFailedException {
         try {
             JodConverter.convert(require.getSrcStream()).as(require.getSrcFormat())
                     .to(require.getDestStream()).as(require.getDestFormat()).execute();
@@ -73,7 +73,7 @@ protected boolean byStream (ConvertRequire require) throws ConvertFailedExceptio
     }
 
     @Override
-    protected  boolean byBase64 (ConvertRequire require) throws ConvertFailedException {
+    public  boolean byBase64 (ConvertRequire require) throws ConvertFailedException {
         ByteArrayInputStream inputStream = null;
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         try {

src/main/java/com/liumapp/workable/converter/strategies/CommonConverter.java

@@ -33,13 +33,13 @@ protected boolean accordingRequire(ConvertRequire require) throws ConvertFailedE
         throw new ConvertFailedException("can not found convert patterns .");
     };
 
-    protected abstract boolean byFilePath (ConvertRequire require) throws ConvertFailedException;
+    public abstract boolean byFilePath (ConvertRequire require) throws ConvertFailedException;
 
-    protected abstract boolean byFileFolder (ConvertRequire require) throws ConvertFailedException;
+    public abstract boolean byFileFolder (ConvertRequire require) throws ConvertFailedException;
 
-    protected abstract boolean byStream (ConvertRequire require) throws ConvertFailedException;
+    public abstract boolean byStream (ConvertRequire require) throws ConvertFailedException;
 
-    protected abstract boolean byBase64 (ConvertRequire require) throws ConvertFailedException;
+    public abstract boolean byBase64 (ConvertRequire require) throws ConvertFailedException;
 
 
     protected String saveTmpFileByBase64 (String fileBase64, String prefix) throws IOException {

src/main/java/com/liumapp/workable/converter/strategies/ConverterStrategy.java

@@ -43,7 +43,7 @@ protected boolean accordingRequire(ConvertRequire require) throws ConvertFailedE
     }
 
     @Override
-    protected boolean byFilePath(ConvertRequire require) throws ConvertFailedException {
+    public boolean byFilePath(ConvertRequire require) throws ConvertFailedException {
         logger.info("get waiting convert file : " + require.getWaitingFilePath());
         logger.info("get result file path : " + require.getResultFilePath());
         File inputFile = new File(require.getWaitingFilePath());
@@ -57,17 +57,17 @@ protected boolean byFilePath(ConvertRequire require) throws ConvertFailedExcepti
     }
 
     @Override
-    protected boolean byFileFolder(ConvertRequire require) throws ConvertFailedException {
+    public boolean byFileFolder(ConvertRequire require) throws ConvertFailedException {
         return false;
     }
 
     @Override
-    protected boolean byStream(ConvertRequire require) throws ConvertFailedException {
+    public boolean byStream(ConvertRequire require) throws ConvertFailedException {
         return false;
     }
 
     @Override
-    protected boolean byBase64(ConvertRequire require) throws ConvertFailedException {
+    public boolean byBase64(ConvertRequire require) throws ConvertFailedException {
         return false;
     }
 }