From 2faa8533a2c83a03a7b5a5e388e2b2e6c08318dc Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 10 Jan 2023 10:52:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E8=B0=83=E6=95=B4=E5=8A=A0=E8=BD=BD=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BA=A4=E6=8D=A2?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1021754 --user=赵勇 【接口测试】接口定义-TEST-选择“测试”按钮下拉菜单“加载用例”页面后-再单击“确认”显示错误 https://www.tapd.cn/55049933/s/1324845
---
 .../components/case/EditApiCase.vue           | 60 ++++++++++++-------
 .../components/runtest/RunTestHTTPPage.vue    |  1 -
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/api-test/frontend/src/business/definition/components/case/EditApiCase.vue b/api-test/frontend/src/business/definition/components/case/EditApiCase.vue
index 26f00c2385..fc57686711 100644
--- a/api-test/frontend/src/business/definition/components/case/EditApiCase.vue
+++ b/api-test/frontend/src/business/definition/components/case/EditApiCase.vue
@@ -19,28 +19,30 @@
 
       <el-container>
         <el-main>
-          <div v-for="item in apiCaseList" :key="item.id ? item.id : item.uuid">
-            <api-case-item
-              :loading="(singleLoading && singleRunId === item.id) || batchLoadingIds.indexOf(item.id) > -1"
-              @refresh="refresh"
-              @refreshCaseList="refreshCaseList"
-              @singleRun="singleRun"
-              @stop="stop"
-              @refreshModule="refreshModule"
-              @copyCase="copyCase"
-              @showExecResult="showExecResult"
-              @showHistory="showHistory"
-              @reLoadCase="reLoadCase"
-              :environment="environment"
-              @setSelectedCaseId="setSelectedCaseId"
-              :is-case-edit="isCaseEdit"
-              :api="api"
-              :currentApi="currentApi"
-              :loaded="loaded"
-              :maintainerOptions="maintainerOptions"
-              :api-case="item"
-              ref="apiCaseItem" />
-          </div>
+          <fieldset :disabled="loaded">
+            <div v-for="item in apiCaseList" :key="item.id ? item.id : item.uuid">
+              <api-case-item
+                :loading="(singleLoading && singleRunId === item.id) || batchLoadingIds.indexOf(item.id) > -1"
+                @refresh="refresh"
+                @refreshCaseList="refreshCaseList"
+                @singleRun="singleRun"
+                @stop="stop"
+                @refreshModule="refreshModule"
+                @copyCase="copyCase"
+                @showExecResult="showExecResult"
+                @showHistory="showHistory"
+                @reLoadCase="reLoadCase"
+                :environment="environment"
+                @setSelectedCaseId="setSelectedCaseId"
+                :is-case-edit="isCaseEdit"
+                :api="api"
+                :currentApi="currentApi"
+                :loaded="loaded"
+                :maintainerOptions="maintainerOptions"
+                :api-case="item"
+                ref="apiCaseItem" />
+            </div>
+          </fieldset>
         </el-main>
       </el-container>
     </ms-drawer>
