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

merge: 合并最新修改

This commit is contained in:
BugKing 2021-11-24 20:20:57 +08:00
parent 7bc10e8394 1bc3a02199
commit a1807c0620
40 changed files with 642 additions and 275 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/BatchRunDefinitionRequest.java
View File

@ -19,4 +19,6 @@ public class BatchRunDefinitionRequest {
//测试计划报告ID。 测试计划执行时使用
private String planReportId;
private String userId;
}

22
backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java
View File

@ -81,7 +81,16 @@ public class Document {
if (StringUtils.isEmpty(item.getGroupId())) {
if (!item.getId().equals("root")) {
if (parentNode != null) {
item.setJsonPath(parentNode.getJsonPath() + "." + item.getName());
if (parentNode.getType().equals("array") && item.getType().equals("string")) {
try {
int index = StringUtils.isNotEmpty(item.getName()) ? Integer.parseInt(item.getName()) : 0;
item.setJsonPath(parentNode.getJsonPath() + "[" + index + "]");
} catch (Exception e) {
item.setJsonPath(parentNode.getJsonPath() + "." + item.getName());
}
} else {
item.setJsonPath(parentNode.getJsonPath() + "." + item.getName());
}
} else {
item.setJsonPath("$." + item.getName());
}
@ -107,7 +116,16 @@ public class Document {
for (DocumentElement item : dataList) {
if (StringUtils.isEmpty(item.getGroupId())) {
if (parentNode != null) {
item.setJsonPath(parentNode.getJsonPath() + "." + item.getName());
if (StringUtils.equals(parentNode.getType(), "array") && item.getType().equals("string")) {
try {
int index = StringUtils.isNotEmpty(item.getName()) ? Integer.parseInt(item.getName()) : 0;
item.setJsonPath(parentNode.getJsonPath() + "[" + index + "]");
} catch (Exception e) {
item.setJsonPath(parentNode.getJsonPath() + "." + item.getName());
}
} else {
item.setJsonPath(parentNode.getJsonPath() + "." + item.getName());
}
} else {
item.setJsonPath("$." + item.getName());
}

23
backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentElement.java
View File

@ -46,12 +46,12 @@ public class DocumentElement {
}
}
public DocumentElement(String name, String type, Object expectedOutcome, boolean typeVerification, List<DocumentElement>children) {
public DocumentElement(String name, String type, Object expectedOutcome, boolean include, List<DocumentElement> children) {
this.id = UUID.randomUUID().toString();
this.name = name;
this.expectedOutcome = expectedOutcome;
this.type = type;
this.typeVerification = typeVerification;
this.include = include;
this.children = children == null ? this.children = new LinkedList<>() : children;
this.rowspan = 1;
this.contentVerification = "value_eq";
@ -62,6 +62,25 @@ public class DocumentElement {
}
}
public DocumentElement(String name, String type, Object expectedOutcome, boolean typeVerification, boolean arrayVerification, List<DocumentElement> children) {
this.id = UUID.randomUUID().toString();
this.name = name;
this.expectedOutcome = expectedOutcome;
this.type = type;
this.typeVerification = typeVerification;
this.arrayVerification = arrayVerification;
this.children = children == null ? this.children = new LinkedList<>() : children;
this.rowspan = 1;
this.contentVerification = "value_eq";
if (StringUtils.equalsAny(type, "object", "array")) {
this.contentVerification = "none";
} else if (expectedOutcome == null || StringUtils.isEmpty(expectedOutcome.toString())) {
this.contentVerification = "none";
}
}
public DocumentElement(String id, String name, String type, Object expectedOutcome, List<DocumentElement> children) {
this.id = id;
this.name = name;

1
backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
View File

@ -125,6 +125,7 @@ public class MsExtract extends MsTestElement {
extractor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("JSONPostProcessorGui"));
extractor.setRefNames(extractJSONPath.getVariable());
extractor.setJsonPathExpressions(extractJSONPath.getExpression());
extractor.setComputeConcatenation(true);
if (extractJSONPath.isMultipleMatching()) {
extractor.setMatchNumbers("-1");
}

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

@ -677,7 +677,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
try {
String value = keyValue.getValue() != null && keyValue.getValue().startsWith("@") ?
ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
value = keyValue.isUrlEncode() ? URLEncoder.encode(value, "utf-8") : value;
value = keyValue.isUrlEncode() ? "${__urlencode(" + value + ")}" : value;
keyValueMap.put(keyValue.getName(), value);
} catch (Exception e) {
LogUtil.error(e);
@ -708,7 +708,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
if (keyValue.getValue() != null) {
try {
String value = keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
value = keyValue.isUrlEncode() ? URLEncoder.encode(value, "utf-8") : value;
value = keyValue.isUrlEncode() ? "${__urlencode(" + value + ")}" : value;
stringBuffer.append("=").append(value);
} catch (Exception e) {
LogUtil.error(e);
@ -726,7 +726,6 @@ public class MsHTTPSamplerProxy extends MsTestElement {
filter(KeyValue::isEnable).forEach(keyValue -> {
try {
String value = StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
value = keyValue.isUrlEncode() ? URLEncoder.encode(value, "utf-8") : value;
HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), value);
if (keyValue.getValue() == null) {
httpArgument.setValue("");

104
backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
View File

@ -84,14 +84,14 @@ public class MsJDBCSampler extends MsTestElement {
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, MsParameter msParameter) {
ParameterConfig config = (ParameterConfig) msParameter;
// 非导出操作，且不是启用状态则跳过执行
if (!config.isOperating() && !this.isEnable()) {
if (config != null && !config.isOperating() && !this.isEnable()) {
return;
}
if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
this.setRefElement();
hashTree = this.getHashTree();
}
if (config.getConfig() == null) {
if (config != null && config.getConfig() == null) {
// 单独接口执行
this.setProjectId(config.getProjectId());
config.setConfig(ElementUtil.getEnvironmentConfig(StringUtils.isNotEmpty(useEnvironment) ? useEnvironment : environmentId, this.getProjectId(), this.isMockEnvironment()));
@ -100,7 +100,7 @@ public class MsJDBCSampler extends MsTestElement {
// 数据兼容处理
if (config.getConfig() != null && StringUtils.isNotEmpty(this.getProjectId()) && config.getConfig().containsKey(this.getProjectId())) {
// 1.8 之后 当前正常数据
} else if (config.getConfig() != null && config.getConfig().containsKey(getParentProjectId())) {
} else if ( config.getConfig() != null && config.getConfig().containsKey(getParentProjectId())) {
// 1.8 前后 混合数据
this.setProjectId(getParentProjectId());
} else {
@ -153,62 +153,80 @@ public class MsJDBCSampler extends MsTestElement {
tree.add(arguments);
}
MsJSR223PreProcessor preProcessor = null;
MsJSR223PostProcessor postProcessor = null;
GlobalScriptConfig globalScriptConfig = null;
if(envConfig != null){
preProcessor = envConfig.getPreProcessor();
postProcessor = envConfig.getPostProcessor();
globalScriptConfig = envConfig.getGlobalScriptConfig();
}
boolean isPreScriptExecAfterPrivateScript = globalScriptConfig == null? false : globalScriptConfig.isPreScriptExecAfterPrivateScript();
boolean isPostScriptExecAfterPrivateScript = globalScriptConfig == null? false : globalScriptConfig.isPostScriptExecAfterPrivateScript();
boolean globalPreScriptIsFilter = false;
boolean globalPostScriptIsFilter = false;
List<String> preFilterProtocal = globalScriptConfig == null? new ArrayList<>() : globalScriptConfig.getFilterRequestPreScript();
List<String> postFilterProtocal = globalScriptConfig == null? new ArrayList<>() : globalScriptConfig.getFilterRequestPostScript();
if(preFilterProtocal.contains(GlobalScriptFilterRequest.JDBC.name())){
globalPreScriptIsFilter = true;
}
if(postFilterProtocal.contains(GlobalScriptFilterRequest.JDBC.name())){
globalPostScriptIsFilter = true;
// 环境通用请求头
Arguments envArguments = getConfigArguments(config);
if (envArguments != null) {
tree.add(envArguments);
}
if(!isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter){
this.addItemHashTree(preProcessor,samplerHashTree,config);
}
if(!isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter){
this.addItemHashTree(postProcessor,samplerHashTree,config);
}
MsJSR223PreProcessor preProcessor = envConfig != null ? envConfig.getPreProcessor() : null;
MsJSR223PostProcessor postProcessor = envConfig != null ? envConfig.getPostProcessor() : null;
GlobalScriptConfig globalScriptConfig = envConfig != null ? envConfig.getGlobalScriptConfig() : null;
if (globalScriptConfig != null) {
boolean isPreScriptExecAfterPrivateScript = globalScriptConfig.isPreScriptExecAfterPrivateScript();
boolean isPostScriptExecAfterPrivateScript = globalScriptConfig.isPostScriptExecAfterPrivateScript();
List<String> preFilters = globalScriptConfig == null ? new ArrayList<>() : globalScriptConfig.getFilterRequestPreScript();
List<String> postFilters = globalScriptConfig == null ? new ArrayList<>() : globalScriptConfig.getFilterRequestPostScript();
boolean globalPreScriptIsFilter = preFilters.contains(GlobalScriptFilterRequest.JDBC.name());
boolean globalPostScriptIsFilter = postFilters.contains(GlobalScriptFilterRequest.JDBC.name());
if (!isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter) {
this.addItemHashTree(preProcessor, samplerHashTree, config);
}
if (!isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter) {
this.addItemHashTree(postProcessor, samplerHashTree, config);
}
if (isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter) {
this.addItemHashTree(preProcessor, samplerHashTree, config);
}
if (isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter) {
this.addItemHashTree(postProcessor, samplerHashTree, config);
}
}
if (CollectionUtils.isNotEmpty(hashTree)) {
hashTree.forEach(el -> {
el.toHashTree(samplerHashTree, el.getHashTree(), config);
});
}
if(isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter){
this.addItemHashTree(preProcessor,samplerHashTree,config);
}
if(isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter){
this.addItemHashTree(postProcessor,samplerHashTree,config);
}
}
private void addItemHashTree(MsTestElement element, HashTree samplerHashTree,ParameterConfig config){
if(element != null){
if (element.getEnvironmentId() == null) {
if (this.getEnvironmentId() == null) {
element.setEnvironmentId(useEnvironment);
} else {
element.setEnvironmentId(this.getEnvironmentId());
}
private void addItemHashTree(MsTestElement element, HashTree samplerHashTree, ParameterConfig config) {
if (element != null && element.getEnvironmentId() == null) {
if (this.getEnvironmentId() == null) {
element.setEnvironmentId(useEnvironment);
} else {
element.setEnvironmentId(this.getEnvironmentId());
}
element.toHashTree(samplerHashTree, element.getHashTree(), config);
}
}
/**
* 环境通用变量
*/
private Arguments getConfigArguments(ParameterConfig config) {
Arguments arguments = new Arguments();
arguments.setEnabled(true);
arguments.setName(StringUtils.isNotEmpty(this.getName()) ? this.getName() : "Arguments");
arguments.setProperty(TestElement.TEST_CLASS, Arguments.class.getName());
arguments.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("ArgumentsPanel"));
// 环境通用变量
if (config.isEffective(this.getProjectId()) && config.getConfig().get(this.getProjectId()).getCommonConfig() != null
&& CollectionUtils.isNotEmpty(config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables())) {
config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")
);
// 清空变量，防止重复添加
config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables().clear();
}
if (arguments.getArguments() != null && arguments.getArguments().size() > 0) {
return arguments;
}
return null;
}
private boolean isDataSource(List<DatabaseConfig> databaseConfigs) {
List<String> ids = databaseConfigs.stream().map(DatabaseConfig::getId).collect(Collectors.toList());
if (StringUtils.isNotEmpty(this.dataSourceId) && ids.contains(this.dataSourceId)) {

175
backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java
View File

@ -26,36 +26,36 @@ import java.util.*;
* @Date 2021/10/14 3:00 下午
*/
public class MockApiUtils {
public static Map<String,String> getHttpRequestHeader(HttpServletRequest request){
Map<String,String> returnMap = new HashMap<>();
public static Map<String, String> getHttpRequestHeader(HttpServletRequest request) {
Map<String, String> returnMap = new HashMap<>();
Enumeration<String> headers = request.getHeaderNames();
while (headers.hasMoreElements()){
while (headers.hasMoreElements()) {
String header = headers.nextElement();
String headerValue = request.getHeader(header);
returnMap.put(header,headerValue);
returnMap.put(header, headerValue);
}
return returnMap;
}
public static boolean matchRequestHeader(JSONArray mockExpectHeaderArray, Map<String, String> requestHeaderMap) {
Map<String,String> mockExpectHeaders = new HashMap<>();
for(int i = 0; i < mockExpectHeaderArray.size(); i++){
Map<String, String> mockExpectHeaders = new HashMap<>();
for (int i = 0; i < mockExpectHeaderArray.size(); i++) {
JSONObject obj = mockExpectHeaderArray.getJSONObject(i);
if(obj.containsKey("name") && obj.containsKey("value")){
mockExpectHeaders.put(obj.getString("name"),obj.getString("value"));
if (obj.containsKey("name") && obj.containsKey("value")) {
mockExpectHeaders.put(obj.getString("name"), obj.getString("value"));
}
}
if(MapUtils.isEmpty(requestHeaderMap) && MapUtils.isNotEmpty(mockExpectHeaders)){
if (MapUtils.isEmpty(requestHeaderMap) && MapUtils.isNotEmpty(mockExpectHeaders)) {
return false;
}else {
for (Map.Entry<String, String> entry: mockExpectHeaders.entrySet()){
} else {
for (Map.Entry<String, String> entry : mockExpectHeaders.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
if(!requestHeaderMap.containsKey(key)){
if (!requestHeaderMap.containsKey(key)) {
return false;
}else {
if(!StringUtils.equals(value,requestHeaderMap.get(key))){
} else {
if (!StringUtils.equals(value, requestHeaderMap.get(key))) {
return false;
}
}
@ -81,8 +81,8 @@ public class MockApiUtils {
String jsonString = "";
if (isJsonSchema) {
if (bodyObj.containsKey("jsonSchema") && bodyObj.getJSONObject("jsonSchema").containsKey("properties")) {
String bodyRetunStr = bodyObj.getJSONObject("jsonSchema").getJSONObject("properties").toJSONString();
if (bodyObj.containsKey("jsonSchema")) {
String bodyRetunStr = bodyObj.getJSONObject("jsonSchema").toJSONString();
jsonString = JSONSchemaGenerator.getJson(bodyRetunStr);
}
} else {
@ -102,15 +102,15 @@ public class MockApiUtils {
if (bodyObj.containsKey("raw")) {
String xmlStr = bodyObj.getString("raw");
JSONObject matchObj = XMLUtils.XmlToJson(xmlStr);
returnJson = matchObj;
returnJson = matchObj;
}
} else if (StringUtils.equalsIgnoreCase(type, "Raw")) {
} else if (StringUtils.equalsIgnoreCase(type, "Raw")) {
if (bodyObj.containsKey("raw")) {
String raw = bodyObj.getString("raw");
if(StringUtils.isNotEmpty(raw)){
if (StringUtils.isNotEmpty(raw)) {
JSONObject rawObject = new JSONObject();
rawObject.put("raw",raw);
returnJson = rawObject;
rawObject.put("raw", raw);
returnJson = rawObject;
}
}
} else if (StringUtils.equalsAnyIgnoreCase(type, "Form Data", "WWW_FORM")) {
@ -132,13 +132,14 @@ public class MockApiUtils {
bodyParamArr.put(kv.getString("name"), values);
}
}
returnJson = bodyParamArr;
returnJson = bodyParamArr;
}
}
}catch (Exception e){}
} catch (Exception e) {
}
return returnJson;
return returnJson;
}
public static JSONObject parseJsonSchema(JSONObject bodyReturnObj) {
@ -208,10 +209,10 @@ public class MockApiUtils {
public static JSONObject getParamsByJSONArray(JSONArray array) {
JSONObject returnObject = new JSONObject();
for(int i = 0; i < array.size();i ++){
for (int i = 0; i < array.size(); i++) {
JSONObject obj = array.getJSONObject(i);
if(obj.containsKey("name") && obj.containsKey("value")){
returnObject.put(obj.getString("name"),obj.getString("value"));
if (obj.containsKey("name") && obj.containsKey("value")) {
returnObject.put(obj.getString("name"), obj.getString("value"));
}
}
return returnObject;
@ -220,7 +221,7 @@ public class MockApiUtils {
public static Map<String, String> getApiResponse(String response) {
Map<String, String> returnMap = new HashMap<>();
String returnStr = "";
if(StringUtils.isNotEmpty(response)){
if (StringUtils.isNotEmpty(response)) {
try {
JSONObject respObj = JSONObject.parseObject(response);
if (respObj.containsKey("body")) {
@ -278,26 +279,26 @@ public class MockApiUtils {
}
}
}
}catch (Exception e){
} catch (Exception e) {
MSException.throwException(e);
}
}
returnMap.put("returnMsg",returnStr);
returnMap.put("returnMsg", returnStr);
return returnMap;
}
public static String getResultByResponseResult(JSONObject bodyObj,String url, Map<String,String> headerMap,RequestMockParams requestMockParams) {
if(headerMap == null){
public static String getResultByResponseResult(JSONObject bodyObj, String url, Map<String, String> headerMap, RequestMockParams requestMockParams) {
if (headerMap == null) {
headerMap = new HashMap<>();
}
if(requestMockParams == null){
if (requestMockParams == null) {
requestMockParams = new RequestMockParams();
}
if(bodyObj == null && bodyObj.isEmpty()){
if (bodyObj == null && bodyObj.isEmpty()) {
return "";
}else {
} else {
String returnStr = "";
if(bodyObj.containsKey("type")){
if (bodyObj.containsKey("type")) {
String type = bodyObj.getString("type");
if (StringUtils.equals(type, "JSON")) {
//判断是否是JsonSchema
@ -320,17 +321,17 @@ public class MockApiUtils {
returnStr = bodyObj.getString("raw");
}
}
} else if(StringUtils.equalsAnyIgnoreCase(type,"Raw")){
} else if (StringUtils.equalsAnyIgnoreCase(type, "Raw")) {
if (bodyObj.containsKey("raw")) {
String raw = bodyObj.getString("raw");
returnStr = raw;
}
} else if(StringUtils.equalsAnyIgnoreCase(type,"XML")){
} else if (StringUtils.equalsAnyIgnoreCase(type, "XML")) {
if (bodyObj.containsKey("xmlHeader")) {
String xmlHeader = bodyObj.getString("xmlHeader");
if(!StringUtils.startsWith(xmlHeader,"<?") && !StringUtils.endsWith(xmlHeader,"?>")){
returnStr = "<?"+xmlHeader+"?>\r\n";
}else {
if (!StringUtils.startsWith(xmlHeader, "<?") && !StringUtils.endsWith(xmlHeader, "?>")) {
returnStr = "<?" + xmlHeader + "?>\r\n";
} else {
returnStr = xmlHeader;
}
}
@ -338,25 +339,25 @@ public class MockApiUtils {
String raw = bodyObj.getString("xmlRaw");
returnStr = returnStr + raw;
}
} else if(StringUtils.equalsAnyIgnoreCase(type,"fromApi")){
} else if (StringUtils.equalsAnyIgnoreCase(type, "fromApi")) {
if (bodyObj.containsKey("apiRspRaw")) {
String raw = bodyObj.getString("apiRspRaw");
returnStr = raw;
}
} else if(StringUtils.equalsAnyIgnoreCase(type,"script")){
} else if (StringUtils.equalsAnyIgnoreCase(type, "script")) {
if (bodyObj.containsKey("scriptObject")) {
JSONObject scriptObj = bodyObj.getJSONObject("scriptObject");
String script = scriptObj.getString("script");
String scriptLanguage =scriptObj.getString("scriptLanguage");
String scriptLanguage = scriptObj.getString("scriptLanguage");
String baseScript = parseScript(url,headerMap,requestMockParams);
String baseScript = parseScript(url, headerMap, requestMockParams);
try {
script = baseScript + script;
if(StringUtils.isEmpty(scriptLanguage)){
if (StringUtils.isEmpty(scriptLanguage)) {
scriptLanguage = "beanshell";
}
returnStr = runScript(script,scriptLanguage);
}catch (Exception e){
returnStr = runScript(script, scriptLanguage);
} catch (Exception e) {
LogUtil.error(e);
}
}
@ -367,58 +368,59 @@ public class MockApiUtils {
}
}
private static String parseScript(String url,Map<String,String> headerMap,RequestMockParams requestMockParams) {
private static String parseScript(String url, Map<String, String> headerMap, RequestMockParams requestMockParams) {
StringBuffer scriptStringBuffer = new StringBuffer();
scriptStringBuffer.append("import java.util.HashMap;\n\n");
scriptStringBuffer.append("HashMap requestParams = new HashMap();\n");
scriptStringBuffer.append("requestParams.put(\"address\",\""+url+"\");\n");
scriptStringBuffer.append("requestParams.put(\"address\",\"" + url + "\");\n");
//写入请求头
for (Map.Entry<String, String> headEntry: headerMap.entrySet()){
for (Map.Entry<String, String> headEntry : headerMap.entrySet()) {
String headerKey = headEntry.getKey();
String headerValue = headEntry.getValue();
scriptStringBuffer.append("requestParams.put(\"header."+headerKey+"\",\""+headerValue+"\");\n");
scriptStringBuffer.append("requestParams.put(\"header." + headerKey + "\",\"" + headerValue + "\");\n");
}
//写入body参数
if(requestMockParams.getBodyParams() != null){
if(requestMockParams.getBodyParams().size() == 1){
if (requestMockParams.getBodyParams() != null) {
if (requestMockParams.getBodyParams().size() == 1) {
//参数是jsonObject
JSONObject bodyParamObj = requestMockParams.getBodyParams().getJSONObject(0);
for(String key : bodyParamObj.keySet()){
for (String key : bodyParamObj.keySet()) {
String value = String.valueOf(bodyParamObj.get(key));
value = StringUtils.replace(value,"\\","\\\\");
value = StringUtils.replace(value,"\"","\\\"");
scriptStringBuffer.append("requestParams.put(\"body."+key+"\",\""+value+"\");\n");
if(StringUtils.equalsIgnoreCase(key,"raw")){
scriptStringBuffer.append("requestParams.put(\"bodyRaw\",\""+value+"\");\n");
value = StringUtils.replace(value, "\\", "\\\\");
value = StringUtils.replace(value, "\"", "\\\"");
scriptStringBuffer.append("requestParams.put(\"body." + key + "\",\"" + value + "\");\n");
if (StringUtils.equalsIgnoreCase(key, "raw")) {
scriptStringBuffer.append("requestParams.put(\"bodyRaw\",\"" + value + "\");\n");
}
}
String jsonBody = bodyParamObj.toJSONString();
jsonBody = StringUtils.replace(jsonBody,"\\","\\\\");
jsonBody = StringUtils.replace(jsonBody,"\"","\\\"");
scriptStringBuffer.append("requestParams.put(\"body.json\",\""+jsonBody+"\");\n");
}else {
scriptStringBuffer.append("requestParams.put(\"bodyRaw\",\""+requestMockParams.getBodyParams().toJSONString()+"\");\n");
jsonBody = StringUtils.replace(jsonBody, "\\", "\\\\");
jsonBody = StringUtils.replace(jsonBody, "\"", "\\\"");
scriptStringBuffer.append("requestParams.put(\"body.json\",\"" + jsonBody + "\");\n");
} else {
scriptStringBuffer.append("requestParams.put(\"bodyRaw\",\"" + requestMockParams.getBodyParams().toJSONString() + "\");\n");
}
}
//写入query参数
if(requestMockParams.getQueryParamsObj() != null){
if (requestMockParams.getQueryParamsObj() != null) {
JSONObject queryParamsObj = requestMockParams.getQueryParamsObj();
for(String key : queryParamsObj.keySet()){
for (String key : queryParamsObj.keySet()) {
String value = String.valueOf(queryParamsObj.get(key));
scriptStringBuffer.append("requestParams.put(\"query."+key+"\",\""+value+"\");\n");
scriptStringBuffer.append("requestParams.put(\"query." + key + "\",\"" + value + "\");\n");
}
}
//写入rest参数
if(requestMockParams.getRestParamsObj() != null){
if (requestMockParams.getRestParamsObj() != null) {
JSONObject restParamsObj = requestMockParams.getRestParamsObj();
for(String key : restParamsObj.keySet()){
for (String key : restParamsObj.keySet()) {
String value = String.valueOf(restParamsObj.get(key));
scriptStringBuffer.append("requestParams.put(\"rest."+key+"\",\""+value+"\");\n");
scriptStringBuffer.append("requestParams.put(\"rest." + key + "\",\"" + value + "\");\n");
}
}
return scriptStringBuffer.toString();
}
private static String runScript(String script, String scriptLanguage) throws ScriptException {
JSR223Sampler jmeterScriptSampler = new JSR223Sampler();
jmeterScriptSampler.setScriptLanguage(scriptLanguage);
@ -428,18 +430,18 @@ public class MockApiUtils {
}
public static RequestMockParams getParams(String urlParams, String apiPath, JSONObject queryParamsObject,JSON paramJson){
RequestMockParams returnParams = getGetParamMap(urlParams,apiPath,queryParamsObject);
if(paramJson != null){
public static RequestMockParams getParams(String urlParams, String apiPath, JSONObject queryParamsObject, JSON paramJson) {
RequestMockParams returnParams = getGetParamMap(urlParams, apiPath, queryParamsObject);
if (paramJson != null) {
if (paramJson instanceof JSONObject) {
if(!((JSONObject) paramJson).isEmpty()){
if (!((JSONObject) paramJson).isEmpty()) {
JSONArray paramsArray = new JSONArray();
paramsArray.add(paramJson);
returnParams.setBodyParams(paramsArray);
}
} else if (paramJson instanceof JSONArray) {
JSONArray paramArray = (JSONArray) paramJson;
if(!paramArray.isEmpty()){
if (!paramArray.isEmpty()) {
returnParams.setBodyParams(paramArray);
}
}
@ -447,7 +449,7 @@ public class MockApiUtils {
return returnParams;
}
public static JSONObject getParameterJsonObject(HttpServletRequest request){
public static JSONObject getParameterJsonObject(HttpServletRequest request) {
JSONObject queryParamsObject = new JSONObject();
Enumeration<String> paramNameItor = request.getParameterNames();
while (paramNameItor.hasMoreElements()) {
@ -469,11 +471,11 @@ public class MockApiUtils {
}
public static JSON getPostParamMap(HttpServletRequest request) {
if (StringUtils.startsWithIgnoreCase(request.getContentType(),"application/JSON")) {
if (StringUtils.startsWithIgnoreCase(request.getContentType(), "application/JSON")) {
JSON returnJson = null;
try {
String param = getRequestPostStr(request);
if(StringUtils.isNotEmpty(param)){
if (StringUtils.isNotEmpty(param)) {
JSONValidator jsonValidator = JSONValidator.from(param);
if (StringUtils.equalsIgnoreCase("Array", jsonValidator.getType().name())) {
returnJson = JSONArray.parseArray(param);
@ -485,7 +487,7 @@ public class MockApiUtils {
LogUtil.error(e);
}
return returnJson;
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(),"text/xml")) {
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "text/xml")) {
String xmlString = readXml(request);
org.json.JSONObject xmlJSONObj = XML.toJSONObject(xmlString);
@ -496,7 +498,7 @@ public class MockApiUtils {
} catch (Exception e) {
}
return object;
} else if (StringUtils.startsWithIgnoreCase( request.getContentType(),"application/x-www-form-urlencoded")) {
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "application/x-www-form-urlencoded")) {
JSONObject object = new JSONObject();
Enumeration<String> paramNameItor = request.getParameterNames();
while (paramNameItor.hasMoreElements()) {
@ -505,19 +507,19 @@ public class MockApiUtils {
object.put(key, value);
}
return object;
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(),"text/plain")) {
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "text/plain")) {
JSONObject object = new JSONObject();
String bodyParam = readBody(request);
if(StringUtils.isNotEmpty(bodyParam)){
object.put("raw",bodyParam);
if (StringUtils.isNotEmpty(bodyParam)) {
object.put("raw", bodyParam);
}
return object;
} else {
JSONObject object = new JSONObject();
String bodyParam = readBody(request);
if(StringUtils.isNotEmpty(bodyParam)){
object.put("raw",bodyParam);
if (StringUtils.isNotEmpty(bodyParam)) {
object.put("raw", bodyParam);
}
return object;
}
@ -548,6 +550,7 @@ public class MockApiUtils {
}
return returnJson;
}
private static String readBody(HttpServletRequest request) {
String result = "";
try {

4
backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
View File

@ -3,7 +3,7 @@ package io.metersphere.api.dto.scenario;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import io.metersphere.api.dto.scenario.request.BodyFile;
import io.metersphere.commons.json.JSONSchemaGenerator;
import io.metersphere.commons.json.JSONSchemaRunTest;
import io.metersphere.commons.utils.FileUtils;
import io.metersphere.jmeter.utils.ScriptEngineUtils;
import lombok.Data;
@ -87,7 +87,7 @@ public class Body {
if (StringUtils.isNotBlank(this.type) && StringUtils.equals(this.type, "JSON")) {
if(StringUtils.isNotEmpty(this.format) && this.getJsonSchema() != null
&& "JSON-SCHEMA".equals(this.format)) {
this.raw = JSONSchemaGenerator.getJson(com.alibaba.fastjson.JSON.toJSONString(this.getJsonSchema()));
this.raw = JSONSchemaRunTest.getJson(com.alibaba.fastjson.JSON.toJSONString(this.getJsonSchema()));
} else { // json 文本也支持 mock 参数
try {
JSONObject jsonObject = com.alibaba.fastjson.JSON.parseObject(this.getRaw());

22
backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
View File

@ -61,7 +61,7 @@ public class ApiJmeterFileService {
if (StringUtils.isNotEmpty(testPlanScenarioId)) {
// 获取场景用例单独的执行环境
TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId);
if(planApiScenario != null){
if (planApiScenario != null) {
String envType = planApiScenario.getEnvironmentType();
String environmentGroupId = planApiScenario.getEnvironmentGroupId();
String environment = planApiScenario.getEnvironment();
@ -73,9 +73,9 @@ public class ApiJmeterFileService {
}
}
HashTree hashTree;
if (ApiRunMode.DEFINITION.name().equals(runMode) || ApiRunMode.API_PLAN.name().equals(runMode) || ApiRunMode.MANUAL_PLAN.name().equals(runMode)) {
if (StringUtils.equalsAnyIgnoreCase(runMode, ApiRunMode.DEFINITION.name(), ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
String testId = remoteTestId;
if(remoteTestId.contains(":")){
if (remoteTestId.contains(":")) {
//执行测试计划案例时会有拼接ID,ID为 planTestCaseId:测试计划报告ID
testId = remoteTestId.split(":")[0];
}
@ -85,13 +85,15 @@ public class ApiJmeterFileService {
if (item == null) {
MSException.throwException("未找到执行场景。");
}
String envType = item.getEnvironmentType();
String envJson = item.getEnvironmentJson();
String envGroupId = item.getEnvironmentGroupId();
if (StringUtils.equals(envType, EnvironmentType.JSON.name()) && StringUtils.isNotBlank(envJson)) {
planEnvMap = JSON.parseObject(envJson, Map.class);
} else if (StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(envGroupId)) {
planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
if (StringUtils.isBlank(testPlanScenarioId)) {
String envType = item.getEnvironmentType();
String envJson = item.getEnvironmentJson();
String envGroupId = item.getEnvironmentGroupId();
if (StringUtils.equals(envType, EnvironmentType.JSON.name()) && StringUtils.isNotBlank(envJson)) {
planEnvMap = JSON.parseObject(envJson, Map.class);
} else if (StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(envGroupId)) {
planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
}
}
hashTree = apiAutomationService.generateHashTree(item, reportId, planEnvMap);
}

128
backend/src/main/java/io/metersphere/api/service/MockConfigService.java
View File

@ -116,25 +116,25 @@ public class MockConfigService {
}
}
public void initExpectNum(){
public void initExpectNum() {
MockExpectConfigExample example = new MockExpectConfigExample();
example.createCriteria().andExpectNumIsNull();
List<MockExpectConfigWithBLOBs> mockExpectConfigList = mockExpectConfigMapper.selectByExampleWithBLOBs(example);
Map<String,List<MockExpectConfigWithBLOBs>> mockConfigIdMap = mockExpectConfigList.stream().collect(Collectors.groupingBy(MockExpectConfig::getMockConfigId));
Map<String, List<MockExpectConfigWithBLOBs>> mockConfigIdMap = mockExpectConfigList.stream().collect(Collectors.groupingBy(MockExpectConfig::getMockConfigId));
for (Map.Entry<String, List<MockExpectConfigWithBLOBs>> entry :
mockConfigIdMap.entrySet()) {
String mockConfigId = entry.getKey();
List<MockExpectConfigWithBLOBs> list = entry.getValue();
String apiNum = extMockExpectConfigMapper.selectApiNumberByMockConfigId(mockConfigId);
if(StringUtils.isEmpty(apiNum) || StringUtils.equalsIgnoreCase(apiNum,"null")){
if (StringUtils.isEmpty(apiNum) || StringUtils.equalsIgnoreCase(apiNum, "null")) {
continue;
}
int expectNumIndex = this.getMockExpectNumIndex(mockConfigId,apiNum);
int expectNumIndex = this.getMockExpectNumIndex(mockConfigId, apiNum);
for (MockExpectConfigWithBLOBs config : list) {
config.setExpectNum(apiNum+"_"+expectNumIndex);
config.setExpectNum(apiNum + "_" + expectNumIndex);
mockExpectConfigMapper.updateByPrimaryKeySelective(config);
expectNumIndex ++;
expectNumIndex++;
}
}
@ -211,17 +211,18 @@ public class MockConfigService {
isSave = true;
request.setId(UUID.randomUUID().toString());
}
//检查名称是否存在
if (request.getName() != null) {
this.checkNameIsExists(request);
}
long timeStmp = System.currentTimeMillis();
String expectNum = this.getMockExpectId(request.getMockConfigId());
MockExpectConfigWithBLOBs model = new MockExpectConfigWithBLOBs();
if (isSave) {
String expectNum = this.getMockExpectId(request.getMockConfigId());
model.setExpectNum(expectNum);
}
model.setId(request.getId());
model.setExpectNum(expectNum);
model.setMockConfigId(request.getMockConfigId());
model.setUpdateTime(timeStmp);
model.setStatus(request.getStatus());
@ -253,46 +254,48 @@ public class MockConfigService {
private String getMockExpectId(String mockConfigId) {
List<String> savedExpectNumber = extMockExpectConfigMapper.selectExlectNumByMockConfigId(mockConfigId);
String apiNum = extMockExpectConfigMapper.selectApiNumberByMockConfigId(mockConfigId);
if(StringUtils.isEmpty(apiNum)){
if (StringUtils.isEmpty(apiNum)) {
apiNum = "";
}else {
} else {
apiNum = apiNum + "_";
}
int index = 1;
for(String expectNum : savedExpectNumber){
if(StringUtils.startsWith(expectNum,apiNum)){
String numStr = StringUtils.substringAfter(expectNum,apiNum);
try{
for (String expectNum : savedExpectNumber) {
if (StringUtils.startsWith(expectNum, apiNum)) {
String numStr = StringUtils.substringAfter(expectNum, apiNum);
try {
int savedIndex = Integer.parseInt(numStr);
if(index <= savedIndex){
index = savedIndex+1;
if (index <= savedIndex) {
index = savedIndex + 1;
}
}catch (Exception ignored){}
} catch (Exception ignored) {
}
}
}
return apiNum + index;
}
private int getMockExpectNumIndex(String mockConfigId,String apiNumber) {
private int getMockExpectNumIndex(String mockConfigId, String apiNumber) {
List<String> savedExpectNumber = extMockExpectConfigMapper.selectExlectNumByMockConfigId(mockConfigId);
String apiNum = apiNumber;
if(StringUtils.isEmpty(apiNum)){
if (StringUtils.isEmpty(apiNum)) {
apiNum = "";
}else {
} else {
apiNum = apiNum + "_";
}
int index = 1;
for(String expectNum : savedExpectNumber){
if(StringUtils.startsWith(expectNum,apiNum)){
String numStr = StringUtils.substringAfter(expectNum,apiNum);
try{
for (String expectNum : savedExpectNumber) {
if (StringUtils.startsWith(expectNum, apiNum)) {
String numStr = StringUtils.substringAfter(expectNum, apiNum);
try {
int savedIndex = Integer.parseInt(numStr);
if(index <= savedIndex){
index = savedIndex+1;
if (index <= savedIndex) {
index = savedIndex + 1;
}
}catch (Exception ignored ){}
} catch (Exception ignored) {
}
}
}
return index;
@ -369,34 +372,34 @@ public class MockConfigService {
}
}
if(expectParamsObj.containsKey("body")){
if (expectParamsObj.containsKey("body")) {
JSONObject expectBodyObject = expectParamsObj.getJSONObject("body");
JSON mockExpectJsonArray = MockApiUtils.getExpectBodyParams(expectBodyObject);
JSONArray jsonArray = requestMockParams.getBodyParams();
if (mockExpectJsonArray instanceof JSONObject) {
if(!JsonStructUtils.checkJsonArrayCompliance(jsonArray, (JSONObject) mockExpectJsonArray)){
if (!JsonStructUtils.checkJsonArrayCompliance(jsonArray, (JSONObject) mockExpectJsonArray)) {
return false;
}
}else if (mockExpectJsonArray instanceof JSONArray) {
if(!JsonStructUtils.checkJsonArrayCompliance(jsonArray, (JSONArray)mockExpectJsonArray)){
} else if (mockExpectJsonArray instanceof JSONArray) {
if (!JsonStructUtils.checkJsonArrayCompliance(jsonArray, (JSONArray) mockExpectJsonArray)) {
return false;
}
}
}
if(expectParamsObj.containsKey("arguments")){
if (expectParamsObj.containsKey("arguments")) {
JSONArray argumentsArray = expectParamsObj.getJSONArray("arguments");
JSONObject urlRequestParamObj = MockApiUtils.getParamsByJSONArray(argumentsArray);
if(!JsonStructUtils.checkJsonObjCompliance(requestMockParams.getQueryParamsObj(), urlRequestParamObj)){
if (!JsonStructUtils.checkJsonObjCompliance(requestMockParams.getQueryParamsObj(), urlRequestParamObj)) {
return false;
}
}
if(expectParamsObj.containsKey("rest")){
if (expectParamsObj.containsKey("rest")) {
JSONArray restArray = expectParamsObj.getJSONArray("rest");
JSONObject restRequestParamObj = MockApiUtils.getParamsByJSONArray(restArray);
if(!JsonStructUtils.checkJsonObjCompliance(requestMockParams.getRestParamsObj(), restRequestParamObj)){
if (!JsonStructUtils.checkJsonObjCompliance(requestMockParams.getRestParamsObj(), restRequestParamObj)) {
return false;
}
}
@ -500,17 +503,17 @@ public class MockConfigService {
boolean matchQuery = false;
boolean matchBody = false;
if(requestMockParams.getQueryParamsObj() != null){
if (requestMockParams.getQueryParamsObj() != null) {
matchQuery = JsonStructUtils.checkJsonObjCompliance(requestMockParams.getQueryParamsObj(), mockExpectJson);
}
if(requestMockParams.getRestParamsObj() != null){
if (requestMockParams.getRestParamsObj() != null) {
matchRest = JsonStructUtils.checkJsonObjCompliance(requestMockParams.getRestParamsObj(), mockExpectJson);
}
if(requestMockParams.getBodyParams() != null){
for (int i = 0;i < requestMockParams.getBodyParams().size(); i ++) {
if (requestMockParams.getBodyParams() != null) {
for (int i = 0; i < requestMockParams.getBodyParams().size(); i++) {
JSONObject reqJsonObj = requestMockParams.getBodyParams().getJSONObject(i);
matchBody = JsonStructUtils.checkJsonObjCompliance(reqJsonObj, mockExpectJson);
if(matchBody){
if (matchBody) {
break;
}
}
@ -764,7 +767,8 @@ public class MockConfigService {
int httpCodeNum = 500;
try {
httpCodeNum = Integer.parseInt(responseJsonObj.getString("httpCode"));
}catch (Exception e){}
} catch (Exception e) {
}
response.setStatus(httpCodeNum);
}
if (responseJsonObj.containsKey("delayed")) {
@ -979,6 +983,7 @@ public class MockConfigService {
}
mockConfigMapper.deleteByExample(configExample);
}
public Map<String, List<MockParamSuggestions>> getApiParamsByApiDefinitionBLOBs(ApiDefinitionWithBLOBs apiModel) {
if (apiModel == null) {
return new HashMap<>();
@ -1016,7 +1021,7 @@ public class MockConfigService {
model.setValue(item);
list.add(model);
});
returnMap.put("value",list);
returnMap.put("value", list);
return returnMap;
}
@ -1085,32 +1090,32 @@ public class MockConfigService {
}
}
if(CollectionUtils.isNotEmpty(queryParamList)){
if (CollectionUtils.isNotEmpty(queryParamList)) {
List<MockParamSuggestions> list = new ArrayList<>();
queryParamList.forEach(item -> {
MockParamSuggestions model = new MockParamSuggestions();
model.setValue(item);
list.add(model);
});
returnMap.put("query",list);
returnMap.put("query", list);
}
if(CollectionUtils.isNotEmpty(restParamList)){
if (CollectionUtils.isNotEmpty(restParamList)) {
List<MockParamSuggestions> list = new ArrayList<>();
restParamList.forEach(item -> {
MockParamSuggestions model = new MockParamSuggestions();
model.setValue(item);
list.add(model);
});
returnMap.put("rest",list);
returnMap.put("rest", list);
}
if(CollectionUtils.isNotEmpty(formDataList)){
if (CollectionUtils.isNotEmpty(formDataList)) {
List<MockParamSuggestions> list = new ArrayList<>();
formDataList.forEach(item -> {
MockParamSuggestions model = new MockParamSuggestions();
model.setValue(item);
list.add(model);
});
returnMap.put("form",list);
returnMap.put("form", list);
}
return returnMap;
}
@ -1153,7 +1158,7 @@ public class MockConfigService {
JSONObject parameterObject = MockApiUtils.getParameterJsonObject(request);
for (ApiDefinitionWithBLOBs api : aualifiedApiList) {
RequestMockParams mockParams = MockApiUtils.getParams(urlSuffix, api.getPath(), parameterObject,paramJson);
RequestMockParams mockParams = MockApiUtils.getParams(urlSuffix, api.getPath(), parameterObject, paramJson);
MockConfigResponse mockConfigData = this.findByApiId(api.getId());
MockExpectConfigResponse finalExpectConfig = this.findExpectConfig(requestHeaderMap, mockConfigData.getMockExpectConfigList(), mockParams);
@ -1223,7 +1228,7 @@ public class MockConfigService {
JSONObject parameterObject = MockApiUtils.getParameterJsonObject(request);
for (ApiDefinitionWithBLOBs api : aualifiedApiList) {
RequestMockParams paramMap = MockApiUtils.getParams(urlSuffix, api.getPath(), parameterObject,paramJson);
RequestMockParams paramMap = MockApiUtils.getParams(urlSuffix, api.getPath(), parameterObject, paramJson);
MockConfigResponse mockConfigData = this.findByApiId(api.getId());
if (mockConfigData != null && mockConfigData.getMockExpectConfigList() != null) {
@ -1451,29 +1456,30 @@ public class MockConfigService {
}
public void updateMockReturnMsgByApi(ApiDefinitionWithBLOBs apiDefinitionWithBLOBs) {
if(apiDefinitionWithBLOBs == null){
if (apiDefinitionWithBLOBs == null) {
return;
}
Map<String, String> returnMap = MockApiUtils.getApiResponse(apiDefinitionWithBLOBs.getResponse());
if(MapUtils.isEmpty(returnMap) || !returnMap.containsKey("returnMsg")){
if (MapUtils.isEmpty(returnMap) || !returnMap.containsKey("returnMsg")) {
return;
}
List<MockExpectConfigWithBLOBs> updateList = this.selectMockExpectConfigByApiId(apiDefinitionWithBLOBs.getId());
if(CollectionUtils.isNotEmpty(updateList)){
for (MockExpectConfigWithBLOBs model: updateList) {
if(StringUtils.isNotEmpty(model.getResponse())){
if (CollectionUtils.isNotEmpty(updateList)) {
for (MockExpectConfigWithBLOBs model : updateList) {
if (StringUtils.isNotEmpty(model.getResponse())) {
try {
JSONObject responseObj = JSONObject.parseObject(model.getResponse());
if(responseObj.containsKey("responseResult")){
if (responseObj.containsKey("responseResult")) {
JSONObject responseResultObject = responseObj.getJSONObject("responseResult");
if(responseResultObject.containsKey("body")){
responseResultObject.getJSONObject("body").put("apiRspRaw",returnMap.get("returnMsg"));
if (responseResultObject.containsKey("body")) {
responseResultObject.getJSONObject("body").put("apiRspRaw", returnMap.get("returnMsg"));
model.setResponse(responseObj.toJSONString());
mockExpectConfigMapper.updateByPrimaryKeySelective(model);
}
}
}catch (Exception e){}
} catch (Exception e) {
}
}
}
}

12
backend/src/main/java/io/metersphere/commons/json/JSONSchemaGenerator.java
View File

@ -172,11 +172,13 @@ public class JSONSchemaGenerator {
List<Object> array = new LinkedList<>();
JsonArray jsonArray = new JsonArray();
if (object.has("items") && object.get("items").isJsonArray()) {
jsonArray = object.get("items").getAsJsonArray();
} else {
JsonObject itemsObject = object.get("items").getAsJsonObject();
array.add(itemsObject);
if (object.has("items")) {
if(object.get("items").isJsonArray()){
jsonArray = object.get("items").getAsJsonArray();
}else {
JsonObject itemsObject = object.get("items").getAsJsonObject();
array.add(itemsObject);
}
}
for (int i = 0; i < jsonArray.size(); i++) {

229
backend/src/main/java/io/metersphere/commons/json/JSONSchemaRunTest.java Normal file
View File

@ -0,0 +1,229 @@
package io.metersphere.commons.json;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.*;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.jmeter.utils.ScriptEngineUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
public class JSONSchemaRunTest {
private static void generator(String json, JSONObject obj) {
analyzeSchema(json, obj);
}
private static void analyzeSchema(String json, JSONObject rootObj) {
try {
Gson gson = new Gson();
JsonElement element = gson.fromJson(json, JsonElement.class);
JsonObject rootElement = element.getAsJsonObject();
analyzeRootSchemaElement(rootElement, rootObj);
} catch (Exception e) {
LogUtil.error(e);
}
}
private static void analyzeRootSchemaElement(JsonObject rootElement, JSONObject rootObj) {
if (rootElement.has("type") || rootElement.has("allOf")) {
analyzeObject(rootElement, rootObj);
}
if (rootElement.has("definitions")) {
analyzeDefinitions(rootElement);
}
}
private static void analyzeObject(JsonObject object, JSONObject rootObj) {
if (object.has("allOf")) {
JsonArray allOfArray = object.get("allOf").getAsJsonArray();
for (JsonElement allOfElement : allOfArray) {
JsonObject allOfElementObj = allOfElement.getAsJsonObject();
if (allOfElementObj.has("properties")) {
JsonObject propertiesObj = allOfElementObj.get("properties").getAsJsonObject();
for (Entry<String, JsonElement> entry : propertiesObj.entrySet()) {
String propertyKey = entry.getKey();
JsonObject propertyObj = propertiesObj.get(propertyKey).getAsJsonObject();
analyzeProperty(rootObj, propertyKey, propertyObj);
}
}
}
} else if (object.has("properties")) {
JsonObject propertiesObj = object.get("properties").getAsJsonObject();
for (Entry<String, JsonElement> entry : propertiesObj.entrySet()) {
String propertyKey = entry.getKey();
JsonObject propertyObj = propertiesObj.get(propertyKey).getAsJsonObject();
analyzeProperty(rootObj, propertyKey, propertyObj);
}
} else if (object.has("type") && object.get("type").getAsString().equals("array")) {
analyzeProperty(rootObj, "MS-OBJECT", object);
} else if (object.has("type") && !object.get("type").getAsString().equals("object")) {
analyzeProperty(rootObj, object.getAsString(), object);
}
}
private static void analyzeProperty(JSONObject concept, String propertyName, JsonObject object) {
if (object.has("type")) {
String propertyObjType = null;
if (object.get("type") instanceof JsonPrimitive) {
propertyObjType = object.get("type").getAsString();
} else if (object.get("type") instanceof JsonArray) {
JsonArray typeArray = (JsonArray) object.get("type").getAsJsonArray();
propertyObjType = typeArray.get(0).getAsString();
if (typeArray.size() > 1) {
if (typeArray.get(1).getAsString().equals("null")) {
// 暂不处理，后续使用时再加
}
}
}
if (propertyObjType.equals("string") || propertyObjType.equals("enum")) {
concept.put(propertyName, getValue(object));
} else if (propertyObjType.equals("integer") || propertyObjType.equals("number")) {
// 先设置空值
concept.put(propertyName, 0);
try {
if (object.has("mock") && object.get("mock").getAsJsonObject() != null && StringUtils.isNotEmpty(object.get("mock").getAsJsonObject().get("mock").getAsString())) {
Number value = object.get("mock").getAsJsonObject().get("mock").getAsNumber();
if (value.toString().indexOf(".") == -1) {
concept.put(propertyName, value.intValue());
} else {
concept.put(propertyName, value.floatValue());
}
}
} catch (Exception e) {
String value = ScriptEngineUtils.buildFunctionCallString(object.get("mock").getAsJsonObject().get("mock").getAsString());
concept.put(propertyName, value);
}
} else if (propertyObjType.equals("boolean")) {
// 先设置空值
concept.put(propertyName, false);
try {
if (object.has("mock") && object.get("mock").getAsJsonObject() != null && StringUtils.isNotEmpty(object.get("mock").getAsJsonObject().get("mock").getAsString())) {
String value = ScriptEngineUtils.buildFunctionCallString(object.get("mock").getAsJsonObject().get("mock").toString());
if (StringUtils.isNotEmpty(value)) {
if (value.indexOf("\"") != -1) {
value = value.replaceAll("\"", "");
}
concept.put(propertyName, Boolean.valueOf(value));
}
}
} catch (Exception e) {
concept.put(propertyName, false);
}
} else if (propertyObjType.equals("array")) {
// 先设置空值
List<Object> array = new LinkedList<>();
JsonArray jsonArray = new JsonArray();
if (object.has("items")) {
if (object.get("items").isJsonArray()) {
jsonArray = object.get("items").getAsJsonArray();
} else {
JsonObject itemsObject = object.get("items").getAsJsonObject();
array.add(itemsObject);
}
}
for (int i = 0; i < jsonArray.size(); i++) {
JsonObject itemsObject = jsonArray.get(i).getAsJsonObject();
if (object.has("items")) {
if (itemsObject.has("mock") && itemsObject.get("mock").getAsJsonObject() != null && StringUtils.isNotEmpty(itemsObject.get("mock").getAsJsonObject().get("mock").getAsString())) {
try {
int value = itemsObject.get("mock").getAsJsonObject().get("mock").getAsInt();
array.add(value);
} catch (Exception e) {
String value = ScriptEngineUtils.buildFunctionCallString(itemsObject.get("mock").getAsJsonObject().get("mock").getAsString());
array.add(value);
}
} else if (itemsObject.has("type") && (itemsObject.has("enum") || itemsObject.get("type").getAsString().equals("string"))) {
array.add(getValue(itemsObject));
} else if (itemsObject.has("type") && itemsObject.get("type").getAsString().equals("number")) {
if (itemsObject.has("mock") && itemsObject.get("mock").getAsJsonObject() != null && StringUtils.isNotEmpty(itemsObject.get("mock").getAsJsonObject().get("mock").getAsString())) {
String value = ScriptEngineUtils.buildFunctionCallString(itemsObject.get("mock").getAsJsonObject().get("mock").getAsString());
array.add(value);
} else {
array.add(0);
}
} else if (itemsObject.has("properties")) {
JSONObject propertyConcept = new JSONObject(true);
JsonObject propertiesObj = itemsObject.get("properties").getAsJsonObject();
for (Entry<String, JsonElement> entry : propertiesObj.entrySet()) {
String propertyKey = entry.getKey();
JsonObject propertyObj = propertiesObj.get(propertyKey).getAsJsonObject();
analyzeProperty(propertyConcept, propertyKey, propertyObj);
}
array.add(propertyConcept);
} else if (itemsObject.has("type") && itemsObject.get("type") instanceof JsonPrimitive) {
JSONObject newJsonObj = new JSONObject();
analyzeProperty(newJsonObj, propertyName + "_item", itemsObject);
array.add(newJsonObj.get(propertyName + "_item"));
}
} else if (object.has("items") && object.get("items").isJsonArray()) {
JsonArray itemsObjectArray = object.get("items").getAsJsonArray();
array.add(itemsObjectArray);
}
}
concept.put(propertyName, array);
} else if (propertyObjType.equals("object")) {
JSONObject obj = new JSONObject();
concept.put(propertyName, obj);
analyzeObject(object, obj);
} else if (StringUtils.equalsIgnoreCase(propertyObjType, "null")) {
concept.put(propertyName, null);
}
}
}
private static Object getValue(JsonObject object) {
try {
if (object.has("mock") && object.get("mock").getAsJsonObject() != null && StringUtils.isNotEmpty(object.get("mock").getAsJsonObject().get("mock").getAsString()) && StringUtils.isNotEmpty(object.get("mock").getAsJsonObject().get("mock").getAsString())) {
String value = ScriptEngineUtils.buildFunctionCallString(object.get("mock").getAsJsonObject().get("mock").getAsString());
return value;
}
} catch (Exception e) {
return object.get("mock").getAsJsonObject().get("mock");
}
return "";
}
private static void analyzeDefinitions(JsonObject object) {
JsonObject definitionsObj = object.get("definitions").getAsJsonObject();
for (Entry<String, JsonElement> entry : definitionsObj.entrySet()) {
String definitionKey = entry.getKey();
JsonObject definitionObj = definitionsObj.get(definitionKey).getAsJsonObject();
JSONObject obj = new JSONObject();
analyzeRootSchemaElement(definitionObj, obj);
}
}
private static String formerJson(String jsonSchema) {
try {
JSONObject root = new JSONObject(true);
generator(jsonSchema, root);
// 格式化返回
Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().disableHtmlEscaping().create();
if (root.get("MS-OBJECT") != null) {
return gson.toJson(root.get("MS-OBJECT"));
}
return gson.toJson(root);
} catch (Exception e) {
return jsonSchema;
}
}
public static String getJson(String jsonSchema) {
try {
if (StringUtils.isEmpty(jsonSchema)) {
return null;
}
return formerJson(jsonSchema);
} catch (Exception ex) {
return jsonSchema;
}
}
}

6
backend/src/main/java/io/metersphere/commons/json/JSONSchemaToDocumentUtils.java
View File

@ -74,7 +74,7 @@ public class JSONSchemaToDocumentUtils {
Object value = null;
boolean required = requiredList.contains(propertyName);
if (object.has("default")) {
value = object.get("default") != null ? object.get("default").toString() : "";
value = object.get("default") != null ? object.get("default").getAsString() : "";
concept.add(new DocumentElement(propertyName, propertyObjType, value, required, null));
} else if (object.has("enum")) {
try {
@ -97,7 +97,7 @@ public class JSONSchemaToDocumentUtils {
} else if (propertyObjType.equals("string")) {
// 先设置空值
if (object.has("default")) {
value = object.get("default") != null ? object.get("default").toString() : "";
value = object.get("default") != null ? object.get("default").getAsString() : "";
}
if (object.has("mock") && object.get("mock").getAsJsonObject() != null && StringUtils.isNotEmpty(object.get("mock").getAsJsonObject().get("mock").getAsString()) && StringUtils.isNotEmpty(object.get("mock").getAsJsonObject().get("mock").getAsString())) {
value = ScriptEngineUtils.buildFunctionCallString(object.get("mock").getAsJsonObject().get("mock").getAsString());
@ -140,7 +140,7 @@ public class JSONSchemaToDocumentUtils {
concept.add(new DocumentElement(propertyName, propertyObjType, value, required, null));
} else if (propertyObjType.equals("array")) {
List<DocumentElement> elements = new LinkedList<>();
concept.add(new DocumentElement(propertyName, propertyObjType, "", requiredList.contains(propertyName), elements));
concept.add(new DocumentElement(propertyName, propertyObjType, "", requiredList.contains(propertyName), true, elements));
JsonArray jsonArray = object.get("items").getAsJsonArray();
analyzeArray(propertyName, jsonArray, elements, requiredList);
} else if (propertyObjType.equals("object")) {

11
backend/src/main/java/io/metersphere/commons/utils/JsonStructUtils.java
View File

@ -167,14 +167,19 @@ public class JsonStructUtils {
return false;
} else {
for (int i = 0; i < matchArr.size(); i++) {
for (int j = i; j < sourceArr.size(); j++) {
boolean finalChack = false;
sourceForeach:for (int j = i; j < sourceArr.size(); j++) {
Object matchItemObj = matchArr.get(i);
Object sourceItemObj = sourceArr.get(j);
boolean check = checkObjCompliance(sourceItemObj, matchItemObj);
if (!check) {
return check;
if (check) {
finalChack = true;
break;
}
}
if(!finalChack){
return false;
}
}
return true;
}

1
backend/src/main/java/io/metersphere/controller/request/MdUploadRequest.java
View File

@ -7,4 +7,5 @@ import lombok.Setter;
@Setter
public class MdUploadRequest {
private String id;
private String fileName;
}

12
backend/src/main/java/io/metersphere/service/ResourceService.java
View File

@ -11,6 +11,8 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Date;
@Service
@ -18,14 +20,20 @@ import java.util.Date;
public class ResourceService {
public void mdUpload(MdUploadRequest request, MultipartFile file) {
FileUtils.uploadFile(file, FileUtils.MD_IMAGE_DIR, request.getId() + "_" + file.getOriginalFilename());
FileUtils.uploadFile(file, FileUtils.MD_IMAGE_DIR, request.getId() + "_" + request.getFileName());
}
public ResponseEntity<FileSystemResource> getMdImage(String name) {
File file = new File(FileUtils.MD_IMAGE_DIR + "/" + name);
HttpHeaders headers = new HttpHeaders();
String fileName = "";
try {
fileName = URLEncoder.encode(file.getName(), "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
headers.add("Cache-Control", "no-cache, no-store, must-revalidate");
headers.add("Content-Disposition", "attachment; filename=" + file.getName());
headers.add("Content-Disposition", "attachment; filename=" + fileName);
headers.add("Pragma", "no-cache");
headers.add("Expires", "0");
headers.add("Last-Modified", new Date().toString());

1
backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
View File

@ -175,7 +175,6 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
}
protected void handleTestCaseIssues(IssuesUpdateRequest issuesRequest) {
if (!issuesRequest.isWithCaseId()) return;
String issuesId = issuesRequest.getId();
if (StringUtils.isNotBlank(issuesRequest.getTestCaseId())) {
insertTestCaseIssues(issuesId, issuesRequest.getTestCaseId());

4
backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
View File

@ -172,6 +172,8 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
// 用例与第三方缺陷平台中的缺陷关联
handleTestCaseIssues(issuesRequest);
} else {
MSException.throwException("请确认该Zentao账号是否开启超级modle调用接口权限");
}
return issues;
}
@ -235,7 +237,7 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
@Override
public void userAuth(UserDTO.PlatformInfo userInfo) {
setUserConfig();
setUserConfig(userInfo);
zentaoClient.login();
}

2
backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
View File

@ -12,8 +12,6 @@ public class IssuesUpdateRequest extends IssuesWithBLOBs {
private String content;
private String testCaseId;
private String workspaceId;
// 带caseId的更新, 默认更新是同时保存用例的关联关系，脑图保存缺陷，不带caseId
private boolean withCaseId = true;
private List<String> tapdUsers;
/**

9
backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
View File

@ -396,9 +396,14 @@ public class TestPlanApiCaseService {
if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
apiResult.setActuator(request.getConfig().getResourcePoolId());
}
if (SessionUtils.getUser() != null) {
apiResult.setUserId(SessionUtils.getUser().getId());
if(StringUtils.isEmpty(request.getUserId())){
if (SessionUtils.getUser() != null) {
apiResult.setUserId(SessionUtils.getUser().getId());
}
}else {
apiResult.setUserId(request.getUserId());
}
apiResult.setResourceId(key.getApiCaseId());
apiResult.setStartTime(System.currentTimeMillis());
apiResult.setType(ApiRunMode.API_PLAN.name());

14
backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
View File

@ -80,7 +80,8 @@ public class TestPlanLoadCaseService {
public List<TestPlanLoadCaseDTO> list(LoadCaseRequest request) {
request.setOrders(ServiceUtils.getDefaultSortOrder(request.getOrders()));
return extTestPlanLoadCaseMapper.selectTestPlanLoadCaseList(request);
List<TestPlanLoadCaseDTO> testPlanLoadCaseDTOList = extTestPlanLoadCaseMapper.selectTestPlanLoadCaseList(request);
return testPlanLoadCaseDTOList;
}
public List<String> selectTestPlanLoadCaseIds(LoadCaseRequest request) {
@ -155,7 +156,7 @@ public class TestPlanLoadCaseService {
if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
serialRun(request);
} else {
ExecutorService executorService = Executors.newFixedThreadPool(request.getRequests().size(),new NamedThreadFactory("TestPlanLoadCaseService"));
ExecutorService executorService = Executors.newFixedThreadPool(request.getRequests().size(), new NamedThreadFactory("TestPlanLoadCaseService"));
request.getRequests().forEach(item -> {
executorService.submit(new ParallelExecTask(performanceTestService, testPlanLoadCaseMapper, item));
});
@ -170,7 +171,7 @@ public class TestPlanLoadCaseService {
}
private void serialRun(RunBatchTestPlanRequest request) throws Exception {
ExecutorService executorService = Executors.newFixedThreadPool(request.getRequests().size(),new NamedThreadFactory("TestPlanLoadCaseService-serial"));
ExecutorService executorService = Executors.newFixedThreadPool(request.getRequests().size(), new NamedThreadFactory("TestPlanLoadCaseService-serial"));
for (RunTestPlanRequest runTestPlanRequest : request.getRequests()) {
Future<LoadTestReportWithBLOBs> future = executorService.submit(new SerialExecTask(performanceTestService, testPlanLoadCaseMapper, loadTestReportMapper, runTestPlanRequest, request.getConfig()));
LoadTestReportWithBLOBs report = future.get();
@ -378,8 +379,8 @@ public class TestPlanLoadCaseService {
return buildCases(cases);
}
public List<TestPlanLoadCaseDTO> getAllCases(Collection<String> ids,String planId,String status) {
List<TestPlanLoadCaseDTO> cases = extTestPlanLoadCaseMapper.getCasesByIds(ids,planId, status);
public List<TestPlanLoadCaseDTO> getAllCases(Collection<String> ids, String planId, String status) {
List<TestPlanLoadCaseDTO> cases = extTestPlanLoadCaseMapper.getCasesByIds(ids, planId, status);
return buildCases(cases);
}
@ -438,6 +439,7 @@ public class TestPlanLoadCaseService {
/**
* 用例自定义排序
*
* @param request
*/
public void updateOrder(ResetOrderRequest request) {
@ -450,7 +452,7 @@ public class TestPlanLoadCaseService {
public void checkStatusByDeleteLoadCaseReportId(String reportId) {
List<String> updatedId = extTestPlanLoadCaseMapper.selectIdByLoadCaseReportIdAndStatusIsRun(reportId);
if(CollectionUtils.isNotEmpty(updatedId)){
if (CollectionUtils.isNotEmpty(updatedId)) {
for (String id : updatedId) {
extTestPlanLoadCaseMapper.updateStatusNullById(id);
}

6
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -1171,13 +1171,17 @@ public class TestPlanReportService {
if (StringUtils.isNotBlank(testPlanReportContent.getScenarioAllCases())) {
List<TestPlanFailureScenarioDTO> allCases = JSONObject.parseArray(testPlanReportContent.getScenarioAllCases(), TestPlanFailureScenarioDTO.class);
for (TestPlanFailureScenarioDTO dto : allCases) {
if (StringUtils.equalsIgnoreCase(dto.getLastResult(), "Underway")) {
if (StringUtils.equalsAnyIgnoreCase("Underway",dto.getStatus(), dto.getLastResult())) {
isUpdate = true;
ApiScenarioReport apiReport = apiScenarioReportMapper.selectByPrimaryKey(dto.getReportId());
if (apiReport != null) {
dto.setLastResult(apiReport.getStatus());
dto.setStatus(apiReport.getStatus());
}
}else if (StringUtils.equalsAnyIgnoreCase("Error",dto.getStatus(), dto.getLastResult())) {
isUpdate = true;
dto.setLastResult("Fail");
dto.setStatus("Fail");
}
}
testPlanReportContent.setScenarioAllCases(JSONArray.toJSONString(allCases));

8
backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
View File

@ -500,7 +500,7 @@ public class TestPlanScenarioCaseService {
String defaultStatus = "Running";
if(isFinish){
defaultStatus = "Error";
defaultStatus = "Fail";
}
Map<String,String> reportStatus = apiScenarioReportService.getReportStatusByReportIds(idMap.values());
for (TestPlanFailureScenarioDTO dto: apiTestCases) {
@ -510,10 +510,14 @@ public class TestPlanScenarioCaseService {
String status = reportStatus.get(reportId);
if(status == null ){
status = defaultStatus;
}else {
if(StringUtils.equalsIgnoreCase(status,"Error")){
status = "Fail";
}
}
dto.setLastResult(status);
dto.setStatus(status);
}
}
return buildCases(apiTestCases);
}

22
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -1087,7 +1087,7 @@ public class TestPlanService {
}
@Transactional(propagation = Propagation.NOT_SUPPORTED)
TestPlanScheduleReportInfoDTO genTestPlanReport(String projectID, String planId, String userId, String triggerMode){
TestPlanScheduleReportInfoDTO genTestPlanReport(String projectID, String planId, String userId, String triggerMode) {
TestPlanScheduleReportInfoDTO reportInfoDTO = testPlanReportService.genTestPlanReportBySchedule(projectID, planId, userId, triggerMode);
return reportInfoDTO;
}
@ -1181,14 +1181,14 @@ public class TestPlanService {
} catch (Exception e) {
LogUtil.error(e);
}
performaneThreadIDMap.put(performanceRequest.getTestPlanLoadId(),reportId);
performaneThreadIDMap.put(performanceRequest.getTestPlanLoadId(), reportId);
if (StringUtils.isNotEmpty(reportId)) {
executePerformanceIdMap.put(caseID, TestPlanApiExecuteStatus.RUNNING.name());
} else {
executePerformanceIdMap.put(caseID, TestPlanApiExecuteStatus.PREPARE.name());
}
}
TestPlanReportExecuteCatch.updateTestPlanThreadInfo(planReportId,null,null,performaneThreadIDMap);
TestPlanReportExecuteCatch.updateTestPlanThreadInfo(planReportId, null, null, performaneThreadIDMap);
if (!performaneReportIDMap.isEmpty()) {
//性能测试时保存性能测试报告ID，在结果返回时用于捕捉并进行
testPlanReportService.updatePerformanceInfo(testPlanReport, performaneReportIDMap, triggerMode);
@ -1205,7 +1205,7 @@ public class TestPlanService {
testPlanLog.info("ReportId[" + planReportId + "] start run. TestPlanID:[" + testPlanID + "]. Execute api :" + JSONObject.toJSONString(executeApiCaseIdMap) + "; Execute scenario:" + JSONObject.toJSONString(executeScenarioCaseIdMap) + "; Execute performance:" + JSONObject.toJSONString(executePerformanceIdMap));
TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(planReportId, executeApiCaseIdMap, executeScenarioCaseIdMap, executePerformanceIdMap);
//执行接口案例任务
this.executeApiTestCase(triggerMode, planReportId, new ArrayList<>(planApiCaseMap.keySet()), runModeConfig);
this.executeApiTestCase(triggerMode, planReportId, userId, new ArrayList<>(planApiCaseMap.keySet()), runModeConfig);
//执行场景执行任务
this.executeScenarioCase(planReportId, testPlanID, projectID, runModeConfig, triggerMode, userId, planScenarioIdsMap);
this.listenTaskExecuteStatus(planReportId);
@ -1227,11 +1227,9 @@ public class TestPlanService {
});
}
private void executeApiTestCase(String triggerMode, String planReportId, List<String> planCaseIds, RunModeConfig runModeConfig) {
private void executeApiTestCase(String triggerMode, String planReportId, String userId, List<String> planCaseIds, RunModeConfig runModeConfig) {
executorService.submit(() -> {
BatchRunDefinitionRequest request = new BatchRunDefinitionRequest();
// List<String> planIdList = new ArrayList<>(1);
// planIdList.add(testPlanId);
if (StringUtils.equals(triggerMode, ReportTriggerMode.API.name())) {
request.setTriggerMode(ApiRunMode.JENKINS_API_PLAN.name());
} else if (StringUtils.equals(triggerMode, ReportTriggerMode.MANUAL.name())) {
@ -1239,10 +1237,10 @@ public class TestPlanService {
} else {
request.setTriggerMode(ApiRunMode.SCHEDULE_API_PLAN.name());
}
request.setPlanIds(planCaseIds);
request.setPlanReportId(planReportId);
request.setConfig(runModeConfig);
request.setUserId(userId);
testPlanApiCaseService.run(request);
});
}
@ -1502,7 +1500,7 @@ public class TestPlanService {
continue;
}
if ((StringUtils.equals(envType, EnvironmentType.JSON.name()) && StringUtils.isBlank(env))
|| StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isBlank(envGroupId)) {
|| StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isBlank(envGroupId)) {
continue;
}
Map<String, String> map = new HashMap<>();
@ -1746,7 +1744,7 @@ public class TestPlanService {
}
}
public void buildApiReport(TestPlanSimpleReportDTO report, JSONObject config, TestPlanExecuteInfo executeInfo,boolean isFinish) {
public void buildApiReport(TestPlanSimpleReportDTO report, JSONObject config, TestPlanExecuteInfo executeInfo, boolean isFinish) {
if (MapUtils.isEmpty(executeInfo.getApiCaseExecInfo()) && MapUtils.isEmpty(executeInfo.getApiScenarioCaseExecInfo())) {
return;
}
@ -1756,12 +1754,12 @@ public class TestPlanService {
if (checkReportConfig(config, "api", "all")) {
if (MapUtils.isNotEmpty(executeInfo.getApiCaseExecInfo())) {
// 接口
apiAllCases = testPlanApiCaseService.getByApiExecReportIds(executeInfo.getApiCaseExecuteThreadMap(),isFinish);
apiAllCases = testPlanApiCaseService.getByApiExecReportIds(executeInfo.getApiCaseExecuteThreadMap(), isFinish);
report.setApiAllCases(apiAllCases);
}
if (MapUtils.isNotEmpty(executeInfo.getApiScenarioCaseExecInfo())) {
//场景
scenarioAllCases = testPlanScenarioCaseService.getAllCases(executeInfo.getApiScenarioThreadMap(),isFinish);
scenarioAllCases = testPlanScenarioCaseService.getAllCases(executeInfo.getApiScenarioThreadMap(), isFinish);
report.setScenarioAllCases(scenarioAllCases);
}
}

14
frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
View File

@ -132,6 +132,13 @@ export default {
this.formatContent(this.scenario.scenarioDefinition.hashTree, obj);
this.fullTreeNodes.push(obj);
},
compare(){
return function(a,b){
let v1 = a.value.sort;
let v2 = b.value.sort;
return v1 - v2;
}
},
setTreeValue(arr) {
arr.forEach(item => {
if (this.debugResult && this.debugResult.get(item.resId)) {
@ -161,6 +168,7 @@ export default {
this.setTreeValue(item.children);
}
})
arr.sort(this.compare());
},
getType(type) {
switch (type) {
@ -301,7 +309,9 @@ export default {
this.content.passAssertions += item.passAssertions
this.content.totalAssertions += item.totalAssertions;
if (item && item.requestResults) {
item.requestResults.forEach(req => {
for(let index in item.requestResults){
let req = item.requestResults[index];
req.sort = index;
req.responseResult.console = res.console;
if (req.method === 'Request' && req.subRequestResults && req.subRequestResults.length > 0) {
this.getTransaction(req.subRequestResults, resMap);
@ -327,7 +337,7 @@ export default {
this.endTime = req.endTime;
}
}
})
}
}
})
}

2
frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
View File

@ -272,8 +272,6 @@ export default {
this.headers = headers;
}
this.visible = true;
this.editData = {type: "CONSTANT"};
this.addParameters(this.editData);
this.disabled = disabled;
},
save() {

2
frontend/src/business/components/api/definition/components/MsCodeEdit.vue
View File

@ -1,5 +1,5 @@
<template>
<editor v-model="formatData" :lang="mode" @init="editorInit" :theme="theme" :height="height"/>
<editor v-model="formatData" :lang="mode" @init="editorInit" :theme="theme" :height="height" :key="readOnly"/>
</template>
<script>

25
frontend/src/business/components/common/head/HeaderTopMenus.vue
View File

@ -43,9 +43,10 @@
</template>
<script>
import {LicenseKey} from '@/common/js/constants';
import {hasLicense} from "@/common/js/utils";
import {MODULE_CHANGE, ModuleEvent} from "@/business/components/common/head/ListEvent";
import {validateAndSetLicense} from "@/business/permission";
import axios from "axios";
// const requireContext = require.context('@/business/components/xpack/', true, /router\.js$/);
// const report = requireContext.keys().map(key => requireContext(key).report);
@ -74,19 +75,27 @@ export default {
}
this.handleSelect(this.activeIndex);
}
},
created() {
},
mounted() {
if (this.$route.matched.length > 0) {
this.activeIndex = this.$route.matched[0].path;
}
let license = localStorage.getItem(LicenseKey);
if (license != "valid") {
this.isReport = false;
} else {
if (module.default) {
module.default.listModules(this);
axios.get('/license/valid').then(response => {
validateAndSetLicense(response.data.data); // 在调用 listModules 之前删除校验失败的 license, axios 失败不弹框
if (!hasLicense()) {
this.isReport = false;
} else {
if (module.default) {
module.default.listModules(this);
}
}
}
}).catch(error => {
window.console.error(error.response || error.message);
});
this.registerEvents();
},

3
frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue
View File

@ -40,6 +40,9 @@
created() {
if (this.schema.mock && Object.prototype.toString.call(this.schema.mock).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
this.mock = this.schema.mock;
if(typeof(this.mock.mock) === 'number'){
this.mock.mock = this.mock.mock+"";
}
} else {
this.schema.mock = this.mock;
}

2
frontend/src/business/components/settings/personal/JiraUserInfo.vue
View File

@ -6,7 +6,7 @@
<el-form-item :label="'Jira ' + $t('organization.integration.account')" prop="account">
<el-input v-model="data.jiraAccount" :placeholder="$t('organization.integration.input_api_account')"/>
</el-form-item>
<el-form-item :label="'Jira ' + $t('organization.integration.password')" prop="password">
<el-form-item label="Token" prop="password">
<el-input v-model="data.jiraPassword" auto-complete="new-password"
:placeholder="$t('organization.integration.input_api_password')" show-password/>
</el-form-item>

1
frontend/src/business/components/settings/plugin/JarConfig.vue
View File

@ -117,6 +117,7 @@ export default {
this.fileList = [];
});
} else {
this.fileList = [];
return false;
}
}

2
frontend/src/business/components/settings/plugin/PluginConfig.vue
View File

@ -57,7 +57,7 @@
</el-table>
</el-card>
<el-dialog :title="$t('commons.import')" :visible.sync="dialogVisible" @close="close">
<el-dialog :title="$t('commons.import')" :visible.sync="dialogVisible" @close="close" destroy-on-close>
<ms-jar-config @close="close"/>
</el-dialog>
<ms-script-view ref="scriptView"/>

2
frontend/src/business/components/settings/workspace/components/JiraSetting.vue
View File

@ -6,7 +6,7 @@
<el-form-item :label="$t('organization.integration.account')" prop="account">
<el-input v-model="form.account" :placeholder="$t('organization.integration.input_api_account')"/>
</el-form-item>
<el-form-item :label="$t('organization.integration.password')" prop="password">
<el-form-item label="Token" prop="password">
<el-input v-model="form.password" auto-complete="new-password" v-if="showInput"
:placeholder="$t('organization.integration.input_api_password')" show-password/>
</el-form-item>

4
frontend/src/business/components/track/case/components/FormRichTextItem.vue
View File

@ -107,9 +107,11 @@ export default {
};
file.prefix = param.id;
this.result.loading = true;
// 带括号和空格，可能无法展示
param.fileName = file.name.replace("(", "").replace(")", "").replace(" ", "");
this.$fileUpload('/resource/md/upload', file, null, param, () => {
this.$success(this.$t('commons.save_success'));
this.$refs.md.$img2Url(pos, '/resource/md/get/' + param.id + '_' + file.name);
this.$refs.md.$img2Url(pos, '/resource/md/get/' + param.id + '_' + param.fileName);
this.result.loading = false;
});
this.$emit('imgAdd', file);

2
frontend/src/business/components/track/issue/IssueEditDetail.vue
View File

@ -275,9 +275,7 @@ export default {
buildCustomFields(this.form, param, this.issueTemplate);
if (this.isPlan) {
param.testCaseIds = [this.caseId];
param.withCaseId = false;
} else {
param.withCaseId = true;
param.testCaseIds = Array.from(this.testCaseContainIds);
}
if (this.planId) {

4
frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
View File

@ -229,10 +229,6 @@ export default {
<style scoped>
.ms-main-container {
height: calc(100vh - 132px);
}
.el-card {
/*width: 95% !important;*/
padding: 15px;

5
frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue
View File

@ -198,6 +198,11 @@ export default {
.ms-aside-container {
border: 0px;
height: 550px;
padding: 10px 0px 0px 10px;
}
.ms-main-container {
height: 580px;
}
</style>

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 3e5bfe95c48c06c9e8c459b041befb372824d5db
Subproject commit 8a79109a23a54ea7b4f0e2860a2da06733adc076

20
frontend/src/business/permission.js
View File

@ -3,10 +3,11 @@ import {TokenKey} from '@/common/js/constants';
import {
enableModules,
hasLicense,
hasPermissions
hasPermissions, removeLicense, saveLicense
} from "@/common/js/utils";
import NProgress from 'nprogress'; // progress bar
import 'nprogress/nprogress.css'; // progress bar style
import 'nprogress/nprogress.css';
import {baseGet} from "@/network/base-network"; // progress bar style
const whiteList = ['/login']; // no redirect whitelist
NProgress.configure({showSpinner: false}); // NProgress Configuration
@ -101,3 +102,18 @@ router.afterEach(() => {
// finish progress bar
NProgress.done();
});
export function getLicense(callback) {
return baseGet("/license/valid", data => {
validateAndSetLicense(data);
if (callback) callback();
});
}
export function validateAndSetLicense(data) {
if (data === null || data.status !== 'valid') {
removeLicense();
} else {
saveLicense(data.status);
}
}

4
frontend/src/common/js/utils.js
View File

@ -152,6 +152,10 @@ export function saveLicense(data) {
localStorage.setItem(LicenseKey, data);
}
export function removeLicense() {
localStorage.removeItem(LicenseKey);
}
export function jsonToMap(jsonStr) {
let obj = JSON.parse(jsonStr);
let strMap = new Map();