From 252e52d316c124a8756734ba2143ffa35b5cc94f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 17 Sep 2020 11:35:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5xmind=20=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=9D=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/service/TestCaseService.java     | 2 +-
 .../main/java/io/metersphere/xmind/XmindToTestCaseParser.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 6914a0ac14..e4642010c8 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -255,7 +255,7 @@ public class TestCaseService {
                 String processLog = new XmindToTestCaseParser(this, userId, projectId, testCaseNames).importXmind(multipartFile);
                 if (!StringUtils.isEmpty(processLog)) {
                     excelResponse.setSuccess(false);
-                    ExcelErrData excelErrData = new ExcelErrData(null, 1, processLog);
+                    ExcelErrData excelErrData = new ExcelErrData(null, 1, Translator.get("upload_fail")+"："+ processLog);
                     errList.add(excelErrData);
                     excelResponse.setErrList(errList);
                 } else {
diff --git a/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java
index 20ab965405..c6987dd289 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java
@@ -222,7 +222,10 @@ public class XmindToTestCaseParser {
         StringBuffer processBuffer = new StringBuffer();
         try {
             File file = multipartFileToFile(multipartFile);
+            if (file == null || !file.exists())
+                return Translator.get("incorrect_format");
             JsonRootBean root = XmindParser.parseObject(file);
+            file.delete();
             if (root != null && root.getRootTopic() != null && root.getRootTopic().getChildren() != null) {
                 // 判断是模块还是用例
                 root.getRootTopic().getChildren().getAttached().forEach(item -> {