fix(项目设置): 修复Http域名使用变量配置报错的缺陷

【【Github issue id
22857】环境配置，Http配置，环境域名需要支持${ip}:${port}格式，客户的场景里有动态ip和端口的诉求。】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001024738

api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java

@@ -45,6 +45,8 @@ import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
 import org.json.JSONObject;
 
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -362,58 +364,10 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                 }
                 String url = httpConfig.getProtocol() + "://" + httpConfig.getSocket();
                 if (isUrl()) {
-                    if (this.isCustomizeReq() && StringUtils.isNotEmpty(this.getUrl())) {
+                    //  正常全路径
-                        url = this.getUrl();
+                    fullPath(sampler, url);
-                        sampler.setProperty("HTTPSampler.path", url);
-                    }
-                    if (StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
-                        url = url.replace(this.getPort(), "10990");
-                    }
-                    try {
-                        URL urlObject = new URL(url);
-                        sampler.setDomain(URLDecoder.decode(urlObject.getHost(), StandardCharsets.UTF_8.name()));
-                        if (urlObject.getPort() > 0 && urlObject.getPort() == 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
-                            sampler.setProperty("HTTPSampler.port", this.getPort());
-                        } else if (urlObject.getPort() != -1) {
-                            sampler.setPort(urlObject.getPort());
-                        }
-                        sampler.setProtocol(urlObject.getProtocol());
-                        sampler.setProperty("HTTPSampler.path", URLDecoder.decode(url, StandardCharsets.UTF_8.name()), StandardCharsets.UTF_8.name());
-                    } catch (Exception e) {
-                        LogUtil.error(e.getMessage(), e);
-                    }
                 } else {
-                    if (!isCustomizeReq() || isRefEnvironment) {
+                    useEnvironmentSample(httpConfig, sampler, url);
-                        if (isCustomizeReqCompleteUrl(this.path)) {
-                            url = httpConfig.getProtocol() + "://" + httpConfig.getSocket();
-                        }
-                        String envPath = "";
-                        if (!isCustomizeReqCompleteUrl(this.path) || isRefEnvironment) {
-                            URL urlObject = new URL(url);
-                            envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getFile();
-                            if (StringUtils.isNotBlank(this.getPath())) {
-                                envPath += this.getPath();
-                            }
-                            sampler.setPort(httpConfig.getPort());
-                            if (StringUtils.isNotEmpty(httpConfig.getDomain())) {
-                                sampler.setDomain(URLDecoder.decode(httpConfig.getDomain(), StandardCharsets.UTF_8.name()));
-                                sampler.setProtocol(httpConfig.getProtocol());
-                            } else {
-                                sampler.setDomain("");
-                                sampler.setProtocol("");
-                                sampler.setPort(-1);
-                            }
-                        } else {
-                            URL urlObject = new URL(this.path);
-                            envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getFile();
-                            sampler.setDomain(URLDecoder.decode(urlObject.getHost(), StandardCharsets.UTF_8.name()));
-                            sampler.setProtocol(urlObject.getProtocol());
-                        }
-                        if (StringUtils.isNotEmpty(envPath) && !envPath.startsWith("/")) {
-                            envPath = "/" + envPath;
-                        }
-                        sampler.setProperty("HTTPSampler.path", URLDecoder.decode(URLEncoder.encode(envPath, StandardCharsets.UTF_8.name()), StandardCharsets.UTF_8.name()));
-                    }
                 }
                 String envPath = sampler.getPath();
                 if (CollectionUtils.isNotEmpty(this.getRest()) && this.isRest()) {
@@ -450,6 +404,67 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         }
     }
 
+    private void useEnvironmentSample(HttpConfig httpConfig, HTTPSamplerProxy sampler, String url) throws MalformedURLException, UnsupportedEncodingException {
+        if (!isCustomizeReq() || isRefEnvironment) {
+            if (isCustomizeReqCompleteUrl(this.path)) {
+                url = httpConfig.getProtocol() + "://" + httpConfig.getSocket();
+            }
+            String envPath = "";
+            if (!isCustomizeReqCompleteUrl(this.path) || isRefEnvironment) {
+                try {
+                    URL urlObject = new URL(url);
+                    envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getFile();
+                    if (StringUtils.isNotBlank(this.getPath())) {
+                        envPath += this.getPath();
+                    }
+                    sampler.setPort(httpConfig.getPort());
+                    if (StringUtils.isNotEmpty(httpConfig.getDomain())) {
+                        sampler.setDomain(URLDecoder.decode(httpConfig.getDomain(), StandardCharsets.UTF_8.name()));
+                        sampler.setProtocol(httpConfig.getProtocol());
+                    } else {
+                        sampler.setDomain("");
+                        sampler.setProtocol("");
+                        sampler.setPort(-1);
+                    }
+                } catch (Exception e) {
+                    envPath = StringUtils.isNotBlank(this.path) ? StringUtils.join(url, this.path) : url;
+                }
+            } else {
+                URL urlObject = new URL(this.path);
+                envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getFile();
+                sampler.setDomain(URLDecoder.decode(urlObject.getHost(), StandardCharsets.UTF_8.name()));
+                sampler.setProtocol(urlObject.getProtocol());
+            }
+            if (StringUtils.isNotEmpty(envPath) && !envPath.startsWith("/")) {
+                envPath = "/" + envPath;
+            }
+            sampler.setProperty("HTTPSampler.path", URLDecoder.decode(URLEncoder.encode(envPath, StandardCharsets.UTF_8.name()), StandardCharsets.UTF_8.name()));
+        }
+    }
+
+    private void fullPath(HTTPSamplerProxy sampler, String url) {
+        if (this.isCustomizeReq() && StringUtils.isNotEmpty(this.getUrl())) {
+            url = this.getUrl();
+            sampler.setProperty("HTTPSampler.path", url);
+        }
+        if (StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
+            url = url.replace(this.getPort(), "10990");
+        }
+        try {
+            URL urlObject = new URL(url);
+            sampler.setDomain(URLDecoder.decode(urlObject.getHost(), StandardCharsets.UTF_8.name()));
+            if (urlObject.getPort() > 0 && urlObject.getPort() == 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
+                sampler.setProperty("HTTPSampler.port", this.getPort());
+            } else if (urlObject.getPort() != -1) {
+                sampler.setPort(urlObject.getPort());
+            }
+            sampler.setProtocol(urlObject.getProtocol());
+            sampler.setProperty("HTTPSampler.path", URLDecoder.decode(url, StandardCharsets.UTF_8.name()), StandardCharsets.UTF_8.name());
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+    }
+
     /**
      * 加载SSL认证
      *

framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue

@@ -445,7 +445,7 @@ export default {
       try {
         url = new URL(urlStr);
       } catch (e) {
-        return false;
+        return true;
       }
       this.condition.domain = decodeURIComponent(url.hostname);
 

project-management/frontend/src/business/menu/environment/components/EnvironmentHttpConfig.vue

@@ -450,7 +450,7 @@ export default {
       try {
         url = new URL(urlStr);
       } catch (e) {
-        return false;
+        return true;
       }
       this.condition.domain = decodeURIComponent(url.hostname);