test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 修复快捷调试特殊 URL 处理问题 

--bug=1047267 --user=赵勇 [接口测试]github#33319接口测试请求地址域名中带有特殊字符@时无法正确识别 https://www.tapd.cn/55049933/s/1600511

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2024-10-29 16:18:08 +08:00 committed by Craftsman
parent a42b6f3c7f
commit 8dd9bc8354
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,20 +403,10 @@ public class MsHTTPSamplerProxy extends MsTestElement {
}
} else {
String envPath = this.path;
try {
if (StringUtils.isNotBlank(url)) {
URL urlObject = new URL(url);
if (url.contains("${")) {
envPath = url;
} else {
sampler.setDomain(URLDecoder.decode(urlObject.getHost(), StandardCharsets.UTF_8));
envPath = urlObject.getPath();
sampler.setPort(urlObject.getPort());
}
sampler.setProtocol(urlObject.getProtocol());
}
} catch (Exception e) {
envPath = url == null ? "" : url;
// 有url则不拼接path 来源于调试请求
if (StringUtils.isNotBlank(url) && StringUtils.isBlank(this.path)) {
envPath = this.url;
sampler.setProperty(HTTPSamplerBase.PATH, envPath);
}
sampler.setProperty(HTTPSamplerBase.PATH, envPath, StandardCharsets.UTF_8.name());
if (CollectionUtils.isNotEmpty(this.getRest()) && this.isRest()) {
@ -477,17 +467,15 @@ public class MsHTTPSamplerProxy extends MsTestElement {
private void fullPath(HTTPSamplerProxy sampler, String url) {
try {
if (this.isCustomizeReq() && StringUtils.isNotEmpty(this.getUrl())) {
url = this.getUrl();
sampler.setProperty(HTTPSamplerBase.PATH, url);
sampler.setProperty(HTTPSamplerBase.PATH, this.getUrl());
return;
}
if (StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
url = url.replace(this.getPort(), "10990");
}
URL urlObject = new URL(url);
String envPath;
if (url.contains("${")) {
envPath = url;
} else {
URL urlObject = new URL(url);
sampler.setDomain(URLDecoder.decode(urlObject.getHost(), StandardCharsets.UTF_8));
if (urlObject.getPort() == 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) {
sampler.setProperty(HTTPSamplerBase.PORT, this.getPort());
@ -495,9 +483,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
sampler.setPort(urlObject.getPort());
}
envPath = urlObject.getPath();
sampler.setProtocol(urlObject.getProtocol());
}
sampler.setProtocol(urlObject.getProtocol());
sampler.setProperty(HTTPSamplerBase.PATH, URLDecoder.decode(envPath, StandardCharsets.UTF_8), StandardCharsets.UTF_8.name());
} catch (Exception e) {
sampler.setProperty(HTTPSamplerBase.PATH, url);