@@ -233,6 +235,9 @@ export default {
       this.selectCaseId = caseId;
     },
     saveCase(hideAlert) {
+      if (this.loaded) {
+        this.close();
+      }
       let index = 0;
       if (this.selectCaseId && this.selectCaseId !== '') {
         for (let i = 0; i < this.apiCaseList.length; i++) {
@@ -684,4 +689,15 @@ export default {
 .ms-drawer-case-header :deep(.ms-drawer-header) {
   margin-left: 0px;
 }
+fieldset {
+  padding: 0px;
+  margin: 0px;
+  min-width: 100%;
+  min-inline-size: 0px;
+  border: 0px;
+}
+
+.ms-fieldset .ms-step-tree-cell::-webkit-scrollbar {
+  width: 0 !important;
+}
 </style>
diff --git a/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue b/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue
index de15794c21..a7c7cf760f 100644
--- a/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue
+++ b/api-test/frontend/src/business/definition/components/runtest/RunTestHTTPPage.vue
@@ -114,7 +114,6 @@
 
 <script>
 import { citedApiScenarioCount, getDefinitionVersions, getMockEnvironment, updateDefinition } from '@/api/definition';
-import { getLastResultDetail } from '@/api/definition-report';
 import { relationGet, updateRuleRelation, versionEnableByProjectId } from '@/api/xpack';
 import MsApiRequestForm from '../request/http/ApiHttpRequestForm';
 import { hasLicense, hasPermission } from 'metersphere-frontend/src/utils/permission';

From 26936d760d3754b28fb0d8982b81d71f0e537eca Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 10 Jan 2023 10:34:48 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=B5=84=E6=BA=90=E6=B1=A0=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...vConfigUtil.java => ApiReportEnvConfigDTO.java} |  2 +-
 .../io/metersphere/api/jmeter/JMeterService.java   | 14 +++++++++-----
 .../io/metersphere/api/jmeter/MsDebugListener.java |  7 +++++++
 .../definition/ApiDefinitionEnvService.java        |  6 +++---
 .../service/definition/ApiDefinitionService.java   |  6 +++---
 5 files changed, 23 insertions(+), 12 deletions(-)
 rename api-test/backend/src/main/java/io/metersphere/api/dto/{ApiReportEnvConfigUtil.java => ApiReportEnvConfigDTO.java} (81%)

diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/ApiReportEnvConfigUtil.java b/api-test/backend/src/main/java/io/metersphere/api/dto/ApiReportEnvConfigDTO.java
similarity index 81%
rename from api-test/backend/src/main/java/io/metersphere/api/dto/ApiReportEnvConfigUtil.java
rename to api-test/backend/src/main/java/io/metersphere/api/dto/ApiReportEnvConfigDTO.java
index ed5b3aa5f1..a282ab3548 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/dto/ApiReportEnvConfigUtil.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/dto/ApiReportEnvConfigDTO.java
@@ -5,7 +5,7 @@ import lombok.Setter;
 
 @Setter
 @Getter
-public class ApiReportEnvConfigUtil {
+public class ApiReportEnvConfigDTO {
 
     private String envName;
 
diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
index 985dac54cd..a2d0f7250e 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
@@ -11,7 +11,10 @@ import io.metersphere.commons.config.KafkaConfig;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.ExtendedParameter;
 import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.*;
+import io.metersphere.commons.utils.FixedCapacityUtil;
+import io.metersphere.commons.utils.GenerateHashTreeUtil;
+import io.metersphere.commons.utils.HashTreeUtil;
+import io.metersphere.commons.utils.JSON;
 import io.metersphere.config.JmeterProperties;
 import io.metersphere.constants.BackendListenerConstants;
 import io.metersphere.constants.RunModeConstants;
@@ -21,9 +24,9 @@ import io.metersphere.dto.RunModeConfigDTO;
 import io.metersphere.engine.Engine;
 import io.metersphere.jmeter.JMeterBase;
 import io.metersphere.jmeter.LocalRunner;
+import io.metersphere.service.ApiPoolDebugService;
 import io.metersphere.service.RemakeReportService;
 import io.metersphere.utils.LoggerUtil;
-import io.metersphere.service.ApiPoolDebugService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -91,12 +94,13 @@ public class JMeterService {
      * @param testId
      * @param testPlan
      */
-    private void addDebugListener(String testId, HashTree testPlan) {
+    private void addDebugListener(String testId, HashTree testPlan, String runMode) {
         MsDebugListener resultCollector = new MsDebugListener();
         resultCollector.setName(testId);
         resultCollector.setProperty(TestElement.TEST_CLASS, MsDebugListener.class.getName());
         resultCollector.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("ViewResultsFullVisualizer"));
         resultCollector.setEnabled(true);
+        resultCollector.setRunMode(runMode);
 
         // 添加DEBUG标示
         HashTree test = ArrayUtils.isNotEmpty(testPlan.getArray()) ? testPlan.getTree(testPlan.getArray()[0]) : null;
@@ -127,12 +131,12 @@ public class JMeterService {
                 && request.getExtendedParameters().containsKey(ExtendedParameter.SYNC_STATUS)
                 && (Boolean) request.getExtendedParameters().get(ExtendedParameter.SYNC_STATUS)) {
             LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加Debug Listener");
-            addDebugListener(request.getReportId(), request.getHashTree());
+            addDebugListener(request.getReportId(), request.getHashTree(), request.getRunMode());
         }
 
         if (request.isDebug()) {
             LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加Debug Listener");
-            addDebugListener(request.getReportId(), request.getHashTree());
+            addDebugListener(request.getReportId(), request.getHashTree(), request.getRunMode());
         } else {
             LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加同步接收结果 Listener");
             JMeterBase.addBackendListener(request, request.getHashTree(), MsApiBackendListener.class.getCanonicalName());
diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
index 49a88805f1..7f233f1af9 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
@@ -54,6 +54,8 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
 
     public static final String TEST_END = "MS_TEST_END";
 
+    private String runMode;
+
     @Override
     public Object clone() {
         MsDebugListener clone = (MsDebugListener) super.clone();
@@ -64,6 +66,10 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
         return getPropertyAsBoolean(ERROR_LOGGING);
     }
 
+    public void setRunMode(String runMode) {
+        this.runMode = runMode;
+    }
+
     public final void setSuccessOnlyLogging(boolean value) {
         if (value) {
             setProperty(new BooleanProperty(SUCCESS_ONLY_LOGGING, true));
@@ -151,6 +157,7 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
                 dto.setExecEnd(false);
                 dto.setReportId("send." + this.getName());
                 dto.setToReport(this.getName());
+                dto.setRunMode(runMode);
 
                 String console = FixedCapacityUtil.getJmeterLogger(this.getName(), false);
                 ApiDefinitionEnvService apiDefinitionEnvService = CommonBeanFactory.getBean(ApiDefinitionEnvService.class);
diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionEnvService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionEnvService.java
index 7d5529e9ef..949490d940 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionEnvService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionEnvService.java
@@ -1,6 +1,6 @@
 package io.metersphere.service.definition;
 
-import io.metersphere.api.dto.ApiReportEnvConfigUtil;
+import io.metersphere.api.dto.ApiReportEnvConfigDTO;
 import io.metersphere.api.dto.MsgDTO;
 import io.metersphere.api.dto.RequestResultExpandDTO;
 import io.metersphere.base.domain.ApiDefinitionEnv;
@@ -80,7 +80,7 @@ public class ApiDefinitionEnvService {
         if (StringUtils.isNotBlank(baseResult.getThreadName())) {
             ApiDefinitionExecResultWithBLOBs result = apiDefinitionExecResultMapper.selectByPrimaryKey(baseResult.getThreadName());
             if (result != null && StringUtils.isNotEmpty(result.getEnvConfig())) {
-                ApiReportEnvConfigUtil envConfig = apiDefinitionService.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig());
+                ApiReportEnvConfigDTO envConfig = apiDefinitionService.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig());
                 if (envConfig != null) {
                     expandDTO.setEnvName(envConfig.getEnvName());
                     expandDTO.setPoolName(envConfig.getResourcePoolName());
@@ -93,7 +93,7 @@ public class ApiDefinitionEnvService {
         if (StringUtils.isNotBlank(dto.getToReport())) {
             ApiDefinitionExecResultWithBLOBs result = apiDefinitionExecResultMapper.selectByPrimaryKey(dto.getToReport());
             if (result != null && StringUtils.isNotEmpty(result.getEnvConfig())) {
-                ApiReportEnvConfigUtil envConfig = apiDefinitionService.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig());
+                ApiReportEnvConfigDTO envConfig = apiDefinitionService.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig());
                 if (envConfig != null) {
                     Map map = JSON.parseObject(dto.getContent().substring(7), Map.class);
                     map.put("envName", envConfig.getEnvName());
diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
index 4f76c21954..6ca0f67127 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
@@ -960,7 +960,7 @@ public class ApiDefinitionService {
             if (StringUtils.isNotBlank(contentStr)) {
                 JSONObject content = JSONUtil.parseObject(contentStr);
                 if (StringUtils.isNotEmpty(result.getEnvConfig())) {
-                    ApiReportEnvConfigUtil envNameByEnvConfig = this.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig());
+                    ApiReportEnvConfigDTO envNameByEnvConfig = this.getEnvNameByEnvConfig(result.getProjectId(), result.getEnvConfig());
                     if (envNameByEnvConfig != null) {
                         content.put("envName", envNameByEnvConfig.getEnvName());
                         content.put("poolName", envNameByEnvConfig.getResourcePoolName());
@@ -975,8 +975,8 @@ public class ApiDefinitionService {
         return reportResult;
     }
 
-    public ApiReportEnvConfigUtil getEnvNameByEnvConfig(String projectId, String envConfig) {
-        ApiReportEnvConfigUtil apiReportEnvConfig = new ApiReportEnvConfigUtil();
+    public ApiReportEnvConfigDTO getEnvNameByEnvConfig(String projectId, String envConfig) {
+        ApiReportEnvConfigDTO apiReportEnvConfig = new ApiReportEnvConfigDTO();
         RunModeConfigDTO runModeConfigDTO = null;
         try {
             runModeConfigDTO = JSON.parseObject(envConfig, RunModeConfigDTO.class);

From 1df1817063cd441469877475879f29190d8a5268 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 10 Jan 2023 11:48:35 +0800
Subject: [PATCH 3/6] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E4=BF=AE=E6=94=B9case=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/component/ApiResponseComponent.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api-test/frontend/src/business/automation/scenario/component/ApiResponseComponent.vue b/api-test/frontend/src/business/automation/scenario/component/ApiResponseComponent.vue
index ea9ec50e04..f32e3d83dd 100644
--- a/api-test/frontend/src/business/automation/scenario/component/ApiResponseComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/ApiResponseComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card class="api-component">
-    <div class="header" @click="active">
+    <div :class="[response && response.envName && response.poolName ? 'env-header' : 'header']" @click="active">
       <i class="icon el-icon-arrow-right" :class="{ 'is-active': isActive }" />
       <ms-request-metric :response="response" />
     </div>
@@ -94,6 +94,11 @@ export default {
 
 <style scoped>
 .header {
+  height: 30px;
+  line-height: 30px;
+}
+.env-header {
+  height: 60px;
   line-height: 30px;
 }
 

From 32d335c6fd304be0c026d909fb04928ad26d42ec Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 10 Jan 2023 13:18:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BA=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1021753 --user=赵勇 【项目设置】站内消息通知用户名显示错误 https://www.tapd.cn/55049933/s/1324990
---
 .../commons/constants/CommonConstants.java    |  3 ++
 .../ApiDefinitionExecResultService.java       | 40 +++++++++++--------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/commons/constants/CommonConstants.java b/api-test/backend/src/main/java/io/metersphere/commons/constants/CommonConstants.java
index ecdfecd3b0..c7b65fb0e1 100644
--- a/api-test/backend/src/main/java/io/metersphere/commons/constants/CommonConstants.java
+++ b/api-test/backend/src/main/java/io/metersphere/commons/constants/CommonConstants.java
@@ -11,4 +11,7 @@ public class CommonConstants {
     public static final String USER_ID = "userId";
     public static final String METHODS_KEY = "methods";
     public static final String CASE = "CASE";
+    public static final String USER = "user";
+    public static final String USER_NAME = "userName";
+
 }
diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java
index b79adefa28..ad44293ca5 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java
@@ -95,18 +95,7 @@ public class ApiDefinitionExecResultService {
                 if (result != null) {
                     result.setResourceId(dto.getTestId());
                     apiExecutionInfoService.insertExecutionInfo(result);
-                    User user = null;
-                    if (MapUtils.isNotEmpty(dto.getExtendedParameters())) {
-                        if (dto.getExtendedParameters().containsKey(CommonConstants.USER_ID) && dto.getExtendedParameters().containsKey("userName")) {
-                            user = new User() {{
-                                this.setId(dto.getExtendedParameters().get(CommonConstants.USER_ID).toString());
-                                this.setName(dto.getExtendedParameters().get("userName").toString());
-                            }};
-                            result.setUserId(user.getId());
-                        } else if (dto.getExtendedParameters().containsKey(CommonConstants.USER_ID)) {
-                            result.setUserId(dto.getExtendedParameters().get(CommonConstants.USER_ID).toString());
-                        }
-                    }
+                    User user = getUser(dto, result);
                     //如果是测试计划用例，更新接口用例的上次执行结果
                     TestPlanApiCase testPlanApiCase = testPlanApiCaseMapper.selectByPrimaryKey(dto.getTestId());
                     if (testPlanApiCase != null) {
@@ -147,10 +136,12 @@ public class ApiDefinitionExecResultService {
                             // 批量更新关联关系状态
                             batchEditStatus(dto.getRunMode(), result.getStatus(), result.getId(), dto.getTestId(), planApiCaseMapper, batchApiTestCaseMapper);
                         }
-                        if (result != null && !StringUtils.startsWithAny(dto.getRunMode(), "SCHEDULE")) {
-                            User user = null;
-                            if (MapUtils.isNotEmpty(dto.getExtendedParameters()) && dto.getExtendedParameters().containsKey("user") && dto.getExtendedParameters().get("user") instanceof User) {
-                                user = (User) dto.getExtendedParameters().get("user");
+                        if (result != null && !StringUtils.startsWithAny(dto.getRunMode(), NoticeConstants.Mode.SCHEDULE)) {
+                            User user = getUser(dto, result);
+                            if (MapUtils.isNotEmpty(dto.getExtendedParameters())
+                                    && dto.getExtendedParameters().containsKey(CommonConstants.USER)
+                                    && dto.getExtendedParameters().get(CommonConstants.USER) instanceof User) {
+                                user = (User) dto.getExtendedParameters().get(CommonConstants.USER);
                             }
                             // 发送通知
                             result.setResourceId(dto.getTestId());
@@ -166,6 +157,23 @@ public class ApiDefinitionExecResultService {
         }
     }
 
+    private User getUser(ResultDTO dto, ApiDefinitionExecResult result) {
+        User user = null;
+        if (MapUtils.isNotEmpty(dto.getExtendedParameters())) {
+            if (dto.getExtendedParameters().containsKey(CommonConstants.USER_ID)
+                    && dto.getExtendedParameters().containsKey(CommonConstants.USER_NAME)) {
+                user = new User() {{
+                    this.setId(dto.getExtendedParameters().get(CommonConstants.USER_ID).toString());
+                    this.setName(dto.getExtendedParameters().get(CommonConstants.USER_NAME).toString());
+                }};
+                result.setUserId(user.getId());
+            } else if (dto.getExtendedParameters().containsKey(CommonConstants.USER_ID)) {
+                result.setUserId(dto.getExtendedParameters().get(CommonConstants.USER_ID).toString());
+            }
+        }
+        return user;
+    }
+
     private void sendNotice(ApiDefinitionExecResult result, User user) {
         try {
             String resourceId = result.getResourceId();

From 3ec2579c7748db85c8e62ecc7427d340680f4f67 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 10 Jan 2023 15:01:55 +0800
Subject: [PATCH 5/6] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20WebSocket=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=BF=83=E8=B7=B3=E6=A3=80=E6=9F=A5=E9=98=B2=E6=AD=A2=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018491 --user=赵勇 【接口测试】github#18046，接口自动化，在导入的接口，配置“前置操作--等待控制器”时间设置为5分钟，“调试”接口最后没显示执行结果 https://www.tapd.cn/55049933/s/1325162
---
 .../io/metersphere/websocket/IndexWebSocket.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/websocket/IndexWebSocket.java b/api-test/backend/src/main/java/io/metersphere/websocket/IndexWebSocket.java
index 15b4419fb1..25f695d156 100644
--- a/api-test/backend/src/main/java/io/metersphere/websocket/IndexWebSocket.java
+++ b/api-test/backend/src/main/java/io/metersphere/websocket/IndexWebSocket.java
@@ -1,10 +1,11 @@
 package io.metersphere.websocket;
 
-import io.metersphere.commons.utils.JSON;
-import io.metersphere.utils.LoggerUtil;
 import io.metersphere.api.dto.MsgDTO;
+import io.metersphere.commons.utils.JSON;
 import io.metersphere.commons.utils.WebSocketUtil;
+import io.metersphere.utils.LoggerUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.websocket.*;
@@ -60,4 +61,12 @@ public class IndexWebSocket {
     public void onError(Session session, Throwable throwable) throws IOException {
         session.close();
     }
+
+    /**
+     * 每一分钟群发一次心跳检查
+     */
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void heartbeatCheck() {
+        WebSocketUtil.sendMessageAll("heartbeat check");
+    }
 }

From 713aa02f67945948d7d280ba5881091610be62bf Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 10 Jan 2023 15:48:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=9E=E9=99=85=E7=BB=93=E6=9E=9C=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=95=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1011022 --user=李玉号
调整测试计划实际结果的字数限制（将300调整为500）
https://www.tapd.cn/55049933/s/1325158

Closes #21156
---
 .../plan/view/comonents/functional/FunctionalTestCaseEdit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index 87a46b2549..a1b41010f5 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -301,9 +301,9 @@ export default {
         let result = {};
         result.actualResult = this.testCase.steptResults[i].actualResult;
         result.executeResult = this.testCase.steptResults[i].executeResult;
-        if (result.actualResult && result.actualResult.length > 300) {
+        if (result.actualResult && result.actualResult.length > 500) {
           this.$warning(this.$t('test_track.plan_view.actual_result')
-            + this.$t('test_track.length_less_than') + '300');
+            + this.$t('test_track.length_less_than') + '500');
           return;
         }
         if (result.executeResult === 'Failure' && this.testCase.status === 'Pass') {