From 589dc65212842953427d5bbfd33a1501cc9c886e Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Tue, 24 Sep 2024 10:50:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=BD=BF=E7=94=A8mock=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8Curl=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1045933 --user=陈建星 [接口测试】接口场景中使用MOCK环境执行，请求URL 地址错误 https://www.tapd.cn/55049933/s/1584279
---
 .../api/mapper/ExtApiDefinitionMapper.xml        |  2 +-
 .../parser/jmeter/MsHTTPElementConverter.java    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 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 ee270b240c..cf901460b3 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
@@ -584,7 +584,7 @@
         order by `pos` desc limit 1;
     </select>
     <select id="getApiDefinitionExecuteInfo" resultType="io.metersphere.api.dto.ApiDefinitionExecuteInfo">
-        select id as resource_id, module_id, path, method
+        select id as resource_id, module_id, path, method, num
         from api_definition
         where protocol = 'HTTP'
             and id in
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java
index 74df401563..831b61fcc2 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java
@@ -80,7 +80,7 @@ public class MsHTTPElementConverter extends AbstractJmeterElementConverter<MsHTT
 
         sampler.setMethod(msHTTPElement.getMethod());
         // path 设置完整的url
-        sampler.setPath(getPath(msHTTPElement, httpConfig));
+        sampler.setPath(getPath(msHTTPElement, httpConfig, envConfig));
 
         setHttpOtherConfig(msHTTPElement.getOtherConfig(), sampler);
 
@@ -182,16 +182,20 @@ public class MsHTTPElementConverter extends AbstractJmeterElementConverter<MsHTT
         return authManager;
     }
 
-    private String getPath(MsHTTPElement msHTTPElement, HttpConfig httpConfig) {
+    private String getPath(MsHTTPElement msHTTPElement, HttpConfig httpConfig, EnvironmentInfoDTO envConfig) {
         String url = msHTTPElement.getPath();
         if (httpConfig != null) {
             // 接口调试没有环境，不取环境的配置
             String protocol = httpConfig.getProtocol().toLowerCase();
             String hostName = httpConfig.getHostname();
-            if (hostName.lastIndexOf("/") == hostName.length() - 1) {
+            if (StringUtils.endsWith(hostName, "/")) {
                 hostName = hostName.substring(0, hostName.length() - 1);
             }
-            if (url.indexOf("/") == 0) {
+            // 如果是 mock 返回的url格式是 /mock-server/projectNum/apiNum
+            if (BooleanUtils.isTrue(envConfig.getMock()) && msHTTPElement.getNum() != null) {
+                hostName = StringUtils.join(hostName, "/", msHTTPElement.getNum());
+            }
+            if (StringUtils.startsWith(url, "/")) {
                 url = url.substring(1);
             }
             url = protocol + "://" + (hostName + "/" + url);
@@ -360,10 +364,6 @@ public class MsHTTPElementConverter extends AbstractJmeterElementConverter<MsHTT
                 match = true;
             }
             if (match) {
-                // 如果是mock 返回的url格式是 /mock-server/projectNum/apiNum
-                if (BooleanUtils.isTrue(envConfig.getMock())) {
-                    httpConfig.setHostname(StringUtils.join(httpConfig.getHostname(), "/", msHTTPElement.getNum()));
-                }
                 return httpConfig;
             }
         }