diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 2d88dde7f5..d70423500e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -130,7 +130,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         }
 
         // 1.8 之前历史数据
-        if(StringUtils.isEmpty(this.getProjectId()) && config.getConfig()!= null && !config.getConfig().isEmpty()){
+        if (StringUtils.isEmpty(this.getProjectId()) && config.getConfig() != null && !config.getConfig().isEmpty()) {
             this.setProjectId("historyProjectID");
         }
 
@@ -154,10 +154,11 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                     }
                     URL urlObject = new URL(url);
                     sampler.setDomain(URLDecoder.decode(urlObject.getHost(), "UTF-8"));
-                    if (urlObject.getPort() > 0 && urlObject.getPort() != 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
-                        sampler.setPort(urlObject.getPort());
-                    } else {
+
+                    if (urlObject.getPort() > 0 && urlObject.getPort() == 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
                         sampler.setProperty("HTTPSampler.port", this.getPort());
+                    } else {
+                        sampler.setPort(urlObject.getPort());
                     }
                     sampler.setProtocol(urlObject.getProtocol());
                     sampler.setPath(urlObject.getPath());
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2115bd28a9..07951ba17a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2115bd28a90854d2b6276a90878934715498c584
+Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd