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

fix(接口测试): 优化设置环境变量参数的代码 

优化设置环境变量参数的代码
This commit is contained in:
song-tianyang 2022-03-07 12:44:23 +08:00 committed by CountryBuilder
parent bf51986a61
commit 9f4eb2a1fa
1 changed files with 76 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java
View File

@ -5,13 +5,16 @@ import com.alibaba.fastjson.JSONObject;
import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs; import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
import io.metersphere.base.mapper.ApiTestEnvironmentMapper; import io.metersphere.base.mapper.ApiTestEnvironmentMapper;
import io.metersphere.utils.LoggerUtil; import io.metersphere.utils.LoggerUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author song.tianyang * @author song.tianyang
@ -23,74 +26,97 @@ public class ApiEnvironmentRunningParamService {
@Resource @Resource
ApiTestEnvironmentMapper testEnvironmentMapper; ApiTestEnvironmentMapper testEnvironmentMapper;
public void addParam(String environmentId, String key, String value) { public void addParam(String environmentId, Map<String,String> varMap) {
if (StringUtils.isEmpty(key)) { if (MapUtils.isEmpty(varMap)) {
return; return;
} }
ApiTestEnvironmentWithBLOBs environment = testEnvironmentMapper.selectByPrimaryKey(environmentId); ApiTestEnvironmentWithBLOBs environment = testEnvironmentMapper.selectByPrimaryKey(environmentId);
if (environment == null) { if (environment == null) {
return; return;
} }
boolean envNeedUpdate = false;
try { try {
JSONObject configObj = JSONObject.parseObject(environment.getConfig()); JSONObject configObj = JSONObject.parseObject(environment.getConfig());
if (configObj.containsKey("commonConfig")) { if (configObj.containsKey("commonConfig")) {
JSONObject commonConfig = configObj.getJSONObject("commonConfig"); JSONObject commonConfig = configObj.getJSONObject("commonConfig");
if (commonConfig.containsKey("variables")) { if (commonConfig.containsKey("variables")) {
JSONArray variables = commonConfig.getJSONArray("variables"); JSONArray variables = commonConfig.getJSONArray("variables");
boolean contains = false;
for (int i = 0; i < variables.size(); i++) { for (Map.Entry<String, String> entry: varMap.entrySet()){
JSONObject jsonObj = variables.getJSONObject(i); String key = entry.getKey();
if (jsonObj.containsKey("name") && StringUtils.equals(jsonObj.getString("name"), key)) { String value = entry.getValue();
contains = true;
jsonObj.put("value", value); boolean contains = false;
for (int i = 0; i < variables.size(); i++) {
JSONObject jsonObj = variables.getJSONObject(i);
if (jsonObj.containsKey("name") && StringUtils.equals(jsonObj.getString("name"), key)) {
contains = true;
if(jsonObj.containsKey("value") && StringUtils.equals(jsonObj.getString("value"), value)){
break;
}else {
envNeedUpdate = true;
jsonObj.put("value", value);
}
}
}
if (!contains) {
envNeedUpdate = true;
JSONObject itemObj = new JSONObject();
itemObj.put("name", key);
itemObj.put("value", value);
itemObj.put("enable", true);
if (variables.size() == 0) {
variables.add(itemObj);
} else {
variables.add(variables.size() - 1, itemObj);
}
commonConfig.put("variables", variables);
} }
} }
if (!contains) { } else {
JSONArray variables = new JSONArray();
for (Map.Entry<String, String> entry: varMap.entrySet()){
String key = entry.getKey();
String value = entry.getValue();
JSONObject itemObj = new JSONObject(); JSONObject itemObj = new JSONObject();
itemObj.put("name", key); itemObj.put("name", key);
itemObj.put("value", value); itemObj.put("value", value);
itemObj.put("enable", true); itemObj.put("enable", true);
variables.add(itemObj);
if (variables.size() == 0) {
variables.add(itemObj);
} else {
variables.add(variables.size() - 1, itemObj);
}
commonConfig.put("variables", variables);
} }
} else {
JSONArray variables = new JSONArray();
JSONObject itemObj = new JSONObject();
itemObj.put("name", key);
itemObj.put("value", value);
itemObj.put("enable", true);
JSONObject emptyObj = new JSONObject(); JSONObject emptyObj = new JSONObject();
emptyObj.put("enable", true); emptyObj.put("enable", true);
variables.add(itemObj);
variables.add(emptyObj); variables.add(emptyObj);
commonConfig.put("variables", variables); commonConfig.put("variables", variables);
} }
} else { } else {
JSONObject commonConfig = new JSONObject(); JSONObject commonConfig = new JSONObject();
JSONArray variables = new JSONArray(); JSONArray variables = new JSONArray();
JSONObject itemObj = new JSONObject(); for (Map.Entry<String, String> entry: varMap.entrySet()) {
itemObj.put("name", key); String key = entry.getKey();
itemObj.put("value", value); String value = entry.getValue();
itemObj.put("enable", true); JSONObject itemObj = new JSONObject();
itemObj.put("name", key);
itemObj.put("value", value);
itemObj.put("enable", true);
variables.add(itemObj);
}
JSONObject emptyObj = new JSONObject(); JSONObject emptyObj = new JSONObject();
emptyObj.put("enable", true); emptyObj.put("enable", true);
variables.add(itemObj);
variables.add(emptyObj); variables.add(emptyObj);
commonConfig.put("variables", variables); commonConfig.put("variables", variables);
configObj.put("commonConfig", commonConfig); configObj.put("commonConfig", commonConfig);
} }
if(envNeedUpdate){
environment.setConfig(configObj.toJSONString());
testEnvironmentMapper.updateByPrimaryKeyWithBLOBs(environment);
}
environment.setConfig(configObj.toJSONString());
testEnvironmentMapper.updateByPrimaryKeyWithBLOBs(environment);
} catch (Exception ex) { } catch (Exception ex) {
LoggerUtil.error("设置环境变量异常：" + ex.getMessage()); LoggerUtil.error("设置环境变量异常：" + ex.getMessage());
} }
@ -98,6 +124,7 @@ public class ApiEnvironmentRunningParamService {
public void parseEvn(String envStr) { public void parseEvn(String envStr) {
String[] envStringArr = envStr.split("\n"); String[] envStringArr = envStr.split("\n");
Map<String, Map<String,String>> envVarsMap = new HashMap<>();
for (String env : envStringArr) { for (String env : envStringArr) {
if (StringUtils.contains(env, "=")) { if (StringUtils.contains(env, "=")) {
String[] envItem = env.split("="); String[] envItem = env.split("=");
@ -110,12 +137,26 @@ public class ApiEnvironmentRunningParamService {
String key = StringUtils.join(keyArr, "."); String key = StringUtils.join(keyArr, ".");
String value = StringUtils.substring(env, jmeterVarKey.length() + 1); String value = StringUtils.substring(env, jmeterVarKey.length() + 1);
if (StringUtils.isNoneEmpty(envId, key, value)) { if (StringUtils.isNoneEmpty(envId, key, value)) {
this.addParam(envId, key, value); if(envVarsMap.containsKey(envId)){
envVarsMap.get(envId).put(key,value);
}else {
Map<String,String> varMap = new HashMap<>();
varMap.put(key,value);
envVarsMap.put(envId,varMap);
}
} }
} }
} }
} }
} }
if(MapUtils.isNotEmpty(envVarsMap)){
for (Map.Entry<String, Map<String, String>> entry: envVarsMap.entrySet()){
String envId = entry.getKey();
Map<String,String> vars = entry.getValue();
this.addParam(envId, vars);
}
}
} }
public void parseEnvironment(List<String> evnStrList) { public void parseEnvironment(List<String> evnStrList) {