From cb9402a075fb414e2653659adc8a5821ed77af7d 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
---
 .../definition/request/sampler/MsTCPSampler.java | 16 +++++++++++++++-
 .../definition/components/case/ApiCaseItem.vue   |  2 +-
 2 files changed, 16 insertions(+), 2 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 cd28a9c08a..e3bc48e160 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -111,7 +111,7 @@
         <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 " :response="apiCase.responseData" :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"/>
+        <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'"/>