From f8475dca0c5dcdd805cc9d2ce9ab27f6878e170d Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Mon, 23 Nov 2020 18:15:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=8D=E5=90=8C=E5=8D=8F=E8=AE=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/definition/ApiDefinitionRequest.java | 1 + .../dto/definition/ApiDefinitionResult.java | 2 + .../definition/SaveApiDefinitionRequest.java | 2 +- .../api/service/ApiDefinitionService.java | 6 +-- .../base/domain/ApiDefinition.java | 2 +- .../base/domain/ApiDefinitionExample.java | 4 +- .../base/mapper/ApiDefinitionMapper.xml | 21 ++++++----- .../api/definition/ApiDefinition.vue | 12 ++++-- .../api/definition/components/ApiCaseList.vue | 2 +- .../api/definition/components/ApiConfig.vue | 5 ++- .../api/definition/components/ApiList.vue | 17 +++++++-- .../api/definition/components/ApiModule.vue | 10 ++++- .../components/basis/AddBasisHttpApi.vue | 31 +++++++++++++--- .../complete/AddCompleteHttpApi.vue | 6 +-- .../common/components/MsDialogFooter.vue | 37 ++++++++++++------- 15 files changed, 109 insertions(+), 49 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java index 52d2de8930..4cf2f96661 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionRequest.java @@ -16,6 +16,7 @@ public class ApiDefinitionRequest { private String projectId; private String moduleId; private List moduleIds; + private String protocol; private String name; private String workspaceId; private String userId; diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionResult.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionResult.java index f129c5b161..fcb345c504 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionResult.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiDefinitionResult.java @@ -11,6 +11,8 @@ public class ApiDefinitionResult extends ApiDefinition { private String projectName; + private String url; + private String userName; private String caseTotal; diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/SaveApiDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/SaveApiDefinitionRequest.java index 24b0597a52..542974134e 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/SaveApiDefinitionRequest.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/SaveApiDefinitionRequest.java @@ -20,7 +20,7 @@ public class SaveApiDefinitionRequest { private String name; - private String url; + private String protocol; private String moduleId; diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java index 683c78b0d9..8eb7fdde22 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java @@ -141,7 +141,7 @@ public class ApiDefinitionService { private void checkNameExist(SaveApiDefinitionRequest request) { ApiDefinitionExample example = new ApiDefinitionExample(); - example.createCriteria().andUrlEqualTo(request.getUrl()).andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(request.getId()); + example.createCriteria().andProtocolEqualTo(request.getProtocol()).andNameEqualTo(request.getName()).andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(request.getId()); if (apiDefinitionMapper.countByExample(example) > 0) { MSException.throwException(Translator.get("api_definition_url_not_repeating")); } @@ -160,7 +160,7 @@ public class ApiDefinitionService { test.setModulePath(request.getModulePath()); test.setModuleId(request.getModuleId()); test.setMethod(request.getMethod()); - test.setUrl(request.getUrl()); + test.setProtocol(request.getProtocol()); test.setDescription(request.getDescription()); test.setResponse(JSONObject.toJSONString(request.getResponse())); test.setEnvironmentId(request.getEnvironmentId()); @@ -175,7 +175,7 @@ public class ApiDefinitionService { final ApiDefinition test = new ApiDefinition(); test.setId(request.getId()); test.setName(request.getName()); - test.setUrl(request.getUrl()); + test.setProtocol(request.getProtocol()); test.setMethod(request.getMethod()); test.setModuleId(request.getModuleId()); test.setProjectId(request.getProjectId()); diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java b/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java index e94a1075ff..571c80d57c 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java +++ b/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java @@ -14,7 +14,7 @@ public class ApiDefinition implements Serializable { private String method; - private String url; + private String protocol; private String environmentId; diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java index c37b7e58d6..17185c26be 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java @@ -264,8 +264,8 @@ public class ApiDefinitionExample { return (Criteria) this; } - public Criteria andUrlEqualTo(String value) { - addCriterion("url =", value, "url"); + public Criteria andProtocolEqualTo(String value) { + addCriterion("protocol =", value, "protocol"); return (Criteria) this; } diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml index 1f6e069867..bdb1cffcf5 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml @@ -7,7 +7,7 @@ - + @@ -80,7 +80,7 @@ - id, project_id, name,module_id,module_path,url ,method ,description, status, user_id, create_time, update_time + id, project_id, name,module_id,module_path,protocol ,method ,description, status, user_id, create_time, update_time request @@ -204,7 +204,7 @@