yuedefeng 6 年之前
父节点
当前提交
12a5ae4217
共有 4 个文件被更改,包括 8 次插入6 次删除
  1. 3 1
      README.md
  2. 二进制
      lib/AsposeWord.zip
  3. 二进制
      lib/aspose-words-15.12.0-jdk16.jar
  4. 5 5
      src/main/java/com/common/workflow/service/util/Word2Pdf.java

+ 3 - 1
README.md

@@ -96,6 +96,8 @@ docker中中文字体乱码的问题(添加宋体):
 COPY simsun.ttf /usr/share/fonts
 COPY simsun.ttf /usr/share/fonts
 
 
 mvn install:install-file -Dfile=aspose-cells-8.5.2.jar -DgroupId=com.aspose -DartifactId=aspose-cells -Dversion=8.5.2 -Dpackaging=jar
 mvn install:install-file -Dfile=aspose-cells-8.5.2.jar -DgroupId=com.aspose -DartifactId=aspose-cells -Dversion=8.5.2 -Dpackaging=jar
-mvn install:install-file -Dfile=aspose-words-16.8.0-jdk16.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=16.8.0 -Dpackaging=jar
+# mvn install:install-file -Dfile=aspose-words-16.8.0-jdk16.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=16.8.0 -Dpackaging=jar
+mvn install:install-file -Dfile=aspose-words-15.12.0-jdk16.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=15.12.0 -Dpackaging=jar
+
 
 
 mvn clean install -Pprod -Dmaven.test.skip=true
 mvn clean install -Pprod -Dmaven.test.skip=true

二进制
lib/AsposeWord.zip


二进制
lib/aspose-words-15.12.0-jdk16.jar


+ 5 - 5
src/main/java/com/common/workflow/service/util/Word2Pdf.java

@@ -72,9 +72,9 @@ public class Word2Pdf {
             //lo.setEncoding(Encoding.getUTF8());
             //lo.setEncoding(Encoding.getUTF8());
             Document doc = new Document(inputStream);// 原始excel路径
             Document doc = new Document(inputStream);// 原始excel路径
             removeWatermark(doc);
             removeWatermark(doc);
-            insertWatermarkText(doc, watermark, 0, 0);
-            insertWatermarkText(doc, watermark, 200, 0);
-            insertWatermarkText(doc, watermark, 400, 0);
+            insertWatermarkText(doc, watermark, 100, 0);
+            insertWatermarkText(doc, watermark, 300, 0);
+            insertWatermarkText(doc, watermark, 550, 0);
 
 
             /*PdfSaveOptions pdfSaveOptions = new PdfSaveOptions(SaveFormat.PDF);
             /*PdfSaveOptions pdfSaveOptions = new PdfSaveOptions(SaveFormat.PDF);
             pdfSaveOptions.setOnePagePerSheet(true);
             pdfSaveOptions.setOnePagePerSheet(true);
@@ -139,9 +139,9 @@ public class Word2Pdf {
         watermark.getTextPath().setText(watermarkText);
         watermark.getTextPath().setText(watermarkText);
         watermark.getTextPath().setFontFamily("宋体");
         watermark.getTextPath().setFontFamily("宋体");
         watermark.setWidth(500);
         watermark.setWidth(500);
-        watermark.setHeight(30);
+        watermark.setHeight(20);
         // Text will be directed from the bottom-left to the top-right corner.
         // Text will be directed from the bottom-left to the top-right corner.
-        watermark.setRotation(-40);
+        watermark.setRotation(-35);
         // Remove the following two lines if you need a solid black text.
         // Remove the following two lines if you need a solid black text.
         watermark.getFill().setColor(Color.lightGray); // Try LightGray to get more Word-style watermark
         watermark.getFill().setColor(Color.lightGray); // Try LightGray to get more Word-style watermark
         watermark.setStrokeColor(Color.lightGray); // Try LightGray to get more Word-style watermark
         watermark.setStrokeColor(Color.lightGray); // Try LightGray to get more Word-style watermark