From 463dfaa463434509b067f48892c0a813c9382dbd Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 4 Mar 2022 14:29:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DTCP=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008379 --user=宋天阳 【github#7974】tcp接口的请求时间和响应时间不起作用
https://www.tapd.cn/55049933/s/1113826
---
 .../request/sampler/MsTCPSampler.java         | 16 ++++-
 .../components/case/ApiCaseItem.vue           | 70 +++++++++++++------
 2 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
index 8f6e55789f..a69480193e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
@@ -227,7 +227,7 @@ public class MsTCPSampler extends MsTestElement {
     }
 
     private void parseEnvironment(EnvironmentConfig config) {
-        if (!isCustomizeReq() && config != null) {
+        if (!isCustomizeReq() && config != null && config.getTcpConfig() != null) {
             if (!isCustomizeReq() && config != null) {
                 this.server = config.getTcpConfig().getServer();
                 this.port = config.getTcpConfig().getPort();
@@ -238,6 +238,14 @@ public class MsTCPSampler extends MsTestElement {
                         this.eolByte = config.getTcpConfig().getEolByte();
                     }
                 }
+
+                if ((StringUtils.isEmpty(this.timeout) || StringUtils.equals(this.timeout, "0")) && StringUtils.isNotEmpty(config.getTcpConfig().getTimeout())) {
+                    this.timeout = config.getTcpConfig().getTimeout();
+                }
+
+                if (StringUtils.isEmpty(this.ctimeout) || StringUtils.equals(this.ctimeout, "0") && StringUtils.isNotEmpty(config.getTcpConfig().getCtimeout())) {
+                    this.ctimeout = config.getTcpConfig().getCtimeout();
+                }
             }
         }
     }
