From 8fb6dad10358337a8b3e314acde7df9567cf0a26 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 16 Dec 2020 10:54:14 +0800
Subject: [PATCH 01/12] =?UTF-8?q?refactor:=20=E5=88=87=E6=8D=A2=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/head/ApiHeaderMenus.vue    | 30 +++--------
 .../components/common/head/ProjectMenu.vue    | 28 ----------
 .../components/common/head/ProjectSwitch.vue  | 52 +++++++++++++++++++
 .../components/common/head/SearchList.vue     |  4 +-
 .../head/PerformanceHeaderMenus.vue           | 32 ++++--------
 .../track/head/TrackHeaderMenus.vue           | 39 ++++++--------
 6 files changed, 87 insertions(+), 98 deletions(-)
 delete mode 100644 frontend/src/business/components/common/head/ProjectMenu.vue
 create mode 100644 frontend/src/business/components/common/head/ProjectSwitch.vue

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 409e7409d4..73548443e6 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -1,25 +1,10 @@
 <template>
   <div id="menu-bar" v-if="isRouterAlive">
     <el-row type="flex">
+      <project-change :project-name="currentProject"/>
       <el-col :span="14">
         <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router :default-active='$route.path'>
 
-          <el-submenu :class="{'deactivation':!isProjectActivation}"
-                      v-permission="['test_manager','test_user','test_viewer']" index="3">
-            <template v-slot:title>
-              <span style="display: inline-block;width: 150px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" :title="currentProject">
-                {{ $t('commons.project') }}: {{currentProject}}
-              </span>
-            </template>
-            <search-list ref="projectRecent" :options="projectRecent" :current-project.sync="currentProject"/>
-            <el-divider class="menu-divider"/>
-            <el-menu-item :index="'/setting/project/create'">
-              <font-awesome-icon :icon="['fa', 'plus']"/>
-              <span style="padding-left: 7px;">{{ $t("project.create") }}</span>
-            </el-menu-item>
-            <ms-show-all :index="'/setting/project/all'"/>
-          </el-submenu>
-
           <el-menu-item :index="'/api/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
@@ -75,10 +60,11 @@ import MsCreateButton from "../../common/head/CreateButton";
 import MsCreateTest from "../../common/head/CreateTest";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
 import SearchList from "@/business/components/common/head/SearchList";
