Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

admin-convert-pdf/pom.xml

@@ -35,6 +35,7 @@
             <artifactId>aspose-words</artifactId>
             <version>18.10</version>
             <classifier>jdk16</classifier>
+            <systemPath></systemPath>
         </dependency>
         <dependency>
             <groupId>com.aspose</groupId>

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 = "<License><Data><Products><Product>Aspose.Total for Java</Product><Product>Aspose.Words for Java</Product></Products><EditionType>Enterprise</EditionType><SubscriptionExpiry>20991231</SubscriptionExpiry><LicenseExpiry>20991231</LicenseExpiry><SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber></Data><Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature></License>";
+            String s = "<License>\n" +
+                    "  <Data>\n" +
+                    "    <Products>\n" +
+                    "      <Product>Aspose.Total for Java</Product>\n" +
+                    "      <Product>Aspose.Words for Java</Product>\n" +
+                    "    </Products>\n" +
+                    "    <EditionType>Enterprise</EditionType>\n" +
+                    "    <SubscriptionExpiry>20991231</SubscriptionExpiry>\n" +
+                    "    <LicenseExpiry>20991231</LicenseExpiry>\n" +
+                    "    <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>\n" +
+                    "  </Data>\n" +
+                    "  <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>\n" +
+                    "</License>";
             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);

web/pom.xml

@@ -21,10 +21,10 @@
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.ibeetl</groupId>
-			<artifactId>admin-convert-pdf</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.ibeetl</groupId>-->
+<!--			<artifactId>admin-convert-pdf</artifactId>-->
+<!--		</dependency>-->
 		<!-- admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
 		<dependency>
 			<groupId>com.ibeetl</groupId>

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();