diff --git a/admin-convert-pdf/pom.xml b/admin-convert-pdf/pom.xml index d1d8568f..10cff4f4 100644 --- a/admin-convert-pdf/pom.xml +++ b/admin-convert-pdf/pom.xml @@ -35,6 +35,7 @@ aspose-words 18.10 jdk16 + com.aspose diff --git a/admin-convert-pdf/src/main/java/util/convertPDF/PDFConverUtil.java b/admin-convert-pdf/src/main/java/util/convertPDF/PDFConverUtil.java index 9e008136..6462496f 100644 --- a/admin-convert-pdf/src/main/java/util/convertPDF/PDFConverUtil.java +++ b/admin-convert-pdf/src/main/java/util/convertPDF/PDFConverUtil.java @@ -145,7 +145,19 @@ public final class PDFConverUtil { public static boolean getLicense() { boolean result = false; try { - String s = "Aspose.Total for JavaAspose.Words for JavaEnterprise20991231209912318bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU="; + String s = "\n" + + " \n" + + " \n" + + " Aspose.Total for Java\n" + + " Aspose.Words for Java\n" + + " \n" + + " Enterprise\n" + + " 20991231\n" + + " 20991231\n" + + " 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7\n" + + " \n" + + " sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=\n" + + ""; ByteArrayInputStream is = new ByteArrayInputStream(s.getBytes()); License aposeLic = new License(); aposeLic.setLicense(is); @@ -402,7 +414,7 @@ public final class PDFConverUtil { */ public static boolean convertToPDFByFileNameSuffix(String fileName, InputStream inputStream, OutputStream outputStream) { - String fileSuffix = getFileSuffix(fileName); + String fileSuffix = getFileSuffix(fileName).toUpperCase(); if (types.get(WORD).contains(fileSuffix)) { return wordToPdfByAspose(inputStream, outputStream); diff --git a/web/pom.xml b/web/pom.xml index b70f5188..f2935869 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -21,10 +21,10 @@ com.ibeetl admin-core - - com.ibeetl - admin-convert-pdf - + + + + com.ibeetl diff --git a/web/src/main/java/com/ibeetl/jlw/web/TempFileController.java b/web/src/main/java/com/ibeetl/jlw/web/TempFileController.java index a429fe3c..05c6fca9 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TempFileController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TempFileController.java @@ -1,17 +1,13 @@ package com.ibeetl.jlw.web; -import cn.hutool.core.io.FileUtil; import cn.jlw.Interceptor.RFile; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.FileEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; -import util.convertPDF.PDFConverUtil; -import java.io.BufferedInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -80,12 +76,12 @@ public class TempFileController { //fileEntity.moveTo("D://"); //相对路径 //fileEntity.moveTo("/image"); - if (null != fileEntity) { - String absoluteUrl = fileEntity.getAbsoluteUrl(); - BufferedInputStream inputStream = FileUtil.getInputStream(absoluteUrl); - FileOutputStream outputStream = new FileOutputStream(absoluteUrl.replaceAll("\\.[^\\.]+", ".pdf")); - PDFConverUtil.convertToPDFByFileNameSuffix(absoluteUrl, inputStream, outputStream); - } +// if (null != fileEntity) { +// String absoluteUrl = fileEntity.getAbsoluteUrl(); +// BufferedInputStream inputStream = FileUtil.getInputStream(absoluteUrl); +// FileOutputStream outputStream = new FileOutputStream(absoluteUrl.replaceAll("\\.[^\\.]+", ".pdf")); +// PDFConverUtil.convertToPDFByFileNameSuffix(absoluteUrl, inputStream, outputStream); +// } return JsonResult.success(fileEntity); //return JsonResult.success();