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

fix(接口测试): 【接口测试】场景-添加自定义请求-dubbo类型，执行失败 

--bug=1013747 --user=宋天阳 【接口测试】场景-添加自定义请求-dubbo类型，执行失败 {#_orginal_url#}
This commit is contained in:
song-tianyang 2022-06-02 15:02:04 +08:00 committed by f2c-ci-robot[bot]
parent 2fe21fb79e
commit 34f55fe3f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
View File

@ -87,7 +87,7 @@ public class MsDubboSampler extends MsTestElement {
// 非导出操作，且不是启用状态则跳过执行 // 非导出操作，且不是启用状态则跳过执行
if (!config.isOperating() && !this.isEnable()) { if (!config.isOperating() && !this.isEnable()) {
return; return;
}else if(config.isOperating() && StringUtils.isNotEmpty(config.getOperatingSampleTestName())){ } else if (config.isOperating() && StringUtils.isNotEmpty(config.getOperatingSampleTestName())) {
this.setName(config.getOperatingSampleTestName()); this.setName(config.getOperatingSampleTestName());
} }
if (this.getReferenced() != null && "Deleted".equals(this.getReferenced())) { if (this.getReferenced() != null && "Deleted".equals(this.getReferenced())) {
@ -112,9 +112,9 @@ public class MsDubboSampler extends MsTestElement {
//处理全局前后置脚本(步骤内) //处理全局前后置脚本(步骤内)
String environmentId = this.getEnvironmentId(); String environmentId = this.getEnvironmentId();
if (environmentId == null) { if (environmentId == null) {
if(StringUtils.isEmpty(this.useEnvironment) && envConfig != null){ if (StringUtils.isEmpty(this.useEnvironment) && envConfig != null) {
environmentId = envConfig.getApiEnvironmentid(); environmentId = envConfig.getApiEnvironmentid();
}else { } else {
environmentId = this.useEnvironment; environmentId = this.useEnvironment;
} }
} }
@ -215,7 +215,7 @@ public class MsDubboSampler extends MsTestElement {
private ConfigTestElement configCenter(MsConfigCenter configCenter) { private ConfigTestElement configCenter(MsConfigCenter configCenter) {
ConfigTestElement configTestElement = new ConfigTestElement(); ConfigTestElement configTestElement = new ConfigTestElement();
if (configCenter != null && configCenter.getProtocol() != null && configCenter.getUsername() != null && configCenter.getPassword() != null) { if (configCenter != null && StringUtils.isNotEmpty(configCenter.getAddress()) && StringUtils.isNotEmpty(configCenter.getProtocol()) && StringUtils.isNotEmpty(configCenter.getUsername()) && StringUtils.isNotEmpty(configCenter.getPassword())) {
Constants.setConfigCenterProtocol(configCenter.getProtocol(), configTestElement); Constants.setConfigCenterProtocol(configCenter.getProtocol(), configTestElement);
Constants.setConfigCenterGroup(configCenter.getGroup(), configTestElement); Constants.setConfigCenterGroup(configCenter.getGroup(), configTestElement);
Constants.setConfigCenterNamespace(configCenter.getNamespace(), configTestElement); Constants.setConfigCenterNamespace(configCenter.getNamespace(), configTestElement);