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

fix(接口测试): API变更记录问题 

--bug=1026202 --user=宋昌昌 【接口测试】接口定义-再次导入ms格式的json文件-（接口参数有删除）-没有变更记录 https://www.tapd.cn/55049933/s/1387376
This commit is contained in:
song-cc-rock 2023-06-28 11:39:03 +08:00 committed by 刘瑞斌
parent e8e5af538b
commit 9b81ddf56b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api-test/backend/src/main/java/io/metersphere/commons/utils/ApiTestDefinitionDiffUtilImpl.java
View File

@ -222,7 +222,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String headerOld = StringUtils.join(JSON_START, httpOld.get(HEADS).toString(), JSON_END); String headerOld = StringUtils.join(JSON_START, httpOld.get(HEADS).toString(), JSON_END);
if (!StringUtils.equals(headerNew, headerOld)) { if (!StringUtils.equals(headerNew, headerOld)) {
String patch = jsonDiff.diff(headerOld, headerNew); String patch = jsonDiff.diff(headerOld, headerNew);
String diffPatch = jsonDiff.apply(headerNew, patch); String diffPatch = jsonDiff.apply(headerOld, patch);
if (StringUtils.isNotBlank(diffPatch) && !isDiffPatchRootEmpty(diffPatch)) { if (StringUtils.isNotBlank(diffPatch) && !isDiffPatchRootEmpty(diffPatch)) {
diffMap.put("header", diffPatch); diffMap.put("header", diffPatch);
} }
@ -234,7 +234,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String statusCodeOld = StringUtils.join(JSON_START, httpOld.get(STATUS_CODE).toString(), JSON_END); String statusCodeOld = StringUtils.join(JSON_START, httpOld.get(STATUS_CODE).toString(), JSON_END);
if (!StringUtils.equals(statusCodeNew, statusCodeOld)) { if (!StringUtils.equals(statusCodeNew, statusCodeOld)) {
String patch = jsonDiff.diff(statusCodeOld, statusCodeNew); String patch = jsonDiff.diff(statusCodeOld, statusCodeNew);
String diff = jsonDiff.apply(statusCodeNew, patch); String diff = jsonDiff.apply(statusCodeOld, patch);;
if (StringUtils.isNotBlank(diff) && !isDiffPatchRootEmpty(diff)) { if (StringUtils.isNotBlank(diff) && !isDiffPatchRootEmpty(diff)) {
diffMap.put(STATUS_CODE, diff); diffMap.put(STATUS_CODE, diff);
} }
@ -246,7 +246,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String bodyStrOld = httpOld.get(BODY).toString(); String bodyStrOld = httpOld.get(BODY).toString();
if (!StringUtils.equals(bodyStrNew, bodyStrOld)) { if (!StringUtils.equals(bodyStrNew, bodyStrOld)) {
String patch = jsonDiff.diff(bodyStrOld, bodyStrNew); String patch = jsonDiff.diff(bodyStrOld, bodyStrNew);
String diff = jsonDiff.apply(bodyStrNew, patch); String diff = jsonDiff.apply(bodyStrOld, patch);
if (StringUtils.isNotBlank(diff) && !isDiffPatchRootEmpty(diff) && !isBodyDiffPatchEmpty(diff)) { if (StringUtils.isNotBlank(diff) && !isDiffPatchRootEmpty(diff) && !isBodyDiffPatchEmpty(diff)) {
diffMap.put(BODY, diff); diffMap.put(BODY, diff);
} }
@ -266,7 +266,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String bodyFormOld = StringUtils.join(JSON_START, JSON.toJSONString(bodyOld.getKvs()), JSON_END); String bodyFormOld = StringUtils.join(JSON_START, JSON.toJSONString(bodyOld.getKvs()), JSON_END);
if (!StringUtils.equals(bodyFormNew, bodyFormOld)) { if (!StringUtils.equals(bodyFormNew, bodyFormOld)) {
String patch = jsonDiff.diff(bodyFormOld, bodyFormNew); String patch = jsonDiff.diff(bodyFormOld, bodyFormNew);
String diff = jsonDiff.apply(bodyFormNew, patch); String diff = jsonDiff.apply(bodyFormOld, patch);
if (StringUtils.isNotBlank(diff) && !isDiffPatchRootEmpty(diff)) { if (StringUtils.isNotBlank(diff) && !isDiffPatchRootEmpty(diff)) {
diffMap.put(BODY_FORM, diff); diffMap.put(BODY_FORM, diff);
} }
@ -289,7 +289,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String queryOld = StringUtils.join(JSON_START, JSON.toJSONString(tcpOld.getParameters()), JSON_END); String queryOld = StringUtils.join(JSON_START, JSON.toJSONString(tcpOld.getParameters()), JSON_END);
if (!StringUtils.equals(queryNew, queryOld)) { if (!StringUtils.equals(queryNew, queryOld)) {
String patch = jsonDiff.diff(queryOld, queryNew); String patch = jsonDiff.diff(queryOld, queryNew);
String diff = jsonDiff.apply(queryNew, patch); String diff = jsonDiff.apply(queryOld, patch);
if (StringUtils.isNotEmpty(diff)) { if (StringUtils.isNotEmpty(diff)) {
diffMap.put(QUERY, diff); diffMap.put(QUERY, diff);
} }
@ -297,7 +297,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
// 对比BODY-JSON参数 // 对比BODY-JSON参数
if (!StringUtils.equals(tcpNew.getJsonDataStruct(), tcpOld.getJsonDataStruct())) { if (!StringUtils.equals(tcpNew.getJsonDataStruct(), tcpOld.getJsonDataStruct())) {
String patch = jsonDiff.diff(tcpOld.getJsonDataStruct(), tcpNew.getJsonDataStruct()); String patch = jsonDiff.diff(tcpOld.getJsonDataStruct(), tcpNew.getJsonDataStruct());
String diff = jsonDiff.apply(tcpNew.getJsonDataStruct(), patch); String diff = jsonDiff.apply(tcpOld.getJsonDataStruct(), patch);
if (StringUtils.isNotEmpty(diff) && !StringUtils.equals(patch, "{}")) { if (StringUtils.isNotEmpty(diff) && !StringUtils.equals(patch, "{}")) {
diffMap.put("body_json", diff); diffMap.put("body_json", diff);
} }
@ -309,7 +309,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
diffMap.put(StringUtils.join(BODY_XML, "_1"), JSON.toJSONString(tcpNew.getXmlDataStruct())); diffMap.put(StringUtils.join(BODY_XML, "_1"), JSON.toJSONString(tcpNew.getXmlDataStruct()));
diffMap.put(StringUtils.join(BODY_XML, "_2"), JSON.toJSONString(tcpOld.getXmlDataStruct())); diffMap.put(StringUtils.join(BODY_XML, "_2"), JSON.toJSONString(tcpOld.getXmlDataStruct()));
String patch = jsonDiff.diff(xmlOld, xmlNew); String patch = jsonDiff.diff(xmlOld, xmlNew);
String diffPatch = jsonDiff.apply(xmlNew, patch); String diffPatch = jsonDiff.apply(xmlOld, patch);
if (StringUtils.isNotEmpty(diffPatch)) { if (StringUtils.isNotEmpty(diffPatch)) {
diffMap.put(BODY_XML, diffPatch); diffMap.put(BODY_XML, diffPatch);
} }
@ -354,7 +354,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String variablesOld = StringUtils.join(JSON_START, JSON.toJSONString(jdbcOld.getVariables()), JSON_END); String variablesOld = StringUtils.join(JSON_START, JSON.toJSONString(jdbcOld.getVariables()), JSON_END);
if (!StringUtils.equals(variablesNew, variablesOld)) { if (!StringUtils.equals(variablesNew, variablesOld)) {
String patch = jsonDiff.diff(variablesOld, variablesNew); String patch = jsonDiff.diff(variablesOld, variablesNew);
String diffPatch = jsonDiff.apply(variablesNew, patch); String diffPatch = jsonDiff.apply(variablesOld, patch);
if (StringUtils.isNotEmpty(diffPatch)) { if (StringUtils.isNotEmpty(diffPatch)) {
diffMap.put("variables", diffPatch); diffMap.put("variables", diffPatch);
} }
@ -395,7 +395,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String argsOld = StringUtils.join(JSON_START, JSON.toJSONString(dubboOld.getArgs()), JSON_END); String argsOld = StringUtils.join(JSON_START, JSON.toJSONString(dubboOld.getArgs()), JSON_END);
if (!StringUtils.equals(argsNew, argsOld)) { if (!StringUtils.equals(argsNew, argsOld)) {
String patch = jsonDiff.diff(argsOld, argsNew); String patch = jsonDiff.diff(argsOld, argsNew);
String diffPatch = jsonDiff.apply(argsNew, patch); String diffPatch = jsonDiff.apply(argsOld, patch);
if (StringUtils.isNotEmpty(diffPatch)) { if (StringUtils.isNotEmpty(diffPatch)) {
diffMap.put("args", diffPatch); diffMap.put("args", diffPatch);
} }
@ -409,7 +409,7 @@ public class ApiTestDefinitionDiffUtilImpl implements ApiDefinitionDiffUtil {
String attachmentOld = StringUtils.join(JSON_START, JSON.toJSONString(dubboOld.getAttachmentArgs()), JSON_END); String attachmentOld = StringUtils.join(JSON_START, JSON.toJSONString(dubboOld.getAttachmentArgs()), JSON_END);
if (!StringUtils.equals(attachmentNew, attachmentOld)) { if (!StringUtils.equals(attachmentNew, attachmentOld)) {
String patch = jsonDiff.diff(attachmentOld, attachmentNew); String patch = jsonDiff.diff(attachmentOld, attachmentNew);
String diffPatch = jsonDiff.apply(attachmentNew, patch); String diffPatch = jsonDiff.apply(attachmentOld, patch);
if (StringUtils.isNotEmpty(diffPatch)) { if (StringUtils.isNotEmpty(diffPatch)) {
diffMap.put("attachment", diffPatch); diffMap.put("attachment", diffPatch);
} }

4
api-test/frontend/src/business/history/api/ApiHttpRequestParams.vue
View File

@ -3,7 +3,7 @@
<div style="border: 1px #dcdfe6 solid" v-if="!loading"> <div style="border: 1px #dcdfe6 solid" v-if="!loading">
<el-tabs v-model="activeName" class="request-tabs"> <el-tabs v-model="activeName" class="request-tabs">
<!-- 请求头--> <!-- 请求头-->
<el-tab-pane :label="$t('api_test.request.headers')" name="headers" v-if="request.header"> <el-tab-pane :label="request.columnName === 'request' ? $t('api_test.request.headers') : $t('api_test.definition.request.response_header')" name="headers" v-if="request.header">
<ms-api-key-value-detail :items="request.header" :showDesc="true" :format="request.headerId" /> <ms-api-key-value-detail :items="request.header" :showDesc="true" :format="request.headerId" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('api_test.definition.request.status_code')" name="statusCode" v-if="request.statusCode"> <el-tab-pane :label="$t('api_test.definition.request.status_code')" name="statusCode" v-if="request.statusCode">
@ -29,7 +29,7 @@
<!--请求体--> <!--请求体-->
<el-tab-pane <el-tab-pane
:label="$t('api_test.request.body')" :label="request.columnName === 'request' ? $t('api_test.request.body') : $t('api_test.definition.request.response_body')"
name="body" name="body"
v-if=" v-if="
request.body && (request.body.form || request.body.jsonSchema || request.body.raw_1 || request.body.raw_2) request.body && (request.body.form || request.body.jsonSchema || request.body.raw_1 || request.body.raw_2)