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

fix(IDEA插件): 修复新版本插件导入没有请求体的问题 

--bug=1018261 --user=张大海 【idea插件】idea插件导入的接口，没有请求体和响应体 https://www.tapd.cn/55049933/s/1266223
This commit is contained in:
zhangdahai112 2022-10-18 18:12:41 +08:00 committed by zhangdahai112
parent 595071602a
commit 380ae96f15
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
View File

@ -165,7 +165,7 @@ public abstract class ApiImportAbstractParser<T> implements ApiImportParser<T> {
protected MsHTTPSamplerProxy buildRequest(String name, String path, String method, String jsonSchema) { protected MsHTTPSamplerProxy buildRequest(String name, String path, String method, String jsonSchema) {
MsHTTPSamplerProxy request = buildRequest(name, path, method); MsHTTPSamplerProxy request = buildRequest(name, path, method);
if (StringUtils.isNotBlank(jsonSchema)) { if (StringUtils.isNotBlank(jsonSchema)) {
request.getBody().setJsonSchema(JSONUtil.parseObject(jsonSchema)); request.getBody().setJsonSchema(JSON.parseObject(jsonSchema));
request.getBody().setFormat("JSON-SCHEMA"); request.getBody().setFormat("JSON-SCHEMA");
} }
return request; return request;

12
api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
View File

@ -1282,14 +1282,14 @@ public class ApiDefinitionService {
// put the data into the to-be-synchronized // put the data into the to-be-synchronized
if (!StringUtils.equals(exApiString, apiString)) { if (!StringUtils.equals(exApiString, apiString)) {
if (!StringUtils.equals(apiDefinition.getMethod(), existApi.getMethod())) { if (!StringUtils.equals(apiDefinition.getMethod(), existApi.getMethod())) {
if (apiSyncCaseRequest.getMethod() && toUpdate) { if (BooleanUtils.toBoolean(apiSyncCaseRequest.getMethod()) && toUpdate) {
apiDefinition.setToBeUpdated(true); apiDefinition.setToBeUpdated(true);
apiDefinition.setToBeUpdateTime(System.currentTimeMillis()); apiDefinition.setToBeUpdateTime(System.currentTimeMillis());
} }
return true; return true;
} }
if (!StringUtils.equals(apiDefinition.getProtocol(), existApi.getProtocol())) { if (!StringUtils.equals(apiDefinition.getProtocol(), existApi.getProtocol())) {
if (apiSyncCaseRequest.getProtocol() && toUpdate) { if (BooleanUtils.toBoolean(apiSyncCaseRequest.getProtocol()) && toUpdate) {
apiDefinition.setToBeUpdated(true); apiDefinition.setToBeUpdated(true);
apiDefinition.setToBeUpdateTime(System.currentTimeMillis()); apiDefinition.setToBeUpdateTime(System.currentTimeMillis());
} }
@ -1297,7 +1297,7 @@ public class ApiDefinitionService {
} }
if (!StringUtils.equals(apiDefinition.getPath(), existApi.getPath())) { if (!StringUtils.equals(apiDefinition.getPath(), existApi.getPath())) {
if (apiSyncCaseRequest.getPath() && toUpdate) { if (BooleanUtils.toBoolean(apiSyncCaseRequest.getPath()) && toUpdate) {
apiDefinition.setToBeUpdated(true); apiDefinition.setToBeUpdated(true);
apiDefinition.setToBeUpdateTime(System.currentTimeMillis()); apiDefinition.setToBeUpdateTime(System.currentTimeMillis());
} }
@ -1320,7 +1320,7 @@ public class ApiDefinitionService {
if (exApiRequest.get("headers") != null && apiRequest.get("headers") != null) { if (exApiRequest.get("headers") != null && apiRequest.get("headers") != null) {
if (!StringUtils.equals(exApiRequest.get("headers").toString(), apiRequest.get("headers").toString())) { if (!StringUtils.equals(exApiRequest.get("headers").toString(), apiRequest.get("headers").toString())) {
if (apiSyncCaseRequest.getHeaders() && toUpdate) { if (BooleanUtils.toBoolean(apiSyncCaseRequest.getHeaders()) && toUpdate) {
apiDefinition.setToBeUpdated(true); apiDefinition.setToBeUpdated(true);
apiDefinition.setToBeUpdateTime(System.currentTimeMillis()); apiDefinition.setToBeUpdateTime(System.currentTimeMillis());
} }
@ -1330,7 +1330,7 @@ public class ApiDefinitionService {
if (exApiRequest.get("arguments") != null && apiRequest.get("arguments") != null) { if (exApiRequest.get("arguments") != null && apiRequest.get("arguments") != null) {
if (!StringUtils.equals(exApiRequest.get("arguments").toString(), apiRequest.get("arguments").toString())) { if (!StringUtils.equals(exApiRequest.get("arguments").toString(), apiRequest.get("arguments").toString())) {
if (apiSyncCaseRequest.getQuery() && toUpdate) { if (BooleanUtils.toBoolean(apiSyncCaseRequest.getQuery()) && toUpdate) {
apiDefinition.setToBeUpdated(true); apiDefinition.setToBeUpdated(true);
apiDefinition.setToBeUpdateTime(System.currentTimeMillis()); apiDefinition.setToBeUpdateTime(System.currentTimeMillis());
} }
@ -1340,7 +1340,7 @@ public class ApiDefinitionService {
if (exApiRequest.get("rest") != null && apiRequest.get("rest") != null) { if (exApiRequest.get("rest") != null && apiRequest.get("rest") != null) {
if (!StringUtils.equals(exApiRequest.get("rest").toString(), apiRequest.get("rest").toString())) { if (!StringUtils.equals(exApiRequest.get("rest").toString(), apiRequest.get("rest").toString())) {
if (apiSyncCaseRequest.getRest() && toUpdate) { if (BooleanUtils.toBoolean(apiSyncCaseRequest.getRest()) && toUpdate) {
apiDefinition.setToBeUpdated(true); apiDefinition.setToBeUpdated(true);
apiDefinition.setToBeUpdateTime(System.currentTimeMillis()); apiDefinition.setToBeUpdateTime(System.currentTimeMillis());
} }