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

feat(接口测试): Mock服务增加更多参数获取 

--story=1010821 --user=宋天阳 mock的后置脚本支持获取不同格式的请求数据
https://www.tapd.cn/55049933/s/1318927
This commit is contained in:
song-tianyang 2022-12-22 10:35:44 +08:00 committed by 建国
parent f4be75de5f
commit 8601141288
8 changed files with 285 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
api-test/backend/src/main/java/io/metersphere/api/dto/mock/RequestMockParams.java
View File

@ -2,7 +2,7 @@ package io.metersphere.api.dto.mock;
import lombok.Getter;
import lombok.Setter;
import org.json.JSONArray;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
/**
@ -12,30 +12,31 @@ import org.json.JSONObject;
@Getter
@Setter
public class RequestMockParams {
private boolean isPost;
private String paramType;
private JSONObject restParamsObj;
private JSONObject queryParamsObj;
private JSONArray bodyParams;
public JSONObject getParamsObj() {
JSONObject returnObj = new JSONObject();
if (restParamsObj != null) {
for (String key : restParamsObj.keySet()) {
Object value = restParamsObj.get(key);
returnObj.put(key, value);
}
}
if (queryParamsObj != null) {
for (String key : queryParamsObj.keySet()) {
Object value = queryParamsObj.get(key);
returnObj.put(key, value);
}
}
return returnObj;
}
//form-data的kv类型参数也存储在queryParamObj中
private JSONObject queryParamsObj;
//JSONArray 或 JSONObject
private Object jsonParam;
private JSONObject xmlToJsonParam;
private String raw;
public boolean isEmpty() {
return (restParamsObj == null || restParamsObj == null) &&
(queryParamsObj == null || queryParamsObj == null) &&
(bodyParams == null || bodyParams == null);
if (isPost) {
return (restParamsObj == null || restParamsObj.isEmpty()) &&
(queryParamsObj == null || queryParamsObj.isEmpty())
&& StringUtils.isBlank(raw);
} else {
return (restParamsObj == null || restParamsObj.isEmpty()) &&
(queryParamsObj == null || queryParamsObj.isEmpty());
}
}
}

5
api-test/backend/src/main/java/io/metersphere/commons/enums/MockRequestType.java Normal file
View File

@ -0,0 +1,5 @@
package io.metersphere.commons.enums;
public enum MockRequestType {
JSON, KV, XML, RAW
}

118
api-test/backend/src/main/java/io/metersphere/commons/utils/mock/MockApiUtils.java
View File

@ -8,6 +8,7 @@ import io.metersphere.api.exec.generator.JSONSchemaGenerator;
import io.metersphere.commons.constants.ElementConstants;
import io.metersphere.commons.constants.PropertyConstant;
import io.metersphere.commons.enums.MockParamConditionEnums;
import io.metersphere.commons.enums.MockRequestType;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*;
import io.metersphere.jmeter.utils.ScriptEngineUtils;
@ -288,13 +289,7 @@ public class MockApiUtils {
}
}
if (headerMap == null) {
headerMap = new HashMap<>();
}
if (requestMockParams == null) {
requestMockParams = new RequestMockParams();
}
if (bodyObj == null && bodyObj == null) {
if (bodyObj == null || bodyObj.isEmpty()) {
return StringUtils.EMPTY;
} else {
String returnStr = StringUtils.EMPTY;
@ -321,8 +316,7 @@ public class MockApiUtils {
}
} else if (StringUtils.equalsAnyIgnoreCase(type, "Raw")) {
if (bodyObj.has("raw")) {
String raw = bodyObj.optString("raw");
returnStr = raw;
returnStr = bodyObj.optString("raw");
}
} else if (StringUtils.equalsAnyIgnoreCase(type, "XML")) {
if (bodyObj.has("xmlHeader")) {
@ -339,8 +333,7 @@ public class MockApiUtils {
}
} else if (StringUtils.equalsAnyIgnoreCase(type, "fromApi")) {
if (bodyObj.has("apiRspRaw")) {
String raw = bodyObj.optString("apiRspRaw");
returnStr = raw;
returnStr = bodyObj.optString("apiRspRaw");
}
}
}
@ -351,67 +344,21 @@ public class MockApiUtils {
}
}
public static RequestMockParams getParams(String urlParams, String apiPath, JSONObject queryParamsObject, Object paramJson, boolean isPostRequest) {
RequestMockParams returnParams = getGetParamMap(urlParams, apiPath, queryParamsObject, isPostRequest);
if (paramJson != null) {
if (paramJson instanceof JSONObject) {
if (!((JSONObject) paramJson).keySet().isEmpty()) {
JSONArray bodyParams = returnParams.getBodyParams();
if (bodyParams == null) {
bodyParams = new JSONArray();
bodyParams.put(paramJson);
} else {
JSONArray oldArray = returnParams.getBodyParams();
if (!JsonStructUtils.checkJsonArrayCompliance(oldArray, ((JSONObject) paramJson))) {
bodyParams.put(((JSONObject) paramJson));
}
}
returnParams.setBodyParams(bodyParams);
}
} else if (paramJson instanceof JSONArray) {
JSONArray paramArray = (JSONArray) paramJson;
if (paramArray != null) {
returnParams.setBodyParams(paramArray);
}
}
}
return returnParams;
}
public static JSONObject getParameterJsonObject(HttpServletRequest request) {
JSONObject queryParamsObject = new JSONObject();
Enumeration<String> paramNameItor = request.getParameterNames();
while (paramNameItor.hasMoreElements()) {
String key = paramNameItor.nextElement();
String value = request.getParameter(key);
queryParamsObject.put(key, value);
}
return queryParamsObject;
}
private static RequestMockParams getGetParamMap(String urlParams, String apiPath, JSONObject queryParamsObject, boolean isPostRequest) {
RequestMockParams requestMockParams = new RequestMockParams();
public static void complementRestParam(String urlParams, String apiPath, RequestMockParams requestMockParams) {
JSONObject urlParamsObject = getSendRestParamMapByIdAndUrl(apiPath, urlParams);
requestMockParams.setRestParamsObj(urlParamsObject);
requestMockParams.setQueryParamsObj(queryParamsObject);
if (isPostRequest && !queryParamsObject.keySet().isEmpty()) {
JSONArray jsonArray = new JSONArray();
if (queryParamsObject.length() != 0) {
jsonArray.put(queryParamsObject);
}
requestMockParams.setBodyParams(jsonArray);
}
return requestMockParams;
}
public static Object getPostParamMap(HttpServletRequest request) {
public static RequestMockParams genRequestMockParamsFromHttpRequest(HttpServletRequest request, boolean isPost) {
RequestMockParams mockParams = new RequestMockParams();
mockParams.setPost(isPost);
if (StringUtils.startsWithIgnoreCase(request.getContentType(), "application/JSON")) {
mockParams.setParamType(MockRequestType.JSON.name());
Object returnJson = null;
try {
String param = getRequestPostStr(request);
mockParams.setRaw(param);
if (StringUtils.isNotEmpty(param)) {
JSONValidator jsonValidator = JSONValidator.from(param);
if (StringUtils.equalsIgnoreCase(PropertyConstant.ARRAY, jsonValidator.getType().name())) {
@ -420,39 +367,52 @@ public class MockApiUtils {
returnJson = JSONUtil.parseObject(param);
}
}
mockParams.setJsonParam(returnJson);
} catch (Exception e) {
LogUtil.error(e);
}
return returnJson;
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "text/xml")) {
mockParams.setParamType(MockRequestType.XML.name());
String xmlString = readXml(request);
JSONObject object = XMLUtil.xmlStringToJSONObject(xmlString);
return object;
JSONObject xmlJsonObject = XMLUtil.xmlStringToJSONObject(xmlString);
mockParams.setXmlToJsonParam(xmlJsonObject);
mockParams.setRaw(xmlString);
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "application/x-www-form-urlencoded")) {
mockParams.setParamType(MockRequestType.KV.name());
JSONObject object = new JSONObject();
Enumeration<String> paramNameItor = request.getParameterNames();
while (paramNameItor.hasMoreElements()) {
String key = paramNameItor.nextElement();
Enumeration<String> paramNameItr = request.getParameterNames();
while (paramNameItr.hasMoreElements()) {
String key = paramNameItr.nextElement();
String value = request.getParameter(key);
object.put(key, value);
}
return object;
mockParams.setQueryParamsObj(object);
} else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "text/plain")) {
JSONObject object = new JSONObject();
mockParams.setParamType(MockRequestType.RAW.name());
String bodyParam = readBody(request);
if (StringUtils.isNotEmpty(bodyParam)) {
object.put("raw", bodyParam);
mockParams.setRaw(bodyParam);
}
} else if (isPost) {
String bodyParam = readBody(request);
if (StringUtils.isNotEmpty(bodyParam)) {
mockParams.setParamType(MockRequestType.RAW.name());
mockParams.setRaw(bodyParam);
}
}
return object;
} else {
if (!StringUtils.equals(mockParams.getParamType(), MockRequestType.KV.name())) {
//非kv类型的请求要检查一下是否带有其它kv参数
JSONObject object = new JSONObject();
String bodyParam = readBody(request);
if (StringUtils.isNotEmpty(bodyParam)) {
object.put("raw", bodyParam);
Enumeration<String> paramNameItr = request.getParameterNames();
while (paramNameItr.hasMoreElements()) {
String key = paramNameItr.nextElement();
String value = request.getParameter(key);
object.put(key, value);
}
return object;
mockParams.setQueryParamsObj(object);
}
return mockParams;
}
private static JSONObject getSendRestParamMapByIdAndUrl(String path, String urlParams) {

171
api-test/backend/src/main/java/io/metersphere/commons/utils/mock/MockScriptEngineUtils.java
View File

@ -3,6 +3,7 @@ package io.metersphere.commons.utils.mock;
import io.metersphere.api.dto.mock.RequestMockParams;
import io.metersphere.commons.constants.ElementConstants;
import io.metersphere.commons.enums.MockRequestType;
import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.JSON;
import io.metersphere.commons.utils.JSONUtil;
@ -15,9 +16,6 @@ import org.json.JSONObject;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import java.io.File;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@ -48,24 +46,6 @@ public class MockScriptEngineUtils {
}
}
public void loadJar(String jarPath) throws Exception {
try {
ClassLoader classLoader = ClassLoader.getSystemClassLoader();
try {
Method method = classLoader.getClass().getDeclaredMethod("addURL", URL.class);
method.setAccessible(true);
method.invoke(classLoader, new File(jarPath).toURI().toURL());
} catch (NoSuchMethodException e) {
Method method = classLoader.getClass()
.getDeclaredMethod("appendToClassPathForInstrumentation", String.class);
method.setAccessible(true);
method.invoke(classLoader, jarPath);
}
} catch (Exception e) {
LogUtil.error(e);
}
}
/**
* 加载jar包
*/
@ -96,9 +76,12 @@ public class MockScriptEngineUtils {
engine = scriptEngineFactory.getEngineByName(scriptLanguage);
preScript = this.genPythonPreScript(url, headerMap, requestMockParams);
}
if (engine != null) {
MsDynamicClassLoader loader = MsClassLoader.loadJar(getJarPaths(projectId));
Thread.currentThread().setContextClassLoader(loader);
engine.eval(preScript);
}
} catch (Exception e) {
LogUtil.error(e);
}
@ -106,9 +89,9 @@ public class MockScriptEngineUtils {
}
private String genBeanshellPreScript(String url, Map<String, String> headerMap, RequestMockParams requestMockParams) {
StringBuffer preScriptBuffer = new StringBuffer();
StringBuilder preScriptBuffer = new StringBuilder();
preScriptBuffer.append("Map vars = new HashMap();\n");
preScriptBuffer.append("vars.put(\"address\",\"" + url + "\");\n");
preScriptBuffer.append("vars.put(\"address\",\"").append(url).append("\");\n");
//写入请求头
if (headerMap != null) {
for (Map.Entry<String, String> headEntry : headerMap.entrySet()) {
@ -116,48 +99,53 @@ public class MockScriptEngineUtils {
String headerValue = headEntry.getValue();
headerKey = StringUtils.replace(headerKey, "\\", "\\\\").replace("\"", "\\\"");
headerValue = StringUtils.replace(headerValue, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars.put(\"header." + headerKey + "\",\"" + headerValue + "\");\n");
preScriptBuffer.append("vars.put(\"header.").append(headerKey).append("\",\"").append(headerValue).append("\");\n");
}
}
//写入body参数
if (requestMockParams != null) {
if (requestMockParams.getBodyParams() != null) {
if (requestMockParams.getBodyParams().length() == 1) {
//参数是jsonObject
JSONObject bodyParamObj = requestMockParams.getBodyParams().optJSONObject(0);
for (String key : bodyParamObj.keySet()) {
String value = String.valueOf(bodyParamObj.get(key));
value = StringUtils.replace(value, "\\", "\\\\");
value = StringUtils.replace(value, "\"", "\\\"");
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars.put(\"body." + key + "\",\"" + value + "\");\n");
if (StringUtils.equalsIgnoreCase(key, "raw")) {
preScriptBuffer.append("vars.put(\"bodyRaw\",\"" + value + "\");\n");
}
}
String jsonBody = bodyParamObj.toString();
jsonBody = StringUtils.replace(jsonBody, "\\", "\\\\");
jsonBody = StringUtils.replace(jsonBody, "\"", "\\\"");
preScriptBuffer.append("vars.put(\"body.json\",\"" + jsonBody + "\");\n");
} else {
String bodyRowString = requestMockParams.getBodyParams().toString();
bodyRowString = StringUtils.replace(bodyRowString, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars.put(\"bodyRaw\",\"" + bodyRowString + "\");\n");
}
}
//写入query参数
//写入body参数
if (requestMockParams.isPost()) {
if (requestMockParams.getQueryParamsObj() != null) {
JSONObject queryParamsObj = requestMockParams.getQueryParamsObj();
for (String key : queryParamsObj.keySet()) {
String value = String.valueOf(queryParamsObj.get(key));
value = StringUtils.replace(value, "\\", "\\\\");
value = StringUtils.replace(value, "\"", "\\\"");
value = StringUtils.replace(value, "\\", "\\\\").replace("\"", "\\\"");
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars.put(\"query." + key + "\",\"" + value + "\");\n");
preScriptBuffer.append("vars.put(\"body.").append(key).append("\",\"").append(value).append("\");\n");
}
}
if (StringUtils.equals(requestMockParams.getParamType(), MockRequestType.JSON.name())) {
String jsonBody = requestMockParams.getRaw();
jsonBody = StringUtils.replace(jsonBody, "\n", "");
jsonBody = StringUtils.replace(jsonBody, "\\", "\\\\");
jsonBody = StringUtils.replace(jsonBody, "\"", "\\\"");
preScriptBuffer.append("vars.put(\"body.json\",\"").append(jsonBody).append("\");\n");
} else if (StringUtils.equals(requestMockParams.getParamType(), MockRequestType.XML.name())) {
String xmlRaw = requestMockParams.getRaw();
xmlRaw = StringUtils.chomp(xmlRaw);
xmlRaw = StringUtils.replace(xmlRaw, "\n", "");
xmlRaw = StringUtils.replace(xmlRaw, "\\", "\\\\");
xmlRaw = StringUtils.replace(xmlRaw, "\"", "\\\"");
preScriptBuffer.append("vars.put(\"body.xml\",\"").append(xmlRaw).append("\");\n");
} else if (StringUtils.equals(requestMockParams.getParamType(), MockRequestType.RAW.name())) {
String bodyRowString = requestMockParams.getRaw();
bodyRowString = StringUtils.replace(bodyRowString, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars.put(\"bodyRaw\",\"").append(bodyRowString).append("\");\n");
}
}
//写入query参数
if (!requestMockParams.isPost() && requestMockParams.getQueryParamsObj() != null) {
JSONObject queryParamsObj = requestMockParams.getQueryParamsObj();
for (String key : queryParamsObj.keySet()) {
String value = String.valueOf(queryParamsObj.get(key));
value = StringUtils.replace(value, "\\", "\\\\").replace("\"", "\\\"");
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars.put(\"query.").append(key).append("\",\"").append(value).append("\");\n");
}
}
//写入rest参数
if (requestMockParams.getRestParamsObj() != null) {
JSONObject restParamsObj = requestMockParams.getRestParamsObj();
@ -166,7 +154,7 @@ public class MockScriptEngineUtils {
key = StringUtils.replace(key, "\"", "\\\"");
value = StringUtils.replace(value, "\"", "\\\"");
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars.put(\"rest." + key + "\",\"" + value + "\");\n");
preScriptBuffer.append("vars.put(\"rest.").append(key).append("\",\"").append(value).append("\");\n");
}
}
}
@ -174,53 +162,61 @@ public class MockScriptEngineUtils {
}
private String genPythonPreScript(String url, Map<String, String> headerMap, RequestMockParams requestMockParams) {
StringBuffer preScriptBuffer = new StringBuffer();
StringBuilder preScriptBuffer = new StringBuilder();
preScriptBuffer.append("vars = {}; \n");
preScriptBuffer.append("vars[\"address\"]=\"" + url + "\";\n");
preScriptBuffer.append("vars[\"address\"]=\"").append(url).append("\";\n");
//写入请求头
for (Map.Entry<String, String> headEntry : headerMap.entrySet()) {
String headerKey = headEntry.getKey();
String headerValue = headEntry.getValue();
headerKey = StringUtils.replace(headerKey, "\\", "\\\\").replace("\"", "\\\"");
headerValue = StringUtils.replace(headerValue, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars[\"header." + headerKey + "\"]=\"" + headerValue + "\";\n");
preScriptBuffer.append("vars[\"header.").append(headerKey).append("\"]=\"").append(headerValue).append("\";\n");
}
if (requestMockParams != null) {
//写入body参数
if (requestMockParams.getBodyParams() != null) {
if (requestMockParams.getBodyParams().length() == 1) {
//参数是jsonObject
JSONObject bodyParamObj = requestMockParams.getBodyParams().optJSONObject(0);
for (String key : bodyParamObj.keySet()) {
String value = String.valueOf(bodyParamObj.get(key));
value = StringUtils.replace(value, "\\", "\\\\");
value = StringUtils.replace(value, "\"", "\\\"");
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars[\"body." + key + "\"]=\"" + value + "\";\n");
if (StringUtils.equalsIgnoreCase(key, "raw")) {
preScriptBuffer.append("vars[\"bodyRaw\"]=\"" + value + "\";\n");
}
}
String jsonBody = bodyParamObj.toString();
jsonBody = StringUtils.replace(jsonBody, "\\", "\\\\");
jsonBody = StringUtils.replace(jsonBody, "\"", "\\\"");
preScriptBuffer.append("vars[\"body.json\"]=\"" + jsonBody + "\";\n");
} else {
String bodyRaw = StringUtils.replace(requestMockParams.getBodyParams().toString(), "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars[\"bodyRaw\"]=\"" + bodyRaw + "\";\n");
}
}
//写入query参数
if (requestMockParams.isPost()) {
if (requestMockParams.getQueryParamsObj() != null) {
JSONObject queryParamsObj = requestMockParams.getQueryParamsObj();
for (String key : queryParamsObj.keySet()) {
String value = String.valueOf(queryParamsObj.get(key));
value = StringUtils.replace(value, "\\", "\\\\");
value = StringUtils.replace(value, "\"", "\\\"");
value = StringUtils.replace(value, "\\", "\\\\").replace("\"", "\\\"");
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars[\"query." + key + "\"]=\"" + value + "\";\n");
preScriptBuffer.append("vars[\"body.").append(key).append("\"]=\"").append(value).append("\";\n");
}
}
if (StringUtils.equals(requestMockParams.getParamType(), MockRequestType.JSON.name())) {
String jsonRaw = requestMockParams.getRaw();
jsonRaw = StringUtils.chomp(jsonRaw);
jsonRaw = StringUtils.replace(jsonRaw, "\n", "");
jsonRaw = StringUtils.replace(jsonRaw, "\\", "\\\\");
jsonRaw = StringUtils.replace(jsonRaw, "\"", "\\\"");
preScriptBuffer.append("vars[\"body.json\"]=\"").append(jsonRaw).append("\";\n");
} else if (StringUtils.equals(requestMockParams.getParamType(), MockRequestType.XML.name())) {
String xmlRaw = requestMockParams.getRaw();
xmlRaw = StringUtils.chomp(xmlRaw);
xmlRaw = StringUtils.replace(xmlRaw, "\n", "");
xmlRaw = StringUtils.replace(xmlRaw, "\\", "\\\\");
xmlRaw = StringUtils.replace(xmlRaw, "\"", "\\\"");
preScriptBuffer.append("vars[\"body.xml\"]=\"").append(xmlRaw).append("\";\n");
} else if (StringUtils.equals(requestMockParams.getParamType(), MockRequestType.RAW.name())) {
String bodyRowString = requestMockParams.getRaw();
bodyRowString = StringUtils.replace(bodyRowString, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars[\"bodyRaw\"]=\"").append(bodyRowString).append("\";\n");
}
}
//写入query参数
if (!requestMockParams.isPost() && requestMockParams.getQueryParamsObj() != null) {
JSONObject queryParamsObj = requestMockParams.getQueryParamsObj();
for (String key : queryParamsObj.keySet()) {
String value = String.valueOf(queryParamsObj.get(key));
value = StringUtils.replace(value, "\\", "\\\\").replace("\"", "\\\"");
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars[\"query.").append(key).append("\"]=\"").append(value).append("\";\n");
}
}
//写入rest参数
if (requestMockParams.getRestParamsObj() != null) {
JSONObject restParamsObj = requestMockParams.getRestParamsObj();
@ -228,7 +224,8 @@ public class MockScriptEngineUtils {
String value = String.valueOf(restParamsObj.get(key));
key = StringUtils.replace(key, "\\", "\\\\").replace("\"", "\\\"");
value = StringUtils.replace(value, "\\", "\\\\").replace("\"", "\\\"");
preScriptBuffer.append("vars[\"rest." + key + "\"]=\"" + value + "\";\n");
preScriptBuffer.append("vars[\"rest.").append(key).append("\"]=\"").append(value).append("\";\n");
}
}
}
return preScriptBuffer.toString();

12
api-test/backend/src/main/java/io/metersphere/controller/mock/MockConfigController.java
View File

@ -8,15 +8,13 @@ import io.metersphere.api.dto.mock.config.MockConfigRequest;
import io.metersphere.api.dto.mock.config.MockExpectConfigRequest;
import io.metersphere.api.dto.mock.config.response.MockConfigResponse;
import io.metersphere.api.dto.mock.config.response.MockExpectConfigResponse;
import io.metersphere.commons.constants.NoticeConstants;
import io.metersphere.commons.utils.mock.MockApiUtils;
import io.metersphere.commons.utils.mock.MockTestDataUtil;
import io.metersphere.notice.annotation.SendNotice;
import io.metersphere.service.definition.ApiDefinitionService;
import io.metersphere.service.MockConfigService;
import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
import io.metersphere.base.domain.MockExpectConfig;
import io.metersphere.base.domain.MockExpectConfigWithBLOBs;
import io.metersphere.commons.utils.mock.MockApiUtils;
import io.metersphere.commons.utils.mock.MockTestDataUtil;
import io.metersphere.service.MockConfigService;
import io.metersphere.service.definition.ApiDefinitionService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -30,7 +28,7 @@ import java.util.Map;
* @Description
*/
@RestController
@RequestMapping("/mock/config")
@RequestMapping("/mock-config")
public class MockConfigController {
@Resource

234
api-test/backend/src/main/java/io/metersphere/service/MockConfigService.java
View File

@ -105,7 +105,7 @@ public class MockConfigService {
}
}
private MockConfigResponse assemblyMockConfingResponse(List<MockConfig> configList) {
private MockConfigResponse assemblyMockConingResponse(List<MockConfig> configList) {
if (!configList.isEmpty()) {
MockConfig config = configList.get(0);
MockExpectConfigExample expectConfigExample = new MockExpectConfigExample();
@ -131,9 +131,6 @@ public class MockConfigService {
* 如果没数据就生成，有数据就返回一套数据结构！
* 所有入参都没有必填项！
* 如果为了查询，请写一个新的接口！
*
* @param request
* @return
*/
public MockConfigResponse genMockConfig(MockConfigRequest request) {
MockConfigResponse returnRsp;
@ -153,40 +150,28 @@ public class MockConfigService {
List<MockConfig> configList = mockConfigMapper.selectByExample(example);
if (configList.isEmpty()) {
long createTimeStmp = System.currentTimeMillis();
long createTimeLong = System.currentTimeMillis();
MockConfig config = new MockConfig();
config.setProjectId(request.getProjectId());
config.setId(UUID.randomUUID().toString());
config.setCreateUserId(SessionUtils.getUserId());
config.setCreateTime(createTimeStmp);
config.setUpdateTime(createTimeStmp);
config.setCreateTime(createTimeLong);
config.setUpdateTime(createTimeLong);
if (request.getApiId() != null) {
config.setApiId(request.getApiId());
mockConfigMapper.insert(config);
}
returnRsp = new MockConfigResponse(config, new ArrayList<>());
} else {
MockConfig config = configList.get(0);
MockExpectConfigExample expectConfigExample = new MockExpectConfigExample();
expectConfigExample.createCriteria().andMockConfigIdEqualTo(config.getId());
expectConfigExample.setOrderByClause("update_time DESC");
List<MockExpectConfigResponse> expectConfigResponseList = new ArrayList<>();
List<MockExpectConfigWithBLOBs> expectConfigList = mockExpectConfigMapper.selectByExampleWithBLOBs(expectConfigExample);
for (MockExpectConfigWithBLOBs expectConfig : expectConfigList) {
MockExpectConfigResponse response = new MockExpectConfigResponse(expectConfig);
expectConfigResponseList.add(response);
returnRsp = this.assemblyMockConingResponse(configList);
}
returnRsp = new MockConfigResponse(config, expectConfigResponseList);
}
return returnRsp;
}
public void sendMockNotice(MockExpectConfigWithBLOBs mockExpectConfigWithBLOBs, String defaultContext, String event) {
if (SessionUtils.getUserId() != null) {
String context = SessionUtils.getUserId().concat(defaultContext).concat(":").concat(mockExpectConfigWithBLOBs.getName());
Map<String, Object> paramMap = new HashMap<>();
MockConfig mockConfig = mockConfigMapper.selectByPrimaryKey(mockExpectConfigWithBLOBs.getMockConfigId());
@ -194,6 +179,7 @@ public class MockConfigService {
NoticeModel noticeModel = NoticeModel.builder().operator(SessionUtils.getUserId()).context(context).testId(mockExpectConfigWithBLOBs.getId()).subject("接口定义通知").paramMap(paramMap).excludeSelf(true).event(event).build();
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
}
}
private void getParamMap(Map<String, Object> paramMap, String userId, MockExpectConfigWithBLOBs mockExpectConfigWithBLOBs, MockConfig mockConfig) {
paramMap.put("operator", userId);
@ -216,9 +202,9 @@ public class MockConfigService {
public MockExpectConfig updateMockExpectConfigStatus(MockExpectConfigRequest request) {
if (StringUtils.isNotEmpty(request.getId()) && StringUtils.isNotEmpty(request.getStatus())) {
MockExpectConfigWithBLOBs model = new MockExpectConfigWithBLOBs();
long timeStmp = System.currentTimeMillis();
long timestamp = System.currentTimeMillis();
model.setId(request.getId());
model.setUpdateTime(timeStmp);
model.setUpdateTime(timestamp);
model.setStatus(request.getStatus());
mockExpectConfigMapper.updateByPrimaryKeySelective(model);
sendMockNotice(model, "更新了mock", NoticeConstants.Event.MOCK_UPDATE);
@ -238,7 +224,7 @@ public class MockConfigService {
if (request.getName() != null) {
this.checkNameIsExists(request);
}
long timeStmp = System.currentTimeMillis();
long timestamp = System.currentTimeMillis();
MockExpectConfigWithBLOBs model = new MockExpectConfigWithBLOBs();
if (isSave) {
String expectNum = this.getMockExpectId(request.getMockConfigId());
@ -247,7 +233,7 @@ public class MockConfigService {
model.setId(request.getId());
model.setMockConfigId(request.getMockConfigId());
model.setUpdateTime(timeStmp);
model.setUpdateTime(timestamp);
model.setStatus(request.getStatus());
if (request.getTags() != null) {
model.setTags(JSON.toJSONString(request.getTags()));
@ -260,7 +246,7 @@ public class MockConfigService {
model.setResponse(JSON.toJSONString(request.getResponse()));
}
if (isSave) {
model.setCreateTime(timeStmp);
model.setCreateTime(timestamp);
model.setCreateUserId(SessionUtils.getUserId());
model.setStatus("true");
mockExpectConfigMapper.insert(model);
@ -321,7 +307,7 @@ public class MockConfigService {
continue;
}
JSONObject requestObj = JSONUtil.parseObject(JSON.toJSONString(model.getRequest()));
MockExpectConfigResponse resultModel = null;
MockExpectConfigResponse resultModel;
if (requestObj.has("params")) {
resultModel = this.getEmptyRequestMockExpectByParams(requestHeaderMap, model);
} else {
@ -340,13 +326,10 @@ public class MockConfigService {
continue;
}
JSONObject mockExpectRequestObj = JSONUtil.parseObject(JSON.toJSONString(model.getRequest()));
boolean isMatch;
boolean isMatch = false;
if (mockExpectRequestObj.has("params")) {
isMatch = this.isRequestMockExpectMatchingByParams(requestHeaderMap, mockExpectRequestObj, requestMockParams);
} else {
isMatch = this.isRequestMockExpectMatching(mockExpectRequestObj, requestMockParams);
}
if (isMatch) {
returnModel = model;
break;
@ -379,7 +362,6 @@ public class MockConfigService {
if (expectParamsObj.has("body")) {
JSONObject expectBodyObject = expectParamsObj.optJSONObject("body");
JSONArray jsonArray = requestMockParams.getBodyParams();
String type = expectBodyObject.optString(PropertyConstant.TYPE);
String paramsFilterType = "And";
if (expectBodyObject.has("paramsFilterType")) {
@ -389,11 +371,28 @@ public class MockConfigService {
JSONArray kvsArr = expectBodyObject.optJSONArray("kvs");
List<MockConfigRequestParams> mockConfigRequestParams = MockApiUtils.getParamsByJSONArray(kvsArr);
if (CollectionUtils.isNotEmpty(mockConfigRequestParams)) {
if (!MockApiUtils.checkParamsCompliance(jsonArray, mockConfigRequestParams, StringUtils.equals(paramsFilterType, "And"))) {
if (!MockApiUtils.checkParamsCompliance(requestMockParams.getQueryParamsObj(), mockConfigRequestParams, StringUtils.equals(paramsFilterType, "And"))) {
return false;
}
}
} else if (StringUtils.equalsAnyIgnoreCase(type, "Raw") && expectBodyObject.has("raw")) {
String rawExpect = expectBodyObject.optString("raw");
if (StringUtils.isEmpty(requestMockParams.getRaw()) || !StringUtils.contains(requestMockParams.getRaw(), rawExpect)) {
return false;
}
} else {
JSONArray jsonArray = null;
if (StringUtils.equalsIgnoreCase(type, "xml") && requestMockParams.getXmlToJsonParam() != null) {
jsonArray = new JSONArray();
jsonArray.put(requestMockParams.getXmlToJsonParam());
} else if (StringUtils.equalsIgnoreCase(type, "json") && requestMockParams.getJsonParam() != null) {
if (requestMockParams.getJsonParam() instanceof JSONArray) {
jsonArray = (JSONArray) requestMockParams.getJsonParam();
} else if (requestMockParams.getJsonParam() instanceof JSONObject) {
jsonArray = new JSONArray();
jsonArray.put(requestMockParams.getJsonParam());
}
}
Object mockExpectJsonArray = MockApiUtils.getExpectBodyParams(expectBodyObject);
if (mockExpectJsonArray instanceof JSONObject) {
if (!JsonStructUtils.checkJsonArrayCompliance(jsonArray, (JSONObject) mockExpectJsonArray)) {
@ -427,69 +426,11 @@ public class MockConfigService {
if (expectParamsObj.has("rest")) {
JSONArray restArray = expectParamsObj.optJSONArray("rest");
List<MockConfigRequestParams> mockConfigRequestParams = MockApiUtils.getParamsByJSONArray(restArray);
if (!MockApiUtils.checkParamsCompliance(requestMockParams.getRestParamsObj(), mockConfigRequestParams, StringUtils.equals(restFilterType, "And"))) {
return false;
}
return MockApiUtils.checkParamsCompliance(requestMockParams.getRestParamsObj(), mockConfigRequestParams, StringUtils.equals(restFilterType, "And"));
}
return true;
}
private boolean isRequestMockExpectMatching(JSONObject mockExpectRequestObj, RequestMockParams requestMockParams) {
boolean isJsonParam = mockExpectRequestObj.getBoolean("jsonParam");
JSONObject mockExpectJson = new JSONObject();
if (isJsonParam) {
String jsonParams = mockExpectRequestObj.optString("jsonData");
JSONValidator jsonValidator = JSONValidator.from(jsonParams);
if (StringUtils.equalsIgnoreCase("Array", jsonValidator.getType().name())) {
JSONArray mockExpectArr = JSONUtil.parseArray(jsonParams);
for (int expectIndex = 0; expectIndex < mockExpectArr.length(); expectIndex++) {
JSONObject itemObj = mockExpectArr.optJSONObject(expectIndex);
mockExpectJson = itemObj;
}
} else if (StringUtils.equalsIgnoreCase("Object", jsonValidator.getType().name())) {
JSONObject mockExpectJsonItem = JSONUtil.parseObject(jsonParams);
mockExpectJson = mockExpectJsonItem;
}
} else {
JSONArray jsonArray = mockExpectRequestObj.optJSONArray("variables");
for (int i = 0; i < jsonArray.length(); i++) {
JSONObject object = jsonArray.optJSONObject(i);
String name = StringUtils.EMPTY;
String value = StringUtils.EMPTY;
if (object.has("name")) {
name = String.valueOf(object.get("name")).trim();
}
if (object.has("value")) {
value = String.valueOf(object.get("value")).trim();
}
if (StringUtils.isNotEmpty(name)) {
mockExpectJson.put(name, value);
}
}
}
boolean matchRest = false;
boolean matchQuery = false;
boolean matchBody = false;
if (requestMockParams.getQueryParamsObj() != null) {
matchQuery = JsonStructUtils.checkJsonObjCompliance(requestMockParams.getQueryParamsObj(), mockExpectJson);
}
if (requestMockParams.getRestParamsObj() != null) {
matchRest = JsonStructUtils.checkJsonObjCompliance(requestMockParams.getRestParamsObj(), mockExpectJson);
}
if (requestMockParams.getBodyParams() != null) {
for (int i = 0; i < requestMockParams.getBodyParams().length(); i++) {
JSONObject reqJsonObj = requestMockParams.getBodyParams().optJSONObject(i);
matchBody = JsonStructUtils.checkJsonObjCompliance(reqJsonObj, mockExpectJson);
if (matchBody) {
break;
}
}
}
return matchRest || matchQuery || matchBody;
}
private MockExpectConfigResponse getEmptyRequestMockExpectByParams(Map<String, String> requestHeaderMap, MockExpectConfigResponse model) {
JSONObject requestObj = JSONUtil.parseObject(JSON.toJSONString(model.getRequest()));
if (requestObj.has("params")) {
@ -632,14 +573,14 @@ public class MockConfigService {
int httpCodeNum = 500;
try {
httpCodeNum = Integer.parseInt(responseJsonObj.optString("httpCode"));
} catch (Exception e) {
} catch (Exception ignored) {
}
response.setStatus(httpCodeNum);
}
if (responseJsonObj.has("delayed")) {
try {
sleepTime = Long.parseLong(String.valueOf(responseJsonObj.get("delayed")));
} catch (Exception e) {
} catch (Exception ignored) {
}
}
} else {
@ -662,14 +603,14 @@ public class MockConfigService {
if (responseObj.has("delayed")) {
try {
sleepTime = Long.parseLong(String.valueOf(responseObj.get("delayed")));
} catch (Exception e) {
} catch (Exception ignored) {
}
}
}
if (sleepTime > 0) {
try {
Thread.sleep(sleepTime);
} catch (Exception e) {
} catch (Exception ignored) {
}
}
} catch (Exception e) {
@ -695,7 +636,7 @@ public class MockConfigService {
if (mockExpectConfigWithBLOBs != null && StringUtils.isNotEmpty(mockExpectConfigWithBLOBs.getRequest())) {
try {
FileUtils.deleteBodyFiles(mockExpectConfigWithBLOBs.getId());
} catch (Exception e) {
} catch (Exception ignored) {
}
}
}
@ -708,8 +649,8 @@ public class MockConfigService {
for (MockConfig mockConfig : mockConfigList) {
example.clear();
example.createCriteria().andMockConfigIdEqualTo(mockConfig.getId());
List<MockExpectConfigWithBLOBs> deleteBolobs = mockExpectConfigMapper.selectByExampleWithBLOBs(example);
for (MockExpectConfigWithBLOBs model : deleteBolobs) {
List<MockExpectConfigWithBLOBs> deleteBlobs = mockExpectConfigMapper.selectByExampleWithBLOBs(example);
for (MockExpectConfigWithBLOBs model : deleteBlobs) {
this.deleteMockExpectFiles(model);
}
mockExpectConfigMapper.deleteByExample(example);
@ -771,11 +712,11 @@ public class MockConfigService {
for (int index = 0; index < headArr.length(); index++) {
JSONObject headObj = headArr.optJSONObject(index);
if (headObj.has("name") && !queryParamList.contains(headObj.has("name"))) {
if (headObj.has("name") && !queryParamList.contains(headObj.optString("name"))) {
queryParamList.add(String.valueOf(headObj.get("name")));
}
}
} catch (Exception e) {
} catch (Exception ignored) {
}
}
if (requestObj.has("rest")) {
@ -783,11 +724,11 @@ public class MockConfigService {
JSONArray headArr = requestObj.optJSONArray("rest");
for (int index = 0; index < headArr.length(); index++) {
JSONObject headObj = headArr.optJSONObject(index);
if (headObj.has("name") && !restParamList.contains(headObj.has("name"))) {
if (headObj.has("name") && !restParamList.contains(headObj.optString("name"))) {
restParamList.add(String.valueOf(headObj.get("name")));
}
}
} catch (Exception e) {
} catch (Exception ignored) {
}
}
//请求体参数类型
@ -802,14 +743,14 @@ public class MockConfigService {
JSONArray kvsArr = bodyObj.optJSONArray("kvs");
for (int i = 0; i < kvsArr.length(); i++) {
JSONObject kv = kvsArr.optJSONObject(i);
if (kv.has("name") && !formDataList.contains(kv.has("name"))) {
if (kv.has("name") && !formDataList.contains(kv.optString("name"))) {
formDataList.add(String.valueOf(kv.get("name")));
}
}
}
}
}
} catch (Exception e) {
} catch (Exception ignored) {
}
}
@ -851,7 +792,7 @@ public class MockConfigService {
JSONObject returnObj = null;
try {
returnObj = JSONUtil.parseObject(request);
} catch (Exception e) {
} catch (Exception ignored) {
}
return returnObj;
}
@ -868,7 +809,7 @@ public class MockConfigService {
MockConfigExample.Criteria criteria = example.createCriteria();
criteria.andApiIdEqualTo(id);
List<MockConfig> configList = mockConfigMapper.selectByExample(example);
return this.assemblyMockConfingResponse(configList);
return this.assemblyMockConingResponse(configList);
}
public String checkReturnWithMockExpectByBodyParam(String method, Map<String, String> requestHeaderMap, Project project, HttpServletRequest request, HttpServletResponse response) {
@ -876,23 +817,23 @@ public class MockConfigService {
boolean matchApi = false;
String url = request.getRequestURL().toString();
if (project != null) {
RequestMockParams requestMockParams = MockApiUtils.genRequestMockParamsFromHttpRequest(request, true);
String urlSuffix = this.getUrlSuffix(project.getSystemId(), request);
List<ApiDefinitionWithBLOBs> aualifiedApiList = apiDefinitionService.preparedUrl(project.getId(), method, urlSuffix, requestHeaderMap.get(MockApiHeaders.MOCK_API_RESOURCE_ID));
Object paramJson = MockApiUtils.getPostParamMap(request);
JSONObject parameterObject = MockApiUtils.getParameterJsonObject(request);
for (ApiDefinitionWithBLOBs api : aualifiedApiList) {
List<ApiDefinitionWithBLOBs> qualifiedApiList = apiDefinitionService.preparedUrl(project.getId(), method, urlSuffix, requestHeaderMap.get(MockApiHeaders.MOCK_API_RESOURCE_ID));
for (ApiDefinitionWithBLOBs api : qualifiedApiList) {
if (StringUtils.isEmpty(returnStr)) {
RequestMockParams mockParams = MockApiUtils.getParams(urlSuffix, api.getPath(), parameterObject, paramJson, true);
//补足rest参数
MockApiUtils.complementRestParam(urlSuffix, api.getPath(), requestMockParams);
MockConfigResponse mockConfigData = this.findByApiId(api.getId());
MockExpectConfigResponse finalExpectConfig = this.findExpectConfig(requestHeaderMap, mockConfigData.getMockExpectConfigList(), mockParams);
MockExpectConfigResponse finalExpectConfig = this.findExpectConfig(requestHeaderMap, mockConfigData.getMockExpectConfigList(), requestMockParams);
if (finalExpectConfig != null) {
returnStr = this.updateHttpServletResponse(project.getId(), finalExpectConfig, url, requestHeaderMap, mockParams, response);
returnStr = this.updateHttpServletResponse(project.getId(), finalExpectConfig, url, requestHeaderMap, requestMockParams, response);
} else {
returnStr = this.getApiDefinitionResponse(api, response);
}
}
}
if (CollectionUtils.isNotEmpty(aualifiedApiList)) {
if (CollectionUtils.isNotEmpty(qualifiedApiList)) {
matchApi = true;
}
}
@ -908,29 +849,27 @@ public class MockConfigService {
String returnStr = StringUtils.EMPTY;
boolean matchApi = false;
String url = request.getRequestURL().toString();
List<ApiDefinitionWithBLOBs> aualifiedApiList = new ArrayList<>();
if (project != null) {
RequestMockParams requestMockParams = MockApiUtils.genRequestMockParamsFromHttpRequest(request, false);
String urlSuffix = this.getUrlSuffix(project.getSystemId(), request);
aualifiedApiList = apiDefinitionService.preparedUrl(project.getId(), method, urlSuffix, requestHeaderMap.get(MockApiHeaders.MOCK_API_RESOURCE_ID));
List<ApiDefinitionWithBLOBs> qualifiedApiList = apiDefinitionService.preparedUrl(project.getId(), method, urlSuffix, requestHeaderMap.get(MockApiHeaders.MOCK_API_RESOURCE_ID));
/*
GET/DELETE 这种通过url穿参数的接口，在接口路径相同的情况下可能会出现这样的情况：
api1: /api/{name} 参数 name = "ABC"
api2: /api/{testParam} 参数 testParam = "ABC"
/**
* GET/DELETE 这种通过url穿参数的接口，在接口路径相同的情况下可能会出现这样的情况：
* api1: /api/{name} 参数 name = "ABC"
* api2: /api/{testParam} 参数 testParam = "ABC"
*
* 匹配预期Mock的逻辑为： 循环apiId进行筛选，直到筛选到预期Mock。如果筛选不到，则取Api的响应模版来进行返回
匹配预期Mock的逻辑为： 循环apiId进行筛选，直到筛选到预期Mock。如果筛选不到，则取Api的响应模版来进行返回
*/
Object paramJson = MockApiUtils.getPostParamMap(request);
JSONObject parameterObject = MockApiUtils.getParameterJsonObject(request);
for (ApiDefinitionWithBLOBs api : aualifiedApiList) {
for (ApiDefinitionWithBLOBs api : qualifiedApiList) {
if (StringUtils.isEmpty(returnStr)) {
RequestMockParams paramMap = MockApiUtils.getParams(urlSuffix, api.getPath(), parameterObject, paramJson, false);
//补足rest参数
MockApiUtils.complementRestParam(urlSuffix, api.getPath(), requestMockParams);
MockConfigResponse mockConfigData = this.findByApiId(api.getId());
if (mockConfigData != null && mockConfigData.getMockExpectConfigList() != null) {
MockExpectConfigResponse finalExpectConfig = this.findExpectConfig(requestHeaderMap, mockConfigData.getMockExpectConfigList(), paramMap);
MockExpectConfigResponse finalExpectConfig = this.findExpectConfig(requestHeaderMap, mockConfigData.getMockExpectConfigList(), requestMockParams);
if (finalExpectConfig != null) {
returnStr = this.updateHttpServletResponse(project.getId(), finalExpectConfig, url, requestHeaderMap, paramMap, response);
returnStr = this.updateHttpServletResponse(project.getId(), finalExpectConfig, url, requestHeaderMap, requestMockParams, response);
} else {
returnStr = this.getApiDefinitionResponse(api, response);
}
@ -938,7 +877,7 @@ public class MockConfigService {
}
}
if (CollectionUtils.isNotEmpty(aualifiedApiList)) {
if (CollectionUtils.isNotEmpty(qualifiedApiList)) {
matchApi = true;
}
}
@ -991,7 +930,7 @@ public class MockConfigService {
for (TcpTreeTableDataStruct dataStruct : list) {
List<String> nameList = dataStruct.getNameDeep();
for (String name : nameList) {
if (!returnList.contains(nameList)) {
if (!returnList.contains(name)) {
returnList.add(name);
}
}
@ -1075,22 +1014,19 @@ public class MockConfigService {
if (isMatch) {
JSONObject responseObj = JSONUtil.parseObject(responseStr);
if (responseObj.has("body")) {
if (isRaw) {
MockExpectConfigDTO dto = new MockExpectConfigDTO();
dto.setMockExpectConfig(expectConfig);
dto.setProjectId(projectId);
if (isRaw) {
rawResult.add(dto);
} else {
MockExpectConfigDTO dto = new MockExpectConfigDTO();
dto.setMockExpectConfig(expectConfig);
dto.setProjectId(projectId);
structResult.add(dto);
}
}
}
}
} catch (Exception e) {
} catch (Exception ignored) {
}
}
}
@ -1112,7 +1048,7 @@ public class MockConfigService {
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
XMLUtil.setExpandEntityReferencesFalse(documentBuilderFactory);
DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
builder.parse(new InputSource(new ByteArrayInputStream(message.getBytes(StandardCharsets.UTF_8.name()))));
builder.parse(new InputSource(new ByteArrayInputStream(message.getBytes(StandardCharsets.UTF_8))));
isXml = true;
} catch (Exception e) {
e.printStackTrace();
@ -1128,7 +1064,7 @@ public class MockConfigService {
if (!StringUtils.equalsIgnoreCase("value", type)) {
isJson = true;
}
} catch (Exception e) {
} catch (Exception ignored) {
}
return isJson;
}
@ -1163,7 +1099,6 @@ public class MockConfigService {
}
private void updateMockExpectConfigs(MockConfig mockConfig, List<MockExpectConfigWithBLOBs> list, SqlSession sqlSession) {
int batchCount = 0;
for (MockExpectConfigWithBLOBs mockExpect : list) {
MockExpectConfig expectInDb = this.findMockExpectConfigByMockConfigIdAndExpectNum(mockConfig.getId(), mockExpect.getExpectNum());
if (expectInDb == null) {
@ -1181,10 +1116,8 @@ public class MockConfigService {
}
}
if (batchCount % 300 == 0) {
sqlSession.flushStatements();
}
}
private MockExpectConfig findMockExpectConfigByMockConfigIdAndExpectNum(String mockConfigId, String expectNum) {
MockExpectConfigExample example = new MockExpectConfigExample();
@ -1208,7 +1141,6 @@ public class MockConfigService {
config.setApiId(apiId);
mockConfigMapper.insert(config);
int batchCount = 0;
for (MockExpectConfigWithBLOBs mockExpect : list) {
mockExpect.setId(UUID.randomUUID().toString());
mockExpect.setMockConfigId(mockId);
@ -1217,10 +1149,8 @@ public class MockConfigService {
mockExpect.setCreateUserId(SessionUtils.getUserId());
mockExpectConfigMapper.insert(mockExpect);
}
if (batchCount % 300 == 0) {
sqlSession.flushStatements();
}
}
private MockConfig selectMockConfigByApiId(String apiId) {
@ -1330,12 +1260,10 @@ public class MockConfigService {
int num1 = Integer.parseInt(tcpMockPortArr[0]);
int num2 = Integer.parseInt(tcpMockPortArr[1]);
int startNum = num1 > num2 ? num2 : num1;
int endNum = num1 < num2 ? num2 : num1;
int startNum = Math.min(num1, num2);
int endNum = Math.max(num1, num2);
if (port < startNum || port > endNum) {
inRange = false;
} else {
if (!(port < startNum || port > endNum)) {
inRange = true;
}
} else {
@ -1344,7 +1272,7 @@ public class MockConfigService {
inRange = true;
}
}
} catch (Exception e) {
} catch (Exception ignored) {
}
}
return inRange;
@ -1358,7 +1286,7 @@ public class MockConfigService {
JSONObject configObj = JSONUtil.parseObject(mockEnv.getConfig());
if (configObj.has("tcpConfig")) {
JSONObject tcpConfigObj = configObj.optJSONObject("tcpConfig");
int tcpPort = 0;
int tcpPort;
if (tcpConfigObj.has("port")) {
tcpPort = tcpConfigObj.optInt("port");
if (tcpPort == 0 || !TCPPool.isTcpOpen(tcpPort)) {

20
api-test/frontend/src/api/api-mock.js
View File

@ -2,41 +2,41 @@ import { get, post } from 'metersphere-frontend/src/plugins/request';
import { fileUpload } from '@/api/base-network';
export function getMockApiParams(id) {
return get('/mock/config/get-api-params/' + id);
return get('/mock-config/get-api-params/' + id);
}
export function updateMockExpectConfigStatus(mockParam) {
return post('/mock/config/update/expect', mockParam);
return post('/mock-config/update/expect', mockParam);
}
export function mockExpectConfig(id) {
return get('/mock/config/get-expect/' + id);
return get('/mock-config/get-expect/' + id);
}
export function delMock(id) {
return get('/mock/config/delete/' + id);
return get('/mock-config/delete/' + id);
}
export function createMockConfig(mockParam) {
return post('/mock/config/gen', mockParam);
return post('/mock-config/gen', mockParam);
}
export function getMockApiResponse(id) {
return get('/mock/config/get-api-response/' + id);
return get('/mock-config/get-api-response/' + id);
}
export function getTcpMockTestData(mockParam) {
return post('/mock/config/get-tcp-test-data', mockParam);
return post('/mock-config/get-tcp-test-data', mockParam);
}
export function getMockTestData(mockParam) {
return post('/mock/config/test-data', mockParam);
return post('/mock-config/test-data', mockParam);
}
export function updateMockExpectConfig(mockParam, file, files) {
return fileUpload('/mock/config/update/form', file, files, mockParam);
return fileUpload('/mock-config/update/form', file, files, mockParam);
}
export function getTcpMockInfo(projectId) {
return get('/mock/config/get-details/' + projectId);
return get('/mock-config/get-details/' + projectId);
}

22
api-test/frontend/src/business/definition/components/mock/Components/MockApiScriptEditor.vue
View File

@ -117,6 +117,14 @@ export default {
title: this.$t('api_test.request.body') + this.$t('api_test.variable') + ' (Raw)',
value: this.getScript('bodyRaw'),
},
{
title: this.$t('api_test.request.body') + this.$t('api_test.variable') + ' (Json)',
value: this.getScript('body.json'),
},
{
title: this.$t('api_test.request.body') + this.$t('api_test.variable') + ' (Xml)',
value: this.getScript('body.xml'),
},
{
title: 'Query ' + this.$t('api_test.definition.document.request_param'),
value: this.getScript('query'),
@ -215,6 +223,20 @@ export default {
returnScript = 'var param=vars.get("bodyRaw")';
}
break;
case 'body.json':
if (laguanges === 'python') {
returnScript = 'param=vars["body.json"]';
} else {
returnScript = 'var param=vars.get("body.json")';
}
break;
case 'body.xml':
if (laguanges === 'python') {
returnScript = 'param=vars["body.xml"]';
} else {
returnScript = 'var param=vars.get("body.xml")';
}
break;
case 'query':
if (laguanges === 'python') {
returnScript = 'param=vars["query.${param}"]';