Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java

@@ -95,7 +95,7 @@ public class DockerTestEngine extends AbstractEngine {
         env.put("BOOTSTRAP_SERVERS", kafkaProperties.getBootstrapServers());
         env.put("LOG_TOPIC", kafkaProperties.getLog().getTopic());
         env.put("RESOURCE_ID", resource.getId());
-        env.put("THREAD_NUM", "" + threadNum);
+        env.put("THREAD_NUM", "0");// 传入0表示不用修改线程数
         env.put("HEAP", jmeterProperties.getHeap());
 
 

backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java

@@ -50,6 +50,10 @@ public class JmeterFileService {
     }
 
     private void setThreadNum(LoadTestWithBLOBs t, Integer limit) {
+        // 传入limit才去改这个值
+        if (limit <= 0) {
+            return;
+        }
         String loadConfiguration = t.getLoadConfiguration();
         JSONArray jsonArray = JSON.parseArray(loadConfiguration);
         for (int i = 0; i < jsonArray.size(); i++) {

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit ed891ee7503cc1ca4679b4779a5c12e2ffee986d
+Subproject commit bb9ad600f10ff2dd9c3d364a7b30b1926dc2a74f

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -222,7 +222,6 @@
         }
         if (this.$refs.apiConfig) {
           this.$refs.apiConfig.forEach(item => {
-            console.log(item);
             item.removeListener();
           }); //  删除所有tab的 ctrl + s 监听
           let tabs = this.apiTabs;

frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue

@@ -104,7 +104,8 @@
       search() {
         this.selectRows = new Set();
         this.loading = true;
-        this.condition.filters = ["Prepare", "Underway", "Completed"];
+
+        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
 
         this.condition.moduleIds = this.selectNodeIds;
 

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 6d6ed5226849337876ecf55312aa6b5f13ba6472
+Subproject commit 416645a24d941eb9727c07c19be70422c2e66cc7