From 3d562bdc5a08ecc53b99972b600a3e20c2888265 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 18 Feb 2025 10:51:33 +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

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java   |  7 +++----
 .../industry/software/common/util/EleCommonUtil.java | 12 +++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 6305863..7fb3338 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -79,10 +79,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
 
     @PostConstruct
     public void init() {
-        String osName = System.getProperty("os.name").toLowerCase();
-        uploadDataDir = osName.startsWith("win") ? environment.getProperty("data.upload.windows.tmp.path") : environment.getProperty("data.upload.linux.tmp.path");
-        downloadDataDir = osName.startsWith("win") ? environment.getProperty("data.download.windows.tmp.path") : environment.getProperty("data.download.linux.tmp.path");
-        tmpDir = osName.startsWith("win") ? environment.getProperty("data.windows.tmp.path") : environment.getProperty("data.linux.tmp.path");
+        uploadDataDir = EleCommonUtil.isWinOs() ? environment.getProperty("data.upload.windows.tmp.path") : environment.getProperty("data.upload.linux.tmp.path");
+        downloadDataDir = EleCommonUtil.isWinOs() ? environment.getProperty("data.download.windows.tmp.path") : environment.getProperty("data.download.linux.tmp.path");
+        tmpDir = EleCommonUtil.isWinOs() ? environment.getProperty("data.windows.tmp.path") : environment.getProperty("data.linux.tmp.path");
     }
 
     /**
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 3fc5ba3..695fc25 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,6 +29,13 @@ 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("java", new TextParse());
+        PARSE_MAP.put("py", new TextParse());
+        PARSE_MAP.put("cpp", new TextParse());
+        PARSE_MAP.put("css", new TextParse());
+        PARSE_MAP.put("html", new TextParse());
+        PARSE_MAP.put("h", new TextParse());
         PARSE_MAP.put("pdf", new PdfParse());
     }
 
@@ -93,7 +100,10 @@ public final class EleCommonUtil {
 
     public static String parse(InputStream inputStream, String fileType) {
 
-        FileParse fileParse = PARSE_MAP.getOrDefault(fileType, new TextParse());
+        FileParse fileParse = PARSE_MAP.getOrDefault(fileType, null);
+        if (fileParse == null) {
+            return "";
+        }
         return fileParse.parseAllText(inputStream, fileType);
     }