From af6d57061cd5ea5d9782bc49df6e2ab0bf80ab47 Mon Sep 17 00:00:00 2001 From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com> Date: Mon, 30 May 2022 18:46:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmock=E7=8E=AF=E5=A2=83=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E4=BD=93=E4=B8=ADArray=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=20(#14149)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1013482 --user=王孝刚 【接口测试】github#13952，mock环境请求体中Array未显示 https://www.tapd.cn/55049933/s/1168499 Co-authored-by: wxg0103 <727495428@qq.com> --- .../api/mock/utils/MockApiUtils.java | 88 ++----------------- 1 file changed, 8 insertions(+), 80 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/mock/utils/MockApiUtils.java b/backend/src/main/java/io/metersphere/api/mock/utils/MockApiUtils.java index 1d48b4241f..cea936dcd3 100644 --- a/backend/src/main/java/io/metersphere/api/mock/utils/MockApiUtils.java +++ b/backend/src/main/java/io/metersphere/api/mock/utils/MockApiUtils.java @@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONValidator; import io.metersphere.api.dto.mock.ApiDefinitionResponseDTO; import io.metersphere.api.dto.mock.MockConfigRequestParams; import io.metersphere.api.dto.mock.RequestMockParams; -import io.metersphere.api.dto.mockconfig.response.JsonSchemaReturnObj; import io.metersphere.api.mock.dto.MockParamConditionEnum; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.json.JSONSchemaGenerator; @@ -146,73 +145,6 @@ public class MockApiUtils { return returnJson; } - public static JSONObject parseJsonSchema(JSONObject bodyReturnObj, boolean useJMeterFunc) { - JSONObject returnObj = new JSONObject(); - if (bodyReturnObj == null) { - return returnObj; - } - - Set keySet = bodyReturnObj.keySet(); - for (String key : keySet) { - try { - JsonSchemaReturnObj obj = bodyReturnObj.getObject(key, JsonSchemaReturnObj.class); - if (StringUtils.equals("object", obj.getType())) { - JSONObject itemObj = parseJsonSchema(obj.getProperties(), useJMeterFunc); - if (!itemObj.isEmpty()) { - returnObj.put(key, itemObj); - } - } else if (StringUtils.equals("array", obj.getType())) { - if (obj.getItems() != null) { - JSONObject itemObj = obj.getItems(); - if (itemObj.containsKey("type")) { - if (StringUtils.equals("object", itemObj.getString("type")) && itemObj.containsKey("properties")) { - JSONObject arrayObj = itemObj.getJSONObject("properties"); - JSONObject parseObj = parseJsonSchema(arrayObj, useJMeterFunc); - JSONArray array = new JSONArray(); - array.add(parseObj); - returnObj.put(key, array); - } else if (StringUtils.equals("string", itemObj.getString("type")) && itemObj.containsKey("mock")) { - JsonSchemaReturnObj arrayObj = JSONObject.toJavaObject(itemObj, JsonSchemaReturnObj.class); - String value = arrayObj.getMockValue(); - if (useJMeterFunc) { - value = getMockValues(arrayObj.getMockValue()); - } - JSONArray array = new JSONArray(); - array.add(value); - returnObj.put(key, array); - } - } - } - } else { - String values = obj.getMockValue(); - if (StringUtils.isEmpty(values)) { - values = ""; - } else if (useJMeterFunc) { - try { - values = values.startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(values) : values; - } catch (Exception e) { - } - } - returnObj.put(key, values); - } - } catch (Exception e) { - LogUtil.error(e); - } - } - return returnObj; - } - - private static String getMockValues(String values) { - if (StringUtils.isEmpty(values)) { - values = ""; - } else { - try { - values = values.startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(values) : values; - } catch (Exception e) { - } - } - return values; - } public static List getParamsByJSONArray(JSONArray array) { List requestParamsList = new ArrayList<>(); @@ -253,12 +185,10 @@ public class MockApiUtils { isJsonSchema = true; } } - if (isJsonSchema) { - if (bodyObj.containsKey("jsonSchema") && bodyObj.getJSONObject("jsonSchema").containsKey("properties")) { - String bodyRetunStr = bodyObj.getJSONObject("jsonSchema").getJSONObject("properties").toJSONString(); - JSONObject bodyReturnObj = JSONObject.parseObject(bodyRetunStr); - JSONObject returnObj = MockApiUtils.parseJsonSchema(bodyReturnObj, false); - returnStr = returnObj.toJSONString(); + if (isJsonSchema && bodyObj.containsKey("jsonSchema")) { + String json = JSONSchemaGenerator.getJson(bodyObj.getJSONObject("jsonSchema").toJSONString()); + if (StringUtils.isNotEmpty(json)) { + returnStr = json; } } else { if (bodyObj.containsKey("raw")) { @@ -378,12 +308,10 @@ public class MockApiUtils { isJsonSchema = true; } } - if (isJsonSchema) { - if (bodyObj.containsKey("jsonSchema") && bodyObj.getJSONObject("jsonSchema").containsKey("properties")) { - String bodyRetunStr = bodyObj.getJSONObject("jsonSchema").getJSONObject("properties").toJSONString(); - JSONObject bodyReturnObj = JSONObject.parseObject(bodyRetunStr); - JSONObject returnObj = MockApiUtils.parseJsonSchema(bodyReturnObj, false); - returnStr = returnObj.toJSONString(); + if (isJsonSchema && bodyObj.containsKey("jsonSchema")) { + String json = JSONSchemaGenerator.getJson(bodyObj.getJSONObject("jsonSchema").toJSONString()); + if (StringUtils.isNotEmpty(json)) { + returnStr = json; } } else { if (bodyObj.containsKey("raw")) {