diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 6edd810..f7a47c5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -82,8 +82,7 @@ public class CommonService { @PostConstruct public void init() { - String osName = System.getProperty("os.name").toLowerCase(); - eleDataPath = osName.startsWith("win") ? environment.getProperty("data.windows.path") : environment.getProperty("data.linux.path"); + eleDataPath = EleCommonUtil.isWinOs() ? environment.getProperty("data.windows.path") : environment.getProperty("data.linux.path"); } /** diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java index bb7340e..e8aae31 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java @@ -12,7 +12,6 @@ public class ExcelParse extends FileParse { @Override public String parseAllText(InputStream stream, String fileType) { String fileTmpPath = createFileTmpPath(fileType); - String res = ""; try { FileUtil.writeFromStream(stream, fileTmpPath); if (fileType.endsWith("xlsx")) { @@ -21,7 +20,10 @@ public class ExcelParse extends FileParse { return OfficeFileUtil.parseXlsAllText(fileTmpPath); } catch (Exception e) { log.error("解析{}格式的excel错误,具体为{}",fileType, e.getMessage(), e); + } finally { + FileUtil.del(fileTmpPath); } + return ""; } } diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java index 47f8ea8..8eeb2a1 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java @@ -18,6 +18,8 @@ public class PptParse extends FileParse { res = fileType.endsWith("pptx") ? OfficeFileUtil.parsePptxAllText(fileTmpPath) : OfficeFileUtil.parsePptAllText(fileTmpPath); } catch (Exception e) { log.error("解析{}格式的ppt错误,具体为{}",fileType, e.getMessage(), e); + } finally { + FileUtil.del(fileTmpPath); } return res; }