build: 保留工具相关的代码在SDK中

backend/app/src/main/java/io/metersphere/listener/AppStartListener.java

@@ -2,7 +2,7 @@ package io.metersphere.listener;
 
 import io.metersphere.api.event.APIEventSource;
 import io.metersphere.plan.listener.ExecEventListener;
-import io.metersphere.sdk.service.PluginLoadService;
+import io.metersphere.system.service.PluginLoadService;
 import io.metersphere.sdk.util.CommonBeanFactory;
 import io.metersphere.sdk.util.LogUtils;
 import jakarta.annotation.Resource;

backend/framework/sdk/pom.xml

@@ -407,17 +407,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.mybatis.generator</groupId>
                 <artifactId>mybatis-generator-maven-plugin</artifactId>

backend/framework/sdk/src/main/java/io/metersphere/sdk/exception/IResultCode.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.controller.handler.result;
+package io.metersphere.sdk.exception;
 
 import io.metersphere.sdk.util.Translator;
 

backend/framework/sdk/src/main/java/io/metersphere/sdk/exception/MSException.java

@@ -1,6 +1,5 @@
 package io.metersphere.sdk.exception;
 
-import io.metersphere.sdk.controller.handler.result.IResultCode;
 import org.apache.commons.lang3.StringUtils;
 
 public class MSException extends RuntimeException {

backend/framework/sdk/src/main/java/io/metersphere/sdk/mapper/BaseMapper.java

@@ -1,4 +0,0 @@
-package io.metersphere.sdk.mapper;
-
-public interface BaseMapper {
-}

backend/framework/sdk/src/main/java/io/metersphere/sdk/notice/sender/NoticeSender.java

@@ -1,9 +0,0 @@
-package io.metersphere.sdk.notice.sender;
-
-
-import io.metersphere.sdk.notice.MessageDetail;
-import io.metersphere.sdk.notice.NoticeModel;
-
-public interface NoticeSender {
-    void send(MessageDetail messageDetail, NoticeModel noticeModel);
-}

backend/framework/sdk/src/main/java/io/metersphere/sdk/uid/worker/WorkerIdAssigner.java

@@ -1,18 +0,0 @@
-
-package io.metersphere.sdk.uid.worker;
-
-/**
- * Represents a worker id assigner for {@link io.metersphere.sdk.uid.impl.DefaultUidGenerator}
- * 
-
- */
-public interface WorkerIdAssigner {
-
-    /**
-     * Assign worker id for {@link io.metersphere.sdk.uid.impl.DefaultUidGenerator}
-     * 
-     * @return assigned worker id
-     */
-    long assignWorkerId();
-
-}

backend/services/api-test/pom.xml

@@ -18,6 +18,24 @@
             <artifactId>metersphere-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-system-setting</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-system-setting</artifactId>
+            <version>${revision}</version>
+            <classifier>tests</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-project-management</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.jmeter</groupId>
             <artifactId>ApacheJMeter_components</artifactId>

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

@@ -4,8 +4,8 @@ import io.metersphere.api.dto.definition.ApiDefinitionDTO;
 import io.metersphere.api.service.APIDefinitionLogService;
 import io.metersphere.api.service.APIDefinitionService;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.validation.groups.Created;
 import io.metersphere.validation.groups.Updated;
 import jakarta.annotation.Resource;

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

@@ -6,9 +6,9 @@ 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.sdk.log.constants.OperationLogModule;
-import io.metersphere.sdk.log.constants.OperationLogType;
 import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.log.constants.OperationLogModule;
+import io.metersphere.system.log.constants.OperationLogType;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
@@ -126,6 +126,7 @@ public class APIDefinitionLogService {
 
     /**
      * 批量更新接口日志
+     *
      * @return
      */
     public List<LogDTO> batchUpdateLog(List<String> ids) {

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

@@ -1,7 +1,7 @@
 package io.metersphere.api.service;
 
-import io.metersphere.sdk.service.CleanupProjectResourceService;
 import io.metersphere.sdk.util.LogUtils;
+import io.metersphere.system.service.CleanupProjectResourceService;
 import org.springframework.stereotype.Component;
 
 @Component

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

@@ -19,7 +19,7 @@ import org.springframework.context.annotation.ComponentScan;
         MinioProperties.class
 })
 @ServletComponentScan
-@ComponentScan(basePackages = {"io.metersphere.sdk", "io.metersphere.api"})
+@ComponentScan(basePackages = {"io.metersphere.sdk", "io.metersphere.api", "io.metersphere.system"})
 public class Application {
 
     public static void main(String[] args) {

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

@@ -4,12 +4,12 @@ import io.metersphere.api.dto.jmeter.processors.MSJSR223Processor;
 import io.metersphere.api.dto.jmeter.sampler.MSDebugSampler;
 import io.metersphere.api.util.JSONUtils;
 import io.metersphere.plugin.api.dto.TestElementDTO;
+import io.metersphere.system.uid.UUID;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.LinkedList;
-import io.metersphere.sdk.uid.UUID;
 
 
 @SpringBootTest

backend/services/api-test/src/test/resources/bootstrap.properties

@@ -8,6 +8,6 @@ embedded.mysql.collation=utf8mb4_general_ci
 # redis
 embedded.redis.enabled=true
 # kafka
-embedded.kafka.enabled=false
+embedded.kafka.enabled=true
 # minio
 embedded.minio.enabled=true

backend/services/bug-management/pom.xml

@@ -18,7 +18,16 @@
             <artifactId>metersphere-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-system-setting</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-project-management</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
 

backend/services/bug-management/src/main/java/io/metersphere/bug/controller/result/BugMgtResultCode.java

@@ -1,6 +1,7 @@
 package io.metersphere.bug.controller.result;
 
-import io.metersphere.sdk.controller.handler.result.IResultCode;
+
+import io.metersphere.sdk.exception.IResultCode;
 
 public enum BugMgtResultCode implements IResultCode {
 

backend/services/bug-management/src/main/java/io/metersphere/bug/service/CleanupBugResourceService.java

@@ -1,6 +1,6 @@
 package io.metersphere.bug.service;
 
-import io.metersphere.sdk.service.CleanupProjectResourceService;
+import io.metersphere.system.service.CleanupProjectResourceService;
 import io.metersphere.sdk.util.LogUtils;
 import org.springframework.stereotype.Component;
 

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

@@ -19,7 +19,7 @@ import org.springframework.context.annotation.ComponentScan;
         MinioProperties.class
 })
 @ServletComponentScan
-@ComponentScan(basePackages = {"io.metersphere.sdk", "io.metersphere.bug"})
+@ComponentScan(basePackages = {"io.metersphere.sdk", "io.metersphere.bug", "io.metersphere.system"})
 public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

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

@@ -4,6 +4,7 @@ import com.jayway.jsonpath.JsonPath;
 import io.metersphere.bug.domain.Bug;
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.uid.UUID;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
@@ -16,9 +17,6 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import io.metersphere.sdk.uid.UUID;
-
-
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 

backend/services/bug-management/src/test/resources/bootstrap.properties

@@ -8,6 +8,6 @@ embedded.mysql.collation=utf8mb4_general_ci
 # redis
 embedded.redis.enabled=true
 # kafka
-embedded.kafka.enabled=false
+embedded.kafka.enabled=true
 # minio
 embedded.minio.enabled=true

backend/services/case-management/pom.xml

@@ -18,7 +18,16 @@
             <artifactId>metersphere-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-system-setting</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-project-management</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,6 +1,6 @@
 package io.metersphere.functional.service;
 
-import io.metersphere.sdk.service.CleanupProjectResourceService;
+import io.metersphere.system.service.CleanupProjectResourceService;
 import io.metersphere.sdk.util.LogUtils;
 import org.springframework.stereotype.Component;
 

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

@@ -20,7 +20,7 @@ import org.springframework.context.annotation.ComponentScan;
         MinioProperties.class
 })
 @ServletComponentScan
