From ad1f32013ea9247df2cd3f2a0b41be75a15c5aee Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 20 Feb 2023 17:42:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E6=89=A7=E8=A1=8C=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=8A=B6=E6=80=81=E6=9C=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1023308 --user=赵勇 【接口测试】之前执行是stopped的接口，现在执行一直running https://www.tapd.cn/55049933/s/1338797
---
 .../main/java/io/metersphere/service/RemakeReportService.java   | 1 -
 .../src/main/java/io/metersphere/service/TestResultService.java | 2 +-
 .../src/components/environment/ApiEnvironmentConfig.vue         | 2 +-
 .../jmeter/src/main/java/io/metersphere/dto/ResultDTO.java      | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/service/RemakeReportService.java b/api-test/backend/src/main/java/io/metersphere/service/RemakeReportService.java
index 4bf9c4e890..371ae59737 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/RemakeReportService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/RemakeReportService.java
@@ -23,7 +23,6 @@ public class RemakeReportService {
             BeanUtils.copyBean(dto, request);
             dto.setQueueId(request.getQueueId());
             dto.setTestId(request.getTestId());
-            dto.setRemake(true);
             LoggerUtil.info("进入异常结果处理：" + dto.getRunMode() + " 整体处理完成", dto.getReportId());
             // 全局并发队列
             PoolExecBlockingQueueUtil.offer(dto.getReportId());
diff --git a/api-test/backend/src/main/java/io/metersphere/service/TestResultService.java b/api-test/backend/src/main/java/io/metersphere/service/TestResultService.java
index b9a5404915..f2825bd34b 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/TestResultService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/TestResultService.java
@@ -263,7 +263,7 @@ public class TestResultService {
                     sendTask(reportTask, dto.getTestId());
                 }
             }
-        } else if (apiRunModes.contains(dto.getRunMode()) && dto.isRemake()) {
+        } else if (apiRunModes.contains(dto.getRunMode())) {
             // 只处理RUNNING中的执行报告
             updateRunningResult(dto);
         }
diff --git a/framework/sdk-parent/frontend/src/components/environment/ApiEnvironmentConfig.vue b/framework/sdk-parent/frontend/src/components/environment/ApiEnvironmentConfig.vue
index 8f42f8db6c..09dac10c1a 100644
--- a/framework/sdk-parent/frontend/src/components/environment/ApiEnvironmentConfig.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/ApiEnvironmentConfig.vue
@@ -245,7 +245,6 @@ export default {
     },
     save() {
       this.$refs.environmentEdit.save();
-      this.$emit('saveRefresh');
     },
     close() {
       this.$emit('close');
@@ -266,6 +265,7 @@ export default {
     },
     refresh() {
       this.getEnvironments();
+      this.$emit('saveRefresh');
     },
   }
 }
diff --git a/framework/sdk-parent/jmeter/src/main/java/io/metersphere/dto/ResultDTO.java b/framework/sdk-parent/jmeter/src/main/java/io/metersphere/dto/ResultDTO.java
index 46b27064a4..5a3cac5076 100644
--- a/framework/sdk-parent/jmeter/src/main/java/io/metersphere/dto/ResultDTO.java
+++ b/framework/sdk-parent/jmeter/src/main/java/io/metersphere/dto/ResultDTO.java
@@ -17,7 +17,6 @@ public class ResultDTO {
     private String runType;
     private String console;
     private String runningDebugSampler;
-    private boolean isRemake;
     // 失败重试
     private boolean retryEnable;
     /**