From a7e5e29bd9771b9cc65cfe09d213c470bbe4166b Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 17 七月 2024 18:28:11 +0800
Subject: [PATCH] 添加pom版本号

---
 src/main/java/com/product/file/util/FileUtil.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/product/file/util/FileUtil.java b/src/main/java/com/product/file/util/FileUtil.java
index a7cdaa2..1b1e553 100644
--- a/src/main/java/com/product/file/util/FileUtil.java
+++ b/src/main/java/com/product/file/util/FileUtil.java
@@ -33,6 +33,43 @@
 	private FileUtil() {
 	}
 
+	public static String checkDocType(File file) {
+		try (FileInputStream fis = new FileInputStream(file)) {
+			byte[] bytes = new byte[8];
+			fis.read(bytes, 0, 8);
+
+			String hex = bytesToHex(bytes);
+
+			if (hex.contains("504B0304") && (file.getName().endsWith(".doc") || file.getName().endsWith(".docx"))) {
+				return "docx";
+			} else if (hex.contains("D0CF11E0") && (file.getName().endsWith(".doc") || file.getName().endsWith(".docx"))) {
+				//鍥犱负doc鏂囦欢鐨勫ご閮ㄤ篃鏄疍0CF11E0锛屾墍浠ラ渶瑕佸垽鏂枃浠跺悗缂�
+				return "doc";
+			}
+			//澧炲姞xls 鍜� xlsx鐨勫垽鏂�
+			else if (hex.contains("504B0304") && (file.getName().endsWith(".xls") || file.getName().endsWith(".xlsx"))) {
+				return "xlsx";
+			} else if (hex.contains("D0CF11E0") && (file.getName().endsWith(".xls") || file.getName().endsWith(".xlsx"))) {
+				//鍥犱负xls鏂囦欢鐨勫ご閮ㄤ篃鏄疍0CF11E0锛屾墍浠ラ渶瑕佸垽鏂枃浠跺悗缂�
+				return "xls";
+			} else {
+				return "unknown";
+			}
+		} catch (
+				IOException e) {
+			e.printStackTrace();
+			return "unknown";
+		}
+	}
+
+	private static String bytesToHex(byte[] bytes) {
+		StringBuilder hex = new StringBuilder();
+		for (byte b : bytes) {
+			hex.append(String.format("%02X", b));
+		}
+		return hex.toString();
+	}
+
 	/**
 	 * 鍚堝苟word鏂囨。
 	 *
@@ -41,16 +78,13 @@
 	 * @return
 	 */
 	public static File mergeFile(File source, File target) throws Exception {
-		//鍒ゆ柇鏂囦欢鏄惁涓� docx鎴杁oc鏍煎紡
-		if (!source.getName().endsWith(".docx") && !source.getName().endsWith(".doc")) {
-			throw new BaseException(FileCode.ADD_FILE_NOT_ALLOWED);
-		}
-		//濡傛灉鏄痙oc鏍煎紡鍒欒浆鎹负docx鏍煎紡
-		if (source.getName().endsWith(".doc")) {
+		if ("doc".equals(FileUtil.checkDocType(source))) {
 			source = toDocx(source);
 		}
-		if (target.getName().endsWith(".doc")) {
+		boolean delTarget = false;
+		if ("doc".equals(FileUtil.checkDocType(target))) {
 			target = toDocx(target);
+			delTarget = true;
 		}
 		XWPFTemplate template = XWPFTemplate.compile(source);
 		NiceXWPFDocument xwpfDocument = template.getXWPFDocument();
@@ -65,6 +99,9 @@
 			} catch (IOException e) {
 				throw e;
 			} finally {
+				if (delTarget) {
+					target.delete();
+				}
 				newDoc.close();
 				sub.close();
 			}
@@ -83,8 +120,9 @@
 		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));
+
+		try (FileInputStream is = new FileInputStream(file);) {
+			Document document = new Document(is);
 			document.save(tempFile.getAbsolutePath(), com.aspose.words.SaveFormat.DOCX);
 			return tempFile;
 		} catch (Exception e) {

--
Gitblit v1.9.2