From b2a63e4f18951e21cd6f0bd3fa754b9e61dcdd4a Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 20 Jan 2025 17:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industry/software/common/parse/PdfParse.java            | 5 ++++-
 .../industry/software/common/parse/WordParse.java           | 6 ++++--
 .../industry/software/common/util/EleCommonUtil.java        | 2 --
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java
index c9e92bb..95cbed5 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java
@@ -1,5 +1,6 @@
 package com.electromagnetic.industry.software.common.parse;
 
+import cn.hutool.core.io.FileUtil;
 import com.electromagnetic.industry.software.common.util.OfficeFileUtil;
 import lombok.extern.slf4j.Slf4j;
 
@@ -10,11 +11,13 @@ public class PdfParse extends FileParse {
     @Override
     public String parseContent(InputStream stream, String fileType) {
         String res = "";
+        String fileTmpPath = createFileTmpPath(fileType);
         try {
-            String fileTmpPath = createFileTmpPath(fileType);
             res = OfficeFileUtil.parsePdf(fileTmpPath);
         } catch (Exception e) {
             log.error("解析pdf文件失败{}", e.getMessage(), e);
+        } finally {
+            FileUtil.del(fileTmpPath);
         }
         return res;
     }
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java
index 76191e3..d9aa1df 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java
@@ -16,12 +16,14 @@ public class WordParse extends FileParse {
         try {
             FileUtil.writeFromStream(stream, fileTmpPath);
             if (fileType.endsWith("docx")) {
-                return OfficeFileUtil.parseDocx(fileTmpPath);
+                res = OfficeFileUtil.parseDocx(fileTmpPath);
             } else {
-                return OfficeFileUtil.parseDoc(fileTmpPath);
+                res = OfficeFileUtil.parseDoc(fileTmpPath);
             }
         } catch (Exception e) {
             log.info("解析{}失败，原因{}", fileType, e.getMessage(), e);
+        } finally {
+            FileUtil.del(fileTmpPath);
         }
         return res;
     }
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
index 8aeb340..7f22392 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
@@ -29,8 +29,6 @@ public final class EleCommonUtil {
         PARSE_MAP.put("ppt", new PptParse());
         PARSE_MAP.put("pptx", new PptParse());
         PARSE_MAP.put("text", new TextParse());
-        PARSE_MAP.put("txt", new TextParse());
-        PARSE_MAP.put("py", new TextParse());
     }
 
     // 正则表达式模式，匹配中文字符、下划线、连字符、加号、数字和英文字符