update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/htmltopdf/HtmlToPdfUtil.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/HtmlToPdfUtil.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.util.htmltopdf;
+package com.qmth.distributed.print.business.util;
 
 import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.enums.PageSizeEnum;
@@ -41,18 +41,12 @@ public class HtmlToPdfUtil {
         DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
         cmd.append(dictionaryConfig.sysDomain().getHtmlToPdfUrl());
         cmd.append(" ");
-        cmd.append(" --page-size ").append(pageSizeEnum.name()).append(" ");// 打A3
-//        cmd.append("  --margin-top 3cm ");
-//        cmd.append("  --page-size A4 ");// 打A4
-//        cmd.append("  --header-line");// 页眉下面的线
-//        cmd.append(" --header-center 这里是页眉这里是页眉这里是页眉这里是页眉 ");//页眉中间内容
-//        cmd.append("  --margin-top 3cm ");// 设置页面上边距 (default 10mm)
-//        //cmd.append(" --header-html  file:///" + "https://blog.csdn.net/x6582026/article/details/53835835");// (添加一个HTML页眉,后面是网址)
-//        cmd.append(" --header-spacing 5 ");// (设置页眉和内容的距离,默认0)
-//        cmd.append(" --footer-center 第[page]页／共[topage]页");//设置在中心位置的页脚内容
-//        //cmd.append(" --footer-html  file:///" + "https://blog.csdn.net/x6582026/article/details/53835835");// (添加一个HTML页脚,后面是网址)
-//        cmd.append(" --footer-line");// * 显示一条线在页脚内容上)
-//        cmd.append(" --footer-spacing 5 ");// (设置页脚和内容的距离)
+        cmd.append(" --page-size ").append(pageSizeEnum.name()).append(" ");
+        cmd.append("  --margin-top 0 ");
+        cmd.append("  --margin-bottom 0 ");
+        cmd.append("  --margin-left 0 ");
+        cmd.append("  --margin-right 0 ");
+
         cmd.append(srcPath);
         cmd.append(" ");
         cmd.append(destPath);
@@ -61,13 +55,12 @@ public class HtmlToPdfUtil {
         boolean result = true;
         try {
             Process proc = Runtime.getRuntime().exec(cmd.toString());
-            new HtmlToPdfInterceptor(proc.getErrorStream()).start();
-            new HtmlToPdfInterceptor(proc.getInputStream()).start();
             proc.waitFor();
         } catch (Exception e) {
             log.error("请求出错", e);
             result = false;
         }
+        log.info("proc result:{}", result);
         return result;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/HttpUtil.java

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.business.util;
 
-import com.qmth.distributed.print.business.util.htmltopdf.HtmlToPdfInterceptor;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/MergePdfUtil.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfUtil.java

@@ -17,8 +17,8 @@ import java.util.Objects;
  * @Author: wangliang
  * @Date: 2021/4/7
  */
-public class MergePdfUtil {
-    private final static Logger log = LoggerFactory.getLogger(MergePdfUtil.class);
+public class PdfUtil {
+    private final static Logger log = LoggerFactory.getLogger(PdfUtil.class);
 
     /**
      * 将多个PDF合并成一个PDF
@@ -26,7 +26,7 @@ public class MergePdfUtil {
      * @param files
      * @param outputPath
      */
-    public static void mergePDF(String[] files, String outputPath) {
+    public static void mergePdf(String[] files, String outputPath) {
         Document document = null;
         PdfCopy copy = null;
         PdfReader reader = null;
@@ -67,6 +67,6 @@ public class MergePdfUtil {
 ////                "/Users/king/Downloads/测试附件/101_148382537591291904_signAndSticker.pdf"
 //        };
 //        String outputPath = "/Users/king/Downloads/pdf/merge1.pdf";
-//        MergePdfUtil.mergePDF(files, outputPath);
+//        MergePdfUtil.mergePdf(files, outputPath);
 //    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/htmltopdf/HtmlToPdfInterceptor.java

@@ -1,54 +0,0 @@
-package com.qmth.distributed.print.business.util.htmltopdf;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Objects;
-
-/**
- * @Description: htmltopdf线程
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/7
- */
-public class HtmlToPdfInterceptor extends Thread {
-    private final static Logger log = LoggerFactory.getLogger(HtmlToPdfInterceptor.class);
-
-    private InputStream is;
-
-    public HtmlToPdfInterceptor(InputStream is) {
-        this.is = is;
-    }
-
-    @Override
-    public void run() {
-        BufferedReader br = null;
-        try {
-            InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
-            br = new BufferedReader(isr);
-            String line = null;
-            while ((line = br.readLine()) != null) {
-                log.info(line.toString()); //输出内容
-            }
-        } catch (IOException e) {
-            log.error("请求出错", e);
-        } finally {
-            try {
-                if (Objects.nonNull(is)) {
-                    is.close();
-                }
-                if (Objects.nonNull(br)) {
-                    br.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}