+import ProjectChange from "@/business/components/common/head/ProjectSwitch";
 
 export default {
   name: "MsApiHeaderMenus",
-  components: {SearchList, MsCreateTest, MsCreateButton, MsShowAll, MsRecentList},
+  components: {SearchList, MsCreateTest, MsCreateButton, MsShowAll, MsRecentList, ProjectChange},
   data() {
     return {
       projectRecent: {
@@ -123,11 +109,11 @@ export default {
   methods: {
     registerEvents() {
       ApiEvent.$on(LIST_CHANGE, () => {
-        // todo 这里偶尔会有 refs 为空的情况
-        if (!this.$refs.projectRecent) {
-          return;
-        }
-        this.$refs.projectRecent.recent();
+        // // todo 这里偶尔会有 refs 为空的情况
+        // if (!this.$refs.projectRecent) {
+        //   return;
+        // }
+        // this.$refs.projectRecent.recent();
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();
       });
diff --git a/frontend/src/business/components/common/head/ProjectMenu.vue b/frontend/src/business/components/common/head/ProjectMenu.vue
deleted file mode 100644
index de90927ab8..0000000000
--- a/frontend/src/business/components/common/head/ProjectMenu.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-  <span>
-    <el-submenu index="10">
-      <template v-slot:title>操作</template>
-      <el-input
-        placeholder="请输入内容"
-        prefix-icon="el-icon-search"
-        v-model="input2">
-      </el-input>
-    </el-submenu>
-  </span>
-
-</template>
-
-<script>
-export default {
-  name: "ProjectMenu",
-  data() {
-    return {
-      input2: '1'
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/frontend/src/business/components/common/head/ProjectSwitch.vue b/frontend/src/business/components/common/head/ProjectSwitch.vue
new file mode 100644
index 0000000000..85e1f77769
--- /dev/null
+++ b/frontend/src/business/components/common/head/ProjectSwitch.vue
@@ -0,0 +1,52 @@
+<template>
+  <el-menu class="header-menu" :unique-opened="true" mode="horizontal" default-active="1">
+    <!-- 不激活项目路由-->
+    <el-menu-item index="1" v-show="false">Placeholder</el-menu-item>
+    <el-submenu v-permission="['test_manager','test_user','test_viewer']" index="2" popper-class="submenu">
+      <template v-slot:title>
+        <span class="project-name" :title="currentProject">
+          {{ $t('commons.project') }}: {{currentProject}}
+        </span>
+      </template>
+      <search-list :current-project.sync="currentProject"/>
+      <el-divider/>
+      <el-menu-item :index="'/setting/project/create'">
+        <font-awesome-icon :icon="['fa', 'plus']"/>
+        <span style="padding-left: 7px;">{{ $t("project.create") }}</span>
+      </el-menu-item>
+      <ms-show-all :index="'/setting/project/all'"/>
+    </el-submenu>
+  </el-menu>
+</template>
+
+<script>
+import SearchList from "@/business/components/common/head/SearchList";
+import MsShowAll from "@/business/components/common/head/ShowAll";
+
+export default {
+  name: "ProjectSwitch",
+  props: {
+    projectName: String
+  },
+  components: {SearchList, MsShowAll},
+  data() {
+    return {
+      currentProject: this.projectName
+    }
+  }
+}
+</script>
+
+<style scoped>
+.project-name {
+  display: inline-block;
+  width: 130px;
+  white-space:nowrap;
+  overflow:hidden;
+  text-overflow:ellipsis;
+}
+
+.el-divider--horizontal {
+  margin: 0;
+}
+</style>
diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index 22f5bd9745..647621d15d 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="result.loading" class="search-list">
+  <div v-loading="result.loading">
     <el-input placeholder="搜索项目"
               prefix-icon="el-icon-search"
               v-model="searchString"
@@ -135,7 +135,7 @@ export default {
 
 .title {
   display: inline-block;
-  padding-left: 20px;
+  padding-left: 15px;
   max-width: 200px;
   white-space: nowrap;
   overflow: hidden;
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index e63010aaec..fedbe25eb6 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -1,25 +1,9 @@
 <template>
   <div id="menu-bar">
     <el-row type="flex">
-      <el-col :span="10">
+      <project-change :project-name="currentProject"/>
+      <el-col :span="12">
         <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router :default-active='$route.path'>
-
-          <el-submenu v-permission="['test_manager','test_user','test_viewer']"
-                      index="3" popper-class="submenu">
-            <template v-slot:title>
-              <span style="display: inline-block;width: 150px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" :title="currentProject">
-                {{ $t('commons.project') }}: {{currentProject}}
-              </span>
-            </template>
-            <search-list ref="projectRecent" :options="projectRecent" :current-project.sync="currentProject"/>
-            <el-divider/>
-            <el-menu-item :index="'/setting/project/create'">
-              <font-awesome-icon :icon="['fa', 'plus']"/>
-              <span style="padding-left: 7px;">{{ $t("project.create") }}</span>
-            </el-menu-item>
-            <ms-show-all :index="'/setting/project/all'"/>
-          </el-submenu>
-
           <el-menu-item :index="'/performance/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
@@ -61,10 +45,12 @@ import MsCreateButton from "../../common/head/CreateButton";
 import MsShowAll from "../../common/head/ShowAll";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
 import SearchList from "@/business/components/common/head/SearchList";
+import ProjectChange from "@/business/components/common/head/ProjectSwitch";
 
 export default {
   name: "PerformanceHeaderMenus",
   components: {
+    ProjectChange,
     SearchList,
     MsCreateButton,
     MsShowAll,
@@ -108,11 +94,11 @@ export default {
   methods: {
     registerEvents() {
       PerformanceEvent.$on(LIST_CHANGE, () => {
-        // todo 这里偶尔会有 refs 为空的情况
-        if (!this.$refs.projectRecent) {
-          return;
-        }
-        this.$refs.projectRecent.recent();
+        // // todo 这里偶尔会有 refs 为空的情况
+        // if (!this.$refs.projectRecent) {
+        //   return;
+        // }
+        // this.$refs.projectRecent.recent();
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();
       });
diff --git a/frontend/src/business/components/track/head/TrackHeaderMenus.vue b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
index 7f01d57323..484234a688 100644
--- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue
+++ b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
@@ -2,25 +2,10 @@
 
   <div id="menu-bar" v-if="isRouterAlive">
     <el-row type="flex">
-      <el-col :span="16">
+      <project-change :project-name="currentProject"/>
+      <el-col :span="14">
         <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router
                  :default-active='$route.path'>
-          <el-submenu :class="{'deactivation':!isProjectActivation}"
-                      v-permission="['test_manager','test_user','test_viewer']" index="3" popper-class="submenu">
-            <template v-slot:title>
-              <span style="display: inline-block;width: 150px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" :title="currentProject">
-                {{ $t('commons.project') }}: {{currentProject}}
-              </span>
-            </template>
-            <search-list ref="projectRecent" :options="projectRecent" :current-project.sync="currentProject"/>
-            <el-divider/>
-            <el-menu-item :index="'/setting/project/create'">
-              <font-awesome-icon :icon="['fa', 'plus']"/>
-              <span style="padding-left: 7px;">{{ $t("project.create") }}</span>
-            </el-menu-item>
-            <ms-show-all :index="'/setting/project/all'"/>
-          </el-submenu>
-
           <el-menu-item :index="'/track/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
@@ -70,10 +55,11 @@ import MsRecentList from "../../common/head/RecentList";
 import MsCreateButton from "../../common/head/CreateButton";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import SearchList from "@/business/components/common/head/SearchList";
+import ProjectChange from "@/business/components/common/head/ProjectSwitch";
 
 export default {
   name: "TrackHeaderMenus",
-  components: {SearchList, MsShowAll, MsRecentList, MsCreateButton},
+  components: {ProjectChange, SearchList, MsShowAll, MsRecentList, MsCreateButton},
   data() {
     return {
       testPlanViewPath: '',
@@ -163,11 +149,11 @@ export default {
     },
     registerEvents() {
       TrackEvent.$on(LIST_CHANGE, () => {
-        // todo 这里偶尔会有 refs 为空的情况
-        if (!this.$refs.projectRecent) {
-          return;
-        }
-        this.$refs.projectRecent.recent();
+        // // todo 这里偶尔会有 refs 为空的情况
+        // if (!this.$refs.projectRecent) {
+        //   return;
+        // }
+        // this.$refs.projectRecent.recent();
         this.$refs.planRecent.recent();
         this.$refs.caseRecent.recent();
       });
@@ -199,4 +185,11 @@ export default {
   border-bottom: white !important;
 }
 
+/*.project-change {*/
+/*  height: 40px;*/
+/*  line-height: 40px;*/
+/*  color: inherit;*/
+/*  margin-left: 20px;*/
+/*}*/
+
 </style>

From 1e73fd61ccb681e88fee205dc4a797d53a408743 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Wed, 16 Dec 2020 11:40:43 +0800
Subject: [PATCH 02/12] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=20jmeter?=
 =?UTF-8?q?=20=E9=95=9C=E5=83=8F=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=E5=8D=95=E7=8B=AC=E4=BB=93=E5=BA=93=20https:?=
 =?UTF-8?q?//github.com/metersphere/jmeter-image?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/jmeter-base/Dockerfile        |   45 -
 docker/jmeter-base/jmeter.properties | 1349 --------------------------
 docker/jmeter-base/log4j2.xml        |  116 ---
 docker/jmeter-master/Dockerfile      |   14 -
 docker/jmeter-master/run-test.sh     |    3 -
 5 files changed, 1527 deletions(-)
 delete mode 100644 docker/jmeter-base/Dockerfile
 delete mode 100644 docker/jmeter-base/jmeter.properties
 delete mode 100644 docker/jmeter-base/log4j2.xml
 delete mode 100644 docker/jmeter-master/Dockerfile
 delete mode 100644 docker/jmeter-master/run-test.sh

diff --git a/docker/jmeter-base/Dockerfile b/docker/jmeter-base/Dockerfile
deleted file mode 100644
index fe3d49f4b0..0000000000
--- a/docker/jmeter-base/Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM alpine:latest
-LABEL maintainer="support@fit2cloud.com"
-
-ENV JMETER_VERSION "5.3"
-ENV KAFKA_BACKEND_LISTENER_VERSION "1.0.4"
-#定义时区参数
-ENV TZ=Asia/Shanghai
-
-RUN apk update && \
-    apk upgrade && \
-    apk add --update openjdk8 wget tar bash && \
-    wget https://mirrors.tuna.tsinghua.edu.cn/apache/jmeter/binaries/apache-jmeter-${JMETER_VERSION}.tgz && \
-    wget https://jmeter-plugins.org/files/packages/jpgc-casutg-2.9.zip && \
-    wget https://jmeter-plugins.org/files/packages/jpgc-tst-2.5.zip && \
-    wget https://github.com/metersphere/jmeter-backend-listener-kafka/releases/download/v${KAFKA_BACKEND_LISTENER_VERSION}/jmeter.backendlistener.kafka-${KAFKA_BACKEND_LISTENER_VERSION}.jar && \
-    wget https://github.com/metersphere/jmeter-plugins-for-apache-dubbo/releases/download/2.7.7/jmeter-plugins-dubbo-2.7.7-jar-with-dependencies.jar && \
-    wget -q "http://search.maven.org/remotecontent?filepath=mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar" -O mysql-connector-java.jar && \
-    wget -q "http://search.maven.org/remotecontent?filepath=com/oracle/database/jdbc/ojdbc8/19.7.0.0/ojdbc8-19.7.0.0.jar" -O ojdbc8.jar && \
-    wget -q "http://search.maven.org/remotecontent?filepath=org/postgresql/postgresql/42.2.14/postgresql-42.2.14.jar" -O postgresql.jar && \
-    wget -q "http://search.maven.org/remotecontent?filepath=com/microsoft/sqlserver/mssql-jdbc/7.4.1.jre8/mssql-jdbc-7.4.1.jre8.jar" -O mssql-jdbc.jar && \
-    mkdir -p /opt/jmeter && \
-    tar -zxf apache-jmeter-${JMETER_VERSION}.tgz -C /opt/jmeter/  --strip-components=1 && \
-    unzip -o jpgc-casutg-2.9.zip -d /tmp/ && mv /tmp/lib/ext/jmeter-plugins-casutg-2.9.jar /opt/jmeter/lib/ext && \
-    unzip -o jpgc-tst-2.5.zip -d /tmp/ && mv /tmp/lib/ext/jmeter-plugins-tst-2.5.jar /opt/jmeter/lib/ext && \
-    mv jmeter.backendlistener.kafka-${KAFKA_BACKEND_LISTENER_VERSION}.jar /opt/jmeter/lib/ext && \
-    mv jmeter-plugins-dubbo-2.7.7-jar-with-dependencies.jar /opt/jmeter/lib/ext && \
-    mv mysql-connector-java.jar /opt/jmeter/lib/ext && \
-    mv ojdbc8.jar /opt/jmeter/lib/ext && \
-    mv postgresql.jar /opt/jmeter/lib/ext && \
-    mv mssql-jdbc.jar /opt/jmeter/lib/ext && \
-    rm -rf apache-jmeter-${JMETER_VERSION}.tgz && \
-    rm -rf jpgc-casutg-2.9.zip && \
-    rm -rf jpgc-tst-2.5.zip && \
-    rm -rf jmeter.backendlistener.kafka-${KAFKA_BACKEND_LISTENER_VERSION}.jar && \
-    rm -rf jmeter-plugins-dubbo-2.7.7-jar-with-dependencies.jar && \
-    rm -rf /var/cache/apk/* && \
-    wget -O /usr/bin/tpl https://github.com/schneidexe/tpl/releases/download/v0.5.0/tpl-linux-amd64 && \
-    chmod +x /usr/bin/tpl && \
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo "$TZ" > /etc/timezone
-
-ENV JMETER_HOME /opt/jmeter
-ENV PATH $PATH:$JMETER_HOME/bin:/usr/lib/jvm/java-1.8-openjdk/bin
-
-ADD log4j2.xml $JMETER_HOME/bin/log4j2.xml
-ADD jmeter.properties $JMETER_HOME/bin/jmeter.properties
\ No newline at end of file
diff --git a/docker/jmeter-base/jmeter.properties b/docker/jmeter-base/jmeter.properties
deleted file mode 100644
index 3f5273c2cf..0000000000
--- a/docker/jmeter-base/jmeter.properties
+++ /dev/null
@@ -1,1349 +0,0 @@
-################################################################################
-# Apache JMeter Property file
-################################################################################
-
-##   Licensed to the Apache Software Foundation (ASF) under one or more
-##   contributor license agreements.  See the NOTICE file distributed with
-##   this work for additional information regarding copyright ownership.
-##   The ASF licenses this file to You under the Apache License, Version 2.0
-##   (the "License"); you may not use this file except in compliance with
-##   the License.  You may obtain a copy of the License at
-##
-##       http://www.apache.org/licenses/LICENSE-2.0
-##
-##   Unless required by applicable law or agreed to in writing, software
-##   distributed under the License is distributed on an "AS IS" BASIS,
-##   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-##   See the License for the specific language governing permissions and
-##   limitations under the License.
-
-################################################################################
-#
-#                      THIS FILE SHOULD NOT BE MODIFIED
-#
-# This avoids having to re-apply the modifications when upgrading JMeter
-# Instead only user.properties should be modified:
-# 1/ copy the property you want to modify to user.properties from jmeter.properties
-# 2/ Change its value there
-#
-################################################################################
-
-# JMeter properties are described in the file
-# http://jmeter.apache.org/usermanual/properties_reference.html
-# A local copy can be found in
-# printable_docs/usermanual/properties_reference.html
-
-#Preferred GUI language. Comment out to use the JVM default locale's language.
-#language=en
-
-
-# Additional locale(s) to add to the displayed list.
-# The current default list is: en, fr, de, no, es, tr, ja, zh_CN, zh_TW, pl, pt_BR
-# [see JMeterMenuBar#makeLanguageMenu()]
-# The entries are a comma-separated list of language names
-#locales.add=zu
-
-
-#---------------------------------------------------------------------------
-# XML Parser
-#---------------------------------------------------------------------------
-
-# Path to a Properties file containing Namespace mapping in the form
-# prefix=Namespace
-# Example:
-# ns=http://biz.aol.com/schema/2006-12-18
-#xpath.namespace.config=
-
-
-# XPath2 query cache for storing compiled XPath queries
-#xpath2query.parser.cache.size=400
-
-#---------------------------------------------------------------------------
-# SSL configuration
-#---------------------------------------------------------------------------
-
-## SSL System properties are now in system.properties
-
-# JMeter no longer converts javax.xxx property entries in this file into System properties.
-# These must now be defined in the system.properties file or on the command-line.
-# The system.properties file gives more flexibility.
-
-# By default, SSL session contexts are now created per-thread, rather than being shared.
-# The original behaviour can be enabled by setting the JMeter property to true
-#https.sessioncontext.shared=false
-
-# Be aware that https default protocol may vary depending on the version of JVM
-# See https://blogs.oracle.com/java-platform-group/entry/diagnosing_tls_ssl_and_https
-# See https://bz.apache.org/bugzilla/show_bug.cgi?id=58236
-# Default HTTPS protocol level:
-#https.default.protocol=TLS
-# This may need to be changed here (or in user.properties) to:
-#https.default.protocol=SSLv3
-
-# List of protocols to enable. You may have to select only a subset if you find issues with target server.
-# This is needed when server does not support Socket version negotiation, this can lead to:
-# javax.net.ssl.SSLPeerUnverifiedException: peer not authenticated
-# java.net.SocketException: Connection reset
-# see https://bz.apache.org/bugzilla/show_bug.cgi?id=54759
-#https.socket.protocols=SSLv2Hello SSLv3 TLSv1
-
-# Control if we allow reuse of cached SSL context between iterations
-# set the value to 'false' to reset the SSL context each iteration
-# Deprecated since 5.0
-#https.use.cached.ssl.context=true
-
-#
-# Reset HTTP State when starting a new Thread Group iteration which means:
-# true means next iteration is associated to a new user
-# false means next iteration is associated to same user
-# true involves:
-# - Closing opened connection
-# - resetting SSL State
-#httpclient.reset_state_on_thread_group_iteration=true
-
-# Start and end index to be used with keystores with many entries
-# The default is to use entry 0, i.e. the first
-#https.keyStoreStartIndex=0
-#https.keyStoreEndIndex=0
-
-#---------------------------------------------------------------------------
-# Look and Feel configuration
-#---------------------------------------------------------------------------
-
-#Classname of the Swing default UI
-#
-# The LAF classnames that are available are now displayed as ToolTip text
-# when hovering over the Options/Look and Feel selection list.
-#
-# You can either use a full class name, as shown below,
-# or one of the strings "System" or "CrossPlatform" which means
-#  JMeter will use the corresponding string returned by UIManager.get<name>LookAndFeelClassName()
-
-# LAF can be overridden by os.name (lowercased, spaces replaced by '_')
-# Sample os.name LAF:
-#jmeter.laf.windows_xp=javax.swing.plaf.metal.MetalLookAndFeel
-
-# Failing that, the OS family = os.name, but only up to first space:
-# Sample OS family LAF:
-#jmeter.laf.windows=com.sun.java.swing.plaf.windows.WindowsLookAndFeel
-
-# Custom settings for Mac using System LAF if you don't want to use Darcula
-#jmeter.laf.mac=System
-
-# Failing that, the JMeter default laf can be defined:
-#jmeter.laf=System
-
-# If none of the above jmeter.laf properties are defined, JMeter uses the CrossPlatform LAF.
-# This is because the CrossPlatform LAF generally looks better than the System LAF.
-# See https://bz.apache.org/bugzilla/show_bug.cgi?id=52026 for details
-# N.B. the laf can be defined in user.properties.
-
-# LoggerPanel display
-# default to false
-#jmeter.loggerpanel.display=false
-
-# Enable LogViewer Panel to receive log event even if closed
-# Enabled since 2.12
-# Note this has some impact on performances, but as GUI mode must
-# not be used for Load Test it is acceptable
-#jmeter.loggerpanel.enable_when_closed=true
-
-# Max lines kept in LoggerPanel, default to 1000 chars
-# 0 means no limit
-#jmeter.loggerpanel.maxlength=1000
-
-# Interval period in ms to process the queue of events of the listeners
-#jmeter.gui.refresh_period=500
-
-# HiDPI mode (default: false)
-# Activate a 'pseudo'-hidpi mode. Allows to increase size of some UI elements
-# which are not correctly managed by JVM with high resolution screens in Linux or Windows
-#jmeter.hidpi.mode=false
-# To enable pseudo-hidpi mode change to true
-#jmeter.hidpi.mode=true
-# HiDPI scale factor
-#jmeter.hidpi.scale.factor=1.0
-# Suggested value for HiDPI
-#jmeter.hidpi.scale.factor=2.0
-
-# Toolbar display
-# Toolbar icon definitions
-#jmeter.toolbar.icons=org/apache/jmeter/images/toolbar/icons-toolbar.properties
-# Toolbar list
-#jmeter.toolbar=new,open,close,save,save_as_testplan,|,cut,copy,paste,|,expand,collapse,toggle,|,test_start,test_stop,test_shutdown,|,test_start_remote_all,test_stop_remote_all,test_shutdown_remote_all,|,test_clear,test_clear_all,|,search,search_reset,|,function_helper,help
-# Toolbar icons default size: 22x22. Available sizes are: 22x22, 32x32, 48x48
-#jmeter.toolbar.icons.size=22x22
-# Suggested value for HiDPI
-#jmeter.toolbar.icons.size=48x48
-
-# Icon definitions
-# default:
-#jmeter.icons=org/apache/jmeter/images/icon.properties
-# alternate:
-#jmeter.icons=org/apache/jmeter/images/icon_1.properties
-# Historical icon set (deprecated)
-#jmeter.icons=org/apache/jmeter/images/icon_old.properties
-
-# Tree icons default size: 19x19. Available sizes are: 19x19, 24x24, 32x32, 48x48
-# Useful for HiDPI display (see below)
-#jmeter.tree.icons.size=19x19
-# Suggested value for HiDPI screen like 3200x1800:
-#jmeter.tree.icons.size=32x32
-
-#Components to not display in JMeter GUI (GUI class name or static label)
-# These elements are deprecated and will be removed in next version:
-# MongoDB Script, MongoDB Source Config, Monitor Results
-# BSF Elements
-not_in_menu=org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler,org.apache.jmeter.protocol.mongodb.config.MongoSourceElement,\
-    org.apache.jmeter.timers.BSFTimer,org.apache.jmeter.modifiers.BSFPreProcessor,org.apache.jmeter.extractor.BSFPostProcessor,org.apache.jmeter.assertions.BSFAssertion,\
-    org.apache.jmeter.visualizers.BSFListener,org.apache.jmeter.protocol.java.sampler.BSFSampler,\
-    org.apache.jmeter.protocol.http.control.gui.SoapSamplerGui
-
-# Number of items in undo history
-# Feature is disabled by default (0) due to known and not fixed bugs:
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=57043
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=57039
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=57040
-# Set it to a number > 0 (25 can be a good default)
-# The bigger it is, the more it consumes memory
-#undo.history.size=0
-
-# Hotkeys to add JMeter components, will add elements when you press Ctrl+0 .. Ctrl+9 (Command+0 .. Command+9 on Mac)
-gui.quick_0=ThreadGroupGui
-gui.quick_1=HttpTestSampleGui
-gui.quick_2=RegexExtractorGui
-gui.quick_3=AssertionGui
-gui.quick_4=ConstantTimerGui
-gui.quick_5=TestActionGui
-gui.quick_6=JSR223PostProcessor
-gui.quick_7=JSR223PreProcessor
-gui.quick_8=DebugSampler
-gui.quick_9=ViewResultsFullVisualizer
-
-
-#---------------------------------------------------------------------------
-# JMX Backup configuration
-#---------------------------------------------------------------------------
-#Enable auto backups of the .jmx file when a test plan is saved.
-#When enabled, before the .jmx is saved, it will be backed up to the directory pointed
-#by the jmeter.gui.action.save.backup_directory property (see below). Backup file names are built
-#after the jmx file being saved. For example, saving test-plan.jmx will create a test-plan-000012.jmx
-#in the backup directory provided that the last created backup file is test-plan-000011.jmx.
-#Default value is true indicating that auto backups are enabled
-#jmeter.gui.action.save.backup_on_save=true
-
-#Set the backup directory path where JMX backups will be created upon save in the GUI.
-#If not set (what it defaults to) then backup files will be created in
-#a sub-directory of the JMeter base installation. The default directory is ${JMETER_HOME}/backups
-#If set and the directory does not exist, it will be created.
-#jmeter.gui.action.save.backup_directory=
-
-#Set the maximum time (in hours) that backup files should be preserved since the save time.
-#By default no expiration time is set which means we keep backups for ever.
-#jmeter.gui.action.save.keep_backup_max_hours=0
-
-#Set the maximum number of backup files that should be preserved. By default 10 backups will be preserved.
-#Setting this to zero will cause the backups to not being deleted (unless keep_backup_max_hours is set to a non zero value)
-#jmeter.gui.action.save.keep_backup_max_count=10
-
-#Enable auto saving of the .jmx file before start run a test plan
-#When enabled, before the run, the .jmx will be saved and also backed up to the directory pointed
-#save_automatically_before_run=true
-
-#---------------------------------------------------------------------------
-# Remote hosts and RMI configuration
-#---------------------------------------------------------------------------
-
-# Remote Hosts - comma definitioned
-remote_hosts=127.0.0.1
-#remote_hosts=localhost:1099,localhost:2010
-
-# RMI port to be used by the server (must start rmiregistry with same port)
-#server_port=1099
-
-# To change the port to (say) 1234:
-# On the server(s)
-# - set server_port=1234
-# - start rmiregistry with port 1234
-# On Windows this can be done by:
-# SET SERVER_PORT=1234
-# JMETER-SERVER
-#
-# On Unix:
-# SERVER_PORT=1234 jmeter-server
-#
-# On the client:
-# - set remote_hosts=server:1234
-
-# Parameter that controls the RMI port used by RemoteSampleListenerImpl (The Controller)
-# Default value is 0 which means port is randomly assigned
-# You may need to open Firewall port on the Controller machine
-#client.rmi.localport=0
-
-# When distributed test is starting, there may be several attempts to initialize
-# remote engines. By default, only single try is made. Increase following property
-# to make it retry for additional times
-#client.tries=1
-
-# If there is initialization retries, following property sets delay between attempts
-#client.retries_delay=5000
-
-# When all initialization tries was made, test will fail if some remote engines are failed
-# Set following property to true to ignore failed nodes and proceed with test
-#client.continue_on_fail=false
-
-# To change the default port (1099) used to access the server:
-#server.rmi.port=1234
-
-# To use a specific port for the JMeter server engine, define
-# the following property before starting the server:
-#server.rmi.localport=4000
-
-# The jmeter server creates by default the RMI registry as part of the server process.
-# To stop the server creating the RMI registry:
-#server.rmi.create=false
-
-# Define the following property to cause JMeter to exit after the first test
-#server.exitaftertest=true
-
-#
-# Configuration of Secure RMI connection
-#
-# Type of keystore : JKS
-#server.rmi.ssl.keystore.type=JKS
-#
-# Keystore file that contains private key
-#server.rmi.ssl.keystore.file=rmi_keystore.jks
-#
-# Password of Keystore
-#server.rmi.ssl.keystore.password=changeit
-#
-# Key alias
-#server.rmi.ssl.keystore.alias=rmi
-#
-# Type of truststore : JKS
-#server.rmi.ssl.truststore.type=JKS
-#
-# Keystore file that contains certificate
-#server.rmi.ssl.truststore.file=rmi_keystore.jks
-#
-# Password of Trust store
-#server.rmi.ssl.truststore.password=changeit
-#
-# Set this if you don't want to use SSL for RMI
-#server.rmi.ssl.disable=false
-server.rmi.ssl.disable=true
-#---------------------------------------------------------------------------
-#         Include Controller
-#---------------------------------------------------------------------------
-
-# Prefix used by IncludeController when building file name
-#includecontroller.prefix=
-
-#---------------------------------------------------------------------------
-# Shared HTTP configuration between HC4 and Java Implementations
-#---------------------------------------------------------------------------
-
-#
-# Should JMeter add to POST request content-type header if missing:
-# Content-Type: application/x-www-form-urlencoded
-# Was true before version 5.0
-#post_add_content_type_if_missing=false
-
-#---------------------------------------------------------------------------
-# HTTP Java configuration
-#---------------------------------------------------------------------------
-
-# Number of connection retries performed by HTTP Java sampler before giving up
-# 0 means no retry since version 3.0
-#http.java.sampler.retries=0
-
-#---------------------------------------------------------------------------
-# Following properties apply to Apache HttpClient
-#---------------------------------------------------------------------------
-
-# set the socket timeout (or use the parameter http.socket.timeout)
-# for AJP Sampler implementation.
-# Value is in milliseconds
-#httpclient.timeout=0
-# 0 == no timeout
-
-# Set the http version (defaults to 1.1)
-#httpclient.version=1.1 (or use the parameter http.protocol.version)
-
-# Define characters per second > 0 to emulate slow connections
-#httpclient.socket.http.cps=0
-#httpclient.socket.https.cps=0
-
-#Enable loopback protocol
-#httpclient.loopback=true
-
-# Define the local host address to be used for multi-homed hosts
-#httpclient.localaddress=1.2.3.4
-
-#---------------------------------------------------------------------------
-# AuthManager Kerberos configuration
-#---------------------------------------------------------------------------
-
-# AuthManager Kerberos configuration
-# Name of application module used in jaas.conf
-#kerberos_jaas_application=JMeter
-
-# Should ports be stripped from urls before constructing SPNs
-# for SPNEGO authentication
-#kerberos.spnego.strip_port=true
-
-# Should credentials be delegated to webservers when using
-# SPNEGO authentication
-#kerberos.spnego.delegate_cred=false
-
-#---------------------------------------------------------------------------
-# Apache HttpComponents HTTPClient configuration (HTTPClient4)
-#---------------------------------------------------------------------------
-
-# define a properties file for overriding Apache HttpClient parameters
-# Uncomment this line if you put anything in hc.parameters file
-#hc.parameters.file=hc.parameters
-
-# If true, default HC4 User-Agent will not be added
-#httpclient4.default_user_agent_disabled=false
-
-# Preemptively send Authorization Header when BASIC auth is used
-#httpclient4.auth.preemptive=true
-
-# Number of retries to attempt (default 0)
-#httpclient4.retrycount=0
-
-# true if it's OK to retry requests that have been sent
-# This will retry Idempotent and non Idempotent requests
-# This should usually be false, but it can be useful
-# when testing against some Load Balancers like Amazon ELB
-#httpclient4.request_sent_retry_enabled=false
-
-# Idle connection timeout (Milliseconds) to apply if the server does not send
-# Keep-Alive headers (default 0)
-# Set this > 0 to compensate for servers that don't send a Keep-Alive header
-# If <= 0, idle timeout will only apply if the server sends a Keep-Alive header
-#httpclient4.idletimeout=0
-
-# Check connections if the elapsed time (Milliseconds) since the last
-# use of the connection exceed this value
-#httpclient4.validate_after_inactivity=1700
-
-# TTL (in Milliseconds) represents an absolute value.
-# No matter what, the connection will not be re-used beyond its TTL.
-#httpclient4.time_to_live=2000
-
-# Max size in bytes of PUT body to retain in result sampler.
-# Bigger results will be clipped.
-#httpclient4.max_body_retain_size=32768
-
-# Ignore EOFException that some edgy application may emit to signal end of GZIP stream
-# Defaults to false
-#httpclient4.gzip_relax_mode=false
-
-# Ignore EOFException that some edgy application may emit to signal end of Deflated stream
-# Defaults to false
-#httpclient4.deflate_relax_mode=false
-
-#---------------------------------------------------------------------------
-# HTTP Cache Manager configuration
-#---------------------------------------------------------------------------
-#
-# Space or comma separated list of methods that can be cached
-#cacheable_methods=GET
-# N.B. This property is currently a temporary solution for Bug 56162
-
-# Since 2.12, JMeter does not create anymore a Sample Result with 204 response
-# code for a resource found in cache which is inline with what browser do.
-#cache_manager.cached_resource_mode=RETURN_NO_SAMPLE
-
-# You can choose between 3 modes:
-# RETURN_NO_SAMPLE (default)
-# RETURN_200_CACHE
-# RETURN_CUSTOM_STATUS
-
-# Those mode have the following behaviours:
-# RETURN_NO_SAMPLE:
-# this mode returns no Sample Result, it has no additional configuration
-
-# RETURN_200_CACHE:
-# this mode will return Sample Result with response code to 200 and
-# response message to "(ex cache)", you can modify response message by setting
-# RETURN_200_CACHE.message=(ex cache)
-
-# RETURN_CUSTOM_STATUS:
-# This mode lets you select what response code and message you want to return,
-# if you use this mode you need to set those properties
-# RETURN_CUSTOM_STATUS.code=
-# RETURN_CUSTOM_STATUS.message=
-
-#---------------------------------------------------------------------------
-# Results file configuration
-#---------------------------------------------------------------------------
-
-# This section helps determine how result data will be saved.
-# The commented out values are the defaults.
-
-# legitimate values: xml, csv, db.  Only xml and csv are currently supported.
-#jmeter.save.saveservice.output_format=csv
-
-# The below properties are true when field should be saved; false otherwise
-#
-# assertion_results_failure_message only affects CSV output
-#jmeter.save.saveservice.assertion_results_failure_message=true
-#
-# legitimate values: none, first, all
-#jmeter.save.saveservice.assertion_results=none
-#
-#jmeter.save.saveservice.data_type=true
-#jmeter.save.saveservice.label=true
-#jmeter.save.saveservice.response_code=true
-# response_data is not currently supported for CSV output
-#jmeter.save.saveservice.response_data=false
-# Save ResponseData for failed samples
-#jmeter.save.saveservice.response_data.on_error=false
-#jmeter.save.saveservice.response_message=true
-#jmeter.save.saveservice.successful=true
-#jmeter.save.saveservice.thread_name=true
-#jmeter.save.saveservice.time=true
-#jmeter.save.saveservice.subresults=true
-#jmeter.save.saveservice.assertions=true
-#jmeter.save.saveservice.latency=true
-# Only available with HttpClient4
-#jmeter.save.saveservice.connect_time=true
-#jmeter.save.saveservice.samplerData=false
-#jmeter.save.saveservice.responseHeaders=false
-#jmeter.save.saveservice.requestHeaders=false
-#jmeter.save.saveservice.encoding=false
-#jmeter.save.saveservice.bytes=true
-# Only available with HttpClient4
-#jmeter.save.saveservice.sent_bytes=true
-#jmeter.save.saveservice.url=true
-#jmeter.save.saveservice.filename=false
-#jmeter.save.saveservice.hostname=false
-#jmeter.save.saveservice.thread_counts=true
-#jmeter.save.saveservice.sample_count=false
-#jmeter.save.saveservice.idle_time=true
-
-# Timestamp format - this only affects CSV output files
-# legitimate values: none, ms, or a format suitable for SimpleDateFormat
-#jmeter.save.saveservice.timestamp_format=ms
-#jmeter.save.saveservice.timestamp_format=yyyy/MM/dd HH:mm:ss.SSS
-
-# For use with Comma-separated value (CSV) files or other formats
-# where the fields' values are separated by specified definitioners.
-# Default:
-#jmeter.save.saveservice.default_definitioner=,
-# For TAB, one can use:
-#jmeter.save.saveservice.default_definitioner=\t
-
-# Only applies to CSV format files:
-# Print field names as first line in CSV
-#jmeter.save.saveservice.print_field_names=true
-
-# Optional list of JMeter variable names whose values are to be saved in the result data files.
-# Use commas to separate the names. For example:
-#sample_variables=SESSION_ID,REFERENCE
-# N.B. The current implementation saves the values in XML as attributes,
-# so the names must be valid XML names.
-# By default JMeter sends the variable to all servers
-# to ensure that the correct data is available at the client.
-
-# Optional xml processing instruction for line 2 of the file:
-# Example:
-#jmeter.save.saveservice.xml_pi=<?xml-stylesheet type="text/xsl" href="../extras/jmeter-results-detail-report.xsl"?>
-# Default value:
-#jmeter.save.saveservice.xml_pi=
-
-# Prefix used to identify filenames that are relative to the current base
-#jmeter.save.saveservice.base_prefix=~/
-
-# AutoFlush on each line written in XML or CSV output
-# Setting this to true will result in less test results data loss in case of Crash
-# but with impact on performances, particularly for intensive tests (low or no pauses)
-# Since JMeter 2.10, this is false by default
-#jmeter.save.saveservice.autoflush=false
-
-#---------------------------------------------------------------------------
-# Settings that affect SampleResults
-#---------------------------------------------------------------------------
-
-# Save the start time stamp instead of the end
-# This also affects the timestamp stored in result files
-sampleresult.timestamp.start=true
-
-# Whether to use System.nanoTime() - otherwise only use System.currentTimeMillis()
-#sampleresult.useNanoTime=true
-
-# Use a background thread to calculate the nanoTime offset
-# Set this to <= 0 to disable the background thread
-#sampleresult.nanoThreadSleep=5000
-
-# Since version 5.0 JMeter has a new SubResult Naming Policy which numbers subresults by default
-# This property if set to true discards renaming policy. This can be required if you're using JMeter for functional testing.
-# Defaults to: false
-#subresults.disable_renaming=false
-
-#---------------------------------------------------------------------------
-# Upgrade property
-#---------------------------------------------------------------------------
-
-# File that holds a record of name changes for backward compatibility issues
-upgrade_properties=/bin/upgrade.properties
-
-#---------------------------------------------------------------------------
-# JMeter Test Script recorder configuration
-#
-# N.B. The element was originally called the Proxy recorder, which is why the
-# properties have the prefix "proxy".
-#---------------------------------------------------------------------------
-
-# If the recorder detects a gap of at least 5s (default) between HTTP requests,
-# it assumes that the user has clicked a new URL
-#proxy.pause=5000
-
-# Add numeric suffix to Sampler names (default true)
-#proxy.number.requests=true
-
-# List of URL patterns that will be added to URL Patterns to exclude
-# Separate multiple lines with ;
-#proxy.excludes.suggested=.*\\.(bmp|css|js|gif|ico|jpe?g|png|swf|woff|woff2)
-
-# Change the default HTTP Sampler (currently HttpClient4)
-# Java:
-#jmeter.httpsampler=HTTPSampler
-#or
-#jmeter.httpsampler=Java
-#
-# HttpClient4.x
-#jmeter.httpsampler=HttpClient4
-
-# By default JMeter tries to be more lenient with RFC2616 redirects and allows
-# relative paths.
-# If you want to test strict conformance, set this value to true
-# When the property is true, JMeter follows http://tools.ietf.org/html/rfc3986#section-5.2
-#jmeter.httpclient.strict_rfc2616=false
-
-# Default content-type include filter to use
-#proxy.content_type_include=text/html|text/plain|text/xml
-# Default content-type exclude filter to use
-#proxy.content_type_exclude=image/.*|text/css|application/.*
-
-# Default headers to remove from Header Manager elements
-# (Cookie and Authorization are always removed)
-#proxy.headers.remove=If-Modified-Since,If-None-Match,Host
-
-# Binary content-type handling
-# These content-types will be handled by saving the request in a file:
-#proxy.binary.types=application/x-amf,application/x-java-serialized-object,binary/octet-stream
-# The files will be saved in this directory:
-#proxy.binary.directory=user.dir
-# The files will be created with this file filesuffix:
-#proxy.binary.filesuffix=.binary
-
-#---------------------------------------------------------------------------
-# Test Script Recorder certificate configuration
-#---------------------------------------------------------------------------
-
-#proxy.cert.directory=<JMeter bin directory>
-#proxy.cert.file=proxyserver.jks
-#proxy.cert.type=JKS
-#proxy.cert.keystorepass=password
-#proxy.cert.keypassword=password
-#proxy.cert.factory=SunX509
-# define this property if you wish to use your own keystore
-#proxy.cert.alias=<none>
-# The default validity for certificates created by JMeter
-#proxy.cert.validity=7
-# Use dynamic key generation (if supported by JMeter/JVM)
-# If false, will revert to using a single key with no certificate
-#proxy.cert.dynamic_keys=true
-
-#---------------------------------------------------------------------------
-# Test Script Recorder miscellaneous configuration
-#---------------------------------------------------------------------------
-
-# Whether to attempt disabling of samples that resulted from redirects
-# where the generated samples use auto-redirection
-#proxy.redirect.disabling=true
-
-# SSL configuration
-#proxy.ssl.protocol=TLS
-
-#---------------------------------------------------------------------------
-# JMeter Proxy configuration
-#---------------------------------------------------------------------------
-# use command-line flags for user-name and password
-#http.proxyDomain=NTLM domain, if required by HTTPClient sampler
-
-#---------------------------------------------------------------------------
-# HTTPSampleResponse Parser configuration
-#---------------------------------------------------------------------------
-
-# Space-separated list of parser groups
-HTTPResponse.parsers=htmlParser wmlParser cssParser
-# for each parser, there should be a parser.types and a parser.className property
-
-# CSS Parser based on ph-css
-cssParser.className=org.apache.jmeter.protocol.http.parser.CssParser
-cssParser.types=text/css
-
-# CSS parser LRU cache size
-# This cache stores the URLs found in a CSS to avoid continuously parsing the CSS
-# By default the cache size is 400
-# It can be disabled by setting its value to 0
-#css.parser.cache.size=400
-
-# Let the CSS Parser ignore all css errors
-#css.parser.ignore_all_css_errors=true
-
-#---------------------------------------------------------------------------
-# HTML Parser configuration
-#---------------------------------------------------------------------------
-
-# Define the HTML parser to be used.
-# Default parser:
-# This new parser (since 2.10) should perform better than all others
-# see https://bz.apache.org/bugzilla/show_bug.cgi?id=55632
-# Do not comment this property
-htmlParser.className=org.apache.jmeter.protocol.http.parser.LagartoBasedHtmlParser
-
-# Other parsers:
-# Default parser before 2.10
-#htmlParser.className=org.apache.jmeter.protocol.http.parser.JTidyHTMLParser
-# Note that Regexp extractor may detect references that have been commented out.
-# In many cases it will work OK, but you should be aware that it may generate
-# additional references.
-#htmlParser.className=org.apache.jmeter.protocol.http.parser.RegexpHTMLParser
-# This parser is based on JSoup, it should be the most accurate but less
-# performant than LagartoBasedHtmlParser
-#htmlParser.className=org.apache.jmeter.protocol.http.parser.JsoupBasedHtmlParser
-
-#Used by HTTPSamplerBase to associate htmlParser with content types below
-htmlParser.types=text/html application/xhtml+xml application/xml text/xml
-
-#---------------------------------------------------------------------------
-# WML Parser configuration
-#---------------------------------------------------------------------------
-
-wmlParser.className=org.apache.jmeter.protocol.http.parser.RegexpHTMLParser
-
-#Used by HTTPSamplerBase to associate wmlParser with content types below
-wmlParser.types=text/vnd.wap.wml
-
-#---------------------------------------------------------------------------
-# Remote batching configuration
-#---------------------------------------------------------------------------
-# How is Sample sender implementations configured:
-# - true (default) means client configuration will be used
-# - false means server configuration will be used
-#sample_sender_client_configured=true
-
-# By default when Stripping modes are used JMeter since 3.1 will strip
-# response even for SampleResults in error.
-# If you want to revert to previous behaviour (no stripping of Responses in error)
-# set this property to false
-#sample_sender_strip_also_on_error=true
-
-# Remote batching support
-# Since JMeter 2.9, default is MODE_STRIPPED_BATCH, which returns samples in
-# batch mode (every 100 samples or every minute by default)
-# Note also that MODE_STRIPPED_BATCH strips response data from SampleResult, so if you need it change to
-# another mode
-# Batch returns samples in batches
-# Statistical returns sample summary statistics
-# mode can also be the class name of an implementation of org.apache.jmeter.samplers.SampleSender
-#mode=Standard
-#mode=Batch
-#mode=Statistical
-#Set to true to key statistical samples on threadName rather than threadGroup
-#key_on_threadname=false
-#mode=Stripped
-#mode=StrippedBatch
-#mode=org.example.load.MySampleSender
-#
-#num_sample_threshold=100
-# Value is in milliseconds
-#time_threshold=60000
-#
-# Asynchronous sender; uses a queue and background worker process to return the samples
-#mode=Asynch
-# default queue size
-#asynch.batch.queue.size=100
-# Same as Asynch but strips response data from SampleResult
-#mode=StrippedAsynch
-#
-# DiskStore: Serialises the samples to disk, rather than saving in memory
-#mode=DiskStore
-# Same as DiskStore but strips response data from SampleResult
-#mode=StrippedDiskStore
-# Note: the mode is currently resolved on the client;
-# other properties (e.g. time_threshold) are resolved on the server.
-
-#---------------------------------------------------------------------------
-# JDBC Request configuration
-#---------------------------------------------------------------------------
-
-# String used to indicate a null value
-#jdbcsampler.nullmarker=]NULL[
-#
-# Max size of BLOBs and CLOBs to store in JDBC sampler. Result will be cut off
-#jdbcsampler.max_retain_result_size=65536
-
-# Database validation query
-# based in https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases list
-jdbc.config.check.query=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS|select 1 from dual|select 1 from sysibm.sysdummy1|select 1|select 1 from rdb$database
-jdbc.config.jdbc.driver.class=com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver
-
-#---------------------------------------------------------------------------
-# OS Process Sampler configuration
-#---------------------------------------------------------------------------
-# Polling to see if process has finished its work, used when a timeout is configured on sampler
-#os_sampler.poll_for_timeout=100
-
-#---------------------------------------------------------------------------
-# TCP Sampler configuration
-#---------------------------------------------------------------------------
-
-# The default handler class
-#tcp.handler=TCPClientImpl
-#
-# eolByte = byte value for end of line
-# set this to a value outside the range -128 to +127 to skip eol checking
-#tcp.eolByte=1000
-#
-# TCP Charset, used by org.apache.jmeter.protocol.tcp.sampler.TCPClientImpl
-# default to Platform defaults charset as returned by Charset.defaultCharset().name()
-#tcp.charset=
-#
-# status.prefix and suffix = strings that enclose the status response code
-#tcp.status.prefix=Status=
-#tcp.status.suffix=.
-#
-# status.properties = property file to convert codes to messages
-#tcp.status.properties=mytestfiles/tcpstatus.properties
-
-# The length prefix used by LengthPrefixedBinaryTCPClientImpl implementation
-# defaults to 2 bytes.
-#tcp.binarylength.prefix.length=2
-
-#---------------------------------------------------------------------------
-# Summariser - Generate Summary Results - configuration (mainly applies to non-GUI mode)
-#---------------------------------------------------------------------------
-#
-# Comment the following property to disable the default non-GUI summariser
-# [or change the value to rename it]
-# (applies to non-GUI mode only)
-summariser.name=summary
-#
-# interval between summaries (in seconds) default 30 seconds
-#summariser.interval=30
-#
-# Write messages to log file
-#summariser.log=true
-#
-# Write messages to System.out
-#summariser.out=true
-
-# Ignore SampleResults generated by TransactionControllers
-# defaults to true
-#summariser.ignore_transaction_controller_sample_result=true
-
-
-#---------------------------------------------------------------------------
-# Aggregate Report and Aggregate Graph - configuration
-#---------------------------------------------------------------------------
-#
-# Percentiles to display in reports
-# Can be float value between 0 and 100
-# First percentile to display, defaults to 90%
-#aggregate_rpt_pct1=90
-# Second percentile to display, defaults to 95%
-#aggregate_rpt_pct2=95
-# Second percentile to display, defaults to 99%
-#aggregate_rpt_pct3=99
-
-#---------------------------------------------------------------------------
-# BackendListener - configuration
-#---------------------------------------------------------------------------
-#
-# Backend metrics window mode (fixed=fixed-size window, timed=time boxed)
-#backend_metrics_window_mode=fixed
-# Backend metrics sliding window size for Percentiles, Min, Max
-#backend_metrics_window=100
-
-# Backend metrics sliding window size for Percentiles, Min, Max
-# when backend_metrics_window_mode is timed
-# Setting this value too high can lead to OOM
-#backend_metrics_large_window=5000
-
-########################
-# Graphite Backend
-########################
-# Send interval in second
-# Defaults to 1 second
-#backend_graphite.send_interval=1
-
-########################
-# Influx Backend
-########################
-
-# Send interval in second
-# Defaults to 5 seconds
-#backend_influxdb.send_interval=5
-#Influxdb timeouts
-#backend_influxdb.connection_timeout=1000
-#backend_influxdb.socket_timeout=3000
-#backend_influxdb.connection_request_timeout=100
-
-#---------------------------------------------------------------------------
-# BeanShell configuration
-#---------------------------------------------------------------------------
-
-# BeanShell Server properties
-#
-# Define the port number as non-zero to start the http server on that port
-#beanshell.server.port=9000
-# The telnet server will be started on the next port
-
-#
-# Define the server initialisation file
-beanshell.server.file=../extras/startup.bsh
-
-#
-# Define a file to be processed at startup
-# This is processed using its own interpreter.
-#beanshell.init.file=
-
-#
-# Define the intialisation files for BeanShell Sampler, Function and other BeanShell elements
-# N.B. Beanshell test elements do not share interpreters.
-#      Each element in each thread has its own interpreter.
-#      This is retained between samples.
-#beanshell.sampler.init=BeanShellSampler.bshrc
-#beanshell.function.init=BeanShellFunction.bshrc
-#beanshell.assertion.init=BeanShellAssertion.bshrc
-#beanshell.listener.init=etc
-#beanshell.postprocessor.init=etc
-#beanshell.preprocessor.init=etc
-#beanshell.timer.init=etc
-
-# The file BeanShellListeners.bshrc contains sample definitions
-# of Test and Thread Listeners.
-
-#---------------------------------------------------------------------------
-# JSR-223 function
-#---------------------------------------------------------------------------
-
-# Path to JSR-223 file containing script to call on JMeter startup
-# JMeter will try to guess the engine to use by the extension
-# of the name of the file.
-# This script can use pre-defined variables:
-# log : Logger to log any message
-# props : JMeter Property
-# OUT : System.OUT
-#jsr223.init.file=
-
-#---------------------------------------------------------------------------
-# Groovy function
-#---------------------------------------------------------------------------
-
-#Path to Groovy file containing utility functions to make available to __groovy function
-#groovy.utilities=
-
-# Example
-#groovy.utilities=bin/utility.groovy
-
-#---------------------------------------------------------------------------
-# MailerModel configuration
-#---------------------------------------------------------------------------
-
-# Number of successful samples before a message is sent
-#mailer.successlimit=2
-#
-# Number of failed samples before a message is sent
-#mailer.failurelimit=2
-
-#---------------------------------------------------------------------------
-# CSVRead configuration
-#---------------------------------------------------------------------------
-
-# CSVRead definitioner setting (default ",")
-# Make sure that there are no trailing spaces or tabs after the definitioner
-# characters, or these will be included in the list of valid definitioners
-#csvread.definitioner=,
-#csvread.definitioner=;
-#csvread.definitioner=!
-#csvread.definitioner=~
-# The following line has a tab after the =
-#csvread.definitioner=
-
-#---------------------------------------------------------------------------
-# __time() function configuration
-#
-# The properties below can be used to redefine the default formats
-#---------------------------------------------------------------------------
-#time.YMD=yyyyMMdd
-#time.HMS=HHmmss
-#time.YMDHMS=yyyyMMdd-HHmmss
-#time.USER1=
-#time.USER2=
-
-#---------------------------------------------------------------------------
-# CSV DataSet configuration
-#---------------------------------------------------------------------------
-
-# String to return at EOF (if recycle not used)
-#csvdataset.eofstring=<EOF>
-#list in https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
-csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII
-
-
-#---------------------------------------------------------------------------
-# LDAP Sampler configuration
-#---------------------------------------------------------------------------
-# Maximum number of search results returned by a search that will be sorted
-# to guarantee a stable ordering (if more results then this limit are returned
-# then no sorting is done). Set to 0 to turn off all sorting, in which case
-# "Equals" response assertions will be very likely to fail against search results.
-#
-#ldapsampler.max_sorted_results=1000
-
-# Number of characters to log for each of three sections (starting matching section, diff section,
-#   ending matching section where not all sections will appear for all diffs) diff display when an Equals
-#   assertion fails. So a value of 100 means a maximum of 300 characters of diff text will be displayed
-#   (+ a number of extra characters like "..." and "[[["/"]]]" which are used to decorate it).
-#assertion.equals_section_diff_len=100
-# test written out to log to signify start/end of diff delta
-#assertion.equals_diff_delta_start=[[[
-#assertion.equals_diff_delta_end=]]]
-
-#---------------------------------------------------------------------------
-# Miscellaneous configuration
-#---------------------------------------------------------------------------
-
-# Size of cache used by CSS Selector Extractor (for JODD implementation only)
-# to store parsed CSS Selector expressions.
-#cssselector.parser.cache.size=400
-
-
-# Used to control what happens when you start a test and
-# have listeners that could overwrite existing result files
-# Possible values:
-# ASK : Ask user
-# APPEND : Append results to existing file
-# DELETE : Delete existing file and start a new file
-#resultcollector.action_if_file_exists=ASK
-
-# If defined, then start the mirror server on the port
-#mirror.server.port=8081
-
-# ORO PatternCacheLRU size
-#oro.patterncache.size=1000
-
-#TestBeanGui
-#
-#propertyEditorSearchPath=null
-
-# Turn expert mode on/off: expert mode will show expert-mode beans and properties
-#jmeter.expertMode=true
-
-# Max size of bytes stored in memory per SampleResult
-# Ensure you don't exceed max capacity of a Java Array and remember
-# that the higher it is, the higher JMeter will consume heap
-# Defaults to 0, which means no truncation
-#httpsampler.max_bytes_to_store_per_request=0
-
-# Max size of buffer in bytes used when reading responses
-# Defaults to 64k
-#httpsampler.max_buffer_size=66560
-
-# Maximum redirects to follow in a single sequence (default 20)
-#httpsampler.max_redirects=20
-# Maximum frame/iframe nesting depth (default 5)
-#httpsampler.max_frame_depth=5
-
-# Revert to BUG 51939 behaviour (no separate container for embedded resources) by setting the following false:
-#httpsampler.separate.container=true
-
-# If embedded resources download fails due to missing resources or other reasons, if this property is true
-# Parent sample will not be marked as failed
-#httpsampler.ignore_failed_embedded_resources=false
-
-#keep alive time for the parallel download threads (in seconds)
-#httpsampler.parallel_download_thread_keepalive_inseconds=60
-
-# Don't keep the embedded resources response data : just keep the size and the md5
-# default to false
-#httpsampler.embedded_resources_use_md5=false
-
-# List of extra HTTP methods that should be available in select box
-#httpsampler.user_defined_methods=VERSION-CONTROL,REPORT,CHECKOUT,CHECKIN,UNCHECKOUT,MKWORKSPACE,UPDATE,LABEL,MERGE,BASELINE-CONTROL,MKACTIVITY
-
-# The encoding to be used if none is provided (default ISO-8859-1)
-#sampleresult.default.encoding=ISO-8859-1
-sampleresult.default.encoding=UTF-8
-
-# CookieManager behaviour - should cookies with null/empty values be deleted?
-# Default is true. Use false to revert to original behaviour
-#CookieManager.delete_null_cookies=true
-
-# CookieManager behaviour - should variable cookies be allowed?
-# Default is true. Use false to revert to original behaviour
-#CookieManager.allow_variable_cookies=true
-
-# CookieManager behaviour - should Cookies be stored as variables?
-# Default is false
-#CookieManager.save.cookies=false
-CookieManager.save.cookies=true
-
-# CookieManager behaviour - prefix to add to cookie name before storing it as a variable
-# Default is COOKIE_; to remove the prefix, define it as one or more spaces
-#CookieManager.name.prefix=
-
-# CookieManager behaviour - check received cookies are valid before storing them?
-# Default is true. Use false to revert to previous behaviour
-#CookieManager.check.cookies=true
-
-# Netscape HTTP Cookie file
-cookies=cookies
-
-# Ability to switch to Nashorn as default Javascript Engine used by IfController and __javaScript function
-# JMeter works as following:
-# - JDK >= 8 and javascript.use_rhino=false or not set : Nashorn
-# - JDK >= 8 and javascript.use_rhino=true: Rhino
-# If you want to use Rhino on JDK8, set this property to true
-#javascript.use_rhino=false
-
-# Number of milliseconds to wait for a thread to stop
-#jmeterengine.threadstop.wait=5000
-
-#Whether to invoke System.exit(0) in server exit code after stopping RMI
-#jmeterengine.remote.system.exit=false
-
-# Whether to call System.exit(1) on failure to stop threads in non-GUI mode.
-# This only takes effect if the test was explicitly requested to stop.
-# If this is disabled, it may be necessary to kill the JVM externally
-#jmeterengine.stopfail.system.exit=true
-
-# Whether to force call System.exit(0) at end of test in non-GUI mode, even if
-# there were no failures and the test was not explicitly asked to stop.
-# Without this, the JVM may never exit if there are other threads spawned by
-# the test which never exit.
-#jmeterengine.force.system.exit=false
-
-# How long to pause (in ms) in the daemon thread before reporting that the JVM has failed to exit.
-# If the value is <= 0, the JMeter does not start the daemon thread
-#jmeter.exit.check.pause=2000
-
-# If running non-GUI, then JMeter listens on the following port for a shutdown message.
-# To disable, set the port to 1000 or less.
-#jmeterengine.nongui.port=4445
-#
-# If the initial port is busy, keep trying until this port is reached
-# (to disable searching, set the value less than or equal to the .port property)
-#jmeterengine.nongui.maxport=4455
-
-# How often to check for shutdown during ramp-up (milliseconds)
-#jmeterthread.rampup.granularity=1000
-
-#Should JMeter expand the tree when loading a test plan?
-# default value is false since JMeter 2.7
-#onload.expandtree=false
-
-#JSyntaxTextArea configuration
-#jsyntaxtextarea.wrapstyleword=true
-#jsyntaxtextarea.linewrap=true
-#jsyntaxtextarea.codefolding=true
-# Set 0 to disable undo feature in JSyntaxTextArea
-#jsyntaxtextarea.maxundos=50
-# Change the font on the (JSyntax) Text Areas. (Useful for HiDPI screens)
-#jsyntaxtextarea.font.family=Hack
-#jsyntaxtextarea.font.size=14
-
-# Set this to false to disable the use of JSyntaxTextArea for the Console Logger panel
-#loggerpanel.usejsyntaxtext=true
-
-# Maximum size of HTML page that can be displayed; default=10 mbytes
-# Set to 0 to disable the size check and display the whole response
-#view.results.tree.max_size=10485760
-
-# Order of Renderers in View Results Tree
-# Note full class names should be used for non jmeter core renderers
-# For JMeter core renderers, class names start with . and are automatically
-# prefixed with org.apache.jmeter.visualizers
-view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundaryExtractor,.RenderAsCssJQuery,.RenderAsXPath,org.apache.jmeter.extractor.json.render.RenderAsJsonRenderer,.RenderAsHTML,.RenderAsHTMLFormatted,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML
-
-# Maximum number of results in the results tree
-# Set to 0 to store all results (might consume a lot of memory)
-#view.results.tree.max_results=500
-
-# Maximum size of Document that can be parsed by Tika engine; defaut=10 * 1024 * 1024 (10MB)
-# Set to 0 to disable the size check
-#document.max_size=0
-
-#JMS options
-# Enable the following property to stop JMS Point-to-Point Sampler from using
-# the properties java.naming.security.[principal|credentials] when creating the queue connection
-#JMSSampler.useSecurity.properties=false
-
-# Set the following value to true in order to skip the delete confirmation dialogue
-#confirm.delete.skip=false
-
-# Used by JSR223 elements
-# Size of compiled scripts cache
-#jsr223.compiled_scripts_cache_size=100
-
-#---------------------------------------------------------------------------
-# Classpath configuration
-#---------------------------------------------------------------------------
-
-# List of directories (separated by ;) to search for additional JMeter plugin classes,
-# for example new GUI elements and samplers.
-# Any jar file in such a directory will be automatically included,
-# jar files in sub directories are ignored.
-# The given value is in addition to any jars found in the lib/ext directory.
-# Do not use this for utility or plugin dependency jars.
-#search_paths=/app1/lib;/app2/lib
-
-# List of directories that JMeter will search for utility and plugin dependency classes.
-# Use your platform path separator to separate multiple paths.
-# Any jar file in such a directory will be automatically included,
-# jar files in sub directories are ignored.
-# The given value is in addition to any jars found in the lib directory.
-# All entries will be added to the class path of the system class loader
-# and also to the path of the JMeter internal loader.
-# Paths with spaces may cause problems for the JVM
-user.classpath=/test/
-
-# List of directories (separated by ;) that JMeter will search for utility
-# and plugin dependency classes.
-# Any jar file in such a directory will be automatically included,
-# jar files in sub directories are ignored.
-# The given value is in addition to any jars found in the lib directory
-# or given by the user.classpath property.
-# All entries will be added to the path of the JMeter internal loader only.
-# For plugin dependencies this property should be used instead of user.classpath.
-#plugin_dependency_paths=../dependencies/lib;../app1/;../app2/
-
-# Classpath finder
-# ================
-# The classpath finder currently needs to load every single JMeter class to find
-# the classes it needs.
-# For non-GUI mode, it's only necessary to scan for Function classes, but all classes
-# are still loaded.
-# All current Function classes include ".function." in their name,
-# and none include ".gui." in the name, so the number of unwanted classes loaded can be
-# reduced by checking for these. However, if a valid function class name does not match
-# these restrictions, it will not be loaded. If problems are encountered, then comment
-# or change the following properties:
-classfinder.functions.contain=.functions.
-classfinder.functions.notContain=.gui.
-
-
-#---------------------------------------------------------------------------
-# Additional property files to load
-#---------------------------------------------------------------------------
-
-# Should JMeter automatically load additional JMeter properties?
-# File name to look for (comment to disable)
-user.properties=user.properties
-
-# Should JMeter automatically load additional system properties?
-# File name to look for (comment to disable)
-system.properties=system.properties
-
-# Comma separated list of files that contain reference to templates and their description
-# Path must be relative to JMeter root folder
-#template.files=/bin/templates/templates.xml
-
-
-#---------------------------------------------------------------------------
-# Thread Group Validation feature
-#---------------------------------------------------------------------------
-
-# Validation is the name of the feature used to rapidly validate a Thread Group runs fine
-# Default implementation is org.apache.jmeter.gui.action.validation.TreeClonerForValidation
-# It runs validation without timers, with 1 thread, 1 iteration and Startup Delay set to 0
-# You can implement your own policy that must extend org.apache.jmeter.engine.TreeCloner
-# JMeter will instantiate it and use it to create the Tree used to run validation on Thread Group
-#testplan_validation.tree_cloner_class=org.apache.jmeter.validation.ComponentTreeClonerForValidation
-
-# Number of threads to use to validate a Thread Group
-#testplan_validation.nb_threads_per_thread_group=1
-
-# Ignore BackendListener when validating the thread group of plan
-#testplan_validation.ignore_backends=true
-
-# Ignore timers when validating the thread group of plan
-#testplan_validation.ignore_timers=true
-
-# Number of iterations to use to validate a Thread Group
-#testplan_validation.number_iterations=1
-
-# Force throuput controllers that work in percentage mode to be a 100%
-# Disabled by default
-#testplan_validation.tpc_force_100_pct=false
-
-#---------------------------------------------------------------------------
-# Think Time configuration
-#---------------------------------------------------------------------------
-
-#
-# Apply a factor on computed pauses by the following Timers:
-# - Gaussian Random Timer
-# - Uniform Random Timer
-# - Poisson Random Timer
-#
-#timer.factor=1.0f
-
-# Default implementation that create the Timer structure to add to Test Plan
-# Implementation of interface org.apache.jmeter.gui.action.thinktime.ThinkTimeCreator
-#think_time_creator.impl=org.apache.jmeter.thinktime.DefaultThinkTimeCreator
-
-# Default Timer GUI class added to Test Plan by DefaultThinkTimeCreator
-#think_time_creator.default_timer_implementation=org.apache.jmeter.timers.gui.UniformRandomTimerGui
-
-# Default constant pause of Timer
-#think_time_creator.default_constant_pause=1000
-
-# Default range pause of Timer
-#think_time_creator.default_range=100
-
-
-# Change this parameter if you want to override the APDEX satisfaction threshold.
-jmeter.reportgenerator.apdex_satisfied_threshold=500
-
-# Change this parameter if you want to override the APDEX tolerance threshold.
-jmeter.reportgenerator.apdex_tolerated_threshold=1500
-
-# Timeout in milliseconds for Report generation when using Tools > Generate HTML report
-#generate_report_ui.generation_timeout=120000
-#---------------------------------------------------------------------------
-# Naming Policy configuration
-#---------------------------------------------------------------------------
-
-# Prefix used when naming elements
-#naming_policy.prefix=
-# Suffix used when naming elements
-#naming_policy.suffix=
-
-# Implementation of interface org.apache.jmeter.gui.action.TreeNodeNamingPolicy
-#naming_policy.impl=org.apache.jmeter.gui.action.impl.DefaultTreeNodeNamingPolicy
-
-#---------------------------------------------------------------------------
-# Help Documentation
-#---------------------------------------------------------------------------
-
-# Switch that allows using Local documentation opened in JMeter GUI
-# By default we use Online documentation opened in Browser
-#help.local=false
-
-#---------------------------------------------------------------------------
-# Documentation generation
-#---------------------------------------------------------------------------
-
-# Path to XSL file used to generate Schematic View of Test Plan
-# When empty, JMeter will use the embedded one in src/core/org/apache/jmeter/gui/action/schematic.xsl
-#docgeneration.schematic_xsl=
diff --git a/docker/jmeter-base/log4j2.xml b/docker/jmeter-base/log4j2.xml
deleted file mode 100644
index cdb08d7377..0000000000
--- a/docker/jmeter-base/log4j2.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<Configuration status="WARN" packages="org.apache.jmeter.gui.logging">
-
-    <Appenders>
-
-        <File name="jmeter-log" fileName="${sys:jmeter.logfile:-jmeter.log}" append="false">
-            <PatternLayout>
-                <pattern>%d %p %c{1.}: %m%n</pattern>
-            </PatternLayout>
-        </File>
-
-        <GuiLogEvent name="gui-log-event">
-            <PatternLayout>
-                <pattern>%d %p %c{1.}: %m%n</pattern>
-            </PatternLayout>
-        </GuiLogEvent>
-        <Kafka name="Kafka" topic="${env:LOG_TOPIC}">
-            <PatternLayout pattern="${env:REPORT_ID} ${env:RESOURCE_ID} %date %message"/>
-            <Property name="bootstrap.servers">${env:BOOTSTRAP_SERVERS}</Property>
-        </Kafka>
-    </Appenders>
-
-    <Loggers>
-
-        <Root level="info">
-            <AppenderRef ref="jmeter-log" />
-            <AppenderRef ref="gui-log-event" />
-            <AppenderRef ref="Kafka" />
-        </Root>
-        <Logger name="org.apache.kafka" level="INFO" />
-        <Logger name="org.apache.jmeter.junit" level="debug" />
-        <!--
-        <Logger name="org.apache.jmeter.control" level="debug" />
-        <Logger name="org.apache.jmeter.testbeans" level="debug" />
-        <Logger name="org.apache.jmeter.engine" level="debug" />
-        <Logger name="org.apache.jmeter.threads" level="debug" />
-        <Logger name="org.apache.jmeter.gui" level="warn" />
-        <Logger name="org.apache.jmeter.testelement" level="debug" />
-        <Logger name="org.apache.jmeter.util" level="warn" />
-        <Logger name="org.apache.jmeter.protocol.http" level="debug" />
-        -->
-        <!-- # For CookieManager, AuthManager etc: -->
-        <!--
-        <Logger name="org.apache.jmeter.protocol.http.control" level="debug" />
-        <Logger name="org.apache.jmeter.protocol.ftp" level="warn" />
-        <Logger name="org.apache.jmeter.protocol.jdbc" level="debug" />
-        <Logger name="org.apache.jmeter.protocol.java" level="warn" />
-        <Logger name="org.apache.jmeter.testelements.property" level="debug" />
-        -->
-        <Logger name="org.apache.jorphan" level="info" />
-
-        <!--
-          # Apache HttpClient logging examples
-        -->
-        <!-- # Enable header wire + context logging - Best for Debugging -->
-        <!--
-        <Logger name="org.apache.http" level="debug" />
-        <Logger name="org.apache.http.wire" level="error" />
-        -->
-
-        <!-- # Enable full wire + context logging -->
-        <!-- <Logger name="org.apache.http" level="debug" /> -->
-
-        <!-- # Enable context logging for connection management -->
-        <!-- <Logger name="org.apache.http.impl.conn" level="debug" /> -->
-
-        <!-- # Enable context logging for connection management / request execution -->
-        <!--
-        <Logger name="org.apache.http.impl.conn" level="debug" />
-        <Logger name="org.apache.http.impl.client" level="debug" />
-        <Logger name="org.apache.http.client" level="debug" />
-        -->
-
-        <!--
-          # Reporting logging configuration examples
-        -->
-        <!-- # If you want to debug reporting, uncomment this line -->
-        <!-- <Logger name="org.apache.jmeter.report" level="debug" /> -->
-
-        <!--
-          # More user specific logging configuration examples.
-        -->
-        <!-- <Logger name="org.apache.jorphan.reflect" level="debug" /> -->
-        <!--
-          # Warning: Enabling the next debug line causes javax.net.ssl.SSLException: Received fatal alert: unexpected_message
-                     for certain sites when used with the default HTTP Sampler
-        -->
-        <!--
-        <Logger name="org.apache.jmeter.util.HttpSSLProtocolSocketFactory" level="debug" />
-        <Logger name="org.apache.jmeter.util.JsseSSLManager" level="debug" />
-        -->
-
-        <!--
-          # Enable Proxy request debug
-        -->
-        <!-- <Logger name="org.apache.jmeter.protocol.http.proxy.HttpRequestHdr" level="debug" /> -->
-
-    </Loggers>
-
-</Configuration>
diff --git a/docker/jmeter-master/Dockerfile b/docker/jmeter-master/Dockerfile
deleted file mode 100644
index 372f8784d9..0000000000
--- a/docker/jmeter-master/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM registry.fit2cloud.com/metersphere/jmeter-base:0.0.1
-LABEL maintainer="support@fit2cloud.com"
-
-EXPOSE 60000
-ENV SSL_DISABLED true
-ENV TESTS_DIR /test
-
-ADD run-test.sh /run-test.sh
-RUN chmod +x /run-test.sh \
-    && mkdir /test \
-    && mkdir /jmeter-log
-
-WORKDIR /jmeter-log/
-ENTRYPOINT /run-test.sh
\ No newline at end of file
diff --git a/docker/jmeter-master/run-test.sh b/docker/jmeter-master/run-test.sh
deleted file mode 100644
index 98b1a02e7e..0000000000
--- a/docker/jmeter-master/run-test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-for file in ${TESTS_DIR}/*.jmx; do
-  jmeter -n -t ${file} -Jserver.rmi.ssl.disable=${SSL_DISABLED}
-done

From 0ff2be302dd082eddfbcdf0579aa5baeb0612ccd Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 16 Dec 2020 13:01:39 +0800
Subject: [PATCH 03/12] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?):=20=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../components/basis/BatchAddParameter.vue    | 63 +++++++++++++++++++
 .../definition/components/body/ApiBody.vue    | 40 ++++++++++--
 .../request/http/ApiHttpRequestForm.vue       | 59 +++++++++++++++--
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  3 +-
 frontend/src/i18n/zh-TW.js                    | 21 ++++---
 8 files changed, 169 insertions(+), 22 deletions(-)
 create mode 100644 frontend/src/business/components/api/definition/components/basis/BatchAddParameter.vue

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index bb494fc68a..1fe20ba15a 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
+Subproject commit 1fe20ba15a7ca3fe9f77ddf866021e7c7dfe5969
diff --git a/frontend/src/business/components/api/definition/components/basis/BatchAddParameter.vue b/frontend/src/business/components/api/definition/components/basis/BatchAddParameter.vue
new file mode 100644
index 0000000000..8829fd390e
--- /dev/null
+++ b/frontend/src/business/components/api/definition/components/basis/BatchAddParameter.vue
@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <el-dialog
+      :title="$t('commons.batch_add')"
+      :visible.sync="dialogVisible"
+      width="60%"
+      class="batch-edit-dialog"
+      :destroy-on-close="true"
+      @close="handleClose">
+      <div>
+        <div>格式：参数名,必填,参数值,备注 如：Accept-Encoding,必填,utf-8,编码</div>
+        <div style="height: 200px">
+          <ms-code-edit :enable-format="false" mode="text" :data.sync="parameters" theme="eclipse" :modes="['text']"
+                        ref="codeEdit"/>
+        </div>
+      </div>
+      <template v-slot:footer>
+        <ms-dialog-footer
+          @cancel="dialogVisible = false"
+          @confirm="confirm()"/>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+  import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
+  import MsCodeEdit from "../../../../common/components/MsCodeEdit";
+
+  export default {
+    name: "BatchAddParameter",
+    components: {
+      MsDialogFooter,
+      MsCodeEdit
+    },
+    props: {},
+    data() {
+      return {
+        dialogVisible: false,
+        parameters: "",
+      }
+    },
+    methods: {
+      open() {
+        this.dialogVisible = true;
+        listenGoBack(this.handleClose);
+      },
+      handleClose() {
+        this.parameters = "";
+        removeGoBackListener(this.handleClose);
+      },
+      confirm() {
+        this.dialogVisible = false;
+        this.$emit("batchSave", this.parameters);
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/api/definition/components/body/ApiBody.vue b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
index 08c82a2d99..28426afe95 100644
--- a/frontend/src/business/components/api/definition/components/body/ApiBody.vue
+++ b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
@@ -25,6 +25,10 @@
         {{ $t('api_test.definition.request.body_binary') }}
       </el-radio>
     </el-radio-group>
+    <el-row v-if="body.type == 'Form Data' || body.type == 'WWW_FORM'">
+      <el-link class="ms-el-link" @click="batchAdd"> {{$t("commons.batch_add")}}</el-link>
+    </el-row>
+
     <ms-api-variable :is-read-only="isReadOnly"
                      :parameters="body.kvs"
                      :isShowEnable="isShowEnable"
@@ -55,12 +59,14 @@
                             type="body"
                             v-if="body.type == 'BINARY'"/>
 
+    <batch-add-parameter @batchSave="batchSave" ref="batchAddParameter"/>
+
   </div>
 </template>
 
 <script>
   import MsApiKeyValue from "../ApiKeyValue";
-  import {BODY_FORMAT, BODY_TYPE, KeyValue} from "../../model/ApiTestModel";
+  import {BODY_TYPE, KeyValue} from "../../model/ApiTestModel";
   import MsCodeEdit from "../../../../common/components/MsCodeEdit";
   import MsJsonCodeEdit from "../../../../common/components/MsJsonCodeEdit";
 
@@ -68,6 +74,7 @@
   import MsApiVariable from "../ApiVariable";
   import MsApiBinaryVariable from "./ApiBinaryVariable";
   import MsApiFromUrlVariable from "./ApiFromUrlVariable";
+  import BatchAddParameter from "../basis/BatchAddParameter";
 
   export default {
     name: "MsApiBody",
@@ -78,7 +85,8 @@
       MsApiKeyValue,
       MsApiBinaryVariable,
       MsApiFromUrlVariable,
-      MsJsonCodeEdit
+      MsJsonCodeEdit,
+      BatchAddParameter
     },
     props: {
       body: {},
@@ -147,9 +155,29 @@
       },
       jsonError(e) {
         this.$error(e);
-      }
-    },
+      },
+      batchAdd() {
+        this.$refs.batchAddParameter.open();
+      },
+      batchSave(data) {
+        if (data) {
+          let params = data.split("\n");
+          let keyValues = [];
+          params.forEach(item => {
+            let line = item.split(/，|,/);
+            let required = false;
+            if (line[1] === '必填' || line[1] === 'true') {
+              required = true;
+            }
+            keyValues.push(new KeyValue({name: line[0], required: required, value: line[2], description: line[3], type: "text", valid: false, file: false, encode: true, enable: true, contentType: "text/plain"}));
+          })
+          keyValues.forEach(item => {
+            this.body.kvs.unshift(item);
+          })
+        }
+      },
 
+    },
     created() {
       if (!this.body.type) {
         this.body.type = BODY_TYPE.FORM_DATA;
@@ -187,4 +215,8 @@
     margin-top: 15px;
   }
 
+  .ms-el-link {
+    float: right;
+    margin-right: 45px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
index 8a239cbf38..c03a7320b4 100644
--- a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
+++ b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
@@ -13,7 +13,6 @@
                 </div>
               </span>
             </el-tooltip>
-
             <ms-api-key-value :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :suggestions="headerSuggestions" :items="headers"/>
           </el-tab-pane>
 
@@ -25,7 +24,9 @@
                   <div class="el-step__icon-inner">{{request.arguments.length-1}}</div>
                 </div></span>
             </el-tooltip>
-
+            <el-row>
+              <el-link class="ms-el-link" @click="batchAdd"> {{$t("commons.batch_add")}}</el-link>
+            </el-row>
             <ms-api-variable :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.arguments"/>
           </el-tab-pane>
 
@@ -39,6 +40,9 @@
                 </div>
               </span>
             </el-tooltip>
+            <el-row>
+              <el-link class="ms-el-link" @click="batchAdd"> {{$t("commons.batch_add")}}</el-link>
+            </el-row>
             <ms-api-variable :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.rest"/>
           </el-tab-pane>
 
@@ -71,6 +75,9 @@
           <!--提取规则-->
           <ms-api-extract :is-read-only="isReadOnly" @copyRow="copyRow" @remove="remove" v-if="row.type==='Extract'" :extract="row"/>
         </div>
+
+        <batch-add-parameter @batchSave="batchSave" ref="batchAddParameter"/>
+
       </div>
     </el-col>
     <!--操作按钮-->
@@ -98,15 +105,24 @@
   import {createComponent} from "../../jmeter/components";
   import MsApiAssertions from "../../assertion/ApiAssertions";
   import MsApiExtract from "../../extract/ApiExtract";
-  import {Assertions, Body, Extract} from "../../../model/ApiTestModel";
+  import {Assertions, Body, Extract, KeyValue} from "../../../model/ApiTestModel";
   import {getUUID} from "@/common/js/utils";
+  import BatchAddParameter from "../../basis/BatchAddParameter";
+
 
   export default {
     name: "MsApiHttpRequestForm",
     components: {
       MsJsr233Processor,
       MsApiAdvancedConfig,
-      MsApiVariable, ApiRequestMethodSelect, MsApiExtract, MsApiAuthConfig, MsApiBody, MsApiKeyValue, MsApiAssertions
+      BatchAddParameter,
+      MsApiVariable,
+      ApiRequestMethodSelect,
+      MsApiExtract,
+      MsApiAuthConfig,
+      MsApiBody,
+      MsApiKeyValue,
+      MsApiAssertions
     },
     props: {
       request: {},
@@ -149,7 +165,7 @@
         },
         headerSuggestions: REQUEST_HEADERS,
         isReloadData: false,
-        isBodyShow: true
+        isBodyShow: true,
       }
     },
 
@@ -216,6 +232,35 @@
         this.$nextTick(() => {
           this.isBodyShow = true;
         });
+      },
+      batchAdd() {
+        this.$refs.batchAddParameter.open();
+      },
+      batchSave(data) {
+        if (data) {
+          let params = data.split("\n");
+          let keyValues = [];
+          params.forEach(item => {
+            let line = item.split(/，|,/);
+            let required = false;
+            if (line[1] === '必填' || line[1] === 'true') {
+              required = true;
+            }
+            keyValues.push(new KeyValue({name: line[0], required: required, value: line[2], description: line[3], type: "text", valid: false, file: false, encode: true, enable: true, contentType: "text/plain"}));
+          })
+          keyValues.forEach(item => {
+            switch (this.activeName) {
+              case "parameters":
+                this.request.arguments.unshift(item);
+                break;
+              case "rest":
+                this.request.rest.unshift(item);
+                break;
+              default:
+                break;
+            }
+          })
+        }
       }
     }
   }
@@ -273,4 +318,8 @@
     border: #E6EEF2;
   }
 
+  .ms-el-link {
+    float: right;
+    margin-right: 45px;
+  }
 </style>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a22a3005d9..29a8fc0960 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a
+Subproject commit 29a8fc09602fde5708af06582ac972d98eb69836
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 49eca88f75..98741015f5 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -124,6 +124,7 @@ export default {
     already_exists: 'The name already exists',
     modifier: 'Modifier',
     validate: "Validate",
+    batch_add: "Batch add",
     date: {
       select_date: 'Select date',
       start_date: 'Start date',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 2bab729eea..5f979021f3 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -124,6 +124,7 @@ export default {
     already_exists: '名称不能重复',
     modifier: '修改人',
     validate: "校验",
+    batch_add: "批量添加",
     date: {
       select_date: '选择日期',
       start_date: '开始日期',
@@ -589,7 +590,7 @@ export default {
         select_table: "选择可见数据",
         select_all: "选择全部数据"
       },
-      report_name_info: '请输入报名名称',
+      report_name_info: '请输入报告名称',
       save_case_info: '请先保存用例',
       reference_deleted: '引用已删除',
     },
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6c4b82dfac..d63f348547 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -124,6 +124,7 @@ export default {
     already_exists: '名稱不能重復',
     modifier: '修改人',
     validate: "校驗",
+    batch_add: "批量添加",
     date: {
       select_date: '選擇日期',
       start_date: '開始日期',
@@ -166,7 +167,7 @@ export default {
         current_user: "是當前用戶"
       }
     },
-    monitor:"監控",
+    monitor: "監控",
     all_label: {
       case: "全部用例",
       review: "全部評審"
@@ -589,7 +590,7 @@ export default {
         select_table: "選擇可見數據",
         select_all: "選擇全部數據"
       },
-      report_name_info: '請輸入報名名稱',
+      report_name_info: '請輸入報告名稱',
       save_case_info: '請先保存用例',
       reference_deleted: '引用已删除',
     },
@@ -829,14 +830,14 @@ export default {
     not_exist: "測試報告不存在",
   },
   api_monitor: {
-    to:"到",
-    start_time:"開始時間",
-    end_time:"結束時間",
-    today:"今天",
-    this_week:"本週",
-    this_mouth:"本月",
-    please_search:"請搜索",
-    date:"日期"
+    to: "到",
+    start_time: "開始時間",
+    end_time: "結束時間",
+    today: "今天",
+    this_week: "本週",
+    this_mouth: "本月",
+    please_search: "請搜索",
+    date: "日期"
   },
   test_track: {
     test_track: "測試跟蹤",

From 86c6254d4875d300f26aa57928ad14958d01c50a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 16 Dec 2020 14:14:00 +0800
Subject: [PATCH 04/12] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=A2=9E=E5=8A=A0=E5=A4=96=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0=E5=9C=BA=E6=99=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiDefinitionController.java   |  3 +-
 .../api/dto/ApiTestImportRequest.java         |  2 +
 .../api/service/ApiDefinitionService.java     |  8 +-
 .../automation/scenario/EditApiScenario.vue   | 95 ++++++++++++-------
 .../api/definition/ApiDefinition.vue          |  4 +-
 .../components/import/ApiImport.vue           | 17 +++-
 6 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
index 9aa8fea318..6f2b5eca02 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -7,6 +7,7 @@ import io.metersphere.api.dto.ApiTestImportRequest;
 import io.metersphere.api.dto.automation.ApiScenarioRequest;
 import io.metersphere.api.dto.automation.ReferenceDTO;
 import io.metersphere.api.dto.definition.*;
+import io.metersphere.api.dto.definition.parse.ApiDefinitionImport;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.base.domain.ApiDefinition;
 import io.metersphere.commons.constants.RoleConstants;
@@ -93,7 +94,7 @@ public class ApiDefinitionController {
 
     @PostMapping(value = "/import", consumes = {"multipart/form-data"})
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public String testCaseImport(@RequestPart(value = "file", required = false) MultipartFile file, @RequestPart("request") ApiTestImportRequest request) {
+    public ApiDefinitionImport testCaseImport(@RequestPart(value = "file", required = false) MultipartFile file, @RequestPart("request") ApiTestImportRequest request) {
         return apiDefinitionService.apiTestImport(file, request);
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java b/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
index 704dadc295..28980a6993 100644
--- a/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
@@ -13,5 +13,7 @@ public class ApiTestImportRequest {
     private String projectId;
     private String platform;
     private Boolean useEnvironment;
+    // 来自场景的导入不需要存储
+    private boolean saved = true;
     private String swaggerUrl;
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 789009212a..5cc574d6d5 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -336,7 +336,7 @@ public class ApiDefinitionService {
     }
 
 
-    public String apiTestImport(MultipartFile file, ApiTestImportRequest request) {
+    public ApiDefinitionImport apiTestImport(MultipartFile file, ApiTestImportRequest request) {
         ApiImportParser apiImportParser = ApiImportParserFactory.getApiImportParser(request.getPlatform());
         ApiDefinitionImport apiImport = null;
         try {
@@ -345,8 +345,10 @@ public class ApiDefinitionService {
             LogUtil.error(e.getMessage(), e);
             MSException.throwException(Translator.get("parse_data_error"));
         }
-        importApiTest(request, apiImport);
-        return "SUCCESS";
+        if (request.isSaved()) {
+            importApiTest(request, apiImport);
+        }
+        return apiImport;
     }
 
     private void importApiTest(ApiTestImportRequest importRequest, ApiDefinitionImport apiImport) {
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 1ecbbef22e..bc35b4f9c0 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -267,6 +267,8 @@
 
       <!--场景公共参数-->
       <ms-scenario-parameters :currentScenario="currentScenario" @addParameters="addParameters" ref="scenarioParameters"/>
+      <!--外部导入-->
+      <api-import ref="apiImport" :saved="false" @refresh="apiImport"/>
     </div>
   </el-card>
 </template>
@@ -293,6 +295,7 @@
   import MsApiScenarioComponent from "./ApiScenarioComponent";
   import MsApiReportDetail from "../report/ApiReportDetail";
   import MsScenarioParameters from "./ScenarioParameters";
+  import ApiImport from "../../definition/components/import/ApiImport";
 
   export default {
     name: "EditApiScenario",
@@ -301,13 +304,21 @@
       currentScenario: {},
     },
     components: {
-      ApiEnvironmentConfig, MsScenarioParameters,
-      MsApiReportDetail, MsAddTag, MsRun,
-      MsApiScenarioComponent, MsImportApiScenario,
-      MsJsr233Processor, MsConstantTimer,
-      MsIfController, MsApiAssertions,
-      MsApiExtract, MsApiDefinition,
-      MsApiComponent, MsApiCustomize
+      ApiEnvironmentConfig,
+      MsScenarioParameters,
+      MsApiReportDetail,
+      MsAddTag, MsRun,
+      MsApiScenarioComponent,
+      MsImportApiScenario,
+      MsJsr233Processor,
+      MsConstantTimer,
+      MsIfController,
+      MsApiAssertions,
+      MsApiExtract,
+      MsApiDefinition,
+      MsApiComponent,
+      MsApiCustomize,
+      ApiImport,
     },
     data() {
       return {
@@ -402,6 +413,7 @@
             this.scenarioVisible = true;
             break;
           default:
+            this.$refs.apiImport.open();
             break;
         }
         this.sort();
@@ -622,36 +634,40 @@
       },
       setFiles(item, bodyUploadFiles, obj) {
         if (item.body) {
-          item.body.kvs.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  if (!item.id) {
-                    let fileId = getUUID().substring(0, 12);
-                    item.name = item.file.name;
-                    item.id = fileId;
+          if (item.body.kvs) {
+            item.body.kvs.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    if (!item.id) {
+                      let fileId = getUUID().substring(0, 12);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                    }
+                    obj.bodyUploadIds.push(item.id);
+                    bodyUploadFiles.push(item.file);
                   }
-                  obj.bodyUploadIds.push(item.id);
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
-          item.body.binary.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  if (!item.id) {
-                    let fileId = getUUID().substring(0, 12);
-                    item.name = item.file.name;
-                    item.id = fileId;
+                });
+              }
+            });
+          }
+          if (item.body.binary) {
+            item.body.binary.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    if (!item.id) {
+                      let fileId = getUUID().substring(0, 12);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                    }
+                    obj.bodyUploadIds.push(item.id);
+                    bodyUploadFiles.push(item.file);
                   }
-                  obj.bodyUploadIds.push(item.id);
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
+                });
+              }
+            });
+          }
         }
       },
       recursiveFile(arr, bodyUploadFiles, obj) {
@@ -736,6 +752,15 @@
       addParameters(data) {
         this.currentScenario.variables = data;
         this.reload();
+      },
+      apiImport(importData) {
+        if (importData && importData.data) {
+          importData.data.forEach(item => {
+            this.setApiParameter(item, "API", "Copy");
+          })
+          this.sort();
+          this.reload();
+        }
       }
     }
   }
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index a7765697b5..57651b95f2 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -225,7 +225,7 @@
         if (!this.$refs.apiList[0].tableData) {
           return;
         }
-        let obj = {protocol: this.currentProtocol, data: this.$refs.apiList[0].tableData}
+        let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol, data: this.$refs.apiList[0].tableData}
         downloadFile("导出API.json", JSON.stringify(obj));
       },
       refresh(data) {
@@ -255,7 +255,7 @@
       changeProtocol(data) {
         this.currentProtocol = data;
       },
-      showExecResult(row){
+      showExecResult(row) {
         this.debug(row);
       },
 
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index bd1f0769f5..416619781e 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -70,6 +70,12 @@
   export default {
     name: "ApiImport",
     components: {MsDialogFooter},
+    props: {
+      saved: {
+        type: Boolean,
+        default: true,
+      }
+    },
     data() {
       return {
         visible: false,
@@ -148,7 +154,7 @@
       },
       uploadValidate(file, fileList) {
         let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
-        if (!this.selectedPlatform.suffixes.has(suffix)) {
+        if (this.selectedPlatform.suffixes && !this.selectedPlatform.suffixes.has(suffix)) {
           this.$warning(this.$t('api_test.api_import.suffixFormatErr'));
           return false;
         }
@@ -170,7 +176,7 @@
               let res = response.data;
               this.$success(this.$t('test_track.case.import.success'));
               this.visible = false;
-              this.$emit('refresh');
+              this.$emit('refresh', res);
             });
           } else {
             return false;
@@ -181,8 +187,11 @@
         let param = {};
         Object.assign(param, this.formData);
         param.platform = this.selectedPlatformValue;
-        param.moduleId = this.currentModule.id;
-        param.modulePath = this.currentModule.path;
+        param.saved = this.saved;
+        if (this.currentModule) {
+          param.moduleId = this.currentModule.id;
+          param.modulePath = this.currentModule.path;
+        }
         param.projectId = getCurrentProjectID();
         if (!this.swaggerUrlEable) {
           param.swaggerUrl = undefined;

From a73b202551a7f077b78992731a9f3597bac39a5a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 16 Dec 2020 14:27:35 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=A2=9E=E5=8A=A0=E5=A4=96=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0=E5=9C=BA=E6=99=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/parse/MsParser.java    |  8 +++++---
 .../metersphere/api/parse/PostmanParser.java  | 14 +++++++------
 .../metersphere/api/parse/Swagger2Parser.java | 20 ++++++++++---------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/MsParser.java b/backend/src/main/java/io/metersphere/api/parse/MsParser.java
index 78effbfff9..d297c3174a 100644
--- a/backend/src/main/java/io/metersphere/api/parse/MsParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/MsParser.java
@@ -32,7 +32,7 @@ public class MsParser extends ApiImportAbstractParser {
         if (testObject.get("projectName") != null) {
             return parseMsFormat(testStr, request);
         } else {
-            return parsePluginFormat(testObject);
+            return parsePluginFormat(testObject, request.isSaved());
         }
     }
 
@@ -53,14 +53,16 @@ public class MsParser extends ApiImportAbstractParser {
         return apiDefinitionImport;
     }
 
-    private ApiDefinitionImport parsePluginFormat(JSONObject testObject) {
+    private ApiDefinitionImport parsePluginFormat(JSONObject testObject, boolean isSaved) {
         List<ApiDefinitionResult> results = new ArrayList<>();
         ApiDefinitionImport apiImport = new ApiDefinitionImport();
         apiImport.setProtocol(RequestType.HTTP);
         apiImport.setData(results);
         testObject.keySet().forEach(tag -> {
             ApiModule module = apiModuleService.getNewModule(tag, this.projectId, 1);
-            createModule(module);
+            if (isSaved) {
+                createModule(module);
+            }
             JSONObject requests = testObject.getJSONObject(tag);
             requests.keySet().forEach(requestName -> {
 
diff --git a/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java b/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
index ec5f63a386..9809326b35 100644
--- a/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/PostmanParser.java
@@ -30,17 +30,17 @@ public class PostmanParser extends ApiImportAbstractParser {
         List<PostmanKeyValue> variables = postmanCollection.getVariable();
         ApiDefinitionImport apiImport = new ApiDefinitionImport();
         List<ApiDefinitionResult> results = new ArrayList<>();
-        parseItem(postmanCollection.getItem(), variables, results, buildModule(postmanCollection.getInfo().getName(), null));
+        parseItem(postmanCollection.getItem(), variables, results, buildModule(postmanCollection.getInfo().getName(), null, request.isSaved()), request.isSaved());
         apiImport.setData(results);
         return apiImport;
     }
 
-    private void parseItem(List<PostmanItem> items, List<PostmanKeyValue> variables, List<ApiDefinitionResult> results, ApiModule parentModule) {
+    private void parseItem(List<PostmanItem> items, List<PostmanKeyValue> variables, List<ApiDefinitionResult> results, ApiModule parentModule, boolean isSaved) {
         for (PostmanItem item : items) {
             List<PostmanItem> childItems = item.getItem();
             if (childItems != null) {
-                ApiModule module = buildModule(item.getName(), parentModule);
-                parseItem(childItems, variables, results, module);
+                ApiModule module = buildModule(item.getName(), parentModule, isSaved);
+                parseItem(childItems, variables, results, module, isSaved);
             } else {
                 ApiDefinitionResult request = parsePostman(item);
                 if (request != null) {
@@ -53,7 +53,7 @@ public class PostmanParser extends ApiImportAbstractParser {
         }
     }
 
-    private ApiModule buildModule(String name, ApiModule parentModule) {
+    private ApiModule buildModule(String name, ApiModule parentModule, boolean isSaved) {
         apiModuleService = CommonBeanFactory.getBean(ApiModuleService.class);
         ApiModule module;
         if (parentModule != null) {
@@ -62,7 +62,9 @@ public class PostmanParser extends ApiImportAbstractParser {
         } else {
             module = apiModuleService.getNewModule(name, this.projectId, 1);
         }
-        createModule(module);
+        if (isSaved) {
+            createModule(module);
+        }
         return module;
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
index b5dea282b7..8be3f760f7 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
@@ -39,11 +39,11 @@ public class Swagger2Parser extends ApiImportAbstractParser {
         }
         ApiDefinitionImport definitionImport = new ApiDefinitionImport();
         this.projectId = request.getProjectId();
-        definitionImport.setData(parseRequests(swagger));
+        definitionImport.setData(parseRequests(swagger, request.isSaved()));
         return definitionImport;
     }
 
-    private List<ApiDefinitionResult> parseRequests(Swagger swagger) {
+    private List<ApiDefinitionResult> parseRequests(Swagger swagger, boolean isSaved) {
         Map<String, Path> paths = swagger.getPaths();
         Set<String> pathNames = paths.keySet();
 
@@ -62,7 +62,7 @@ public class Swagger2Parser extends ApiImportAbstractParser {
                 parseParameters(operation, request);
                 apiDefinition.setRequest(JSON.toJSONString(request));
                 apiDefinition.setResponse(JSON.toJSONString(parseResponse(operation.getResponses())));
-                buildModule(apiDefinition, operation);
+                buildModule(apiDefinition, operation, isSaved);
                 results.add(apiDefinition);
             }
         }
@@ -71,13 +71,15 @@ public class Swagger2Parser extends ApiImportAbstractParser {
         return results;
     }
 
-    private void buildModule(ApiDefinitionResult apiDefinition, Operation operation) {
+    private void buildModule(ApiDefinitionResult apiDefinition, Operation operation, boolean isSaved) {
         List<String> tags = operation.getTags();
         if (tags != null) {
             tags.forEach(tag -> {
                 apiModuleService = CommonBeanFactory.getBean(ApiModuleService.class);
                 ApiModule module = apiModuleService.getNewModule(tag, this.projectId, 1);
-                createModule(module);
+                if (isSaved) {
+                    createModule(module);
+                }
                 apiDefinition.setModuleId(module.getId());
             });
         }
@@ -113,8 +115,8 @@ public class Swagger2Parser extends ApiImportAbstractParser {
         for (Parameter parameter : parameters) {
             switch (parameter.getIn()) {
                 case SwaggerParameterType.PATH:
-                   parsePathParameters(parameter, request.getRest());
-                   break;
+                    parsePathParameters(parameter, request.getRest());
+                    break;
                 case SwaggerParameterType.QUERY:
                     parseQueryParameters(parameter, request.getArguments());
                     break;
@@ -297,14 +299,14 @@ public class Swagger2Parser extends ApiImportAbstractParser {
                 || value instanceof DecimalProperty) {
             return 0.0;
         } else {// todo 其他类型?
-           return getDefaultStringValue(value.getDescription());
+            return getDefaultStringValue(value.getDescription());
         }
     }
 
     private void parseFormDataParameters(FormParameter parameter, Body body) {
         List<KeyValue> keyValues = Optional.ofNullable(body.getKvs()).orElse(new ArrayList<>());
         KeyValue kv = new KeyValue(parameter.getName(), "", getDefaultStringValue(parameter.getDescription()));
-        if (StringUtils.equals(parameter.getType(), "file") ) {
+        if (StringUtils.equals(parameter.getType(), "file")) {
             kv.setType("file");
         }
         keyValues.add(kv);

From 0b38df4576846bb8b17c9eb42d921650c4d52d45 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 16 Dec 2020 14:35:30 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=A1=B9=E7=9B=AE=E5=90=8E=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/common/head/SearchList.vue    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index 647621d15d..d4bbf9d1de 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -98,13 +98,10 @@ export default {
       }
       this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => {
         localStorage.setItem(PROJECT_ID, projectId);
-        if (this.$route.path.indexOf('/track/review/view/') >= 0) {
-          this.$router.replace('/track/review/all');
-        } else if (this.$route.path.indexOf('/track/plan/view/') >= 0) {
-          this.$router.replace('/track/plan/all');
-        } else {
-          window.location.reload();
-        }
+        let path = this.$route.matched[0].path ? this.$route.matched[0].path : '/';
+        this.$router.push(path).then(() => {
+          window.location.reload()
+        }).catch(err => err);
         this.changeProjectName(projectId);
       });
     },

From 62b02eeb81c991b376dd95e92f26204132a879f0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 16 Dec 2020 14:38:13 +0800
Subject: [PATCH 07/12] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectController.java         |  5 ----
 .../components/api/head/ApiHeaderMenus.vue    | 30 -------------------
 .../components/common/head/SearchList.vue     |  7 -----
 .../head/PerformanceHeaderMenus.vue           | 14 ---------
 .../track/head/TrackHeaderMenus.vue           | 22 --------------
 5 files changed, 78 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/ProjectController.java b/backend/src/main/java/io/metersphere/controller/ProjectController.java
index 3750e8fd41..2ce466d0d9 100644
--- a/backend/src/main/java/io/metersphere/controller/ProjectController.java
+++ b/backend/src/main/java/io/metersphere/controller/ProjectController.java
@@ -84,9 +84,4 @@ public class ProjectController {
         projectService.updateProject(Project);
     }
 
-    @PostMapping("/search")
-    public List<ProjectDTO> searchProject(@RequestBody ProjectRequest projectRequest) {
-        projectRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
-        return projectService.getProjectList(projectRequest);
-    }
 }
diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 73548443e6..10dae0f5fa 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -67,16 +67,6 @@ export default {
   components: {SearchList, MsCreateTest, MsCreateButton, MsShowAll, MsRecentList, ProjectChange},
   data() {
     return {
-      projectRecent: {
-        title: this.$t('project.recent'),
-        url: "/project/recent/5",
-        index: function (item) {
-          return '/api/test/list/' + item.id;
-        },
-        router: function (item) {
-          return {name: 'ApiTestList', params: {projectId: item.id, projectName: item.name}}
-        }
-      },
       testRecent: {
         title: this.$t('load_test.recent'),
         url: "/api/recent/5",
@@ -101,19 +91,10 @@ export default {
       currentProject: ''
     }
   },
-  // watch: {
-  //   '$route'(to) {
-  //     this.init();
-  //   },
-  // },
   methods: {
     registerEvents() {
       ApiEvent.$on(LIST_CHANGE, () => {
         // // todo 这里偶尔会有 refs 为空的情况
-        // if (!this.$refs.projectRecent) {
-        //   return;
-        // }
-        // this.$refs.projectRecent.recent();
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();
       });
@@ -124,17 +105,6 @@ export default {
         this.isRouterAlive = true;
       });
     },
-    // init() {
-    //   let path = this.$route.path;
-    //   if (path.indexOf("/api/test/list") >= 0 && !!this.$route.params.projectId) {
-    //     this.apiTestProjectPath = path;
-    //     //不激活项目菜单栏
-    //     this.isProjectActivation = false;
-    //     this.reload();
-    //   } else {
-    //     this.isProjectActivation = true;
-    //   }
-    // },
   },
   mounted() {
     this.registerEvents();
diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index d4bbf9d1de..4b861ec45a 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -76,13 +76,6 @@ export default {
         })
       }
     },
-    search() {
-      if (hasRoles(ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
-        this.result = this.$post("/project/search", {name: this.searchString},response => {
-          this.items = response.data;
-        })
-      }
-    },
     query(queryString) {
       this.items = queryString ? this.searchArray.filter(this.createFilter(queryString)) : this.searchArray;
     },
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index fedbe25eb6..117b735ac9 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -59,16 +59,6 @@ export default {
   },
   data() {
     return {
-      projectRecent: {
-        title: this.$t('project.recent'),
-        url: "/project/recent/5",
-        index(item) {
-          return '/performance/test/' + item.id;
-        },
-        router(item) {
-          return {name: 'perPlan', params: {projectId: item.id, projectName: item.name}}
-        }
-      },
       testRecent: {
         title: this.$t('load_test.recent'),
         url: "/performance/recent/5",
@@ -95,10 +85,6 @@ export default {
     registerEvents() {
       PerformanceEvent.$on(LIST_CHANGE, () => {
         // // todo 这里偶尔会有 refs 为空的情况
-        // if (!this.$refs.projectRecent) {
-        //   return;
-        // }
-        // this.$refs.projectRecent.recent();
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();
       });
diff --git a/frontend/src/business/components/track/head/TrackHeaderMenus.vue b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
index 484234a688..7b9dbd4ac3 100644
--- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue
+++ b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
@@ -69,16 +69,6 @@ export default {
       testCaseProjectPath: '',
       isProjectActivation: true,
       currentProject: '',
-      projectRecent: {
-        title: this.$t('project.recent'),
-        url: "/project/recent/5",
-        index: function (item) {
-          return '/track/case/' + item.id;
-        },
-        router: function (item) {
-          return {name: 'testCase', params: {projectId: item.id, projectName: item.name}}
-        }
-      },
       caseRecent: {
         title: this.$t('test_track.recent_case'),
         url: "/test/case/recent/5",
@@ -126,14 +116,6 @@ export default {
     },
     init() {
       let path = this.$route.path;
-      // if (path.indexOf("/track/case") >= 0 && !!this.$route.params.projectId) {
-      //   this.testCaseProjectPath = path;
-      //   //不激活项目菜单栏
-      //   this.isProjectActivation = false;
-      //   this.reload();
-      // } else {
-      //   this.isProjectActivation = true;
-      // }
       if (path.indexOf("/track/plan/view") >= 0) {
         this.testPlanViewPath = path;
         this.reload();
@@ -150,10 +132,6 @@ export default {
     registerEvents() {
       TrackEvent.$on(LIST_CHANGE, () => {
         // // todo 这里偶尔会有 refs 为空的情况
-        // if (!this.$refs.projectRecent) {
-        //   return;
-        // }
-        // this.$refs.projectRecent.recent();
         this.$refs.planRecent.recent();
         this.$refs.caseRecent.recent();
       });

From 98459d6d5e37e657a30db202977db398ece6376f Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 16 Dec 2020 14:44:08 +0800
Subject: [PATCH 08/12] fix:placeholder

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 1fe20ba15a..61397c1672 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 1fe20ba15a7ca3fe9f77ddf866021e7c7dfe5969
+Subproject commit 61397c16728a63493507679f7e0940d9099f337f
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 29a8fc0960..e1e8b4dffb 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 29a8fc09602fde5708af06582ac972d98eb69836
+Subproject commit e1e8b4dffb4f71f1402ddae6bb149dd0be195342

From 48e6e82451d222de6cf00dcf095c319eb348dc10 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 16 Dec 2020 15:30:34 +0800
Subject: [PATCH 09/12] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/components/RequestResult.vue       | 12 +++-
 .../report/components/RequestResultTail.vue   | 24 --------
 .../api/automation/scenario/DebugRun.vue      | 60 ++++++++++---------
 .../automation/scenario/EditApiScenario.vue   | 14 ++---
 4 files changed, 48 insertions(+), 62 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/components/RequestResult.vue b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
index 6631e69395..28efc6cbea 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResult.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
@@ -17,15 +17,21 @@
 
         <el-col :span="5">
           <el-tooltip effect="dark" :content="request.responseResult.responseCode" placement="bottom" :open-delay="800">
-            <div class="url" style="color: #5daf34">{{ request.responseResult.responseCode }}</div>
+            <div style="color: #5daf34" v-if="request.success">{{ request.responseResult.responseCode }}</div>
+            <div style="color: #FE6F71" v-else>{{ request.responseResult.responseCode }}</div>
           </el-tooltip>
         </el-col>
         <el-col :span="3">
-          {{request.responseResult.responseTime}} ms
+          <span v-if="request.success">
+            {{request.responseResult.responseTime}} ms
+          </span>
+          <span style="color: #FE6F71" v-else>
+            {{request.responseResult.responseTime}} ms
+          </span>
         </el-col>
 
         <el-col :span="2">
-          <div class="success">
+          <div>
             <el-tag size="mini" type="success" v-if="request.success">
               {{ $t('api_report.success') }}
             </el-tag>
diff --git a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
index cbc5a58c8f..500eaa2f1c 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
@@ -8,33 +8,10 @@
           </div>
         </el-col>
         <el-col :span="10">
-          <div class="name">{{request.name}}</div>
           <el-tooltip effect="dark" :content="request.url" placement="bottom" :open-delay="800">
             <div class="url">{{request.url}}</div>
           </el-tooltip>
         </el-col>
-        <el-col :span="4">
-          {{request.startTime | timestampFormatDate(true) }}
-        </el-col>
-        <el-col :span="2">
-          <div class="time">
-            {{request.responseResult.responseTime}}
-          </div>
-        </el-col>
-        <el-col :span="2">
-          {{request.error}}
-        </el-col>
-        <el-col :span="2">
-          {{assertion}}
-        </el-col>
-        <el-col :span="2">
-          <el-tag size="mini" type="success" v-if="request.success">
-            {{$t('api_report.success')}}
-          </el-tag>
-          <el-tag size="mini" type="danger" v-else>
-            {{$t('api_report.fail')}}
-          </el-tag>
-        </el-col>
       </el-row>
     </div>
     <el-collapse-transition>
@@ -52,7 +29,6 @@
           </el-tab-pane>
         </el-tabs>
         <div v-else>
-          <ms-request-metric :request="request"/>
           <ms-request-text v-if="isCodeEditAlive" :request="request"/>
           <br>
           <ms-response-text :request-type="requestType" v-if="isCodeEditAlive" :response="request.responseResult"/>
diff --git a/frontend/src/business/components/api/automation/scenario/DebugRun.vue b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
index e24015b171..f8bbd9132a 100644
--- a/frontend/src/business/components/api/automation/scenario/DebugRun.vue
+++ b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
@@ -32,36 +32,40 @@
     methods: {
       setFiles(item, bodyUploadFiles, obj) {
         if (item.body) {
-          item.body.kvs.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  if (!item.id) {
-                    let fileId = getUUID().substring(0, 12);
-                    item.name = item.file.name;
-                    item.id = fileId;
+          if (item.body.kvs) {
+            item.body.kvs.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    if (!item.id) {
+                      let fileId = getUUID().substring(0, 12);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                    }
+                    obj.bodyUploadIds.push(item.id);
+                    bodyUploadFiles.push(item.file);
                   }
-                  obj.bodyUploadIds.push(item.id);
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
-          item.body.binary.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  if (!item.id) {
-                    let fileId = getUUID().substring(0, 12);
-                    item.name = item.file.name;
-                    item.id = fileId;
+                });
+              }
+            });
+          }
+          if (item.body.binary) {
+            item.body.binary.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    if (!item.id) {
+                      let fileId = getUUID().substring(0, 12);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                    }
+                    obj.bodyUploadIds.push(item.id);
+                    bodyUploadFiles.push(item.file);
                   }
-                  obj.bodyUploadIds.push(item.id);
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
+                });
+              }
+            });
+          }
         }
       },
       recursiveFile(arr, bodyUploadFiles, obj) {
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index bc35b4f9c0..4c1fb5faea 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -113,7 +113,7 @@
       </el-form>
 
       <!-- 场景步骤-->
-      <div v-loading="isReloadData">
+      <div v-loading="loading">
         <p class="tip">{{$t('api_test.automation.scenario_step')}} </p>
         <el-row>
           <el-col :span="21">
@@ -157,13 +157,13 @@
               </el-row>
             </div>
             <!-- 场景步骤内容 -->
-            <div style="margin-top: 10px" v-loading="isReloadData">
+            <div style="margin-top: 10px" v-loading="loading">
               <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition"
                        :default-expanded-keys="expandedNode"
                        :expand-on-click-node="false"
                        @node-expand="nodeExpand"
                        @node-collapse="nodeCollapse"
-                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!isReloadData" draggable>
+                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable>
                  <span class="custom-tree-node father" slot-scope="{ node, data}" style="width: 96%">
                     <template>
                       <!-- 场景 -->
@@ -344,7 +344,7 @@
         options: API_STATUS,
         levels: PRIORITY,
         scenario: {},
-        isReloadData: false,
+        loading: false,
         apiListVisible: false,
         customizeVisible: false,
         scenarioVisible: false,
@@ -565,9 +565,9 @@
         this.reload();
       },
       reload() {
-        this.isReloadData = true
+        this.loading = true
         this.$nextTick(() => {
-          this.isReloadData = false
+          this.loading = false
         })
       },
       runDebug() {
@@ -744,7 +744,7 @@
       },
       runRefresh() {
         this.debugVisible = true;
-        this.isReloadData = false;
+        this.loading = false;
       },
       showScenarioParameters() {
         this.$refs.scenarioParameters.open(this.currentScenario.variables);

From 1bfeaa2c075452cdd50dfeb4f0783447b85f6702 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 16 Dec 2020 16:07:58 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/common/head/ProjectSwitch.vue  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/common/head/ProjectSwitch.vue b/frontend/src/business/components/common/head/ProjectSwitch.vue
index 85e1f77769..b9c024b3a9 100644
--- a/frontend/src/business/components/common/head/ProjectSwitch.vue
+++ b/frontend/src/business/components/common/head/ProjectSwitch.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-menu class="header-menu" :unique-opened="true" mode="horizontal" default-active="1">
+  <el-menu class="header-menu" :unique-opened="true" mode="horizontal" default-active="1" router>
     <!-- 不激活项目路由-->
     <el-menu-item index="1" v-show="false">Placeholder</el-menu-item>
     <el-submenu v-permission="['test_manager','test_user','test_viewer']" index="2" popper-class="submenu">
@@ -14,21 +14,23 @@
         <font-awesome-icon :icon="['fa', 'plus']"/>
         <span style="padding-left: 7px;">{{ $t("project.create") }}</span>
       </el-menu-item>
-      <ms-show-all :index="'/setting/project/all'"/>
+      <el-menu-item :index="'/setting/project/all'">
+        <font-awesome-icon :icon="['fa', 'list-ul']"/>
+        <span style="padding-left: 7px;">{{ $t('commons.show_all') }}</span>
+      </el-menu-item>
     </el-submenu>
   </el-menu>
 </template>
 
 <script>
 import SearchList from "@/business/components/common/head/SearchList";
-import MsShowAll from "@/business/components/common/head/ShowAll";
 
 export default {
   name: "ProjectSwitch",
   props: {
     projectName: String
   },
-  components: {SearchList, MsShowAll},
+  components: {SearchList},
   data() {
     return {
       currentProject: this.projectName

From ee82f669c30b836b9611f467ec02ead4a912ee08 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 16 Dec 2020 16:37:42 +0800
Subject: [PATCH 11/12] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89):=20=E6=8E=A5=E5=8F=A3=E6=89=A7=E8=A1=8C=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E4=BF=9D=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiDefinitionExecResultService.java       |  6 ---
 .../api/service/ApiDefinitionService.java     |  2 +-
 .../ext/ExtApiDefinitionExecResultMapper.java |  3 +-
 .../ext/ExtApiDefinitionExecResultMapper.xml  |  4 +-
 .../mapper/ext/ExtApiDefinitionMapper.xml     | 26 ++++++++---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  | 44 ++++++++++++++++---
 6 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index a3466cbe9e..f5a175d62e 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import io.metersphere.api.jmeter.TestResult;
 import io.metersphere.base.domain.ApiDefinitionExecResult;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
-import io.metersphere.base.mapper.ext.ExtApiDefinitionExecResultMapper;
 import io.metersphere.commons.utils.SessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,14 +17,9 @@ import java.util.UUID;
 public class ApiDefinitionExecResultService {
     @Resource
     private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
-    @Resource
-    private ExtApiDefinitionExecResultMapper extApiDefinitionExecResultMapper;
-
 
     public void saveApiResult(TestResult result) {
         result.getScenarios().get(0).getRequestResults().forEach(item -> {
-            // 清理原始资源，每个执行 保留一条结果
-            extApiDefinitionExecResultMapper.deleteByResourceId(item.getName());
             ApiDefinitionExecResult saveResult = new ApiDefinitionExecResult();
             saveResult.setId(UUID.randomUUID().toString());
             saveResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 5cc574d6d5..6b1fa87426 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -326,7 +326,7 @@ public class ApiDefinitionService {
      * @return
      */
     public APIReportResult getDbResult(String testId) {
-        ApiDefinitionExecResult result = extApiDefinitionExecResultMapper.selectByResourceId(testId);
+        ApiDefinitionExecResult result = extApiDefinitionExecResultMapper.selectMaxResultByResourceId(testId);
         if (result == null) {
             return null;
         }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
index e9a480815b..8c33a17d5f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
@@ -6,7 +6,6 @@ public interface ExtApiDefinitionExecResultMapper {
 
     void deleteByResourceId(String id);
 
-    ApiDefinitionExecResult selectByResourceId(String resourceId);
-
+    ApiDefinitionExecResult selectMaxResultByResourceId(String resourceId);
 
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 8031d82c59..fec17fae05 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -5,8 +5,8 @@
       delete from api_definition_exec_result  where resource_id = #{id,jdbcType=VARCHAR}
     </delete>
 
-    <select id="selectByResourceId" parameterType="java.lang.String" resultType="io.metersphere.base.domain.ApiDefinitionExecResult">
+    <select id="selectMaxResultByResourceId" parameterType="java.lang.String" resultType="io.metersphere.base.domain.ApiDefinitionExecResult">
         select  * from api_definition_exec_result
-        where resource_id = #{resourceId,jdbcType=VARCHAR}
+        where resource_id = #{resourceId,jdbcType=VARCHAR} ORDER BY update_time DESC LIMIT 1
     </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 545bc9b71a..8ffd1aa754 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -89,17 +89,29 @@
 
     <select id="selectByIds" resultType="io.metersphere.api.dto.definition.ApiComputeResult">
         select t1.api_definition_id apiDefinitionId,count(t1.id) caseTotal,
-        case t2.status
-        when 'success' then '通过'
-        when 'error' then '未通过'
-        ELSE '未执行' end as status ,
-        CONCAT(FORMAT(SUM(IF(t2.`status` = 'success', 1, 0))/ COUNT(t1.id)*100, 2), '%') passRate
-        from api_test_case t1 left join api_definition_exec_result t2 on t1.id = t2.resource_id
+            case t2.status
+            when 'success' then '通过'
+            when 'error' then '未通过'
+            ELSE '未执行' end as status ,
+            CONCAT(FORMAT(SUM(IF(t2.`status` = 'success', 1, 0))/ COUNT(t1.id)*100, 2), '%') passRate
+            from api_test_case t1 left join (
+        select
+          a.status, a.id, a.resource_id
+        from
+          api_definition_exec_result a
+        left join (
+          select
+            max(start_time) start_time , id, resource_id
+          from
+            api_definition_exec_result
+          group by
+            resource_id ) as b on a.id = b.id
+        where
+          a.start_time = b.start_time)as t2 on t1.id = t2.resource_id
         group by t1.api_definition_id having t1.api_definition_id in
         <foreach collection="ids" item="v" separator="," open="(" close=")">
             #{v}
         </foreach>
-        order by t2.end_time desc;
     </select>
 
     <sql id="combine">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 88c90a3119..1b65a29482 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -146,15 +146,45 @@
     </sql>
 
     <select id="list" resultType="io.metersphere.api.dto.definition.ApiTestCaseResult">
-        select atc.id, atc.project_id,
-        atc.name,atc.priority,atc.api_definition_id,T1.name as createUser ,T2.name as updateUser,
-        atc.description,atc.request,atc.response,atc.create_user_id,
-        atc.create_time,atc.update_user_id, atc.update_time,ader.status execResult
-        from api_test_case atc left join user T1 on atc.create_user_id = T1.id left join user T2 on
-        atc.update_user_id = T2.id left join api_definition_exec_result ader on atc.id = ader.resource_id
+        select
+            atc.id,
+            atc.project_id,
+            atc.name,
+            atc.priority,
+            atc.api_definition_id,
+            u1.name as createUser ,
+            u2.name as updateUser,
+            atc.description,
+            atc.request,
+            atc.response,
+            atc.create_user_id,
+            atc.create_time,
+            atc.update_user_id,
+            atc.update_time,
+            ader.status execResult
+        from
+          api_test_case atc
+        left join user u1 on
+          atc.create_user_id = u1.id
+        left join user u2 on
+          atc.update_user_id = u2.id
+        left join (
+            select
+              a.status, a.id, a.resource_id
+            from
+              api_definition_exec_result a
+            left join (
+                select
+                  max(start_time) start_time , id, resource_id
+                from
+                  api_definition_exec_result
+                group by
+                  resource_id ) as b on a.id = b.id
+                where
+                  a.start_time = b.start_time) as ader
+        on atc.id = ader.resource_id
         <where>
             <if test="request.name != null and request.name!=''">
-
                 and atc.name like CONCAT('%', #{request.name},'%')
             </if>
             <if test="request.id != null and request.id!=''">

From 09fabf35f2c0695530aa0e0187fbe134bf3075d3 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 16 Dec 2020 16:38:22 +0800
Subject: [PATCH 12/12] fix:placeholder

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index e1e8b4dffb..d39dafaf84 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit e1e8b4dffb4f71f1402ddae6bb149dd0be195342
+Subproject commit d39dafaf84b9c7a56cb51f2caf67dd7dfde5938c