From 7d2fa6ae0d17556195c737d0514f66a8c7b2a138 Mon Sep 17 00:00:00 2001
From: Jianguo-Genius <herman.song.yang@gmail.com>
Date: Wed, 18 Sep 2024 15:49:21 +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=8Djmx=E6=96=87=E4=BB=B6=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=A4=B4=E8=A7=A3=E6=9E=90=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=1046513 --user=宋天阳 【接口测试】定义-导入jmeter接口文件-导入信息请求头错误 https://www.tapd.cn/55049933/s/1579922
---
 .../api/mapper/ExtApiDefinitionMapper.xml           |  1 +
 .../api/parser/api/HarParserApiDefinition.java      |  3 ++-
 .../api/parser/ms/http/HeaderManagerConverter.java  | 13 +++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
index c57fdec10f..ee270b240c 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
@@ -504,6 +504,7 @@
             api_definition.num like concat('%', #{request.condition.keyword},'%')
             or api_definition.name like concat('%', #{request.condition.keyword},'%')
             or api_definition.tags like concat('%', #{request.condition.keyword},'%')
+            or api_definition.path like concat('%', #{request.condition.keyword},'%')
             )
         </if>
         <include refid="filters">
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/api/HarParserApiDefinition.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/api/HarParserApiDefinition.java
index 06cd9166ee..37bfc01b96 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/api/HarParserApiDefinition.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/api/HarParserApiDefinition.java
@@ -363,8 +363,9 @@ public class HarParserApiDefinition extends HttpApiDefinitionImportAbstractParse
         if (StringUtils.equalsIgnoreCase("GET", requestBody.method) || requestBody.postData == null) {
             return;
         }
-        String bodyType = Body.BodyType.NONE.name();
+        String bodyType = content.mimeType;
         if (StringUtils.isEmpty(bodyType)) {
+            bodyType = Body.BodyType.RAW.name();
             body.setRawBody(new RawBody() {{
                 this.setValue(content.text);
             }});
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/ms/http/HeaderManagerConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/ms/http/HeaderManagerConverter.java
index 0b13891867..26390e51ba 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/ms/http/HeaderManagerConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/ms/http/HeaderManagerConverter.java
@@ -4,6 +4,7 @@ import io.metersphere.api.dto.request.http.MsHTTPElement;
 import io.metersphere.api.dto.request.http.MsHeader;
 import io.metersphere.plugin.api.spi.AbstractMsElementConverter;
 import io.metersphere.plugin.api.spi.AbstractMsTestElement;
+import jodd.util.StringUtil;
 import org.apache.jmeter.protocol.http.control.HeaderManager;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -23,10 +24,18 @@ public class HeaderManagerConverter extends AbstractMsElementConverter<HeaderMan
             for (int i = 0; i < collectionProperty.size(); i++) {
                 JMeterProperty jMeterProperty = collectionProperty.get(i);
                 String key = jMeterProperty.getName();
+                String value = jMeterProperty.getStringValue();
+                if (StringUtil.isEmpty(key)) {
+                    String[] valueArr = value.split("\t");
+                    key = valueArr[0];
+                    value = valueArr[1];
+                }
                 if (!extendsHeaderKey.contains(key)) {
+                    String finalKey = key;
+                    String finalValue = value;
                     headerKvList.add(new MsHeader() {{
-                        this.setKey(key);
-                        this.setValue(jMeterProperty.getStringValue());
+                        this.setKey(finalKey);
+                        this.setValue(finalValue);
                     }});
                 }
             }