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

refactor(接口测试): 优化http变量取ip配置的逻辑

This commit is contained in:
wxg0103 2023-03-31 19:24:04 +08:00 committed by fit2-zhao
parent 662e8e28c3
commit 1440e64a73
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,10 +425,13 @@ public class MsHTTPSamplerProxy extends MsTestElement {
envPath += this.getPath(); envPath += this.getPath();
} }
sampler.setPort(httpConfig.getPort()); sampler.setPort(httpConfig.getPort());
if (StringUtils.isNotEmpty(httpConfig.getDomain())) { if (httpConfig.getDomain().startsWith("${")){
sampler.setProtocol(httpConfig.getProtocol());
envPath = StringUtils.isNotBlank(this.path) ? StringUtils.join(httpConfig.getSocket(), this.path) : url;
} else if (StringUtils.isNotEmpty(httpConfig.getDomain())) {
sampler.setDomain(URLDecoder.decode(httpConfig.getDomain(), StandardCharsets.UTF_8.name())); sampler.setDomain(URLDecoder.decode(httpConfig.getDomain(), StandardCharsets.UTF_8.name()));
sampler.setProtocol(httpConfig.getProtocol()); sampler.setProtocol(httpConfig.getProtocol());
} else { } else {
sampler.setDomain(""); sampler.setDomain("");
sampler.setProtocol(""); sampler.setProtocol("");
sampler.setPort(-1); sampler.setPort(-1);