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

fix(接口测试): 修复环境变量背覆盖问题 

--bug=1018123 --user=赵勇 [接口测试]接口case后置脚本中设置环境参数执行后会覆盖掉手动添加的通用配置参数 https://www.tapd.cn/55049933/s/1273979
This commit is contained in:
fit2-zhao 2022-10-24 12:03:57 +08:00 committed by f2c-ci-robot[bot]
parent cbafdca681
commit 8adacee396
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiEnvironmentRunningParamService.java
View File

@ -49,36 +49,35 @@ public class ApiEnvironmentRunningParamService {
JSONObject commonConfig = configObj.optJSONObject(COMMON_CONFIG);
if (commonConfig.has(VARIABLES)) {
JSONArray variables = commonConfig.optJSONArray(VARIABLES);
List<JSONObject> variableList = new LinkedList<>();
if (variables == null) {
return;
}
for (Map.Entry<String, String> entry : varMap.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
boolean contains = false;
for (int i = 0; i < variables.length(); i++) {
JSONObject jsonObj = variables.optJSONObject(i);
if (jsonObj.has(NAME) && StringUtils.equals(jsonObj.optString(NAME), key)) {
if (jsonObj.has(NAME) && StringUtils.equals(jsonObj.optString(NAME), entry.getKey())) {
contains = true;
if (jsonObj.has(VALUE) && StringUtils.equals(jsonObj.optString(VALUE), value)) {
if (jsonObj.has(VALUE) && StringUtils.equals(jsonObj.optString(VALUE), entry.getValue())) {
break;
} else {
envNeedUpdate = true;
jsonObj.put(VALUE, value);
jsonObj.put(VALUE, entry.getValue());
}
}
}
if (!contains) {
envNeedUpdate = true;
JSONObject itemObj = new JSONObject();
itemObj.put(NAME, key);
itemObj.put(VALUE, value);
itemObj.put(NAME, entry.getKey());
itemObj.put(VALUE, entry.getValue());
itemObj.put(ENABLE, true);
if (variableList.size() == 0) {
variableList.add(itemObj);
if (variables.length() == 0) {
variables.put(itemObj);
} else {
variableList.add(variables.length() - 1, itemObj);
variables.put(variables.length() - 1, itemObj);
}
commonConfig.put(VARIABLES, variableList);
commonConfig.put(VARIABLES, variables);
}
}
} else {