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

fix(接口测试): 场景导出JMX时host转换增加带端口号域名的解析 

场景导出JMX时host转换增加带端口号域名的解析
This commit is contained in:
song-tianyang 2022-05-18 20:24:23 +08:00 committed by f2c-ci-robot[bot]
parent e606f28c1c
commit fb9f992b60
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/dto/definition/request/dns/MsDNSCacheManager.java
View File

@ -76,6 +76,8 @@ public class MsDNSCacheManager extends MsTestElement {
String hostDomain = host.getDomain().trim().replace("http://", "").replace("https://", ""); String hostDomain = host.getDomain().trim().replace("http://", "").replace("https://", "");
if (StringUtils.equals(hostDomain, domain)) { if (StringUtils.equals(hostDomain, domain)) {
dnsMap.put(hostDomain, host.getIp()); dnsMap.put(hostDomain, host.getIp());
}else if(StringUtils.startsWith(hostDomain,domain+":")){
dnsMap.put(domain,StringUtils.replace(hostDomain,domain,host.getIp()));
} }
} }
}); });

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

@ -216,10 +216,22 @@ public class MsHTTPSamplerProxy extends MsTestElement {
if (config.isOperating() && config.isEffective(this.getProjectId()) && config.getConfig().get(this.getProjectId()).getCommonConfig() != null if (config.isOperating() && config.isEffective(this.getProjectId()) && config.getConfig().get(this.getProjectId()).getCommonConfig() != null
&& config.getConfig().get(this.getProjectId()).getCommonConfig().isEnableHost()) { && config.getConfig().get(this.getProjectId()).getCommonConfig().isEnableHost()) {
//导出的需要将DNSCache去掉，并把域名进行ip替换 //导出的需要将DNSCache去掉，并把域名进行ip替换
Map<String,String> dnsMap = MsDNSCacheManager.getEnvironmentDns(config.getConfig().get(this.getProjectId()), httpConfig); Map<String, String> dnsMap = MsDNSCacheManager.getEnvironmentDns(config.getConfig().get(this.getProjectId()), httpConfig);
String domain = sampler.getDomain(); String domain = sampler.getDomain();
if(dnsMap.containsKey(domain)){ if (dnsMap.containsKey(domain)) {
sampler.setDomain(dnsMap.get(domain)); String address = dnsMap.get(domain);
if (address.contains(":")) {
String[] addressArr = StringUtils.split(address, ":");
if (addressArr.length == 2) {
try {
sampler.setDomain(addressArr[0]);
sampler.setPort(Integer.parseInt(addressArr[1]));
} catch (Exception ignored) {
}
}
} else {
sampler.setDomain(dnsMap.get(domain));
}
} }
} }
final HashTree httpSamplerTree = tree.add(sampler); final HashTree httpSamplerTree = tree.add(sampler);
@ -682,28 +694,28 @@ public class MsHTTPSamplerProxy extends MsTestElement {
list.stream(). list.stream().
filter(KeyValue::isValid). filter(KeyValue::isValid).
filter(KeyValue::isEnable).forEach(keyValue -> { filter(KeyValue::isEnable).forEach(keyValue -> {
try { try {
String value = StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue(); String value = StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), value); HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), value);
if (keyValue.getValue() == null) { if (keyValue.getValue() == null) {
httpArgument.setValue(""); httpArgument.setValue("");
} }
httpArgument.setAlwaysEncoded(keyValue.isUrlEncode()); httpArgument.setAlwaysEncoded(keyValue.isUrlEncode());
if (StringUtils.isNotBlank(keyValue.getContentType())) { if (StringUtils.isNotBlank(keyValue.getContentType())) {
httpArgument.setContentType(keyValue.getContentType()); httpArgument.setContentType(keyValue.getContentType());
} }
if (StringUtils.equalsIgnoreCase(this.method, "get")) { if (StringUtils.equalsIgnoreCase(this.method, "get")) {
if (StringUtils.isNotEmpty(httpArgument.getValue())) { if (StringUtils.isNotEmpty(httpArgument.getValue())) {
arguments.addArgument(httpArgument); arguments.addArgument(httpArgument);
} }
} else { } else {
arguments.addArgument(httpArgument); arguments.addArgument(httpArgument);
} }
} catch (Exception e) { } catch (Exception e) {
} }
} }
); );
return arguments; return arguments;
} }