From 8b2c0b39ac45a37bfcc2bb9aee094cca63dad87c Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 16 八月 2023 12:00:12 +0800
Subject: [PATCH] clear

---
 src/main/java/com/product/file/util/FileUtil.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/product/file/util/FileUtil.java b/src/main/java/com/product/file/util/FileUtil.java
index 33a326b..4e3e573 100644
--- a/src/main/java/com/product/file/util/FileUtil.java
+++ b/src/main/java/com/product/file/util/FileUtil.java
@@ -1,9 +1,8 @@
 package com.product.file.util;
 
 import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.poi.word.WordUtil;
 import com.aspose.words.Document;
+import com.aspose.words.SaveFormat;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.xwpf.NiceXWPFDocument;
 import com.google.common.collect.Maps;
@@ -13,10 +12,6 @@
 import com.product.file.config.CmnConst;
 import com.product.file.config.FileCode;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.text.WordUtils;
-import org.apache.log4j.Logger;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
 
 import java.io.*;
 import java.util.List;
@@ -34,8 +29,6 @@
  */
 @Slf4j
 public class FileUtil {
-	private static Properties properties;
-
 
 	private FileUtil() {
 	}
@@ -83,6 +76,9 @@
 	}
 
 	public static File toDocx(File file) {
+		if (!AsposeUtil.getLicense(2)) {
+			return file;
+		}
 		String docxName = UUID.randomUUID().toString() + ".docx";
 		File docxFile = new File(file.getParent() + File.separator + docxName);
 		String tempDir = Global.getSystemConfig("temp.dir", "./attachment/temp");
@@ -97,6 +93,24 @@
 		return docxFile;
 	}
 
+	public static File toDoc(File file) {
+		if (!AsposeUtil.getLicense(2)) {
+			return file;
+		}
+		String docxName = UUID.randomUUID().toString() + ".doc";
+		File docxFile = new File(file.getParent() + File.separator + docxName);
+		String tempDir = Global.getSystemConfig("temp.dir", "./attachment/temp");
+		File tempFile = new File(tempDir + File.separator + docxName);
+		try {
+			Document document = new Document(new FileInputStream(file));
+			document.save(tempFile.getAbsolutePath(), SaveFormat.DOC);
+			return tempFile;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return docxFile;
+	}
+
 	/**
 	 * 鎵归噺鎵撳寘
 	 *

--
Gitblit v1.9.2