refactor: 重新规划sdk

backend/app/src/main/java/io/metersphere/Application.java

@@ -1,6 +1,6 @@
 package io.metersphere;
 
-import io.metersphere.sdk.config.MinioProperties;
+import io.metersphere.system.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;

backend/framework/sdk/pom.xml

@@ -15,15 +15,22 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>io.metersphere</groupId>
+            <groupId>org.apache.jmeter</groupId>
-            <artifactId>metersphere-domain</artifactId>
+            <artifactId>ApacheJMeter_components</artifactId>
-            <version>${revision}</version>
+            <version>${jmeter.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mail</artifactId>
+                    <groupId>javax.mail</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.metersphere</groupId>
             <artifactId>metersphere-jmeter-functions</artifactId>
             <version>${metersphere-jmeter-functions.version}</version>
         </dependency>
+
         <!-- 基础包 -->
         <dependency>
             <groupId>io.metersphere</groupId>
@@ -36,11 +43,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.metersphere</groupId>
-            <artifactId>metersphere-plugin-platform-sdk</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.core5</groupId>
             <artifactId>httpcore5</artifactId>
@@ -98,31 +100,7 @@
             <artifactId>spring-boot-starter-rsocket</artifactId>
         </dependency>
         <!--  end spring 相关     -->
-        <!--  start mysql 相关      -->
+
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-mysql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-            <version>${pagehelper.version}</version>
-        </dependency>
-        <!--  end mysql 相关      -->
         <!--  start apache commons 相关-->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -187,64 +165,6 @@
             <artifactId>reflections</artifactId>
             <version>${reflections.version}</version>
         </dependency>
-        <!-- 定时任务配置-->
-        <dependency>
-            <groupId>com.fit2cloud</groupId>
-            <artifactId>quartz-spring-boot-starter</artifactId>
-            <version>${quartz-starter.version}</version>
-        </dependency>
-        <!-- start shiro   -->
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-spring-boot-starter</artifactId>
-            <version>${shiro.version}</version>
-            <classifier>jakarta</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.shiro</groupId>
-                    <artifactId>shiro-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.shiro</groupId>
-                    <artifactId>shiro-spring</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-web</artifactId>
-            <version>${shiro.version}</version>
-            <classifier>jakarta</classifier>
-            <exclusions>
-                <exclusion>
-                    <artifactId>shiro-core</artifactId>
-                    <groupId>org.apache.shiro</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
-            <version>${shiro.version}</version>
-            <classifier>jakarta</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-spring</artifactId>
-            <version>${shiro.version}</version>
-            <classifier>jakarta</classifier>
-            <exclusions>
-                <exclusion>
-                    <artifactId>shiro-web</artifactId>
-                    <groupId>org.apache.shiro</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>shiro-core</artifactId>
-                    <groupId>org.apache.shiro</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- end shiro   -->
         <!-- 解析xml-->
         <dependency>
             <groupId>org.dom4j</groupId>

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/assertion/MsAssertionDuration.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.assertion;
+package io.metersphere.sdk.dto.api.request.assertion;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/assertion/MsAssertionJSR223.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.assertion;
+package io.metersphere.sdk.dto.api.request.assertion;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/assertion/MsAssertionJsonPath.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.assertion;
+package io.metersphere.sdk.dto.api.request.assertion;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/assertion/MsAssertionRegex.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.assertion;
+package io.metersphere.sdk.dto.api.request.assertion;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/assertion/MsAssertionType.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.assertion;
+package io.metersphere.sdk.dto.api.request.assertion;
 
 import lombok.Data;
 

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/assertion/MsAssertionXPath2.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.assertion;
+package io.metersphere.sdk.dto.api.request.assertion;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/assertion/MsAssertions.java

@@ -1,8 +1,7 @@
-package io.metersphere.api.dto.request.assertion;
+package io.metersphere.sdk.dto.api.request.assertion;
 
 import io.metersphere.plugin.api.annotation.PluginSubType;
 import io.metersphere.plugin.api.dto.TestElementDTO;
-import io.metersphere.project.dto.environment.assertions.document.MsAssertionDocument;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,5 +18,4 @@ public class MsAssertions extends TestElementDTO {
     private List<MsAssertionJSR223> jsr223;
     private List<MsAssertionXPath2> xpath2;
     private MsAssertionDuration duration;
-    private MsAssertionDocument document;
 }

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/logic/controller/MsLoopController.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.logic.controller;
+package io.metersphere.sdk.dto.api.request.logic.controller;
 
 import io.metersphere.plugin.api.annotation.PluginSubType;
 import io.metersphere.plugin.api.dto.TestElementDTO;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/post/extract/MsExtract.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.post.extract;
+package io.metersphere.sdk.dto.api.request.post.extract;
 
 import io.metersphere.plugin.api.annotation.PluginSubType;
 import io.metersphere.plugin.api.dto.TestElementDTO;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/post/extract/MsExtractCommon.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.post.extract;
+package io.metersphere.sdk.dto.api.request.post.extract;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/post/extract/MsExtractJSONPath.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.post.extract;
+package io.metersphere.sdk.dto.api.request.post.extract;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,6 +7,6 @@ import lombok.EqualsAndHashCode;
 @Data
 public class MsExtractJSONPath extends MsExtractCommon {
     public MsExtractJSONPath() {
-        setType(MsExtractType.JSON_PATH);
+        setType(JSON_PATH);
     }
 }

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/post/extract/MsExtractRegex.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.post.extract;
+package io.metersphere.sdk.dto.api.request.post.extract;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/post/extract/MsExtractType.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.post.extract;
+package io.metersphere.sdk.dto.api.request.post.extract;
 
 import lombok.Data;
 

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/post/extract/MsExtractXPath.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.post.extract;
+package io.metersphere.sdk.dto.api.request.post.extract;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/post/processors/MsPostJSR223Processor.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.post.processors;
+package io.metersphere.sdk.dto.api.request.post.processors;
 
 import io.metersphere.plugin.api.annotation.PluginSubType;
 import io.metersphere.plugin.api.dto.TestElementDTO;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/pre/processors/MsPreJSR223Processor.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.pre.processors;
+package io.metersphere.sdk.dto.api.request.pre.processors;
 
 import io.metersphere.plugin.api.annotation.PluginSubType;
 import io.metersphere.plugin.api.dto.TestElementDTO;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/processors/MsJSR223Processor.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.processors;
+package io.metersphere.sdk.dto.api.request.processors;
 
 import io.metersphere.plugin.api.annotation.PluginSubType;
 import io.metersphere.plugin.api.dto.TestElementDTO;

backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/request/sampler/MsDebugSampler.java

@@ -1,4 +1,4 @@
-package io.metersphere.api.dto.request.sampler;
+package io.metersphere.sdk.dto.api.request.sampler;
 
 import io.metersphere.plugin.api.annotation.PluginSubType;
 import io.metersphere.plugin.api.dto.TestElementDTO;

backend/services/api-test/src/main/java/io/metersphere/api/service/ApiDefinitionLogService.java

@@ -5,7 +5,7 @@ import io.metersphere.api.domain.ApiDefinitionExample;
 import io.metersphere.api.dto.definition.ApiDefinitionDTO;
 import io.metersphere.api.mapper.ApiDefinitionMapper;
 import io.metersphere.sdk.constants.HttpMethodConstants;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;

backend/services/api-test/src/main/java/io/metersphere/api/util/ApiDataUtils.java

@@ -11,8 +11,8 @@ import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver;
 import com.fasterxml.jackson.databind.type.CollectionType;
-import io.metersphere.api.dto.request.post.processors.MsPostJSR223Processor;
+import io.metersphere.sdk.dto.api.request.post.processors.MsPostJSR223Processor;
-import io.metersphere.api.dto.request.sampler.MsDebugSampler;
+import io.metersphere.sdk.dto.api.request.sampler.MsDebugSampler;
 import io.metersphere.sdk.exception.MSException;
 
 import java.io.IOException;

backend/services/api-test/src/test/java/io/metersphere/api/Application.java

@@ -1,6 +1,6 @@
 package io.metersphere.api;
 
-import io.metersphere.sdk.config.MinioProperties;
+import io.metersphere.system.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;

backend/services/api-test/src/test/java/io/metersphere/api/controller/PluginSubTypeTests.java

@@ -1,9 +1,9 @@
 package io.metersphere.api.controller;
 
-import io.metersphere.api.dto.request.post.processors.MsPostJSR223Processor;
-import io.metersphere.api.dto.request.sampler.MsDebugSampler;
 import io.metersphere.api.util.ApiDataUtils;
 import io.metersphere.plugin.api.dto.TestElementDTO;
+import io.metersphere.sdk.dto.api.request.post.processors.MsPostJSR223Processor;
+import io.metersphere.sdk.dto.api.request.sampler.MsDebugSampler;
 import io.metersphere.system.uid.IDGenerator;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

backend/services/bug-management/src/test/java/io/metersphere/bug/Application.java

@@ -1,6 +1,6 @@
 package io.metersphere.bug;
 
-import io.metersphere.sdk.config.MinioProperties;
+import io.metersphere.system.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;

backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseController.java

@@ -7,7 +7,7 @@ import io.metersphere.functional.service.FunctionalCaseService;
 import io.metersphere.project.service.ProjectTemplateService;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.TemplateScene;
-import io.metersphere.sdk.dto.TemplateDTO;
+import io.metersphere.system.dto.sdk.TemplateDTO;
 import io.metersphere.system.log.annotation.Log;
 import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.utils.SessionUtils;

backend/services/case-management/src/main/java/io/metersphere/functional/dto/FunctionalCaseDetailDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.functional.dto;
 
-import io.metersphere.sdk.dto.TemplateCustomFieldDTO;
+import io.metersphere.system.dto.sdk.TemplateCustomFieldDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java

@@ -12,12 +12,12 @@ import io.metersphere.functional.request.FunctionalCaseAddRequest;
 import io.metersphere.functional.result.FunctionalCaseResultCode;
 import io.metersphere.project.service.ProjectTemplateService;
 import io.metersphere.sdk.constants.*;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.TemplateCustomFieldDTO;
+import io.metersphere.system.dto.sdk.TemplateCustomFieldDTO;
-import io.metersphere.sdk.dto.TemplateDTO;
+import io.metersphere.system.dto.sdk.TemplateDTO;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.file.FileRequest;
+import io.metersphere.system.file.FileRequest;
-import io.metersphere.sdk.file.MinioRepository;
+import io.metersphere.system.file.MinioRepository;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.MsFileUtils;

backend/services/case-management/src/test/java/io/metersphere/functional/Application.java

@@ -1,7 +1,7 @@
 package io.metersphere.functional;
 
 
-import io.metersphere.sdk.config.MinioProperties;
+import io.metersphere.system.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;

backend/services/case-management/src/test/java/io/metersphere/functional/utils/FileBaseUtils.java

@@ -2,9 +2,9 @@ package io.metersphere.functional.utils;
 
 import io.metersphere.project.dto.filemanagement.FileInformationDTO;
 import io.metersphere.project.request.filemanagement.FileMetadataTableRequest;
-import io.metersphere.sdk.dto.BaseTreeNode;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
 import io.metersphere.sdk.util.JSON;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import org.apache.commons.collections4.CollectionUtils;
 import org.junit.jupiter.api.Assertions;
 import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;

backend/services/project-management/src/main/java/io/metersphere/project/controller/EnvironmentController.java

@@ -10,7 +10,7 @@ import io.metersphere.project.service.EnvironmentLogService;
 import io.metersphere.project.service.EnvironmentService;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.domain.Environment;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.utils.SessionUtils;
 import io.metersphere.system.log.annotation.Log;
 import io.metersphere.system.log.constants.OperationLogType;

backend/services/project-management/src/main/java/io/metersphere/project/controller/FileManagementController.java

@@ -6,7 +6,7 @@ import io.metersphere.project.service.FileManagementService;
 import io.metersphere.project.service.FileMetadataService;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.utils.SessionUtils;
 import io.swagger.v3.oas.annotations.Operation;

backend/services/project-management/src/main/java/io/metersphere/project/controller/FileModuleController.java

@@ -5,8 +5,8 @@ import io.metersphere.project.request.filemanagement.FileModuleUpdateRequest;
 import io.metersphere.project.service.FileModuleLogService;
 import io.metersphere.project.service.FileModuleService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.BaseTreeNode;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
-import io.metersphere.sdk.dto.request.NodeMoveRequest;
+import io.metersphere.system.dto.sdk.request.NodeMoveRequest;
 import io.metersphere.system.log.annotation.Log;
 import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.utils.SessionUtils;

backend/services/project-management/src/main/java/io/metersphere/project/controller/NoticeMessageTaskController.java

@@ -6,8 +6,8 @@ import io.metersphere.project.dto.MessageTemplateConfigDTO;
 import io.metersphere.project.service.MessageTaskLogService;
 import io.metersphere.project.service.NoticeMessageTaskService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.request.MessageTaskRequest;
+import io.metersphere.system.dto.sdk.request.MessageTaskRequest;
 import io.metersphere.system.controller.handler.ResultHolder;
 import io.metersphere.system.log.annotation.Log;
 import io.metersphere.system.log.constants.OperationLogType;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectApplicationController.java

@@ -8,7 +8,7 @@ import io.metersphere.project.service.ProjectService;
 import io.metersphere.sdk.constants.ApplicationScope;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.ProjectApplicationType;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.User;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectController.java

@@ -5,8 +5,8 @@ import io.metersphere.project.request.ProjectSwitchRequest;
 import io.metersphere.project.service.ProjectLogService;
 import io.metersphere.project.service.ProjectService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.UserDTO;
+import io.metersphere.system.dto.user.UserDTO;
 import io.metersphere.system.dto.ProjectDTO;
 import io.metersphere.system.dto.UpdateProjectRequest;
 import io.metersphere.system.log.annotation.Log;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectCustomFieldController.java

@@ -4,8 +4,8 @@ package io.metersphere.project.controller;
 import io.metersphere.project.service.ProjectCustomFieldLogService;
 import io.metersphere.project.service.ProjectCustomFieldService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.CustomFieldDTO;
+import io.metersphere.system.dto.sdk.CustomFieldDTO;
-import io.metersphere.sdk.dto.request.CustomFieldUpdateRequest;
+import io.metersphere.system.dto.sdk.request.CustomFieldUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.log.annotation.Log;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectLogController.java

@@ -7,8 +7,8 @@ import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.system.log.service.OperationLogService;
 import io.metersphere.system.log.vo.OperationLogRequest;
 import io.metersphere.system.log.vo.OperationLogResponse;
-import io.metersphere.sdk.util.PageUtils;
+import io.metersphere.system.utils.PageUtils;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import io.metersphere.system.utils.SessionUtils;
 import io.metersphere.system.domain.User;
 import io.metersphere.system.service.UserService;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectMemberController.java

@@ -9,10 +9,10 @@ import io.metersphere.project.request.ProjectMemberEditRequest;
 import io.metersphere.project.request.ProjectMemberRequest;
 import io.metersphere.project.service.ProjectMemberService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.UserExtendDTO;
+import io.metersphere.system.dto.user.UserExtendDTO;
-import io.metersphere.sdk.util.PageUtils;
+import io.metersphere.system.utils.PageUtils;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import io.metersphere.system.utils.SessionUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectStatusFlowSettingController.java

@@ -3,10 +3,10 @@ package io.metersphere.project.controller;
 import io.metersphere.project.service.ProjectStatusFlowSettingLogService;
 import io.metersphere.project.service.ProjectStatusFlowSettingService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.request.StatusDefinitionUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusFlowUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusItemAddRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemAddRequest;
-import io.metersphere.sdk.dto.request.StatusItemUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemUpdateRequest;
 import io.metersphere.system.domain.StatusItem;
 import io.metersphere.system.dto.StatusItemDTO;
 import io.metersphere.system.log.annotation.Log;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java

@@ -4,8 +4,8 @@ import io.metersphere.project.dto.ProjectTemplateDTO;
 import io.metersphere.project.service.ProjectTemplateLogService;
 import io.metersphere.project.service.ProjectTemplateService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.TemplateDTO;
+import io.metersphere.system.dto.sdk.TemplateDTO;
-import io.metersphere.sdk.dto.request.TemplateUpdateRequest;
+import io.metersphere.system.dto.sdk.request.TemplateUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.system.domain.Template;
 import io.metersphere.system.log.annotation.Log;

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectUserRoleController.java

@@ -10,12 +10,12 @@ import io.metersphere.project.request.ProjectUserRoleRequest;
 import io.metersphere.project.service.ProjectUserRoleLogService;
 import io.metersphere.project.service.ProjectUserRoleService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.PermissionDefinitionItem;
+import io.metersphere.system.dto.permission.PermissionDefinitionItem;
-import io.metersphere.sdk.dto.UserExtendDTO;
+import io.metersphere.system.dto.user.UserExtendDTO;
-import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
+import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
-import io.metersphere.sdk.util.PageUtils;
+import io.metersphere.system.utils.PageUtils;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import io.metersphere.system.domain.User;
 import io.metersphere.system.domain.UserRole;
 import io.metersphere.system.log.annotation.Log;

backend/services/project-management/src/main/java/io/metersphere/project/dto/MessageTaskDetailDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.dto;
 
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/services/project-management/src/main/java/io/metersphere/project/dto/MessageTemplateFieldDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.dto;
 
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

backend/services/project-management/src/main/java/io/metersphere/project/dto/MessageTemplateResultDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.dto;
 
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/services/project-management/src/main/java/io/metersphere/project/dto/NodeSortDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.dto;
 
-import io.metersphere.sdk.dto.BaseModule;
+import io.metersphere.system.dto.sdk.BaseModule;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;

backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateOptionDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.dto;
 
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentExportDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.dto.environment;
 
-import io.metersphere.sdk.dto.TableBatchProcessDTO;
+import io.metersphere.system.dto.table.TableBatchProcessDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.java

@@ -1,7 +1,7 @@
 package io.metersphere.project.mapper;
 
 import io.metersphere.project.domain.FileModule;
-import io.metersphere.sdk.dto.BaseTreeNode;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtFileModuleMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.ExtFileModuleMapper">
-    <select id="selectBaseByProjectId" resultType="io.metersphere.sdk.dto.BaseTreeNode">
+    <select id="selectBaseByProjectId" resultType="io.metersphere.system.dto.sdk.BaseTreeNode">
         SELECT id, name, parent_id AS parentId, 'module' AS type
         FROM file_module
         WHERE project_id = #{0}
         ORDER BY pos
     </select>
-    <select id="selectIdAndParentIdByProjectId" resultType="io.metersphere.sdk.dto.BaseTreeNode">
+    <select id="selectIdAndParentIdByProjectId" resultType="io.metersphere.system.dto.sdk.BaseTreeNode">
         SELECT id, parent_id AS parentId
         FROM file_module
         WHERE project_id = #{0}

backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectMemberMapper.java

@@ -1,7 +1,7 @@
 package io.metersphere.project.mapper;
 
 import io.metersphere.project.request.ProjectMemberRequest;
-import io.metersphere.sdk.dto.UserExtendDTO;
+import io.metersphere.system.dto.user.UserExtendDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectMemberMapper.xml

@@ -17,7 +17,7 @@
         order by u.name
     </select>
 
-    <select id="getMemberByOrg" resultType="io.metersphere.sdk.dto.UserExtendDTO">
+    <select id="getMemberByOrg" resultType="io.metersphere.system.dto.user.UserExtendDTO">
         select distinct u.* from user_role_relation urr join `user` u on urr.user_id = u.id
         where
             u.deleted = 0

backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.java

@@ -3,7 +3,7 @@ package io.metersphere.project.mapper;
 import io.metersphere.project.dto.ProjectUserRoleDTO;
 import io.metersphere.project.request.ProjectUserRoleMemberRequest;
 import io.metersphere.project.request.ProjectUserRoleRequest;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.domain.User;
 import io.metersphere.system.domain.UserRoleRelation;
 import org.apache.ibatis.annotations.Param;

backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml

@@ -44,7 +44,7 @@
         order by u.create_time desc
     </select>
 
-    <select id="getProjectUserSelectList" resultType="io.metersphere.sdk.dto.OptionDTO">
+    <select id="getProjectUserSelectList" resultType="io.metersphere.system.dto.sdk.OptionDTO">
         select u.id,
                u.name
         from user_role_relation urr

backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectMemberRequest.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.request;
 
-import io.metersphere.sdk.dto.BasePageRequest;
+import io.metersphere.system.dto.sdk.BasePageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectUserRoleMemberRequest.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.request;
 
-import io.metersphere.sdk.dto.BasePageRequest;
+import io.metersphere.system.dto.sdk.BasePageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectUserRoleRequest.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.request;
 
-import io.metersphere.sdk.dto.BasePageRequest;
+import io.metersphere.system.dto.sdk.BasePageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

backend/services/project-management/src/main/java/io/metersphere/project/request/filemanagement/FileBatchProcessDTO.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.request.filemanagement;
 
-import io.metersphere.sdk.dto.TableBatchProcessDTO;
+import io.metersphere.system.dto.table.TableBatchProcessDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

backend/services/project-management/src/main/java/io/metersphere/project/request/filemanagement/FileMetadataTableRequest.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.request.filemanagement;
 
-import io.metersphere.sdk.dto.BasePageRequest;
+import io.metersphere.system.dto.sdk.BasePageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

backend/services/project-management/src/main/java/io/metersphere/project/service/CreateRobotResourceService.java

@@ -10,7 +10,7 @@ import io.metersphere.project.enums.ProjectRobotPlatform;
 import io.metersphere.project.mapper.MessageTaskBlobMapper;
 import io.metersphere.project.mapper.MessageTaskMapper;
 import io.metersphere.project.mapper.ProjectRobotMapper;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.notice.constants.NoticeConstants;
 import io.metersphere.system.service.CreateProjectResourceService;

backend/services/project-management/src/main/java/io/metersphere/project/service/EnvironmentLogService.java

@@ -6,7 +6,7 @@ import io.metersphere.project.dto.environment.EnvironmentRequest;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.sdk.domain.Environment;
 import io.metersphere.sdk.domain.EnvironmentBlob;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
 
 import io.metersphere.sdk.mapper.EnvironmentBlobMapper;
 import io.metersphere.sdk.mapper.EnvironmentMapper;

backend/services/project-management/src/main/java/io/metersphere/project/service/EnvironmentService.java

@@ -14,11 +14,11 @@ import io.metersphere.sdk.domain.Environment;
 import io.metersphere.sdk.domain.EnvironmentBlob;
 import io.metersphere.sdk.domain.EnvironmentBlobExample;
 import io.metersphere.sdk.domain.EnvironmentExample;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.file.FileRequest;
+import io.metersphere.system.file.FileRequest;
-import io.metersphere.sdk.file.MinioRepository;
+import io.metersphere.system.file.MinioRepository;
 import io.metersphere.sdk.mapper.EnvironmentBlobMapper;
 import io.metersphere.sdk.mapper.EnvironmentMapper;
 import io.metersphere.sdk.util.JSON;

backend/services/project-management/src/main/java/io/metersphere/project/service/FileManagementService.java

@@ -10,7 +10,7 @@ import io.metersphere.project.mapper.FileModuleMapper;
 import io.metersphere.project.request.filemanagement.FileBatchProcessDTO;
 import io.metersphere.sdk.constants.ModuleConstants;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.file.FileRequest;
+import io.metersphere.system.file.FileRequest;
 import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.sdk.util.TempFileUtils;
 import jakarta.annotation.Resource;

backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataLogService.java

@@ -5,8 +5,8 @@ import io.metersphere.project.domain.Project;
 import io.metersphere.project.mapper.FileMetadataMapper;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.sdk.constants.HttpMethodConstants;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.builder.LogDTOBuilder;
+import io.metersphere.system.dto.builder.LogDTOBuilder;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.log.constants.OperationLogModule;

backend/services/project-management/src/main/java/io/metersphere/project/service/FileMetadataService.java

@@ -14,9 +14,11 @@ import io.metersphere.project.utils.FileDownloadUtils;
 import io.metersphere.sdk.constants.ModuleConstants;
 import io.metersphere.sdk.constants.StorageType;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.file.FileRequest;
+import io.metersphere.system.file.FileRequest;
 import io.metersphere.sdk.util.*;
 import io.metersphere.system.uid.IDGenerator;
+import io.metersphere.system.utils.PageUtils;
+import io.metersphere.system.utils.Pager;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleLogService.java

@@ -6,9 +6,9 @@ import io.metersphere.project.dto.NodeSortDTO;
 import io.metersphere.project.mapper.FileModuleMapper;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.sdk.constants.HttpMethodConstants;
-import io.metersphere.sdk.dto.BaseModule;
+import io.metersphere.system.dto.sdk.BaseModule;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.builder.LogDTOBuilder;
+import io.metersphere.system.dto.builder.LogDTOBuilder;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.log.constants.OperationLogModule;

backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java

@@ -9,9 +9,9 @@ import io.metersphere.project.mapper.FileModuleMapper;
 import io.metersphere.project.request.filemanagement.FileModuleCreateRequest;
 import io.metersphere.project.request.filemanagement.FileModuleUpdateRequest;
 import io.metersphere.sdk.constants.ModuleConstants;
-import io.metersphere.sdk.dto.BaseModule;
+import io.metersphere.system.dto.sdk.BaseModule;
-import io.metersphere.sdk.dto.BaseTreeNode;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
-import io.metersphere.sdk.dto.request.NodeMoveRequest;
+import io.metersphere.system.dto.sdk.request.NodeMoveRequest;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.service.CleanupProjectResourceService;

backend/services/project-management/src/main/java/io/metersphere/project/service/FileService.java

@@ -1,7 +1,7 @@
 package io.metersphere.project.service;
 
-import io.metersphere.sdk.file.FileCenter;
+import io.metersphere.system.file.FileCenter;
-import io.metersphere.sdk.file.FileRequest;
+import io.metersphere.system.file.FileRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 

backend/services/project-management/src/main/java/io/metersphere/project/service/GlobalParamsLogService.java

@@ -4,7 +4,7 @@ import io.metersphere.project.domain.Project;
 import io.metersphere.project.dto.environment.GlobalParamsRequest;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.sdk.domain.ProjectParameters;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
 
 import io.metersphere.sdk.mapper.ProjectParametersMapper;
 import io.metersphere.sdk.util.JSON;

backend/services/project-management/src/main/java/io/metersphere/project/service/MessageTaskLogService.java

@@ -9,8 +9,8 @@ import io.metersphere.project.enums.ProjectRobotPlatform;
 import io.metersphere.project.mapper.MessageTaskMapper;
 import io.metersphere.project.mapper.ProjectRobotMapper;
 import io.metersphere.sdk.constants.HttpMethodConstants;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.request.MessageTaskRequest;
+import io.metersphere.system.dto.sdk.request.MessageTaskRequest;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;

backend/services/project-management/src/main/java/io/metersphere/project/service/ModuleTreeService.java

@@ -3,8 +3,8 @@ package io.metersphere.project.service;
 import io.metersphere.project.dto.ModuleCountDTO;
 import io.metersphere.project.dto.NodeSortDTO;
 import io.metersphere.sdk.constants.ModuleConstants;
-import io.metersphere.sdk.dto.BaseModule;
+import io.metersphere.system.dto.sdk.BaseModule;
-import io.metersphere.sdk.dto.BaseTreeNode;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
 import io.metersphere.sdk.util.Translator;
 import jakarta.validation.constraints.NotNull;
 import org.apache.commons.collections4.CollectionUtils;

backend/services/project-management/src/main/java/io/metersphere/project/service/NoticeMessageTaskService.java

@@ -7,8 +7,8 @@ import io.metersphere.project.enums.ProjectRobotPlatform;
 import io.metersphere.project.enums.result.ProjectResultCode;
 import io.metersphere.project.mapper.*;
 import io.metersphere.sdk.constants.TemplateScene;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.request.MessageTaskRequest;
+import io.metersphere.system.dto.sdk.request.MessageTaskRequest;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;

backend/services/project-management/src/main/java/io/metersphere/project/service/NoticeTemplateService.java

@@ -8,9 +8,9 @@ import io.metersphere.plan.domain.TestPlan;
 import io.metersphere.project.dto.MessageTemplateFieldDTO;
 import io.metersphere.project.dto.MessageTemplateResultDTO;
 import io.metersphere.sdk.constants.TemplateScene;
-import io.metersphere.sdk.dto.ApiDefinitionCaseDTO;
+import io.metersphere.system.dto.sdk.ApiDefinitionCaseDTO;
-import io.metersphere.sdk.dto.FunctionalCaseMessageDTO;
+import io.metersphere.system.dto.sdk.FunctionalCaseMessageDTO;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.domain.CustomFieldExample;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectApplicationService.java

@@ -18,8 +18,8 @@ import io.metersphere.project.utils.ModuleSortUtils;
 import io.metersphere.sdk.constants.OperationLogConstants;
 import io.metersphere.sdk.constants.ProjectApplicationType;
 import io.metersphere.sdk.constants.ScheduleType;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.domain.*;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectCustomFieldLogService.java

@@ -1,7 +1,7 @@
 package io.metersphere.project.service;
 
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.request.CustomFieldUpdateRequest;
+import io.metersphere.system.dto.sdk.request.CustomFieldUpdateRequest;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.log.constants.OperationLogModule;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectCustomFieldService.java

@@ -2,8 +2,8 @@ package io.metersphere.project.service;
 
 import io.metersphere.project.domain.Project;
 import io.metersphere.sdk.constants.TemplateScopeType;
-import io.metersphere.sdk.dto.CustomFieldDTO;
+import io.metersphere.system.dto.sdk.CustomFieldDTO;
-import io.metersphere.sdk.dto.request.CustomFieldOptionRequest;
+import io.metersphere.system.dto.sdk.request.CustomFieldOptionRequest;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.service.BaseCustomFieldService;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectLogService.java

@@ -2,7 +2,7 @@ package io.metersphere.project.service;
 
 import io.metersphere.project.domain.Project;
 import io.metersphere.project.mapper.ProjectMapper;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
 import io.metersphere.system.dto.UpdateProjectRequest;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.log.constants.OperationLogModule;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java

@@ -11,9 +11,9 @@ import io.metersphere.project.request.ProjectMemberRequest;
 import io.metersphere.sdk.constants.HttpMethodConstants;
 import io.metersphere.sdk.constants.UserRoleEnum;
 import io.metersphere.sdk.constants.UserRoleType;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.UserExtendDTO;
+import io.metersphere.system.dto.user.UserExtendDTO;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectService.java

@@ -10,9 +10,9 @@ import io.metersphere.project.mapper.ProjectTestResourcePoolMapper;
 import io.metersphere.project.request.ProjectSwitchRequest;
 import io.metersphere.sdk.constants.InternalUserRole;
 import io.metersphere.sdk.constants.ApplicationScope;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.SessionUser;
+import io.metersphere.system.dto.sdk.SessionUser;
-import io.metersphere.sdk.dto.UserDTO;
+import io.metersphere.system.dto.user.UserDTO;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.CommonBeanFactory;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectStatusFlowSettingLogService.java

@@ -1,10 +1,10 @@
 package io.metersphere.project.service;
 
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.request.StatusDefinitionUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusFlowUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusItemAddRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemAddRequest;
-import io.metersphere.sdk.dto.request.StatusItemUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemUpdateRequest;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.StatusItem;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectStatusFlowSettingService.java

@@ -1,10 +1,10 @@
 package io.metersphere.project.service;
 
 import io.metersphere.sdk.constants.TemplateScopeType;
-import io.metersphere.sdk.dto.request.StatusDefinitionUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusFlowUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusItemAddRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemAddRequest;
-import io.metersphere.sdk.dto.request.StatusItemUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.system.domain.StatusItem;
 import io.metersphere.system.dto.StatusItemDTO;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateLogService.java

@@ -1,7 +1,7 @@
 package io.metersphere.project.service;
 
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.request.TemplateUpdateRequest;
+import io.metersphere.system.dto.sdk.request.TemplateUpdateRequest;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.Template;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateService.java

@@ -9,8 +9,8 @@ import io.metersphere.sdk.constants.InternalUser;
 import io.metersphere.sdk.constants.ProjectApplicationType;
 import io.metersphere.sdk.constants.TemplateScene;
 import io.metersphere.sdk.constants.TemplateScopeType;
-import io.metersphere.sdk.dto.TemplateDTO;
+import io.metersphere.system.dto.sdk.TemplateDTO;
-import io.metersphere.sdk.dto.request.TemplateCustomFieldRequest;
+import io.metersphere.system.dto.sdk.request.TemplateCustomFieldRequest;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.Translator;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectUserRoleLogService.java

@@ -5,8 +5,8 @@ import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.project.request.ProjectUserRoleEditRequest;
 import io.metersphere.project.request.ProjectUserRoleMemberEditRequest;
 import io.metersphere.sdk.constants.OperationLogConstants;
-import io.metersphere.sdk.dto.LogDTO;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
+import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.JSON;

backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectUserRoleService.java

@@ -7,8 +7,8 @@ import io.metersphere.project.request.ProjectUserRoleMemberRequest;
 import io.metersphere.project.request.ProjectUserRoleRequest;
 import io.metersphere.sdk.constants.InternalUserRole;
 import io.metersphere.sdk.constants.UserRoleType;
-import io.metersphere.sdk.dto.PermissionDefinitionItem;
+import io.metersphere.system.dto.permission.PermissionDefinitionItem;
-import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
+import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.User;

backend/services/project-management/src/test/java/io/metersphere/project/Application.java

@@ -1,6 +1,6 @@
 package io.metersphere.project;
 
-import io.metersphere.sdk.config.MinioProperties;
+import io.metersphere.system.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;

backend/services/project-management/src/test/java/io/metersphere/project/controller/EnvironmentControllerTests.java

@@ -25,9 +25,9 @@ import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.domain.Environment;
 import io.metersphere.sdk.domain.EnvironmentBlob;
 import io.metersphere.sdk.domain.EnvironmentExample;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.file.FileRequest;
+import io.metersphere.system.file.FileRequest;
-import io.metersphere.sdk.file.MinioRepository;
+import io.metersphere.system.file.MinioRepository;
 import io.metersphere.sdk.mapper.EnvironmentBlobMapper;
 import io.metersphere.sdk.mapper.EnvironmentMapper;
 import io.metersphere.sdk.util.CommonBeanFactory;

backend/services/project-management/src/test/java/io/metersphere/project/controller/NoticeMessageTaskControllerTests.java

@@ -8,8 +8,8 @@ import io.metersphere.project.dto.*;
 import io.metersphere.project.mapper.MessageTaskBlobMapper;
 import io.metersphere.project.mapper.MessageTaskMapper;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.request.MessageTaskRequest;
+import io.metersphere.system.dto.sdk.request.MessageTaskRequest;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.handler.ResultHolder;

backend/services/project-management/src/test/java/io/metersphere/project/controller/NoticeTemplateControllerTests.java

@@ -3,7 +3,7 @@ package io.metersphere.project.controller;
 import io.metersphere.project.dto.MessageTemplateFieldDTO;
 import io.metersphere.project.dto.MessageTemplateResultDTO;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.handler.ResultHolder;

backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectControllerTests.java

@@ -8,7 +8,7 @@ import io.metersphere.project.request.ProjectSwitchRequest;
 import io.metersphere.sdk.constants.ApplicationScope;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.dto.UserDTO;
+import io.metersphere.system.dto.user.UserDTO;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.handler.ResultHolder;

backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectCustomFieldControllerTests.java

@@ -1,9 +1,9 @@
 package io.metersphere.project.controller;
 
 import io.metersphere.sdk.constants.*;
-import io.metersphere.sdk.dto.CustomFieldDTO;
+import io.metersphere.system.dto.sdk.CustomFieldDTO;
-import io.metersphere.sdk.dto.request.CustomFieldOptionRequest;
+import io.metersphere.system.dto.sdk.request.CustomFieldOptionRequest;
-import io.metersphere.sdk.dto.request.CustomFieldUpdateRequest;
+import io.metersphere.system.dto.sdk.request.CustomFieldUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.param.CustomFieldUpdateRequestDefinition;

backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectMemberControllerTests.java

@@ -8,7 +8,7 @@ import io.metersphere.project.request.ProjectMemberRequest;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.util.JSON;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.handler.ResultHolder;
 import io.metersphere.system.log.constants.OperationLogType;

backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectRobotControllerTests.java

@@ -13,8 +13,8 @@ import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.project.mapper.ProjectRobotMapper;
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.domain.OperationLogExample;
-import io.metersphere.sdk.dto.OptionDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.sdk.dto.request.MessageTaskRequest;
+import io.metersphere.system.dto.sdk.request.MessageTaskRequest;
 import io.metersphere.sdk.mapper.OperationLogMapper;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;

backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectStatusFlowSettingControllerTest.java

@@ -1,10 +1,10 @@
 package io.metersphere.project.controller;
 
 import io.metersphere.sdk.constants.*;
-import io.metersphere.sdk.dto.request.StatusDefinitionUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusFlowUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
-import io.metersphere.sdk.dto.request.StatusItemAddRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemAddRequest;
-import io.metersphere.sdk.dto.request.StatusItemUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.OrganizationStatusFlowSettingControllerTest;

backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectTemplateControllerTests.java

@@ -7,10 +7,10 @@ import io.metersphere.sdk.constants.OrganizationParameterConstants;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.TemplateScene;
 import io.metersphere.sdk.constants.TemplateScopeType;
-import io.metersphere.sdk.dto.TemplateCustomFieldDTO;
+import io.metersphere.system.dto.sdk.TemplateCustomFieldDTO;
-import io.metersphere.sdk.dto.TemplateDTO;
+import io.metersphere.system.dto.sdk.TemplateDTO;
-import io.metersphere.sdk.dto.request.TemplateCustomFieldRequest;
+import io.metersphere.system.dto.sdk.request.TemplateCustomFieldRequest;
-import io.metersphere.sdk.dto.request.TemplateUpdateRequest;
+import io.metersphere.system.dto.sdk.request.TemplateUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.system.base.BasePluginTestService;
 import io.metersphere.system.base.BaseTest;

backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectUserRoleControllerTests.java

@@ -8,9 +8,9 @@ import io.metersphere.project.request.ProjectUserRoleRequest;
 import io.metersphere.sdk.constants.InternalUserRole;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
+import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
 import io.metersphere.sdk.util.JSON;
-import io.metersphere.sdk.util.Pager;
+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;

backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java

@@ -12,10 +12,10 @@ import io.metersphere.project.utils.FileManagementRequestUtils;
 import io.metersphere.sdk.constants.ModuleConstants;
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.constants.StorageType;
-import io.metersphere.sdk.dto.BaseTreeNode;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
-import io.metersphere.sdk.dto.request.NodeMoveRequest;
+import io.metersphere.system.dto.sdk.request.NodeMoveRequest;
 import io.metersphere.sdk.util.JSON;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import io.metersphere.sdk.util.TempFileUtils;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.handler.ResultHolder;

backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementPermissionControllerTests.java

@@ -5,7 +5,7 @@ import io.metersphere.project.utils.FileManagementBaseUtils;
 import io.metersphere.project.utils.FileManagementRequestUtils;
 import io.metersphere.sdk.constants.ModuleConstants;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.dto.request.NodeMoveRequest;
+import io.metersphere.system.dto.sdk.request.NodeMoveRequest;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.base.BaseTest;
 import org.junit.jupiter.api.MethodOrderer;

backend/services/project-management/src/test/java/io/metersphere/project/utils/FileManagementBaseUtils.java

@@ -2,9 +2,9 @@ package io.metersphere.project.utils;
 
 import io.metersphere.project.dto.filemanagement.FileInformationDTO;
 import io.metersphere.project.request.filemanagement.FileMetadataTableRequest;
-import io.metersphere.sdk.dto.BaseTreeNode;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
 import io.metersphere.sdk.util.JSON;
-import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.utils.Pager;
 import org.apache.commons.collections4.CollectionUtils;
 import org.junit.jupiter.api.Assertions;
 import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;

backend/services/system-setting/pom.xml

@@ -18,6 +18,99 @@
             <artifactId>metersphere-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-domain</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <!-- 定时任务配置-->
+        <dependency>
+            <groupId>com.fit2cloud</groupId>
+            <artifactId>quartz-spring-boot-starter</artifactId>
+            <version>${quartz-starter.version}</version>
+        </dependency>
+        <!-- start shiro   -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring-boot-starter</artifactId>
+            <version>${shiro.version}</version>
+            <classifier>jakarta</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-spring</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-web</artifactId>
+            <version>${shiro.version}</version>
+            <classifier>jakarta</classifier>
+            <exclusions>
+                <exclusion>
+                    <artifactId>shiro-core</artifactId>
+                    <groupId>org.apache.shiro</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>${shiro.version}</version>
+            <classifier>jakarta</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring</artifactId>
+            <version>${shiro.version}</version>
+            <classifier>jakarta</classifier>
+            <exclusions>
+                <exclusion>
+                    <artifactId>shiro-web</artifactId>
+                    <groupId>org.apache.shiro</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>shiro-core</artifactId>
+                    <groupId>org.apache.shiro</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- end shiro   -->
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-plugin-platform-sdk</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <!--  start mysql 相关      -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${mybatis-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-mysql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>${pagehelper.version}</version>
+        </dependency>
+        <!--  end mysql 相关      -->
     </dependencies>
 
     <build>