fix(接口自动化): 修复调试执行结果丢包问题，日志排查DEBUG

backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java

@@ -70,7 +70,6 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
     public void teardownTest(BackendListenerContext context) throws Exception {
         TestResult testResult = new TestResult();
         testResult.setTestId(testId);
-        testResult.setConsole(resultService.getJmeterLogger(testId, true));
         testResult.setTotal(0);
         // 一个脚本里可能包含多个场景(ThreadGroup)，所以要区分开，key: 场景Id
         final Map<String, ScenarioResult> scenarios = new LinkedHashMap<>();
@@ -87,6 +86,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         super.teardownTest(context);
         testResult.getScenarios().addAll(scenarios.values());
         testResult.getScenarios().sort(Comparator.comparing(ScenarioResult::getId));
+        testResult.setConsole(resultService.getJmeterLogger(testId, true));
         testResultService.saveResult(testResult, this.runMode, this.debugReportId, this.testId);
     }
 

backend/src/main/java/io/metersphere/api/jmeter/JmeterLoggerAppender.java

@@ -17,15 +17,17 @@ public class JmeterLoggerAppender extends UnsynchronizedAppenderBase<ILoggingEve
             if (logger == null) {
                 logger = new LinkedHashMap<>();
             }
-            StringBuffer message = new StringBuffer();
+            if (!event.getLevel().levelStr.equals(LogUtil.DEBUG)) {
-            message.append(DateUtils.getTimeStr(event.getTimeStamp())).append(" ")
+                StringBuffer message = new StringBuffer();
-                    .append(event.getLevel()).append(" ")
+                message.append(DateUtils.getTimeStr(event.getTimeStamp())).append(" ")
-                    .append(event.getThreadName()).append(" ")
+                        .append(event.getLevel()).append(" ")
-                    .append(event.getFormattedMessage()).append("\n");
+                        .append(event.getThreadName()).append(" ")
-            if (logger.containsKey(event.getTimeStamp())) {
+                        .append(event.getFormattedMessage()).append("\n");
-                logger.get(event.getTimeStamp()).append(message);
+                if (logger.containsKey(event.getTimeStamp())) {
-            } else {
+                    logger.get(event.getTimeStamp()).append(message);
-                logger.put(event.getTimeStamp(), message);
+                } else {
+                    logger.put(event.getTimeStamp(), message);
+                }
             }
         } catch (Exception e) {
             LogUtil.error(e);

backend/src/main/java/io/metersphere/api/service/MsResultService.java

@@ -13,15 +13,14 @@ import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Service;
 import sun.security.util.Cache;
 
-import java.util.Comparator;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
 public class MsResultService {
     // 零时存放实时结果
     private Cache cache = Cache.newHardMemoryCache(0, 3600 * 2);
+    private Map<String, List<SampleResult>> processCache = new HashMap<>();
 
     private final static String THREAD_SPLIT = " ";
 
@@ -34,29 +33,59 @@ public class MsResultService {
         return null;
     }
 
+    public List<SampleResult> procResult(String key) {
+        if (this.processCache.get(key) != null) {
+            return this.processCache.get(key);
+        }
+        return new LinkedList<>();
+    }
+
     public void setCache(String key, SampleResult result) {
         if (key.startsWith("[") && key.endsWith("]")) {
             key = JSON.parseArray(key).get(0).toString();
         }
-        TestResult testResult = this.getResult(key);
+        List<SampleResult> testResult = this.procResult(key);
+        testResult.add(result);
+        this.processCache.put(key, testResult);
+    }
+
+    public TestResult sysnSampleResult(String key) {
+        if (key.startsWith("[") && key.endsWith("]")) {
+            key = JSON.parseArray(key).get(0).toString();
+        }
+        String logs = getJmeterLogger(key, false);
+        List<SampleResult> results = this.processCache.get(key);
+        boolean isRemove = false;
+        TestResult testResult = (TestResult) cache.get(key);
         if (testResult == null) {
             testResult = new TestResult();
         }
-        if (result.getResponseCode().equals(MsResultCollector.TEST_END)) {
+        if (CollectionUtils.isNotEmpty(results)) {
-            testResult.setEnd(true);
+            final Map<String, ScenarioResult> scenarios = new LinkedHashMap<>();
+            for (SampleResult result : results) {
+                if (result.getResponseCode().equals(MsResultCollector.TEST_END)) {
+                    testResult.setEnd(true);
+                    this.cache.put(key, testResult);
+                    isRemove = true;
+                    break;
+                }
+                testResult.setTestId(key);
+                if (StringUtils.isNotEmpty(logs)) {
+                    testResult.setConsole(logs);
+                }
+                testResult.setTotal(0);
+                this.formatTestResult(testResult, scenarios, result);
+            }
+            testResult.getScenarios().clear();
+            testResult.getScenarios().addAll(scenarios.values());
+            testResult.getScenarios().sort(Comparator.comparing(ScenarioResult::getId));
             this.cache.put(key, testResult);
-            return;
+
+            if (isRemove) {
+                this.processCache.remove(key);
+            }
         }
-        testResult.setTestId(key);
+        return (TestResult) cache.get(key);
-        testResult.setConsole(getJmeterLogger(key, false));
-        testResult.setTotal(0);
-        final Map<String, ScenarioResult> scenarios = new LinkedHashMap<>();
-
-        this.formatTestResult(testResult, scenarios, result);
-
-        testResult.getScenarios().addAll(scenarios.values());
-        testResult.getScenarios().sort(Comparator.comparing(ScenarioResult::getId));
-        this.cache.put(key, testResult);
     }
 
     public void delete(String testId) {
@@ -88,7 +117,6 @@ public class MsResultService {
             scenarioResult.addError(result.getErrorCount());
             testResult.addError(result.getErrorCount());
         }
-
         RequestResult requestResult = this.getRequestResult(result);
         scenarioResult.getRequestResults().add(requestResult);
         scenarioResult.addResponseTime(result.getTime());
@@ -114,6 +142,12 @@ public class MsResultService {
                 .filter(map -> map.getKey() > finalStartTime && map.getKey() < endTime)
                 .map(map -> map.getValue()).collect(Collectors.joining());
         if (removed) {
+            if (processCache.get(testId) != null) {
+                try {
+                    Thread.sleep(2000);
+                } catch (Exception e) {
+                }
+            }
             FixedTask.tasks.remove(testId);
         }
         if (FixedTask.tasks.isEmpty()) {

backend/src/main/java/io/metersphere/websocket/ScenarioReportWebSocket.java

@@ -88,7 +88,7 @@ public class ScenarioReportWebSocket {
         @Override
         public void run() {
             try {
-                TestResult report = resultService.getResult(reportId);
+                TestResult report = resultService.sysnSampleResult(reportId);
                 if (!session.isOpen()) {
                     return;
                 }

backend/src/main/java/io/metersphere/websocket/TaskCenterWebSocket.java

@@ -31,7 +31,7 @@ public class TaskCenterWebSocket {
     public void onOpen(@PathParam("projectId") String projectId, Session session) {
         Timer timer = new Timer(true);
         TaskCenterWebSocket.TaskCenter task = new TaskCenterWebSocket.TaskCenter(session, projectId);
-        timer.schedule(task, 0, 6 * 1000);
+        timer.schedule(task, 0, 10 * 1000);
         refreshTasks.putIfAbsent(session, timer);
     }
 

frontend/src/business/components/api/automation/scenario/EditApiScenario.vue

@@ -1131,12 +1131,12 @@ export default {
           }
           this.loading = false;
           this.sort();
+          // 初始化resourceId
+          if (this.scenarioDefinition) {
+            this.resetResourceId(this.scenarioDefinition);
+          }
         })
       }
-      // 初始化resourceId
-      if (this.scenarioDefinition) {
-        this.resetResourceId(this.scenarioDefinition);
-      }
     },
     setParameter() {
       this.currentScenario.stepTotal = this.scenarioDefinition.length;

frontend/src/business/components/api/automation/scenario/component/IfController.vue

@@ -13,7 +13,7 @@
 
     <template v-slot:headerLeft>
 
-      <el-input draggable size="mini" v-model="controller.variable" style="width: 15%" :placeholder="$t('api_test.request.condition_variable')"/>
+      <el-input draggable size="mini" v-model="controller.variable" style="width: 12%" :placeholder="$t('api_test.request.condition_variable')"/>
 
       <el-select v-model="controller.operator" :placeholder="$t('commons.please_select')" size="mini"
                  @change="change" class="ms-select">
@@ -27,7 +27,7 @@
     </template>
 
     <template v-slot:debugStepCode>
-      <span class="ms-step-debug-code" :class="node.data.code ==='error'?'ms-req-error':'ms-req-success'" v-if="!loading && node.data.debug">
+      <span class="ms-step-debug-code" :class="node.data.code ==='error'?'ms-req-error':'ms-req-success'" v-if="!loading && node.data.debug && node.data.code">
         {{ getCode() }}
       </span>
     </template>
@@ -141,7 +141,7 @@
 
 <style scoped>
   .ms-btn {
-    width: 20%;
+    width: 15%;
     margin-left: 5px;
   }
 
@@ -165,6 +165,6 @@
     text-overflow: ellipsis;
     vertical-align: middle;
     white-space: nowrap;
-    width: 100px;
+    width: 80px;
   }
 </style>