From 6f1ac2f9bf481dc28cca6c232796999e52bb457d Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 1 Nov 2023 10:45:25 +0800 Subject: [PATCH] =?UTF-8?q?chore(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E5=BD=92=E7=B1=BB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectApplicationControllerTests.java | 4 ++-- .../ProjectUserRoleControllerTests.java | 2 +- .../system/controller/AuthSourceController.java | 4 ++-- .../controller/OrganizationController.java | 5 ++++- .../OrganizationProjectController.java | 8 ++++---- .../OrganizationUserRoleController.java | 6 +++--- .../system/controller/PluginController.java | 4 ++-- .../controller/ServiceIntegrationController.java | 2 +- .../controller/SystemOrganizationController.java | 8 ++++---- .../controller/SystemProjectController.java | 8 ++++---- .../system/controller/UserController.java | 16 ++++++++-------- .../{ => dto}/request/AuthSourceRequest.java | 2 +- .../request/AuthSourceStatusRequest.java | 2 +- .../request/OrgMemberExtendProjectRequest.java | 2 +- .../request/OrganizationDeleteRequest.java | 2 +- .../request/OrganizationEditRequest.java | 2 +- .../request/OrganizationMemberBatchRequest.java | 2 +- .../request/OrganizationMemberExtendRequest.java | 2 +- .../request/OrganizationMemberRequest.java | 2 +- .../request/OrganizationMemberRequestByOrg.java | 2 +- .../request/OrganizationMemberUpdateRequest.java | 2 +- .../request/OrganizationNameEditRequest.java | 2 +- .../request/OrganizationProjectRequest.java | 2 +- .../{ => dto}/request/OrganizationRequest.java | 2 +- .../request/OrganizationUserRoleEditRequest.java | 2 +- .../OrganizationUserRoleMemberEditRequest.java | 2 +- .../OrganizationUserRoleMemberRequest.java | 2 +- .../{ => dto}/request/PlatformOptionRequest.java | 2 +- .../{ => dto}/request/PluginUpdateRequest.java | 2 +- .../request/ProjectAddMemberBatchRequest.java | 2 +- .../request/ProjectAddMemberRequest.java | 2 +- .../{ => dto}/request/ProjectMemberRequest.java | 2 +- .../system/{ => dto}/request/ProjectRequest.java | 2 +- .../request/ServiceIntegrationUpdateRequest.java | 2 +- .../request/user/UserChangeEnableRequest.java | 2 +- .../{ => dto}/request/user/UserEditRequest.java | 2 +- .../user/UserRoleBatchRelationRequest.java | 2 +- .../response}/UserImportResponse.java | 2 +- .../user => dto/response}/UserSelectOption.java | 2 +- .../user => dto/response}/UserTableResponse.java | 2 +- .../system/mapper/ExtOrganizationMapper.java | 4 ++-- .../system/mapper/ExtOrganizationMapper.xml | 2 +- .../system/mapper/ExtSystemProjectMapper.java | 4 ++-- .../system/mapper/ExtUserRoleMapper.java | 2 +- .../system/service/AuthSourceLogService.java | 2 +- .../system/service/AuthSourceService.java | 2 +- .../system/service/CommonProjectService.java | 2 +- .../service/GlobalUserRoleRelationService.java | 2 +- .../system/service/GlobalUserRoleService.java | 2 +- .../service/OrganizationProjectService.java | 8 ++++---- .../system/service/OrganizationService.java | 2 +- .../service/OrganizationUserRoleLogService.java | 4 ++-- .../service/OrganizationUserRoleService.java | 4 ++-- .../system/service/PluginLogService.java | 2 +- .../system/service/PluginService.java | 4 ++-- .../service/ServiceIntegrationLogService.java | 2 +- .../service/ServiceIntegrationService.java | 2 +- .../system/service/SystemProjectService.java | 6 +++--- .../system/service/UserLogService.java | 6 +++--- .../system/service/UserRoleRelationService.java | 2 +- .../metersphere/system/service/UserService.java | 8 ++++---- .../system/base/BasePluginTestService.java | 4 ++-- .../controller/AuthSourceControllerTests.java | 4 ++-- .../controller/OrganizationControllerTests.java | 8 ++++---- .../OrganizationProjectControllerTests.java | 6 +++--- .../OrganizationUserRoleControllerTests.java | 6 +++--- .../system/controller/PluginControllerTests.java | 4 ++-- .../ServiceIntegrationControllerTests.java | 2 +- .../SystemOrganizationControllerTests.java | 6 +++--- .../controller/SystemProjectControllerTests.java | 6 +++--- .../user/UserControllerPermissionTests.java | 6 +++--- .../controller/user/UserControllerTests.java | 12 ++++++------ .../system/utils/user/UserParamUtils.java | 6 +++--- 73 files changed, 135 insertions(+), 132 deletions(-) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/AuthSourceRequest.java (96%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/AuthSourceStatusRequest.java (90%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrgMemberExtendProjectRequest.java (92%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationDeleteRequest.java (91%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationEditRequest.java (95%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationMemberBatchRequest.java (92%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationMemberExtendRequest.java (92%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationMemberRequest.java (94%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationMemberRequestByOrg.java (95%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationMemberUpdateRequest.java (96%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationNameEditRequest.java (95%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationProjectRequest.java (93%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationRequest.java (89%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationUserRoleEditRequest.java (96%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationUserRoleMemberEditRequest.java (96%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/OrganizationUserRoleMemberRequest.java (95%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/PlatformOptionRequest.java (93%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/PluginUpdateRequest.java (97%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/ProjectAddMemberBatchRequest.java (93%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/ProjectAddMemberRequest.java (95%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/ProjectMemberRequest.java (91%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/ProjectRequest.java (90%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/ServiceIntegrationUpdateRequest.java (97%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/user/UserChangeEnableRequest.java (89%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/user/UserEditRequest.java (94%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{ => dto}/request/user/UserRoleBatchRelationRequest.java (91%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{response/user => dto/response}/UserImportResponse.java (95%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{response/user => dto/response}/UserSelectOption.java (90%) rename backend/services/system-setting/src/main/java/io/metersphere/system/{response/user => dto/response}/UserTableResponse.java (93%) diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectApplicationControllerTests.java b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectApplicationControllerTests.java index 0b7d187f0b..441b8af62e 100644 --- a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectApplicationControllerTests.java +++ b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectApplicationControllerTests.java @@ -10,8 +10,8 @@ import io.metersphere.sdk.util.JSON; import io.metersphere.system.base.BaseTest; import io.metersphere.system.controller.handler.ResultHolder; import io.metersphere.system.domain.Plugin; -import io.metersphere.system.request.PluginUpdateRequest; -import io.metersphere.system.request.ServiceIntegrationUpdateRequest; +import io.metersphere.system.dto.request.PluginUpdateRequest; +import io.metersphere.system.dto.request.ServiceIntegrationUpdateRequest; import io.metersphere.system.service.PluginService; import jakarta.annotation.Resource; import lombok.Getter; diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectUserRoleControllerTests.java b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectUserRoleControllerTests.java index 0ac62512fd..aca30e150d 100644 --- a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectUserRoleControllerTests.java +++ b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectUserRoleControllerTests.java @@ -14,7 +14,7 @@ import io.metersphere.system.utils.Pager; import io.metersphere.system.base.BaseTest; import io.metersphere.system.controller.handler.ResultHolder; import io.metersphere.system.domain.User; -import io.metersphere.system.request.OrganizationUserRoleEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleEditRequest; import io.metersphere.system.service.BaseUserRolePermissionService; import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/AuthSourceController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/AuthSourceController.java index 59ae369480..dd6ea281f9 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/AuthSourceController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/AuthSourceController.java @@ -13,8 +13,8 @@ import io.metersphere.system.utils.PageUtils; import io.metersphere.system.utils.Pager; import io.metersphere.system.domain.AuthSource; import io.metersphere.system.dto.AuthSourceDTO; -import io.metersphere.system.request.AuthSourceRequest; -import io.metersphere.system.request.AuthSourceStatusRequest; +import io.metersphere.system.dto.request.AuthSourceRequest; +import io.metersphere.system.dto.request.AuthSourceStatusRequest; import io.metersphere.system.service.AuthSourceLogService; import io.metersphere.system.service.AuthSourceService; import io.swagger.v3.oas.annotations.Operation; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java index 0ad9422ccb..9a3690ad07 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java @@ -3,6 +3,10 @@ package io.metersphere.system.controller; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.metersphere.sdk.constants.PermissionConstants; +import io.metersphere.system.dto.request.OrgMemberExtendProjectRequest; +import io.metersphere.system.dto.request.OrganizationMemberExtendRequest; +import io.metersphere.system.dto.request.OrganizationMemberUpdateRequest; +import io.metersphere.system.dto.request.OrganizationRequest; import io.metersphere.system.dto.sdk.OptionDTO; import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.constants.OperationLogType; @@ -11,7 +15,6 @@ import io.metersphere.system.utils.Pager; import io.metersphere.system.utils.SessionUtils; import io.metersphere.system.dto.OptionDisabledDTO; import io.metersphere.system.dto.OrgUserExtend; -import io.metersphere.system.request.*; import io.metersphere.system.service.OrganizationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationProjectController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationProjectController.java index 3e425f0281..e7233f07a9 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationProjectController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationProjectController.java @@ -14,10 +14,10 @@ import io.metersphere.system.dto.UpdateProjectNameRequest; import io.metersphere.system.dto.UpdateProjectRequest; import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.constants.OperationLogType; -import io.metersphere.system.request.OrganizationProjectRequest; -import io.metersphere.system.request.ProjectAddMemberBatchRequest; -import io.metersphere.system.request.ProjectAddMemberRequest; -import io.metersphere.system.request.ProjectMemberRequest; +import io.metersphere.system.dto.request.OrganizationProjectRequest; +import io.metersphere.system.dto.request.ProjectAddMemberBatchRequest; +import io.metersphere.system.dto.request.ProjectAddMemberRequest; +import io.metersphere.system.dto.request.ProjectMemberRequest; import io.metersphere.system.service.OrganizationProjectLogService; import io.metersphere.system.service.OrganizationProjectService; import io.metersphere.system.utils.SessionUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationUserRoleController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationUserRoleController.java index 4671f90584..84f38f2ada 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationUserRoleController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationUserRoleController.java @@ -13,9 +13,9 @@ import io.metersphere.system.domain.User; import io.metersphere.system.domain.UserRole; import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.constants.OperationLogType; -import io.metersphere.system.request.OrganizationUserRoleEditRequest; -import io.metersphere.system.request.OrganizationUserRoleMemberEditRequest; -import io.metersphere.system.request.OrganizationUserRoleMemberRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberRequest; import io.metersphere.system.service.OrganizationUserRoleLogService; import io.metersphere.system.service.OrganizationUserRoleService; import io.metersphere.system.service.UserRoleService; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/PluginController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/PluginController.java index ccbcba78ca..7b76d41f4f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/PluginController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/PluginController.java @@ -5,11 +5,11 @@ import io.metersphere.sdk.constants.PermissionConstants; import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.sdk.util.BeanUtils; -import io.metersphere.system.request.PlatformOptionRequest; +import io.metersphere.system.dto.request.PlatformOptionRequest; import io.metersphere.system.utils.SessionUtils; import io.metersphere.system.domain.Plugin; import io.metersphere.system.dto.PluginDTO; -import io.metersphere.system.request.PluginUpdateRequest; +import io.metersphere.system.dto.request.PluginUpdateRequest; import io.metersphere.system.service.PluginLogService; import io.metersphere.system.service.PluginService; import io.metersphere.validation.groups.Created; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/ServiceIntegrationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/ServiceIntegrationController.java index daa6a4c17a..005f52d622 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/ServiceIntegrationController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/ServiceIntegrationController.java @@ -5,7 +5,7 @@ import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.domain.ServiceIntegration; import io.metersphere.system.dto.ServiceIntegrationDTO; -import io.metersphere.system.request.ServiceIntegrationUpdateRequest; +import io.metersphere.system.dto.request.ServiceIntegrationUpdateRequest; import io.metersphere.system.service.ServiceIntegrationLogService; import io.metersphere.system.service.ServiceIntegrationService; import io.metersphere.validation.groups.Created; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java index 1858bdb90b..3fa50458e1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java @@ -10,10 +10,10 @@ import io.metersphere.system.utils.PageUtils; import io.metersphere.system.utils.Pager; import io.metersphere.system.dto.OrganizationDTO; import io.metersphere.system.dto.ProjectDTO; -import io.metersphere.system.request.OrganizationMemberRequest; -import io.metersphere.system.request.OrganizationProjectRequest; -import io.metersphere.system.request.OrganizationRequest; -import io.metersphere.system.request.ProjectRequest; +import io.metersphere.system.dto.request.OrganizationMemberRequest; +import io.metersphere.system.dto.request.OrganizationProjectRequest; +import io.metersphere.system.dto.request.OrganizationRequest; +import io.metersphere.system.dto.request.ProjectRequest; import io.metersphere.system.service.OrganizationService; import io.metersphere.system.service.SystemProjectService; import io.metersphere.system.service.UserService; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemProjectController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemProjectController.java index 3c4a0f6b91..a31f40dbf9 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemProjectController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemProjectController.java @@ -15,10 +15,10 @@ import io.metersphere.system.dto.UpdateProjectNameRequest; import io.metersphere.system.dto.UpdateProjectRequest; import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.constants.OperationLogType; -import io.metersphere.system.request.ProjectAddMemberBatchRequest; -import io.metersphere.system.request.ProjectAddMemberRequest; -import io.metersphere.system.request.ProjectMemberRequest; -import io.metersphere.system.request.ProjectRequest; +import io.metersphere.system.dto.request.ProjectAddMemberBatchRequest; +import io.metersphere.system.dto.request.ProjectAddMemberRequest; +import io.metersphere.system.dto.request.ProjectMemberRequest; +import io.metersphere.system.dto.request.ProjectRequest; import io.metersphere.system.service.SystemProjectLogService; import io.metersphere.system.service.SystemProjectService; import io.metersphere.system.service.UserService; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java index 4952b7ed27..01ca146a17 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java @@ -21,14 +21,14 @@ import io.metersphere.system.dto.table.TableBatchProcessResponse; import io.metersphere.system.dto.user.UserDTO; import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.constants.OperationLogType; -import io.metersphere.system.request.OrganizationMemberBatchRequest; -import io.metersphere.system.request.ProjectAddMemberBatchRequest; -import io.metersphere.system.request.user.UserChangeEnableRequest; -import io.metersphere.system.request.user.UserEditRequest; -import io.metersphere.system.request.user.UserRoleBatchRelationRequest; -import io.metersphere.system.response.user.UserImportResponse; -import io.metersphere.system.response.user.UserSelectOption; -import io.metersphere.system.response.user.UserTableResponse; +import io.metersphere.system.dto.request.OrganizationMemberBatchRequest; +import io.metersphere.system.dto.request.ProjectAddMemberBatchRequest; +import io.metersphere.system.dto.request.user.UserChangeEnableRequest; +import io.metersphere.system.dto.request.user.UserEditRequest; +import io.metersphere.system.dto.request.user.UserRoleBatchRelationRequest; +import io.metersphere.system.dto.response.UserImportResponse; +import io.metersphere.system.dto.response.UserSelectOption; +import io.metersphere.system.dto.response.UserTableResponse; import io.metersphere.system.service.*; import io.metersphere.system.utils.SessionUtils; import io.metersphere.system.utils.TreeNodeParseUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/AuthSourceRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/AuthSourceRequest.java similarity index 96% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/AuthSourceRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/AuthSourceRequest.java index 5f7ac01397..23e854cba5 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/AuthSourceRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/AuthSourceRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/AuthSourceStatusRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/AuthSourceStatusRequest.java similarity index 90% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/AuthSourceStatusRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/AuthSourceStatusRequest.java index edc2f94429..fd8ad8e372 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/AuthSourceStatusRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/AuthSourceStatusRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrgMemberExtendProjectRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrgMemberExtendProjectRequest.java similarity index 92% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrgMemberExtendProjectRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrgMemberExtendProjectRequest.java index 9761d13dfb..ba683eac92 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrgMemberExtendProjectRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrgMemberExtendProjectRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationDeleteRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationDeleteRequest.java similarity index 91% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationDeleteRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationDeleteRequest.java index 5974d8a2d7..a0ecd0089a 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationDeleteRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationDeleteRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationEditRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationEditRequest.java similarity index 95% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationEditRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationEditRequest.java index af406c9d87..63e1cab63b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationEditRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationEditRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberBatchRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberBatchRequest.java similarity index 92% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberBatchRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberBatchRequest.java index daa9905fc6..fb900148f1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberBatchRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberBatchRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberExtendRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberExtendRequest.java similarity index 92% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberExtendRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberExtendRequest.java index ae5ba21904..71d31b9333 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberExtendRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberExtendRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberRequest.java similarity index 94% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberRequest.java index a077994c72..0d28202108 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberRequestByOrg.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberRequestByOrg.java similarity index 95% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberRequestByOrg.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberRequestByOrg.java index 94acc7940e..471d8d2dc6 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberRequestByOrg.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberRequestByOrg.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberUpdateRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberUpdateRequest.java similarity index 96% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberUpdateRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberUpdateRequest.java index 2a4ed284f8..fa7f096438 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationMemberUpdateRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationMemberUpdateRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationNameEditRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationNameEditRequest.java similarity index 95% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationNameEditRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationNameEditRequest.java index 5a74ab4b33..da3d68ab6e 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationNameEditRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationNameEditRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationProjectRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationProjectRequest.java similarity index 93% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationProjectRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationProjectRequest.java index ad1081ca2f..e551d96b52 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationProjectRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationProjectRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.system.dto.sdk.BasePageRequest; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationRequest.java similarity index 89% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationRequest.java index 9762f2689e..c0d82d498a 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.system.dto.sdk.BasePageRequest; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleEditRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleEditRequest.java similarity index 96% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleEditRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleEditRequest.java index a10e496d54..c8f63c31a1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleEditRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleEditRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberEditRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleMemberEditRequest.java similarity index 96% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberEditRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleMemberEditRequest.java index 6a14be6079..c0ac677eb7 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberEditRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleMemberEditRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleMemberRequest.java similarity index 95% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleMemberRequest.java index 3225b571e2..7af8c248b1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/OrganizationUserRoleMemberRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.system.dto.sdk.BasePageRequest; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/PlatformOptionRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/PlatformOptionRequest.java similarity index 93% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/PlatformOptionRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/PlatformOptionRequest.java index 8787a10f1d..308534bbf2 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/PlatformOptionRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/PlatformOptionRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/PluginUpdateRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/PluginUpdateRequest.java similarity index 97% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/PluginUpdateRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/PluginUpdateRequest.java index 38c1c8e9ae..6fd8f9c07b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/PluginUpdateRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/PluginUpdateRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectAddMemberBatchRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectAddMemberBatchRequest.java similarity index 93% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectAddMemberBatchRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectAddMemberBatchRequest.java index 66d86cae75..df8bc63828 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectAddMemberBatchRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectAddMemberBatchRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectAddMemberRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectAddMemberRequest.java similarity index 95% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectAddMemberRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectAddMemberRequest.java index 664a1d4ec6..72aaa79c18 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectAddMemberRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectAddMemberRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectMemberRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectMemberRequest.java similarity index 91% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectMemberRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectMemberRequest.java index 5921214074..bd30c455c2 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectMemberRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectMemberRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.system.dto.sdk.BasePageRequest; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectRequest.java similarity index 90% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectRequest.java index 121ceeeaa6..238a8a12f0 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ProjectRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.system.dto.sdk.BasePageRequest; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ServiceIntegrationUpdateRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ServiceIntegrationUpdateRequest.java similarity index 97% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/ServiceIntegrationUpdateRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ServiceIntegrationUpdateRequest.java index 58728b1af8..08b2b15454 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ServiceIntegrationUpdateRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/ServiceIntegrationUpdateRequest.java @@ -1,5 +1,5 @@ -package io.metersphere.system.request; +package io.metersphere.system.dto.request; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserChangeEnableRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserChangeEnableRequest.java similarity index 89% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserChangeEnableRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserChangeEnableRequest.java index 5568ead058..b9f9a38e4b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserChangeEnableRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserChangeEnableRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request.user; +package io.metersphere.system.dto.request.user; import io.metersphere.system.dto.table.TableBatchProcessDTO; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserEditRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserEditRequest.java similarity index 94% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserEditRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserEditRequest.java index 6b87732401..bcc4c68229 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserEditRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserEditRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request.user; +package io.metersphere.system.dto.request.user; import io.metersphere.system.dto.UserCreateInfo; import io.metersphere.validation.groups.Created; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserRoleBatchRelationRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserRoleBatchRelationRequest.java similarity index 91% rename from backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserRoleBatchRelationRequest.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserRoleBatchRelationRequest.java index 6b5400a42b..75275fff35 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/user/UserRoleBatchRelationRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/user/UserRoleBatchRelationRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.system.request.user; +package io.metersphere.system.dto.request.user; import io.metersphere.system.dto.table.TableBatchProcessDTO; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserImportResponse.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserImportResponse.java similarity index 95% rename from backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserImportResponse.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserImportResponse.java index fab96a3298..ddb75d1db3 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserImportResponse.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserImportResponse.java @@ -1,4 +1,4 @@ -package io.metersphere.system.response.user; +package io.metersphere.system.dto.response; import io.metersphere.system.dto.sdk.ExcelParseDTO; import io.metersphere.system.dto.excel.UserExcelRowDTO; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserSelectOption.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserSelectOption.java similarity index 90% rename from backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserSelectOption.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserSelectOption.java index 977d2d0f6e..ff4e3b83a1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserSelectOption.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserSelectOption.java @@ -1,4 +1,4 @@ -package io.metersphere.system.response.user; +package io.metersphere.system.dto.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserTableResponse.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserTableResponse.java similarity index 93% rename from backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserTableResponse.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserTableResponse.java index df0f8e61b5..1978f0b553 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/response/user/UserTableResponse.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/response/UserTableResponse.java @@ -1,4 +1,4 @@ -package io.metersphere.system.response.user; +package io.metersphere.system.dto.response; import io.metersphere.system.domain.Organization; import io.metersphere.system.domain.User; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.java index 96fe941c54..d460c8d134 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.java @@ -4,8 +4,8 @@ import io.metersphere.system.dto.sdk.OptionDTO; import io.metersphere.system.dto.user.UserExtendDTO; import io.metersphere.system.domain.User; import io.metersphere.system.dto.*; -import io.metersphere.system.request.OrganizationDeleteRequest; -import io.metersphere.system.request.OrganizationRequest; +import io.metersphere.system.dto.request.OrganizationDeleteRequest; +import io.metersphere.system.dto.request.OrganizationRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml index 4761bfac74..163d5c5a62 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml @@ -36,7 +36,7 @@ from organization - + update organization set deleted = true, delete_time = #{request.deleteTime}, diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtSystemProjectMapper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtSystemProjectMapper.java index f578d1fd02..c56bbd54e5 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtSystemProjectMapper.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtSystemProjectMapper.java @@ -4,8 +4,8 @@ import io.metersphere.system.dto.user.UserExtendDTO; import io.metersphere.system.dto.OrganizationProjectOptionsDTO; import io.metersphere.system.dto.ProjectDTO; import io.metersphere.system.dto.ProjectResourcePoolDTO; -import io.metersphere.system.request.ProjectMemberRequest; -import io.metersphere.system.request.ProjectRequest; +import io.metersphere.system.dto.request.ProjectMemberRequest; +import io.metersphere.system.dto.request.ProjectRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.java index e5110284da..b545cfc29b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.java @@ -1,7 +1,7 @@ package io.metersphere.system.mapper; import io.metersphere.system.domain.User; -import io.metersphere.system.request.OrganizationUserRoleMemberRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceLogService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceLogService.java index a81097cf1b..f26a603f12 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceLogService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceLogService.java @@ -8,7 +8,7 @@ import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.sdk.util.JSON; import io.metersphere.system.domain.AuthSource; import io.metersphere.system.mapper.AuthSourceMapper; -import io.metersphere.system.request.AuthSourceRequest; +import io.metersphere.system.dto.request.AuthSourceRequest; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java index 8dc479e49f..7f53c5b166 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/AuthSourceService.java @@ -9,7 +9,7 @@ import io.metersphere.system.domain.AuthSource; import io.metersphere.system.domain.AuthSourceExample; import io.metersphere.system.dto.AuthSourceDTO; import io.metersphere.system.mapper.AuthSourceMapper; -import io.metersphere.system.request.AuthSourceRequest; +import io.metersphere.system.dto.request.AuthSourceRequest; import jakarta.annotation.Resource; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/CommonProjectService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/CommonProjectService.java index ec69ace9e4..baf37b2e70 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/CommonProjectService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/CommonProjectService.java @@ -25,7 +25,7 @@ import io.metersphere.system.log.constants.OperationLogModule; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.log.service.OperationLogService; import io.metersphere.system.mapper.*; -import io.metersphere.system.request.ProjectAddMemberBatchRequest; +import io.metersphere.system.dto.request.ProjectAddMemberBatchRequest; import io.metersphere.system.uid.IDGenerator; import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleRelationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleRelationService.java index 598e1b07cd..f553c6be50 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleRelationService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleRelationService.java @@ -14,7 +14,7 @@ import io.metersphere.system.domain.UserRoleRelation; import io.metersphere.system.domain.UserRoleRelationExample; import io.metersphere.system.dto.request.GlobalUserRoleRelationQueryRequest; import io.metersphere.system.mapper.ExtUserRoleRelationMapper; -import io.metersphere.system.request.user.UserRoleBatchRelationRequest; +import io.metersphere.system.dto.request.user.UserRoleBatchRelationRequest; import io.metersphere.validation.groups.Created; import io.metersphere.validation.groups.Updated; import jakarta.annotation.Resource; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleService.java index 66d88603a4..4d7a6bb4a6 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleService.java @@ -10,7 +10,7 @@ import io.metersphere.system.domain.UserRole; import io.metersphere.system.domain.UserRoleExample; import io.metersphere.system.mapper.ExtUserRoleMapper; import io.metersphere.system.mapper.UserRoleMapper; -import io.metersphere.system.response.user.UserSelectOption; +import io.metersphere.system.dto.response.UserSelectOption; import jakarta.annotation.Resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationProjectService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationProjectService.java index 5b74af21e4..b129d963d6 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationProjectService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationProjectService.java @@ -16,10 +16,10 @@ import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.mapper.ExtSystemProjectMapper; import io.metersphere.system.mapper.OrganizationMapper; import io.metersphere.system.mapper.UserRoleRelationMapper; -import io.metersphere.system.request.OrganizationProjectRequest; -import io.metersphere.system.request.ProjectAddMemberBatchRequest; -import io.metersphere.system.request.ProjectMemberRequest; -import io.metersphere.system.request.ProjectRequest; +import io.metersphere.system.dto.request.OrganizationProjectRequest; +import io.metersphere.system.dto.request.ProjectAddMemberBatchRequest; +import io.metersphere.system.dto.request.ProjectMemberRequest; +import io.metersphere.system.dto.request.ProjectRequest; import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java index 355b3ad408..c40554ca14 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java @@ -4,6 +4,7 @@ import io.metersphere.project.domain.Project; import io.metersphere.project.domain.ProjectExample; import io.metersphere.project.mapper.ProjectMapper; import io.metersphere.sdk.constants.*; +import io.metersphere.system.dto.request.*; import io.metersphere.system.log.dto.LogDTO; import io.metersphere.system.dto.sdk.OptionDTO; import io.metersphere.system.dto.user.UserExtendDTO; @@ -18,7 +19,6 @@ import io.metersphere.system.log.constants.OperationLogModule; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.log.service.OperationLogService; import io.metersphere.system.mapper.*; -import io.metersphere.system.request.*; import io.metersphere.system.uid.IDGenerator; import io.metersphere.system.utils.ServiceUtils; import jakarta.annotation.Resource; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleLogService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleLogService.java index 36bbb2eddb..88eb12f36f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleLogService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleLogService.java @@ -9,8 +9,8 @@ import io.metersphere.sdk.util.JSON; import io.metersphere.system.domain.UserRole; import io.metersphere.system.domain.UserRoleExample; import io.metersphere.system.mapper.UserRoleMapper; -import io.metersphere.system.request.OrganizationUserRoleEditRequest; -import io.metersphere.system.request.OrganizationUserRoleMemberEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberEditRequest; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java index 26daa960b7..39610cee49 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java @@ -9,8 +9,8 @@ import io.metersphere.sdk.exception.MSException; import io.metersphere.sdk.util.Translator; import io.metersphere.system.domain.*; import io.metersphere.system.mapper.*; -import io.metersphere.system.request.OrganizationUserRoleMemberEditRequest; -import io.metersphere.system.request.OrganizationUserRoleMemberRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberRequest; import io.metersphere.system.uid.IDGenerator; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginLogService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginLogService.java index 8aa2ba19be..5e01ec2a9c 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginLogService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginLogService.java @@ -9,7 +9,7 @@ import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.log.dto.LogDTO; import io.metersphere.sdk.util.JSON; import org.springframework.transaction.annotation.Transactional; -import io.metersphere.system.request.PluginUpdateRequest; +import io.metersphere.system.dto.request.PluginUpdateRequest; /** * @author jianxing diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginService.java index fd421badea..08f0924b89 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginService.java @@ -20,8 +20,8 @@ import io.metersphere.system.dto.PluginDTO; import io.metersphere.system.dto.PluginNotifiedDTO; import io.metersphere.system.mapper.ExtPluginMapper; import io.metersphere.system.mapper.PluginMapper; -import io.metersphere.system.request.PlatformOptionRequest; -import io.metersphere.system.request.PluginUpdateRequest; +import io.metersphere.system.dto.request.PlatformOptionRequest; +import io.metersphere.system.dto.request.PluginUpdateRequest; import io.metersphere.system.utils.ServiceUtils; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationLogService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationLogService.java index 8ad88c0755..81d2b76552 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationLogService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationLogService.java @@ -6,7 +6,7 @@ import io.metersphere.system.log.constants.OperationLogModule; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.sdk.util.JSON; import io.metersphere.system.domain.ServiceIntegration; -import io.metersphere.system.request.ServiceIntegrationUpdateRequest; +import io.metersphere.system.dto.request.ServiceIntegrationUpdateRequest; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java index 08ecad46af..565856db49 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java @@ -12,7 +12,7 @@ import io.metersphere.system.domain.ServiceIntegration; import io.metersphere.system.domain.ServiceIntegrationExample; import io.metersphere.system.dto.ServiceIntegrationDTO; import io.metersphere.system.mapper.ServiceIntegrationMapper; -import io.metersphere.system.request.ServiceIntegrationUpdateRequest; +import io.metersphere.system.dto.request.ServiceIntegrationUpdateRequest; import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemProjectService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemProjectService.java index 654ed988df..b2b6a23b13 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemProjectService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemProjectService.java @@ -8,9 +8,9 @@ import io.metersphere.system.dto.*; import io.metersphere.system.log.constants.OperationLogModule; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.mapper.ExtSystemProjectMapper; -import io.metersphere.system.request.ProjectAddMemberBatchRequest; -import io.metersphere.system.request.ProjectMemberRequest; -import io.metersphere.system.request.ProjectRequest; +import io.metersphere.system.dto.request.ProjectAddMemberBatchRequest; +import io.metersphere.system.dto.request.ProjectMemberRequest; +import io.metersphere.system.dto.request.ProjectRequest; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLogService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLogService.java index 8e01b82c38..3a2fa11b2b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLogService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserLogService.java @@ -17,9 +17,9 @@ import io.metersphere.system.log.service.OperationLogService; import io.metersphere.system.mapper.OrganizationMapper; import io.metersphere.system.mapper.UserMapper; import io.metersphere.system.mapper.UserRoleMapper; -import io.metersphere.system.request.user.UserChangeEnableRequest; -import io.metersphere.system.request.user.UserEditRequest; -import io.metersphere.system.request.user.UserRoleBatchRelationRequest; +import io.metersphere.system.dto.request.user.UserChangeEnableRequest; +import io.metersphere.system.dto.request.user.UserEditRequest; +import io.metersphere.system.dto.request.user.UserRoleBatchRelationRequest; import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.apache.commons.lang3.StringUtils; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java index e0f142b8cd..1e3c90fb0d 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java @@ -14,7 +14,7 @@ import io.metersphere.system.mapper.ExtUserRoleRelationMapper; import io.metersphere.system.mapper.OrganizationMapper; import io.metersphere.system.mapper.UserRoleMapper; import io.metersphere.system.mapper.UserRoleRelationMapper; -import io.metersphere.system.response.user.UserTableResponse; +import io.metersphere.system.dto.response.UserTableResponse; import jakarta.annotation.Resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java index 1bbdbd5fe4..995c79353d 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java @@ -26,10 +26,10 @@ import io.metersphere.system.mapper.ExtUserMapper; import io.metersphere.system.mapper.SystemParameterMapper; import io.metersphere.system.mapper.UserMapper; import io.metersphere.system.notice.sender.impl.MailNoticeSender; -import io.metersphere.system.request.user.UserChangeEnableRequest; -import io.metersphere.system.request.user.UserEditRequest; -import io.metersphere.system.response.user.UserImportResponse; -import io.metersphere.system.response.user.UserTableResponse; +import io.metersphere.system.dto.request.user.UserChangeEnableRequest; +import io.metersphere.system.dto.request.user.UserEditRequest; +import io.metersphere.system.dto.response.UserImportResponse; +import io.metersphere.system.dto.response.UserTableResponse; import io.metersphere.system.uid.IDGenerator; import io.metersphere.system.utils.UserImportEventListener; import jakarta.annotation.Resource; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java b/backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java index aad0daa8ec..827f3ccc5a 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java @@ -8,8 +8,8 @@ import io.metersphere.sdk.util.JSON; import io.metersphere.system.domain.Plugin; import io.metersphere.system.domain.ServiceIntegration; import io.metersphere.system.mapper.PluginMapper; -import io.metersphere.system.request.PluginUpdateRequest; -import io.metersphere.system.request.ServiceIntegrationUpdateRequest; +import io.metersphere.system.dto.request.PluginUpdateRequest; +import io.metersphere.system.dto.request.ServiceIntegrationUpdateRequest; import io.metersphere.system.service.PluginService; import io.metersphere.system.service.ServiceIntegrationService; import jakarta.annotation.Resource; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/AuthSourceControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/AuthSourceControllerTests.java index 7ec275912f..b72db49e2d 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/AuthSourceControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/AuthSourceControllerTests.java @@ -11,8 +11,8 @@ import io.metersphere.system.ldap.vo.LdapRequest; import io.metersphere.sdk.util.JSON; import io.metersphere.system.utils.Pager; import io.metersphere.system.domain.AuthSource; -import io.metersphere.system.request.AuthSourceRequest; -import io.metersphere.system.request.AuthSourceStatusRequest; +import io.metersphere.system.dto.request.AuthSourceRequest; +import io.metersphere.system.dto.request.AuthSourceStatusRequest; import jakarta.annotation.Resource; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java index ada384fa29..cf71f6e3fb 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java @@ -8,10 +8,10 @@ import io.metersphere.system.dto.sdk.OptionDTO; import io.metersphere.sdk.util.JSON; import io.metersphere.system.utils.Pager; import io.metersphere.system.dto.OrgUserExtend; -import io.metersphere.system.request.OrgMemberExtendProjectRequest; -import io.metersphere.system.request.OrganizationMemberExtendRequest; -import io.metersphere.system.request.OrganizationMemberUpdateRequest; -import io.metersphere.system.request.OrganizationRequest; +import io.metersphere.system.dto.request.OrgMemberExtendProjectRequest; +import io.metersphere.system.dto.request.OrganizationMemberExtendRequest; +import io.metersphere.system.dto.request.OrganizationMemberUpdateRequest; +import io.metersphere.system.dto.request.OrganizationRequest; import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationProjectControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationProjectControllerTests.java index b7d3344e21..2a30ab27f6 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationProjectControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationProjectControllerTests.java @@ -22,9 +22,9 @@ import io.metersphere.system.dto.*; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.mapper.UserMapper; import io.metersphere.system.mapper.UserRoleRelationMapper; -import io.metersphere.system.request.OrganizationProjectRequest; -import io.metersphere.system.request.ProjectAddMemberRequest; -import io.metersphere.system.request.ProjectMemberRequest; +import io.metersphere.system.dto.request.OrganizationProjectRequest; +import io.metersphere.system.dto.request.ProjectAddMemberRequest; +import io.metersphere.system.dto.request.ProjectMemberRequest; import io.metersphere.system.service.OrganizationService; import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java index 154a0a3fe8..44db407bfe 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java @@ -11,9 +11,9 @@ import io.metersphere.system.controller.handler.ResultHolder; import io.metersphere.system.domain.User; import io.metersphere.system.domain.UserRole; import io.metersphere.system.dto.OrganizationDTO; -import io.metersphere.system.request.OrganizationUserRoleEditRequest; -import io.metersphere.system.request.OrganizationUserRoleMemberEditRequest; -import io.metersphere.system.request.OrganizationUserRoleMemberRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberEditRequest; +import io.metersphere.system.dto.request.OrganizationUserRoleMemberRequest; import io.metersphere.system.service.BaseUserRolePermissionService; import io.metersphere.system.service.OrganizationService; import jakarta.annotation.Resource; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/PluginControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/PluginControllerTests.java index 11288f5edd..ca50f86970 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/PluginControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/PluginControllerTests.java @@ -15,8 +15,8 @@ import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.mapper.PluginMapper; import io.metersphere.system.mapper.PluginOrganizationMapper; import io.metersphere.system.mapper.PluginScriptMapper; -import io.metersphere.system.request.PlatformOptionRequest; -import io.metersphere.system.request.PluginUpdateRequest; +import io.metersphere.system.dto.request.PlatformOptionRequest; +import io.metersphere.system.dto.request.PluginUpdateRequest; import io.metersphere.system.service.JdbcDriverPluginService; import io.metersphere.system.service.OrganizationService; import io.metersphere.system.service.PluginService; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java index df5c2310b7..a808194174 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java @@ -13,7 +13,7 @@ import io.metersphere.system.dto.ServiceIntegrationDTO; import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.mapper.PluginMapper; import io.metersphere.system.mapper.ServiceIntegrationMapper; -import io.metersphere.system.request.ServiceIntegrationUpdateRequest; +import io.metersphere.system.dto.request.ServiceIntegrationUpdateRequest; import io.metersphere.system.service.OrganizationService; import io.metersphere.system.service.PluginLoadService; import jakarta.annotation.Resource; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemOrganizationControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemOrganizationControllerTests.java index 543d43d9a4..dd0568994d 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemOrganizationControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemOrganizationControllerTests.java @@ -10,9 +10,9 @@ import io.metersphere.system.controller.handler.ResultHolder; import io.metersphere.system.dto.OrganizationDTO; import io.metersphere.system.dto.ProjectDTO; import io.metersphere.system.log.constants.OperationLogType; -import io.metersphere.system.request.OrganizationMemberRequest; -import io.metersphere.system.request.OrganizationRequest; -import io.metersphere.system.request.ProjectRequest; +import io.metersphere.system.dto.request.OrganizationMemberRequest; +import io.metersphere.system.dto.request.OrganizationRequest; +import io.metersphere.system.dto.request.ProjectRequest; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.*; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemProjectControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemProjectControllerTests.java index 62cb88c5d2..5955aa2c8c 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemProjectControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/SystemProjectControllerTests.java @@ -21,9 +21,9 @@ import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.mapper.OrganizationParameterMapper; import io.metersphere.system.mapper.UserMapper; import io.metersphere.system.mapper.UserRoleRelationMapper; -import io.metersphere.system.request.ProjectAddMemberRequest; -import io.metersphere.system.request.ProjectMemberRequest; -import io.metersphere.system.request.ProjectRequest; +import io.metersphere.system.dto.request.ProjectAddMemberRequest; +import io.metersphere.system.dto.request.ProjectMemberRequest; +import io.metersphere.system.dto.request.ProjectRequest; import io.metersphere.system.service.*; import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java index a12ecf5906..da2da4ce0d 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java @@ -5,9 +5,9 @@ import io.metersphere.sdk.constants.PermissionConstants; import io.metersphere.system.dto.table.TableBatchProcessDTO; import io.metersphere.system.dto.UserCreateInfo; import io.metersphere.system.dto.request.UserInviteRequest; -import io.metersphere.system.request.user.UserChangeEnableRequest; -import io.metersphere.system.request.user.UserRoleBatchRelationRequest; -import io.metersphere.system.response.user.UserSelectOption; +import io.metersphere.system.dto.request.user.UserChangeEnableRequest; +import io.metersphere.system.dto.request.user.UserRoleBatchRelationRequest; +import io.metersphere.system.dto.response.UserSelectOption; import io.metersphere.system.utils.user.UserParamUtils; import io.metersphere.system.utils.user.UserRequestUtils; import org.junit.jupiter.api.MethodOrderer; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerTests.java index d9d9d02f4e..0f8c8703df 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerTests.java @@ -25,12 +25,12 @@ import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.mapper.UserInviteMapper; import io.metersphere.system.mapper.UserMapper; import io.metersphere.system.mapper.UserRoleRelationMapper; -import io.metersphere.system.request.user.UserChangeEnableRequest; -import io.metersphere.system.request.user.UserEditRequest; -import io.metersphere.system.request.user.UserRoleBatchRelationRequest; -import io.metersphere.system.response.user.UserImportResponse; -import io.metersphere.system.response.user.UserSelectOption; -import io.metersphere.system.response.user.UserTableResponse; +import io.metersphere.system.dto.request.user.UserChangeEnableRequest; +import io.metersphere.system.dto.request.user.UserEditRequest; +import io.metersphere.system.dto.request.user.UserRoleBatchRelationRequest; +import io.metersphere.system.dto.response.UserImportResponse; +import io.metersphere.system.dto.response.UserSelectOption; +import io.metersphere.system.dto.response.UserTableResponse; import io.metersphere.system.service.GlobalUserRoleRelationService; import io.metersphere.system.service.UserService; import io.metersphere.system.service.UserToolService; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/utils/user/UserParamUtils.java b/backend/services/system-setting/src/test/java/io/metersphere/system/utils/user/UserParamUtils.java index c583be880f..26fe49c653 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/utils/user/UserParamUtils.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/utils/user/UserParamUtils.java @@ -9,9 +9,9 @@ import io.metersphere.system.domain.UserRole; import io.metersphere.system.dto.UserBatchCreateDTO; import io.metersphere.system.dto.UserCreateInfo; import io.metersphere.system.dto.request.UserInviteRequest; -import io.metersphere.system.request.user.UserEditRequest; -import io.metersphere.system.response.user.UserImportResponse; -import io.metersphere.system.response.user.UserSelectOption; +import io.metersphere.system.dto.request.user.UserEditRequest; +import io.metersphere.system.dto.response.UserImportResponse; +import io.metersphere.system.dto.response.UserSelectOption; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Assertions;