@@ -265,6 +273,12 @@ public class MsTCPSampler extends MsTestElement {
         tcpSampler.setCloseConnection(String.valueOf(this.isCloseConnection()));
         tcpSampler.setSoLinger(this.getSoLinger());
         tcpSampler.setEolByte(this.getEolByte());
+        if (StringUtils.isNotEmpty(this.timeout)) {
+            tcpSampler.setTimeout(this.timeout);
+        }
+        if (StringUtils.isNotEmpty(this.ctimeout)) {
+            tcpSampler.setConnectTimeout(this.ctimeout);
+        }
 
         String value = this.getRequest();
         if (StringUtils.isNotEmpty(this.getConnectEncoding())) {
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 5c9ee44c8d..b3d19cdb64 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -8,7 +8,7 @@
             <el-input v-if="!apiCase.id || isShowInput" size="small" v-model="apiCase.name" :name="index" :key="index"
                       class="ms-api-header-select" style="width: 180px"
                       :readonly="!hasPermission('PROJECT_API_DEFINITION:READ+EDIT_CASE')"
-                       :placeholder="$t('commons.input_name')" ref="nameEdit"/>
+                      :placeholder="$t('commons.input_name')" ref="nameEdit"/>
             <span v-else>
               <el-tooltip :content="apiCase.id ? apiCase.name : ''" placement="top">
                 <span>{{ apiCase.id ? apiCase.name : '' | ellipsis }}</span>
@@ -17,7 +17,8 @@
               <i class="el-icon-edit" style="cursor:pointer" @click="showInput(apiCase)"/>
             </span>
 
-            <el-link type="primary" style="margin-left: 10px" @click="openHis(apiCase)" v-if="apiCase.id">{{ $t('operating_log.change_history') }}</el-link>
+            <el-link type="primary" style="margin-left: 10px" @click="openHis(apiCase)"
+                     v-if="apiCase.id">{{ $t('operating_log.change_history') }}</el-link>
           </span>
           <div v-if="apiCase.id" style="color: #999999;font-size: 12px">
             <span style="margin-left: 10px">
@@ -27,13 +28,15 @@
           </div>
         </el-col>
         <el-col :span="2">
-          <el-select size="mini" v-model="apiCase.priority" class="ms-api-select" @change="changePriority(apiCase)" :disabled="loaded">
+          <el-select size="mini" v-model="apiCase.priority" class="ms-api-select" @change="changePriority(apiCase)"
+                     :disabled="loaded">
             <el-option v-for="grd in priorities" :key="grd.id" :label="grd.name" :value="grd.id"/>
           </el-select>
         </el-col>
         <el-col :span="api.protocol==='HTTP'?4:0">
           <span v-if="api.protocol==='HTTP'">
-            <el-tag size="mini" :style="{'background-color': getColor(true, apiCase.request.method), border: getColor(true, apiCase.request.method)}"
+            <el-tag size="mini"
+                    :style="{'background-color': getColor(true, apiCase.request.method), border: getColor(true, apiCase.request.method)}"
                     class="api-el-tag">
                 {{ apiCase.request.method }}
             </el-tag>
@@ -45,34 +48,42 @@
         <el-col :span="5">
           <el-row>
             <el-col :span="8">
-              <el-select size="small" v-model="apiCase.caseStatus" style="margin-right: 5px" @change="saveTestCase(apiCase,true)" :disabled="loaded">
+              <el-select size="small" v-model="apiCase.caseStatus" style="margin-right: 5px"
+                         @change="saveTestCase(apiCase,true)" :disabled="loaded">
                 <el-option v-for="item in options" :key="item.id" :label="$t(item.label)" :value="item.id"/>
               </el-select>
             </el-col>
             <el-col :span="16">
               <div class="tag-item" @click.stop>
                 <el-tooltip :content="$t('commons.follow')" placement="bottom" effect="dark" v-if="!showFollow">
-                  <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-top: 2px; margin-right: 15px;cursor: pointer " @click="saveFollow"/>
+                  <i class="el-icon-star-off"
+                     style="color: #783987; font-size: 25px; margin-top: 2px; margin-right: 15px;cursor: pointer "
+                     @click="saveFollow"/>
                 </el-tooltip>
                 <el-tooltip :content="$t('commons.cancel')" placement="bottom" effect="dark" v-if="showFollow">
-                  <i class="el-icon-star-on" style="color: #783987; font-size: 28px; margin-top: 2px; margin-right: 15px;cursor: pointer " @click="saveFollow" v-if="showFollow"/>
+                  <i class="el-icon-star-on"
+                     style="color: #783987; font-size: 28px; margin-top: 2px; margin-right: 15px;cursor: pointer "
+                     @click="saveFollow" v-if="showFollow"/>
                 </el-tooltip>
               </div>
             </el-col>
           </el-row>
           <el-row style="margin-top: 5px">
             <div class="tag-item" @click.stop>
-              <ms-input-tag :currentScenario="apiCase" ref="tag" @keyup.enter.native="saveTestCase(apiCase,true)" :disabled="loaded"/>
+              <ms-input-tag :currentScenario="apiCase" ref="tag" @keyup.enter.native="saveTestCase(apiCase,true)"
+                            :disabled="loaded"/>
             </div>
           </el-row>
         </el-col>
 
         <el-col :span="3">
           <span @click.stop v-if="!loaded">
-            <ms-tip-button @click="singleRun(apiCase)" :tip="$t('api_test.run')" icon="el-icon-video-play" v-permission="['PROJECT_API_DEFINITION:READ+RUN']"
+            <ms-tip-button @click="singleRun(apiCase)" :tip="$t('api_test.run')" icon="el-icon-video-play"
+                           v-permission="['PROJECT_API_DEFINITION:READ+RUN']"
                            class="run-button" size="mini" :disabled="!apiCase.id || loaded" circle v-if="!loading"/>
             <el-tooltip :content="$t('report.stop_btn')" placement="top" :enterable="false" v-else>
-              <el-button :disabled="!apiCase.id" @click.once="stop(apiCase)" size="mini" style="color:white;padding: 0;width: 28px;height: 28px;" class="stop-btn" circle>
+              <el-button :disabled="!apiCase.id" @click.once="stop(apiCase)" size="mini"
+                         style="color:white;padding: 0;width: 28px;height: 28px;" class="stop-btn" circle>
                 <div style="transform: scale(0.72)">
                   <span style="margin-left: -3.5px;font-weight: bold">STOP</span>
                 </div>
@@ -85,10 +96,12 @@
         </el-col>
 
         <el-col :span="4">
-          <el-link @click.stop type="danger" v-if="apiCase.execResult && apiCase.execResult==='error'" @click="showExecResult(apiCase)">
+          <el-link @click.stop type="danger" v-if="apiCase.execResult && apiCase.execResult==='error'"
+                   @click="showExecResult(apiCase)">
             {{ getResult(apiCase.execResult) }}
           </el-link>
-          <el-link @click.stop v-else-if="apiCase.execResult && apiCase.execResult==='success'" @click="showExecResult(apiCase)">
+          <el-link @click.stop v-else-if="apiCase.execResult && apiCase.execResult==='success'"
+                   @click="showExecResult(apiCase)">
             {{ getResult(apiCase.execResult) }}
           </el-link>
           <div v-else> {{ getResult(apiCase.execResult) }}</div>
@@ -110,22 +123,27 @@
       <div v-if="apiCase.active||type==='detail'" v-loading="loading">
         <el-divider></el-divider>
         <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-        <ms-api-request-form :isShowEnable="true" :showScript="true" :headers="apiCase.request.headers " :request="apiCase.request" v-if="api.protocol==='HTTP'"/>
-        <tcp-format-parameters :showScript="true" :request="apiCase.request" v-if="api.method==='TCP' && apiCase.request.esbDataStruct == null"/>
-        <esb-definition v-xpack :request="apiCase.request" :showScript="true" v-if="isXpack&&api.method==='ESB'" ref="esbDefinition"/>
+        <ms-api-request-form :isShowEnable="true" :showScript="true" :headers="apiCase.request.headers "
+                             :request="apiCase.request" v-if="api.protocol==='HTTP'"/>
+        <tcp-format-parameters :showScript="true" :request="apiCase.request" v-if="api.method==='TCP'"/>
+        <esb-definition v-xpack :request="apiCase.request" :showScript="true" v-if="isXpack&&api.method==='ESB'"
+                        ref="esbDefinition"/>
         <ms-sql-basis-parameters :showScript="true" :request="apiCase.request" v-if="api.protocol==='SQL'"/>
         <ms-dubbo-basis-parameters :showScript="true" :request="apiCase.request" v-if="api.protocol==='DUBBO'"/>
 
         <!-- HTTP 请求返回数据 -->
         <p class="tip">{{ $t('api_test.definition.request.res_param') }}</p>
         <div v-if="isXpack&&api.method==='ESB'">
-          <esb-definition-response v-xpack v-if="isXpack" :currentProtocol="apiCase.request.protocol" :request="apiCase.request" :is-api-component="false" :show-options-button="false" :show-header="true" :api-item="apiCase"/>
+          <esb-definition-response v-xpack v-if="isXpack" :currentProtocol="apiCase.request.protocol"
+                                   :request="apiCase.request" :is-api-component="false" :show-options-button="false"
+                                   :show-header="true" :api-item="apiCase"/>
         </div>
         <div v-else>
           <api-response-component :currentProtocol="apiCase.request.protocol" :api-item="apiCase" :result="runResult"/>
         </div>
 
-        <ms-jmx-step v-if="apiCase.request.hashTree && apiCase.request.hashTree.length > 0" :request="apiCase.request" :api-id="api.id" :response="apiCase.responseData"/>
+        <ms-jmx-step v-if="apiCase.request.hashTree && apiCase.request.hashTree.length > 0" :request="apiCase.request"
+                     :api-id="api.id" :response="apiCase.responseData"/>
 
       </div>
     </el-collapse-transition>
@@ -192,7 +210,7 @@ export default {
     ShowMoreBtn,
     MsChangeHistory,
     "esbDefinition": esbDefinition.default,
-    "esbDefinitionResponse": esbDefinitionResponse.default ,
+    "esbDefinitionResponse": esbDefinitionResponse.default,
     ApiCaseHeader
   },
   data() {
@@ -324,7 +342,14 @@ export default {
         let uuid = getUUID();
         let request = JSON.parse(JSON.stringify(data.request));
         request.id = uuid;
-        let obj = {name: "copy_" + data.name, priority: data.priority, active: true, tags: data.tags, request: request, uuid: uuid};
+        let obj = {
+          name: "copy_" + data.name,
+          priority: data.priority,
+          active: true,
+          tags: data.tags,
+          request: request,
+          uuid: uuid
+        };
         this.$emit('copyCase', obj);
       }
     },
@@ -394,7 +419,10 @@ export default {
             stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type);
           }
           if (stepArray[i].type === "Assertions" && !stepArray[i].document) {
-            stepArray[i].document = {type: "JSON", data: {xmlFollowAPI: false, jsonFollowAPI: false, json: [], xml: []}};
+            stepArray[i].document = {
+              type: "JSON",
+              data: {xmlFollowAPI: false, jsonFollowAPI: false, json: [], xml: []}
+            };
           }
           if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) {
             stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type);
@@ -479,7 +507,7 @@ export default {
           this.addModule(row);
         } else {
           this.api.source = "editCase";
-          if (!this.isSave){
+          if (!this.isSave) {
             this.saveCase(row, hideAlert);
           }
         }