chore(系统设置): 归类处理

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml

@@ -36,7 +36,7 @@
         from organization
     </select>
 
-    <update id="delete" parameterType="io.metersphere.system.request.OrganizationDeleteRequest">
+    <update id="delete" parameterType="io.metersphere.system.dto.request.OrganizationDeleteRequest">
         update organization
         set deleted     = true,
             delete_time = #{request.deleteTime},

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.*;

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;

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;

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;

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;