-@ComponentScan(basePackages = {"io.metersphere.sdk", "io.metersphere.functional"})
+@ComponentScan(basePackages = {"io.metersphere.sdk", "io.metersphere.functional", "io.metersphere.system"})
 public class Application {
 
     public static void main(String[] args) {

backend/services/case-management/src/test/resources/bootstrap.properties

@@ -8,6 +8,6 @@ embedded.mysql.collation=utf8mb4_general_ci
 # redis
 embedded.redis.enabled=true
 # kafka
-embedded.kafka.enabled=false
+embedded.kafka.enabled=true
 # minio
 embedded.minio.enabled=true

backend/services/load-test/pom.xml

@@ -18,7 +18,16 @@
             <artifactId>metersphere-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-system-setting</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.metersphere</groupId>
+            <artifactId>metersphere-project-management</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
 

backend/services/project-management/pom.xml

@@ -21,7 +21,7 @@
 
         <dependency>
             <groupId>io.metersphere</groupId>
-            <artifactId>metersphere-sdk</artifactId>
+            <artifactId>metersphere-system-setting</artifactId>
             <version>${revision}</version>
             <classifier>tests</classifier>
             <type>test-jar</type>

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

@@ -3,7 +3,7 @@ package io.metersphere.project.controller;
 
 import io.metersphere.project.dto.MessageTaskDTO;
 import io.metersphere.project.service.NoticeMessageTaskService;
-import io.metersphere.sdk.controller.handler.ResultHolder;
+import io.metersphere.system.controller.handler.ResultHolder;
 import io.metersphere.sdk.dto.request.MessageTaskRequest;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.validation.groups.Created;

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

@@ -5,8 +5,8 @@ import io.metersphere.project.request.ProjectApplicationRequest;
 import io.metersphere.project.service.ProjectApplicationService;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.OptionDTO;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.system.domain.User;
 import io.metersphere.validation.groups.Updated;

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

@@ -4,9 +4,9 @@ package io.metersphere.project.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.log.service.OperationLogService;
+import io.metersphere.system.log.service.OperationLogService;
-import io.metersphere.sdk.log.vo.OperationLogRequest;
+import io.metersphere.system.log.vo.OperationLogRequest;
-import io.metersphere.sdk.log.vo.OperationLogResponse;
+import io.metersphere.system.log.vo.OperationLogResponse;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

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

@@ -13,8 +13,8 @@ import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.PermissionDefinitionItem;
 import io.metersphere.sdk.dto.UserExtend;
 import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;

backend/services/project-management/src/main/java/io/metersphere/project/enums/result/ProjectResultCode.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.enums.result;
 
-import io.metersphere.sdk.controller.handler.result.IResultCode;
+import io.metersphere.sdk.exception.IResultCode;
 
 /**
  * @author guoyuqi

backend/services/project-management/src/main/java/io/metersphere/project/job/CleanUpReportJob.java

@@ -1,6 +1,6 @@
 package io.metersphere.project.job;
 
-import io.metersphere.sdk.sechedule.BaseScheduleJob;
+import io.metersphere.system.sechedule.BaseScheduleJob;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobKey;
 import org.quartz.TriggerKey;

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

@@ -37,7 +37,7 @@
                     <choose>
                         <when test="key == 'roleIds'">
                             and urr.role_id in
-                            <include refid="io.metersphere.sdk.mapper.BaseMapper.filterInWrapper"/>
+                            <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                     </choose>
                 </if>

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

@@ -5,7 +5,7 @@ import io.metersphere.sdk.domain.ProjectParametersExample;
 import io.metersphere.sdk.mapper.EnvironmentBlobMapper;
 import io.metersphere.sdk.mapper.EnvironmentMapper;
 import io.metersphere.sdk.mapper.ProjectParametersMapper;
-import io.metersphere.sdk.service.CleanupProjectResourceService;
+import io.metersphere.system.service.CleanupProjectResourceService;
 import io.metersphere.sdk.util.LogUtils;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;

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

@@ -2,7 +2,7 @@ package io.metersphere.project.service;
 
 import io.metersphere.project.domain.ProjectRobotExample;
 import io.metersphere.project.mapper.ProjectRobotMapper;
-import io.metersphere.sdk.service.CleanupProjectResourceService;
+import io.metersphere.system.service.CleanupProjectResourceService;
 import io.metersphere.sdk.util.LogUtils;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;

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

@@ -3,8 +3,8 @@ package io.metersphere.project.service;
 import io.metersphere.project.domain.ProjectRobot;
 import io.metersphere.project.enums.ProjectRobotPlatform;
 import io.metersphere.project.mapper.ProjectRobotMapper;
-import io.metersphere.sdk.service.CreateProjectResourceService;
+import io.metersphere.system.service.CreateProjectResourceService;
-import io.metersphere.sdk.uid.UUID;
+import io.metersphere.system.uid.UUID;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 

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

@@ -10,10 +10,10 @@ import io.metersphere.project.mapper.MessageTaskBlobMapper;
 import io.metersphere.project.mapper.MessageTaskMapper;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.project.mapper.ProjectRobotMapper;
-import io.metersphere.sdk.controller.handler.ResultHolder;
+import io.metersphere.system.controller.handler.ResultHolder;
 import io.metersphere.sdk.dto.request.MessageTaskRequest;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.uid.UUID;
+import io.metersphere.system.uid.UUID;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.User;
 import io.metersphere.system.domain.UserRoleRelation;

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

@@ -13,12 +13,12 @@ import io.metersphere.sdk.constants.ProjectApplicationType;
 import io.metersphere.sdk.constants.ScheduleType;
 import io.metersphere.sdk.dto.LogDTO;
 import io.metersphere.sdk.dto.OptionDTO;
-import io.metersphere.sdk.log.constants.OperationLogModule;
+import io.metersphere.system.log.constants.OperationLogModule;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.sechedule.BaseScheduleService;
+import io.metersphere.system.sechedule.BaseScheduleService;
-import io.metersphere.sdk.service.PluginLoadService;
+import io.metersphere.system.service.PluginLoadService;
 import io.metersphere.sdk.util.JSON;
-import io.metersphere.sdk.util.ServiceUtils;
+import io.metersphere.system.utils.ServiceUtils;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.system.domain.*;
 import io.metersphere.system.mapper.ExtPluginMapper;

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

@@ -15,10 +15,10 @@ import io.metersphere.sdk.dto.LogDTO;
 import io.metersphere.sdk.dto.OptionDTO;
 import io.metersphere.sdk.dto.UserExtend;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.log.constants.OperationLogModule;
+import io.metersphere.system.log.constants.OperationLogModule;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.log.service.OperationLogService;
+import io.metersphere.system.log.service.OperationLogService;
-import io.metersphere.sdk.uid.UUID;
+import io.metersphere.system.uid.UUID;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Translator;

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

@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
-import io.metersphere.sdk.uid.UUID;
+import io.metersphere.system.uid.UUID;
 
 @Service
 @Transactional

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

@@ -10,7 +10,7 @@ import io.metersphere.sdk.dto.ProjectExtendDTO;
 import io.metersphere.sdk.dto.SessionUser;
 import io.metersphere.sdk.dto.UserDTO;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.service.BaseUserService;
+import io.metersphere.system.service.BaseUserService;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.SessionUtils;

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

@@ -7,8 +7,8 @@ import io.metersphere.project.request.ProjectUserRoleMemberEditRequest;
 import io.metersphere.sdk.constants.OperationLogConstants;
 import io.metersphere.sdk.dto.LogDTO;
 import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
-import io.metersphere.sdk.log.constants.OperationLogModule;
+import io.metersphere.system.log.constants.OperationLogModule;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.domain.UserRole;
 import io.metersphere.system.domain.UserRoleExample;

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

@@ -11,8 +11,8 @@ import io.metersphere.sdk.dto.PermissionDefinitionItem;
 import io.metersphere.sdk.dto.UserExtend;
 import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.service.BaseUserRoleService;
+import io.metersphere.system.service.BaseUserRoleService;
-import io.metersphere.sdk.uid.UUID;
+import io.metersphere.system.uid.UUID;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.*;

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

@@ -1,7 +1,7 @@
 package io.metersphere.project.controller;
 
 import io.metersphere.project.service.CleanupEnvironmentResourceService;
-import io.metersphere.sdk.invoker.ProjectServiceInvoker;
+import io.metersphere.system.invoker.ProjectServiceInvoker;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;

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

@@ -3,11 +3,11 @@ package io.metersphere.project.controller;
 import io.metersphere.project.domain.ProjectRobot;
 import io.metersphere.project.request.ProjectRobotRequest;
 import io.metersphere.project.service.CleanupRobotResourceService;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.junit.jupiter.api.*;

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

@@ -2,12 +2,12 @@ package io.metersphere.project.controller;
 
 import io.metersphere.project.domain.ProjectRobot;
 import io.metersphere.project.request.ProjectRobotRequest;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
-import io.metersphere.sdk.invoker.ProjectServiceInvoker;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
+import io.metersphere.system.invoker.ProjectServiceInvoker;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

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

@@ -1,6 +1,6 @@
 package io.metersphere.project.controller;
 
-import io.metersphere.sdk.base.BaseTest;
+import io.metersphere.system.base.BaseTest;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

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

@@ -1,10 +1,8 @@
 package io.metersphere.project.controller;
 
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.constants.VariableTypeConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
 import io.metersphere.sdk.domain.ProjectParameters;
 import io.metersphere.sdk.domain.ProjectParametersExample;
 import io.metersphere.sdk.dto.environment.GlobalParamsDTO;
@@ -13,6 +11,8 @@ import io.metersphere.sdk.dto.environment.KeyValue;
 import io.metersphere.sdk.dto.environment.variables.CommonVariables;
 import io.metersphere.sdk.mapper.ProjectParametersMapper;
 import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

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

@@ -5,12 +5,12 @@ import io.metersphere.project.domain.MessageTask;
 import io.metersphere.project.domain.MessageTaskExample;
 import io.metersphere.project.dto.MessageTaskDTO;
 import io.metersphere.project.mapper.MessageTaskMapper;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
 import io.metersphere.sdk.dto.request.MessageTaskRequest;
-import io.metersphere.sdk.notice.constants.NoticeConstants;
 import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
+import io.metersphere.system.notice.constants.NoticeConstants;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.junit.jupiter.api.*;

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

@@ -4,10 +4,10 @@ import io.metersphere.project.controller.param.ProjectApplicationDefinition;
 import io.metersphere.project.controller.param.ProjectApplicationRequestDefinition;
 import io.metersphere.project.domain.ProjectApplication;
 import io.metersphere.project.request.ProjectApplicationRequest;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.ProjectApplicationType;
-import io.metersphere.sdk.controller.handler.ResultHolder;
 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.service.PluginService;
@@ -323,7 +323,6 @@ public class ProjectApplicationControllerTests extends BaseTest {
      */
 
 
-
     /**
      * ==========用例管理 start==========
      */
@@ -384,6 +383,7 @@ public class ProjectApplicationControllerTests extends BaseTest {
         // 返回请求正常
         Assertions.assertNotNull(resultHolder);
     }
+
     /**
      * ==========用例管理 start==========
      */

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

@@ -5,13 +5,13 @@ import io.metersphere.project.domain.Project;
 import io.metersphere.project.domain.ProjectExample;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.project.request.ProjectSwitchRequest;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
 import io.metersphere.sdk.dto.ProjectExtendDTO;
 import io.metersphere.sdk.dto.UserDTO;
 import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

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

@@ -1,9 +1,9 @@
 package io.metersphere.project.controller;
 
 
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.log.vo.OperationLogRequest;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.log.vo.OperationLogRequest;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;

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

@@ -5,13 +5,13 @@ import io.metersphere.project.request.ProjectMemberAddRequest;
 import io.metersphere.project.request.ProjectMemberBatchDeleteRequest;
 import io.metersphere.project.request.ProjectMemberEditRequest;
 import io.metersphere.project.request.ProjectMemberRequest;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
-import io.metersphere.sdk.log.constants.OperationLogType;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Pager;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
+import io.metersphere.system.log.constants.OperationLogType;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

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

@@ -5,14 +5,12 @@ import io.metersphere.project.dto.ProjectRobotDTO;
 import io.metersphere.project.enums.ProjectRobotPlatform;
 import io.metersphere.project.enums.ProjectRobotType;
 import io.metersphere.project.request.ProjectRobotRequest;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
-
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Pager;
-
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -335,7 +333,8 @@ public class ProjectRobotControllerTests extends BaseTest {
     }
 
     private static ProjectRobot getResult(MvcResult mvcResult) throws UnsupportedEncodingException {
-        String contentAsString = mvcResult.getResponse().getContentAsString(StandardCharsets.UTF_8);;
+        String contentAsString = mvcResult.getResponse().getContentAsString(StandardCharsets.UTF_8);
+        ;
         ResultHolder resultHolder = JSON.parseObject(contentAsString, ResultHolder.class);
         return JSON.parseObject(JSON.toJSONString(resultHolder.getData()), ProjectRobot.class);
     }

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

@@ -5,17 +5,17 @@ import io.metersphere.project.request.ProjectUserRoleEditRequest;
 import io.metersphere.project.request.ProjectUserRoleMemberEditRequest;
 import io.metersphere.project.request.ProjectUserRoleMemberRequest;
 import io.metersphere.project.request.ProjectUserRoleRequest;
-import io.metersphere.sdk.base.BaseTest;
 import io.metersphere.sdk.constants.InternalUserRole;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.sdk.controller.handler.ResultHolder;
 import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
-import io.metersphere.sdk.service.BaseUserRolePermissionService;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.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.service.BaseUserRolePermissionService;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,7 +36,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static io.metersphere.sdk.controller.handler.result.CommonResultCode.INTERNAL_USER_ROLE_PERMISSION;
+import static io.metersphere.system.controller.handler.result.CommonResultCode.INTERNAL_USER_ROLE_PERMISSION;
 import static io.metersphere.system.controller.result.SystemResultCode.NO_PROJECT_USER_ROLE_PERMISSION;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 

backend/services/system-setting/pom.xml

@@ -18,18 +18,21 @@
             <artifactId>metersphere-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>io.metersphere</groupId>
-            <artifactId>metersphere-sdk</artifactId>
-            <version>${revision}</version>
-            <classifier>tests</classifier>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>

backend/services/system-setting/src/main/java/io/metersphere/system/config/I18nConfig.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 import io.metersphere.sdk.util.CommonBeanFactory;
 import io.metersphere.sdk.util.Translator;

backend/services/system-setting/src/main/java/io/metersphere/system/config/ModuleOpenApiConfig.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;

backend/services/system-setting/src/main/java/io/metersphere/system/config/MybatisConfig.java

@@ -1,10 +1,10 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 import com.fit2cloud.quartz.anno.QuartzDataSource;
 import com.github.pagehelper.PageInterceptor;
 import com.zaxxer.hikari.HikariDataSource;
-import io.metersphere.sdk.interceptor.MybatisInterceptor;
+import io.metersphere.system.interceptor.MybatisInterceptor;
-import io.metersphere.sdk.interceptor.UserDesensitizationInterceptor;
+import io.metersphere.system.interceptor.UserDesensitizationInterceptor;
 import io.metersphere.sdk.util.MybatisInterceptorConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;

backend/services/system-setting/src/main/java/io/metersphere/system/config/OpenApiConfig.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 
 import io.metersphere.sdk.constants.SessionConstants;

backend/services/system-setting/src/main/java/io/metersphere/system/config/PermissionConfig.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 import io.metersphere.sdk.dto.PermissionDefinitionItem;
 import io.metersphere.sdk.util.JSON;

backend/services/system-setting/src/main/java/io/metersphere/system/config/RsaConfig.java

@@ -1,10 +1,10 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 
 import io.metersphere.sdk.file.FileCenter;
 import io.metersphere.sdk.file.FileRepository;
 import io.metersphere.sdk.file.FileRequest;
-import io.metersphere.sdk.log.constants.OperationLogModule;
+import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.sdk.util.RsaKey;
 import io.metersphere.sdk.util.RsaUtil;
 import org.apache.commons.lang3.SerializationUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/config/ScheduleConfig.java

@@ -1,7 +1,7 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
-import io.metersphere.sdk.sechedule.BaseScheduleService;
+import io.metersphere.system.sechedule.BaseScheduleService;
-import io.metersphere.sdk.sechedule.ScheduleManager;
+import io.metersphere.system.sechedule.ScheduleManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

backend/services/system-setting/src/main/java/io/metersphere/system/config/SessionConfig.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 
 import com.fit2cloud.quartz.anno.QuartzScheduled;

backend/services/system-setting/src/main/java/io/metersphere/system/config/ShiroConfig.java

@@ -1,11 +1,11 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 
-import io.metersphere.sdk.security.ApiKeyFilter;
+import io.metersphere.system.security.ApiKeyFilter;
-import io.metersphere.sdk.security.CsrfFilter;
+import io.metersphere.system.security.CsrfFilter;
-import io.metersphere.sdk.security.MsPermissionAnnotationMethodInterceptor;
+import io.metersphere.system.security.MsPermissionAnnotationMethodInterceptor;
-import io.metersphere.sdk.security.TotpFilter;
+import io.metersphere.system.security.TotpFilter;
-import io.metersphere.sdk.security.realm.LocalRealm;
+import io.metersphere.system.security.realm.LocalRealm;
 import io.metersphere.sdk.util.FilterChainUtils;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;

backend/services/system-setting/src/main/java/io/metersphere/system/config/TOTPConfig.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config;
+package io.metersphere.system.config;
 
 import com.bastiaanjansen.otp.HMACAlgorithm;
 import com.bastiaanjansen.otp.TOTPGenerator;

backend/services/system-setting/src/main/java/io/metersphere/system/config/interceptor/ApiTestInterceptor.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config.interceptor;
+package io.metersphere.system.config.interceptor;
 
 import io.metersphere.api.domain.*;
 import io.metersphere.sdk.util.CompressUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/config/interceptor/LoadTestInterceptor.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config.interceptor;
+package io.metersphere.system.config.interceptor;
 
 import io.metersphere.load.domain.*;
 import io.metersphere.sdk.util.CompressUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/config/interceptor/ProjectInterceptor.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config.interceptor;
+package io.metersphere.system.config.interceptor;
 
 import io.metersphere.project.domain.CustomFunctionBlob;
 import io.metersphere.project.domain.FileMetadataBlob;

backend/services/system-setting/src/main/java/io/metersphere/system/config/interceptor/SdkInterceptor.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config.interceptor;
+package io.metersphere.system.config.interceptor;
 
 import io.metersphere.sdk.domain.OperationLogBlob;
 import io.metersphere.sdk.util.CompressUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/config/interceptor/SystemInterceptor.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config.interceptor;
+package io.metersphere.system.config.interceptor;
 
 import io.metersphere.sdk.util.CompressUtils;
 import io.metersphere.sdk.util.MybatisInterceptorConfig;

backend/services/system-setting/src/main/java/io/metersphere/system/config/interceptor/UiInterceptor.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.config.interceptor;
+package io.metersphere.system.config.interceptor;
 
 import io.metersphere.load.domain.*;
 import io.metersphere.sdk.util.CompressUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/AuthSourceController.java

@@ -4,11 +4,11 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.BasePageRequest;
-import io.metersphere.sdk.ldap.service.LdapService;
+import io.metersphere.system.ldap.service.LdapService;
-import io.metersphere.sdk.ldap.vo.LdapLoginRequest;
+import io.metersphere.system.ldap.vo.LdapLoginRequest;
-import io.metersphere.sdk.ldap.vo.LdapRequest;
+import io.metersphere.system.ldap.vo.LdapRequest;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.system.domain.AuthSource;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/GlobalUserRoleController.java

@@ -4,8 +4,8 @@ import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.PermissionDefinitionItem;
 import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
 import io.metersphere.sdk.dto.request.UserRoleUpdateRequest;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.system.domain.UserRole;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/GlobalUserRoleRelationController.java

@@ -6,8 +6,8 @@ import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.UserExcludeOptionDTO;
 import io.metersphere.sdk.dto.UserRoleRelationUserDTO;
 import io.metersphere.sdk.dto.request.GlobalUserRoleRelationUpdateRequest;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/LicenseController.java

@@ -1,8 +1,8 @@
-package io.metersphere.sdk.controller;
+package io.metersphere.system.controller;
 
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.LicenseDTO;
-import io.metersphere.sdk.service.LicenseService;
+import io.metersphere.system.service.LicenseService;
 import io.metersphere.sdk.util.CommonBeanFactory;
 import io.metersphere.sdk.util.SessionUtils;
 import io.swagger.v3.oas.annotations.Operation;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/LoginController.java

@@ -1,16 +1,16 @@
-package io.metersphere.sdk.controller;
+package io.metersphere.system.controller;
 
 
 import io.metersphere.sdk.constants.HttpMethodConstants;
 import io.metersphere.sdk.constants.UserSource;
-import io.metersphere.sdk.controller.handler.ResultHolder;
+import io.metersphere.system.controller.handler.ResultHolder;
-import io.metersphere.sdk.controller.handler.result.MsHttpResultCode;
+import io.metersphere.system.controller.handler.result.MsHttpResultCode;
 import io.metersphere.sdk.dto.LoginRequest;
 import io.metersphere.sdk.dto.SessionUser;
 import io.metersphere.sdk.dto.UserDTO;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.service.BaseUserService;
+import io.metersphere.system.service.BaseUserService;
 import io.metersphere.sdk.util.RsaKey;
 import io.metersphere.sdk.util.RsaUtil;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/NotificationController.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.controller;
+package io.metersphere.system.controller;
 
 
 import com.github.pagehelper.Page;
@@ -6,7 +6,7 @@ import com.github.pagehelper.PageHelper;
 
 import io.metersphere.project.domain.Notification;
 import io.metersphere.sdk.dto.request.NotificationRequest;
-import io.metersphere.sdk.service.NotificationService;
+import io.metersphere.system.service.NotificationService;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OperationLogController.java

@@ -4,9 +4,9 @@ package io.metersphere.system.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.log.service.OperationLogService;
+import io.metersphere.system.log.service.OperationLogService;
-import io.metersphere.sdk.log.vo.OperationLogRequest;
+import io.metersphere.system.log.vo.OperationLogRequest;
-import io.metersphere.sdk.log.vo.OperationLogResponse;
+import io.metersphere.system.log.vo.OperationLogResponse;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.system.domain.User;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java

@@ -4,8 +4,8 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.OptionDTO;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationCustomFieldController.java

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

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationLogController.java

@@ -4,9 +4,9 @@ package io.metersphere.system.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.log.service.OperationLogService;
+import io.metersphere.system.log.service.OperationLogService;
-import io.metersphere.sdk.log.vo.OperationLogRequest;
+import io.metersphere.system.log.vo.OperationLogRequest;
-import io.metersphere.sdk.log.vo.OperationLogResponse;
+import io.metersphere.system.log.vo.OperationLogResponse;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationProjectController.java

@@ -6,8 +6,8 @@ import com.github.pagehelper.PageHelper;
 import io.metersphere.project.domain.Project;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.*;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationTemplateController.java

@@ -3,8 +3,8 @@ package io.metersphere.system.controller;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.TemplateDTO;
 import io.metersphere.sdk.dto.request.TemplateUpdateRequest;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.system.domain.Template;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationUserRoleController.java

@@ -5,8 +5,8 @@ import com.github.pagehelper.PageHelper;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.PermissionDefinitionItem;
 import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/PluginController.java

@@ -1,8 +1,8 @@
 package io.metersphere.system.controller;
 
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.system.domain.Plugin;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/ServiceIntegrationController.java

@@ -1,8 +1,8 @@
 package io.metersphere.system.controller;
 
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+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;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemParameterController.java

@@ -4,9 +4,9 @@ package io.metersphere.system.controller;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.BaseSystemConfigDTO;
 import io.metersphere.sdk.dto.EMailInfoDto;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.service.SystemParameterService;
+import io.metersphere.system.service.SystemParameterService;
 import io.metersphere.system.domain.SystemParameter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemProjectController.java

@@ -6,8 +6,8 @@ import com.github.pagehelper.PageHelper;
 import io.metersphere.project.domain.Project;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.*;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/TestResourcePoolController.java

@@ -7,9 +7,9 @@ import io.metersphere.sdk.dto.QueryResourcePoolRequest;
 import io.metersphere.sdk.dto.TestResourcePoolDTO;
 import io.metersphere.sdk.dto.TestResourcePoolRequest;
 import io.metersphere.sdk.dto.TestResourcePoolReturnDTO;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.service.TestResourcePoolService;
+import io.metersphere.system.service.TestResourcePoolService;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java

@@ -7,8 +7,8 @@ import io.metersphere.project.domain.Project;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.UserSource;
 import io.metersphere.sdk.dto.*;
-import io.metersphere.sdk.log.annotation.Log;
+import io.metersphere.system.log.annotation.Log;
-import io.metersphere.sdk.log.constants.OperationLogType;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.PageUtils;
 import io.metersphere.sdk.util.Pager;
 import io.metersphere.sdk.util.SessionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/environment/EnvironmentController.java

@@ -1,11 +1,11 @@
-package io.metersphere.sdk.controller.environment;
+package io.metersphere.system.controller.environment;
 
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.domain.Environment;
 import io.metersphere.sdk.dto.OptionDTO;
 import io.metersphere.sdk.dto.environment.EnvironmentConfigRequest;
 import io.metersphere.sdk.dto.environment.dataSource.DataSource;
-import io.metersphere.sdk.service.environment.EnvironmentService;
+import io.metersphere.system.service.environment.EnvironmentService;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.validation.groups.Created;
 import io.swagger.v3.oas.annotations.Operation;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/environment/GlobalParamsController.java

@@ -1,8 +1,8 @@
-package io.metersphere.sdk.controller.environment;
+package io.metersphere.system.controller.environment;
 
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.environment.GlobalParamsRequest;
-import io.metersphere.sdk.service.environment.GlobalParamsService;
+import io.metersphere.system.service.environment.GlobalParamsService;
 import io.metersphere.sdk.util.SessionUtils;
 import io.metersphere.validation.groups.Created;
 import io.metersphere.validation.groups.Updated;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/RestControllerExceptionHandler.java

@@ -1,9 +1,9 @@
-package io.metersphere.sdk.controller.handler;
+package io.metersphere.system.controller.handler;
 
-import io.metersphere.sdk.controller.handler.result.IResultCode;
+import io.metersphere.sdk.exception.IResultCode;
-import io.metersphere.sdk.controller.handler.result.MsHttpResultCode;
+import io.metersphere.system.controller.handler.result.MsHttpResultCode;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.util.ServiceUtils;
+import io.metersphere.system.utils.ServiceUtils;
 import io.metersphere.sdk.util.Translator;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/ResultHolder.java

@@ -1,6 +1,6 @@
-package io.metersphere.sdk.controller.handler;
+package io.metersphere.system.controller.handler;
 
-import io.metersphere.sdk.controller.handler.result.MsHttpResultCode;
+import io.metersphere.system.controller.handler.result.MsHttpResultCode;
 import lombok.Data;
 
 @Data

backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/ResultResponseBodyAdvice.java

@@ -1,6 +1,6 @@
-package io.metersphere.sdk.controller.handler;
+package io.metersphere.system.controller.handler;
 
-import io.metersphere.sdk.controller.handler.annotation.NoResultHolder;
+import io.metersphere.system.controller.handler.annotation.NoResultHolder;
 import io.metersphere.sdk.util.JSON;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;

backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/annotation/NoResultHolder.java

@@ -1,4 +1,4 @@
-package io.metersphere.sdk.controller.handler.annotation;
+package io.metersphere.system.controller.handler.annotation;
 
 import java.lang.annotation.*;
 

backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/result/CommonResultCode.java

@@ -1,4 +1,6 @@
-package io.metersphere.sdk.controller.handler.result;
+package io.metersphere.system.controller.handler.result;
+
+import io.metersphere.sdk.exception.IResultCode;
 
 /**
  * 通用功能状态码

backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/result/MsHttpResultCode.java

@@ -1,4 +1,6 @@
-package io.metersphere.sdk.controller.handler.result;
+package io.metersphere.system.controller.handler.result;
+
+import io.metersphere.sdk.exception.IResultCode;
 
 /**
  * 具有 Http 含义的状态码

backend/services/system-setting/src/main/java/io/metersphere/system/controller/result/SystemResultCode.java

@@ -1,6 +1,6 @@
 package io.metersphere.system.controller.result;
 
-import io.metersphere.sdk.controller.handler.result.IResultCode;
+import io.metersphere.sdk.exception.IResultCode;
 
 /**
  * @author jianxing