chore: Optimize Imports

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

@@ -14,8 +14,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Objects;
-
 @RestController
 @RequestMapping(value = "/api/report/share")
 @Tag(name = "接口测试-接口报告-分享")

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

@@ -1,6 +1,5 @@
 package io.metersphere.api.controller.debug;
 
-import io.metersphere.api.constants.ApiResourceType;
 import io.metersphere.api.domain.ApiDebug;
 import io.metersphere.api.dto.debug.*;
 import io.metersphere.api.dto.request.ApiEditPosRequest;

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.page.PageMethod;
 import io.metersphere.api.constants.ApiResource;
-import io.metersphere.api.constants.ApiResourceType;
 import io.metersphere.api.domain.ApiDefinitionMock;
 import io.metersphere.api.dto.definition.ApiDefinitionMockDTO;
 import io.metersphere.api.dto.definition.ApiMockBatchEditRequest;

backend/services/api-test/src/main/java/io/metersphere/api/listener/MessageListener.java

@@ -7,7 +7,10 @@ import io.metersphere.api.service.ApiReportSendNoticeService;
 import io.metersphere.api.service.definition.ApiTestCaseBatchRunService;
 import io.metersphere.api.service.queue.ApiExecutionQueueService;
 import io.metersphere.api.service.scenario.ApiScenarioBatchRunService;
-import io.metersphere.sdk.constants.*;
+import io.metersphere.sdk.constants.ApiExecuteResourceType;
+import io.metersphere.sdk.constants.ExecStatus;
+import io.metersphere.sdk.constants.KafkaTopicConstants;
+import io.metersphere.sdk.constants.ResultStatus;
 import io.metersphere.sdk.dto.api.notice.ApiNoticeDTO;
 import io.metersphere.sdk.dto.queue.ExecutionQueue;
 import io.metersphere.sdk.dto.queue.ExecutionQueueDetail;

backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java

@@ -10,7 +10,6 @@ import io.metersphere.project.dto.ModuleCountDTO;
 import io.metersphere.project.dto.NodeSortQueryParam;
 import io.metersphere.request.AssociateOtherCaseRequest;
 import io.metersphere.request.TestCasePageProviderRequest;
-import io.metersphere.sdk.dto.AssociateCaseDTO;
 import io.metersphere.system.dto.sdk.BaseTreeNode;
 import org.apache.ibatis.annotations.Param;
 

backend/services/api-test/src/main/java/io/metersphere/api/parser/TestElementParser.java

@@ -1,8 +1,8 @@
 package io.metersphere.api.parser;
 
 
-import io.metersphere.plugin.api.spi.AbstractMsTestElement;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.plugin.api.spi.AbstractMsTestElement;
 
 /**
  * @Author: jianxing

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/body/MsBinaryBodyConverter.java

@@ -1,7 +1,7 @@
 package io.metersphere.api.parser.jmeter.body;
 
-import io.metersphere.api.dto.request.http.body.BinaryBody;
 import io.metersphere.api.dto.ApiFile;
+import io.metersphere.api.dto.request.http.body.BinaryBody;
 import io.metersphere.plugin.api.dto.ParameterConfig;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/MsProcessorConverter.java

@@ -1,8 +1,8 @@
 package io.metersphere.api.parser.jmeter.processor;
 
 
-import io.metersphere.project.api.processor.MsProcessor;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.processor.MsProcessor;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.jorphan.collections.HashTree;
 

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/ScriptPostProcessorConverter.java

@@ -1,7 +1,7 @@
 package io.metersphere.api.parser.jmeter.processor;
 
-import io.metersphere.project.api.processor.ScriptProcessor;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.processor.ScriptProcessor;
 import org.apache.jmeter.extractor.BeanShellPostProcessor;
 import org.apache.jmeter.extractor.JSR223PostProcessor;
 import org.apache.jmeter.testelement.TestElement;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/AssertionConverter.java

@@ -1,9 +1,9 @@
 package io.metersphere.api.parser.jmeter.processor.assertion;
 
-import io.metersphere.project.api.assertion.MsAssertion;
-import io.metersphere.sdk.util.EnumValidator;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.assertion.MsAssertion;
 import io.metersphere.sdk.constants.MsAssertionCondition;
+import io.metersphere.sdk.util.EnumValidator;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.assertions.ResponseAssertion;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseBodyAssertionConverter.java

@@ -1,9 +1,9 @@
 package io.metersphere.api.parser.jmeter.processor.assertion;
 
-import io.metersphere.project.api.assertion.MsResponseBodyAssertion;
 import io.metersphere.api.parser.jmeter.processor.assertion.body.ResponseBodyTypeAssertionConverter;
 import io.metersphere.api.parser.jmeter.processor.assertion.body.ResponseBodyTypeAssertionFactory;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.assertion.MsResponseBodyAssertion;
 import org.apache.jorphan.collections.HashTree;
 
 /**

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseCodeAssertionConverter.java

@@ -1,7 +1,7 @@
 package io.metersphere.api.parser.jmeter.processor.assertion;
 
-import io.metersphere.project.api.assertion.MsResponseCodeAssertion;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.assertion.MsResponseCodeAssertion;
 import io.metersphere.sdk.dto.api.result.ResponseAssertionResult;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.assertions.ResponseAssertion;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseTimeAssertionConverter.java

@@ -1,7 +1,7 @@
 package io.metersphere.api.parser.jmeter.processor.assertion;
 
-import io.metersphere.project.api.assertion.MsResponseTimeAssertion;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.assertion.MsResponseTimeAssertion;
 import io.metersphere.sdk.dto.api.result.ResponseAssertionResult;
 import org.apache.jmeter.assertions.DurationAssertion;
 import org.apache.jmeter.save.SaveService;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java

@@ -1,10 +1,10 @@
 package io.metersphere.api.parser.jmeter.processor.assertion;
 
-import io.metersphere.project.constants.ScriptLanguageType;
-import io.metersphere.project.api.assertion.MsVariableAssertion;
-import io.metersphere.project.api.processor.ScriptProcessor;
 import io.metersphere.api.parser.jmeter.processor.ScriptProcessorConverter;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.assertion.MsVariableAssertion;
+import io.metersphere.project.api.processor.ScriptProcessor;
+import io.metersphere.project.constants.ScriptLanguageType;
 import io.metersphere.sdk.constants.MsAssertionCondition;
 import io.metersphere.sdk.dto.api.result.ResponseAssertionResult;
 import org.apache.commons.lang3.BooleanUtils;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/body/RegexAssertionConverter.java

@@ -1,9 +1,9 @@
 package io.metersphere.api.parser.jmeter.processor.assertion.body;
 
-import io.metersphere.project.api.assertion.body.MsRegexAssertion;
-import io.metersphere.project.api.assertion.body.MsRegexAssertionItem;
 import io.metersphere.api.parser.jmeter.processor.assertion.AssertionConverter;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.assertion.body.MsRegexAssertion;
+import io.metersphere.project.api.assertion.body.MsRegexAssertionItem;
 import io.metersphere.sdk.dto.api.result.ResponseAssertionResult;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.jmeter.assertions.ResponseAssertion;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/body/ResponseBodyTypeAssertionConverter.java

@@ -1,8 +1,8 @@
 package io.metersphere.api.parser.jmeter.processor.assertion.body;
 
 import io.metersphere.api.parser.jmeter.processor.assertion.AssertionConverter;
-import io.metersphere.project.api.assertion.body.MsBodyAssertionItem;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.assertion.body.MsBodyAssertionItem;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jorphan.collections.HashTree;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/body/XPathAssertionConverter.java

@@ -1,9 +1,9 @@
 package io.metersphere.api.parser.jmeter.processor.assertion.body;
 
+import io.metersphere.plugin.api.dto.ParameterConfig;
 import io.metersphere.project.api.assertion.body.MsXPathAssertion;
 import io.metersphere.project.api.assertion.body.MsXPathAssertionItem;
 import io.metersphere.project.api.processor.extract.XPathExtract;
-import io.metersphere.plugin.api.dto.ParameterConfig;
 import io.metersphere.sdk.dto.api.result.ResponseAssertionResult;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/ExtractConverter.java

@@ -1,8 +1,8 @@
 package io.metersphere.api.parser.jmeter.processor.extract;
 
+import io.metersphere.plugin.api.dto.ParameterConfig;
 import io.metersphere.project.api.processor.extract.MsExtract;
 import io.metersphere.project.api.processor.extract.ResultMatchingExtract;
-import io.metersphere.plugin.api.dto.ParameterConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jorphan.collections.HashTree;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/JSONPathExtractConverter.java

@@ -1,7 +1,7 @@
 package io.metersphere.api.parser.jmeter.processor.extract;
 
-import io.metersphere.project.api.processor.extract.JSONPathExtract;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.processor.extract.JSONPathExtract;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.extractor.json.jsonpath.JSONPostProcessor;
 import org.apache.jmeter.save.SaveService;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/RegexExtractConverter.java

@@ -1,7 +1,7 @@
 package io.metersphere.api.parser.jmeter.processor.extract;
 
-import io.metersphere.project.api.processor.extract.RegexExtract;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.processor.extract.RegexExtract;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.extractor.RegexExtractor;
 import org.apache.jmeter.save.SaveService;

backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/XPathExtractConverter.java

@@ -1,7 +1,7 @@
 package io.metersphere.api.parser.jmeter.processor.extract;
 
-import io.metersphere.project.api.processor.extract.XPathExtract;
 import io.metersphere.plugin.api.dto.ParameterConfig;
+import io.metersphere.project.api.processor.extract.XPathExtract;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.extractor.XPath2Extractor;
 import org.apache.jmeter.extractor.XPathExtractor;

backend/services/api-test/src/main/java/io/metersphere/api/parser/step/ApiStepParser.java

@@ -2,14 +2,14 @@ package io.metersphere.api.parser.step;
 
 import io.metersphere.api.domain.ApiDefinitionBlob;
 import io.metersphere.api.domain.ApiScenarioStep;
-import io.metersphere.api.dto.request.http.body.FormDataKV;
-import io.metersphere.project.api.KeyValueParam;
 import io.metersphere.api.dto.request.http.MsHTTPElement;
 import io.metersphere.api.dto.request.http.body.Body;
+import io.metersphere.api.dto.request.http.body.FormDataKV;
 import io.metersphere.api.dto.scenario.ApiScenarioStepCommonDTO;
 import io.metersphere.api.mapper.ApiDefinitionBlobMapper;
 import io.metersphere.api.utils.ApiDataUtils;
 import io.metersphere.plugin.api.spi.AbstractMsTestElement;
+import io.metersphere.project.api.KeyValueParam;
 import io.metersphere.sdk.util.CommonBeanFactory;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -14,7 +14,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Service

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

@@ -1,6 +1,5 @@
 package io.metersphere.api.service;
 
-import io.metersphere.sdk.constants.ApiFileResourceType;
 import io.metersphere.api.domain.ApiFileResource;
 import io.metersphere.api.domain.ApiFileResourceExample;
 import io.metersphere.api.dto.debug.ApiFileResourceUpdateRequest;
@@ -9,8 +8,7 @@ import io.metersphere.api.mapper.ApiFileResourceMapper;
 import io.metersphere.project.dto.filemanagement.FileLogRecord;
 import io.metersphere.project.service.FileAssociationService;
 import io.metersphere.project.service.FileMetadataService;
-import io.metersphere.system.service.CommonFileService;
+import io.metersphere.sdk.constants.ApiFileResourceType;
-import io.metersphere.system.service.FileService;
 import io.metersphere.sdk.constants.DefaultRepositoryDir;
 import io.metersphere.sdk.constants.StorageType;
 import io.metersphere.sdk.exception.MSException;
@@ -20,6 +18,8 @@ import io.metersphere.sdk.file.FileRepository;
 import io.metersphere.sdk.file.FileRequest;
 import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.sdk.util.Translator;
+import io.metersphere.system.service.CommonFileService;
+import io.metersphere.system.service.FileService;
 import io.metersphere.system.uid.IDGenerator;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;

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

@@ -11,7 +11,6 @@ import io.metersphere.project.dto.environment.EnvironmentConfig;
 import io.metersphere.project.mapper.ExtEnvironmentMapper;
 import io.metersphere.project.mapper.ExtProjectMapper;
 import io.metersphere.project.service.EnvironmentService;
-import io.metersphere.system.service.FileService;
 import io.metersphere.project.service.ProjectApplicationService;
 import io.metersphere.sdk.constants.ProjectApplicationType;
 import io.metersphere.sdk.constants.StorageType;
@@ -22,6 +21,7 @@ import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.domain.TestResourcePool;
 import io.metersphere.system.dto.ProtocolDTO;
 import io.metersphere.system.service.ApiPluginService;
+import io.metersphere.system.service.FileService;
 import io.metersphere.system.service.PluginLoadService;
 import io.metersphere.system.utils.ServiceUtils;
 import jakarta.annotation.Resource;

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

@@ -1,6 +1,9 @@
 package io.metersphere.api.service.definition;
 
-import io.metersphere.api.domain.*;
+import io.metersphere.api.domain.ApiDefinitionMock;
+import io.metersphere.api.domain.ApiDefinitionMockConfig;
+import io.metersphere.api.domain.ApiDefinitionMockConfigExample;
+import io.metersphere.api.domain.ApiDefinitionMockExample;
 import io.metersphere.api.dto.definition.ApiDefinitionMockDTO;
 import io.metersphere.api.dto.definition.request.ApiDefinitionMockAddRequest;
 import io.metersphere.api.dto.definition.request.ApiDefinitionMockRequest;

backend/services/api-test/src/main/java/io/metersphere/api/utils/JmeterElementConverterRegister.java

@@ -1,6 +1,9 @@
 package io.metersphere.api.utils;
 
-import io.metersphere.api.parser.jmeter.*;
+import io.metersphere.api.parser.jmeter.MsCommonElementConverter;
+import io.metersphere.api.parser.jmeter.MsHTTPElementConverter;
+import io.metersphere.api.parser.jmeter.MsScenarioConverter;
+import io.metersphere.api.parser.jmeter.MsScriptElementConverter;
 import io.metersphere.api.parser.jmeter.child.MsCsvChildPreConverter;
 import io.metersphere.api.parser.jmeter.controller.MsConstantTimerControllerConverter;
 import io.metersphere.api.parser.jmeter.controller.MsIfControllerConverter;

backend/services/api-test/src/main/java/io/metersphere/api/utils/regex/model/BaseNode.java

@@ -1,6 +1,8 @@
 package io.metersphere.api.utils.regex.model;
 
-import io.metersphere.api.utils.regex.exception.*;
+import io.metersphere.api.utils.regex.exception.RegexpIllegalException;
+import io.metersphere.api.utils.regex.exception.TypeNotMatchException;
+import io.metersphere.api.utils.regex.exception.UninitializedException;
 
 import java.util.ArrayList;
 import java.util.List;

backend/services/api-test/src/main/java/io/metersphere/api/utils/regex/model/LinkNode.java

@@ -1,6 +1,8 @@
 package io.metersphere.api.utils.regex.model;
 
-import io.metersphere.api.utils.regex.exception.*;
+import io.metersphere.api.utils.regex.exception.RegexpIllegalException;
+import io.metersphere.api.utils.regex.exception.TypeNotMatchException;
+import io.metersphere.api.utils.regex.exception.UninitializedException;
 
 import java.util.ArrayList;
 import java.util.Arrays;

backend/services/api-test/src/main/java/io/metersphere/api/utils/regex/model/Node.java

@@ -1,6 +1,8 @@
 package io.metersphere.api.utils.regex.model;
 
-import io.metersphere.api.utils.regex.exception.*;
+import io.metersphere.api.utils.regex.exception.RegexpIllegalException;
+import io.metersphere.api.utils.regex.exception.TypeNotMatchException;
+import io.metersphere.api.utils.regex.exception.UninitializedException;
 
 public interface Node {
 

backend/services/api-test/src/main/java/io/metersphere/api/utils/regex/model/OptionalNode.java

@@ -1,11 +1,12 @@
 package io.metersphere.api.utils.regex.model;
 
-import io.metersphere.api.utils.regex.exception.*;
+import io.metersphere.api.utils.regex.exception.RegexpIllegalException;
+import io.metersphere.api.utils.regex.exception.TypeNotMatchException;
+import io.metersphere.api.utils.regex.exception.UninitializedException;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 public class OptionalNode extends BaseNode {
 

backend/services/api-test/src/main/java/io/metersphere/api/utils/regex/model/OrdinaryNode.java

@@ -1,5 +1,9 @@
 package io.metersphere.api.utils.regex.model;
-import io.metersphere.api.utils.regex.exception.*;
+
+import io.metersphere.api.utils.regex.exception.RegexpIllegalException;
+import io.metersphere.api.utils.regex.exception.TypeNotMatchException;
+import io.metersphere.api.utils.regex.exception.UninitializedException;
+
 import java.util.List;
 
 public class OrdinaryNode extends BaseNode {

backend/services/api-test/src/main/java/io/metersphere/api/utils/regex/model/RepeatNode.java

@@ -1,11 +1,12 @@
 package io.metersphere.api.utils.regex.model;
 
-import io.metersphere.api.utils.regex.exception.*;
+import io.metersphere.api.utils.regex.exception.RegexpIllegalException;
+import io.metersphere.api.utils.regex.exception.TypeNotMatchException;
+import io.metersphere.api.utils.regex.exception.UninitializedException;
 
 import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.List;
-import java.util.Random;
 
 public class RepeatNode extends BaseNode {
 

backend/services/api-test/src/main/java/io/metersphere/api/utils/regex/model/SingleNode.java

@@ -1,11 +1,12 @@
 package io.metersphere.api.utils.regex.model;
 
-import io.metersphere.api.utils.regex.exception.*;
+import io.metersphere.api.utils.regex.exception.RegexpIllegalException;
+import io.metersphere.api.utils.regex.exception.TypeNotMatchException;
+import io.metersphere.api.utils.regex.exception.UninitializedException;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 public class SingleNode extends BaseNode {
 

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

@@ -16,9 +16,6 @@ import io.metersphere.api.dto.request.ApiTransferRequest;
 import io.metersphere.api.dto.request.MsCommonElement;
 import io.metersphere.api.dto.request.http.MsHTTPElement;
 import io.metersphere.api.dto.request.http.RestParam;
-import io.metersphere.project.dto.environment.auth.BasicAuth;
-import io.metersphere.project.dto.environment.auth.DigestAuth;
-import io.metersphere.project.dto.environment.auth.HTTPAuthConfig;
 import io.metersphere.api.dto.request.http.body.*;
 import io.metersphere.api.mapper.ApiDebugBlobMapper;
 import io.metersphere.api.mapper.ApiDebugMapper;
@@ -41,6 +38,9 @@ import io.metersphere.project.domain.ProjectTestResourcePool;
 import io.metersphere.project.domain.ProjectTestResourcePoolExample;
 import io.metersphere.project.dto.CommonScriptInfo;
 import io.metersphere.project.dto.customfunction.request.CustomFunctionRequest;
+import io.metersphere.project.dto.environment.auth.BasicAuth;
+import io.metersphere.project.dto.environment.auth.DigestAuth;
+import io.metersphere.project.dto.environment.auth.HTTPAuthConfig;
 import io.metersphere.project.dto.filemanagement.FileInfo;
 import io.metersphere.project.mapper.ProjectTestResourcePoolMapper;
 import io.metersphere.project.service.CustomFunctionService;

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

@@ -23,6 +23,7 @@ import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.uid.IDGenerator;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -30,7 +31,6 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.apache.commons.lang3.StringUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;

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

@@ -26,13 +26,13 @@ import io.metersphere.system.uid.IDGenerator;
 import io.metersphere.system.uid.NumGenerator;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
-import org.apache.commons.lang3.StringUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;

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

@@ -34,7 +34,10 @@ import io.metersphere.sdk.file.FileCenter;
 import io.metersphere.sdk.file.FileCopyRequest;
 import io.metersphere.sdk.file.FileRepository;
 import io.metersphere.sdk.file.FileRequest;
-import io.metersphere.sdk.util.*;
+import io.metersphere.sdk.util.FileAssociationSourceUtil;
+import io.metersphere.sdk.util.LogUtils;
+import io.metersphere.sdk.util.MsFileUtils;
+import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.mapper.BaseUserMapper;
@@ -42,7 +45,6 @@ import io.metersphere.system.service.CommonFileService;
 import io.metersphere.system.service.FileService;
 import io.metersphere.system.uid.IDGenerator;
 import jakarta.annotation.Resource;
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -13,7 +13,6 @@ import io.metersphere.project.domain.FileAssociationExample;
 import io.metersphere.project.dto.ProjectUserDTO;
 import io.metersphere.project.mapper.FileAssociationMapper;
 import io.metersphere.project.request.ProjectMemberRequest;
-import io.metersphere.system.service.FileService;
 import io.metersphere.project.service.ProjectApplicationService;
 import io.metersphere.project.service.ProjectMemberService;
 import io.metersphere.sdk.constants.DefaultRepositoryDir;
@@ -23,6 +22,7 @@ import io.metersphere.sdk.util.FileAssociationSourceUtil;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.domain.ServiceIntegration;
+import io.metersphere.system.service.FileService;
 import io.metersphere.system.service.PlatformPluginService;
 import io.metersphere.system.service.PluginLoadService;
 import jakarta.annotation.Resource;

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

@@ -20,7 +20,6 @@ import io.metersphere.project.mapper.FileAssociationMapper;
 import io.metersphere.project.mapper.FileMetadataMapper;
 import io.metersphere.project.mapper.ProjectApplicationMapper;
 import io.metersphere.project.mapper.ProjectMapper;
-import io.metersphere.system.service.FileService;
 import io.metersphere.sdk.constants.DefaultRepositoryDir;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.StorageType;
@@ -38,6 +37,7 @@ import io.metersphere.system.dto.sdk.TemplateDTO;
 import io.metersphere.system.dto.sdk.request.PosRequest;
 import io.metersphere.system.mapper.CustomFieldMapper;
 import io.metersphere.system.mapper.ServiceIntegrationMapper;
+import io.metersphere.system.service.FileService;
 import io.metersphere.system.service.PluginService;
 import io.metersphere.system.uid.IDGenerator;
 import io.metersphere.system.utils.Pager;

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

@@ -1,8 +1,8 @@
 package io.metersphere.system.config;
 
-import io.metersphere.system.dto.permission.PermissionDefinitionItem;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.LogUtils;
+import io.metersphere.system.dto.permission.PermissionDefinitionItem;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Bean;

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

@@ -1,7 +1,7 @@
 package io.metersphere.system.config;
 
-import io.metersphere.system.schedule.ScheduleService;
 import io.metersphere.system.schedule.ScheduleManager;
+import io.metersphere.system.schedule.ScheduleService;
 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/interceptor/SystemInterceptor.java

@@ -1,8 +1,8 @@
 package io.metersphere.system.config.interceptor;
 
 import io.metersphere.sdk.util.CompressUtils;
-import io.metersphere.system.utils.MybatisInterceptorConfig;
 import io.metersphere.system.domain.*;
+import io.metersphere.system.utils.MybatisInterceptorConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

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

@@ -1,16 +1,16 @@
 package io.metersphere.system.controller;
 
 import io.metersphere.sdk.constants.PermissionConstants;
+import io.metersphere.sdk.util.BeanUtils;
+import io.metersphere.system.domain.UserRole;
 import io.metersphere.system.dto.permission.PermissionDefinitionItem;
 import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
 import io.metersphere.system.dto.sdk.request.UserRoleUpdateRequest;
 import io.metersphere.system.log.annotation.Log;
 import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.util.BeanUtils;
-import io.metersphere.system.utils.SessionUtils;
-import io.metersphere.system.domain.UserRole;
 import io.metersphere.system.service.GlobalUserRoleLogService;
 import io.metersphere.system.service.GlobalUserRoleService;
+import io.metersphere.system.utils.SessionUtils;
 import io.metersphere.validation.groups.Created;
 import io.metersphere.validation.groups.Updated;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -3,17 +3,17 @@ package io.metersphere.system.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.sdk.constants.PermissionConstants;
+import io.metersphere.system.dto.request.GlobalUserRoleRelationQueryRequest;
+import io.metersphere.system.dto.sdk.request.GlobalUserRoleRelationUpdateRequest;
 import io.metersphere.system.dto.user.UserExcludeOptionDTO;
 import io.metersphere.system.dto.user.UserRoleRelationUserDTO;
-import io.metersphere.system.dto.sdk.request.GlobalUserRoleRelationUpdateRequest;
 import io.metersphere.system.log.annotation.Log;
 import io.metersphere.system.log.constants.OperationLogType;
+import io.metersphere.system.service.GlobalUserRoleRelationLogService;
+import io.metersphere.system.service.GlobalUserRoleRelationService;
 import io.metersphere.system.utils.PageUtils;
 import io.metersphere.system.utils.Pager;
 import io.metersphere.system.utils.SessionUtils;
-import io.metersphere.system.dto.request.GlobalUserRoleRelationQueryRequest;
-import io.metersphere.system.service.GlobalUserRoleRelationLogService;
-import io.metersphere.system.service.GlobalUserRoleRelationService;
 import io.metersphere.validation.groups.Created;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -2,13 +2,12 @@ package io.metersphere.system.controller;
 
 import com.fasterxml.jackson.databind.node.TextNode;
 import io.metersphere.sdk.constants.PermissionConstants;
+import io.metersphere.sdk.util.CommonBeanFactory;
 import io.metersphere.system.dto.sdk.LicenseDTO;
 import io.metersphere.system.service.LicenseService;
-import io.metersphere.sdk.util.CommonBeanFactory;
 import io.metersphere.system.utils.SessionUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;

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

@@ -2,15 +2,15 @@ package io.metersphere.system.controller;
 
 
 import io.metersphere.sdk.constants.PermissionConstants;
+import io.metersphere.sdk.util.BeanUtils;
+import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.dto.sdk.CustomFieldDTO;
 import io.metersphere.system.dto.sdk.request.CustomFieldUpdateRequest;
 import io.metersphere.system.log.annotation.Log;
 import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.util.BeanUtils;
-import io.metersphere.system.utils.SessionUtils;
-import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.service.OrganizationCustomFieldLogService;
 import io.metersphere.system.service.OrganizationCustomFieldService;
+import io.metersphere.system.utils.SessionUtils;
 import io.metersphere.validation.groups.Created;
 import io.metersphere.validation.groups.Updated;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -2,16 +2,16 @@ package io.metersphere.system.controller;
 
 import io.metersphere.plugin.platform.dto.SelectOption;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.system.log.annotation.Log;
-import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.BeanUtils;
-import io.metersphere.system.dto.request.PlatformOptionRequest;
-import io.metersphere.system.utils.SessionUtils;
 import io.metersphere.system.domain.Plugin;
 import io.metersphere.system.dto.PluginDTO;
+import io.metersphere.system.dto.request.PlatformOptionRequest;
 import io.metersphere.system.dto.request.PluginUpdateRequest;
+import io.metersphere.system.log.annotation.Log;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.service.PluginLogService;
 import io.metersphere.system.service.PluginService;
+import io.metersphere.system.utils.SessionUtils;
 import io.metersphere.validation.groups.Created;
 import io.metersphere.validation.groups.Updated;
 import io.swagger.v3.oas.annotations.Operation;

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

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

backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrgUserExtend.java

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

backend/services/system-setting/src/main/java/io/metersphere/system/dto/PluginDTO.java

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

backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/GlobalUserRoleRelationQueryRequest.java

@@ -1,10 +1,10 @@
 package io.metersphere.system.dto.request;
 
+import io.metersphere.system.dto.sdk.BasePageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
-import io.metersphere.system.dto.sdk.BasePageRequest;
 
 /**
  * @author : jianxing

backend/services/system-setting/src/main/java/io/metersphere/system/log/aspect/OperationLogAspect.java

@@ -1,11 +1,11 @@
 package io.metersphere.system.log.aspect;
 
-import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.log.annotation.Log;
-import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.system.log.service.OperationLogService;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.LogUtils;
+import io.metersphere.system.log.annotation.Log;
+import io.metersphere.system.log.constants.OperationLogType;
+import io.metersphere.system.log.dto.LogDTO;
+import io.metersphere.system.log.service.OperationLogService;
 import io.metersphere.system.utils.SessionUtils;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;

backend/services/system-setting/src/main/java/io/metersphere/system/log/service/OperationLogService.java

@@ -12,8 +12,8 @@ import io.metersphere.system.domain.OperationHistoryExample;
 import io.metersphere.system.domain.Organization;
 import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.log.vo.SystemOperationLogRequest;
 import io.metersphere.system.log.vo.OperationLogResponse;
+import io.metersphere.system.log.vo.SystemOperationLogRequest;
 import io.metersphere.system.mapper.*;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/log/vo/BaseOperationLogRequest.java

@@ -10,8 +10,6 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BaseOperationLogRequest extends BasePageRequest {

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

@@ -1,8 +1,8 @@
 package io.metersphere.system.mapper;
 
 
-import io.metersphere.system.log.vo.SystemOperationLogRequest;
 import io.metersphere.system.log.vo.OperationLogResponse;
+import io.metersphere.system.log.vo.SystemOperationLogRequest;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

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

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

@@ -1,7 +1,7 @@
 package io.metersphere.system.mapper;
 
-import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.dto.PluginDTO;
+import io.metersphere.system.dto.sdk.OptionDTO;
 
 import java.util.List;
 

backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/impl/LarkNoticeSender.java

@@ -1,12 +1,12 @@
 package io.metersphere.system.notice.sender.impl;
 
-import io.metersphere.system.notice.Receiver;
-import io.metersphere.system.notice.MessageDetail;
-import io.metersphere.system.notice.NoticeModel;
-import io.metersphere.system.notice.sender.AbstractNoticeSender;
-import io.metersphere.system.notice.utils.LarkClient;
 import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.domain.User;
+import io.metersphere.system.notice.MessageDetail;
+import io.metersphere.system.notice.NoticeModel;
+import io.metersphere.system.notice.Receiver;
+import io.metersphere.system.notice.sender.AbstractNoticeSender;
+import io.metersphere.system.notice.utils.LarkClient;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;

backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/impl/MailNoticeSender.java

@@ -2,15 +2,16 @@ package io.metersphere.system.notice.sender.impl;
 
 
 import io.metersphere.sdk.constants.ParamConstants;
-import io.metersphere.system.notice.MessageDetail;
-import io.metersphere.system.notice.NoticeModel;
-import io.metersphere.system.notice.sender.AbstractNoticeSender;
 import io.metersphere.sdk.util.EncryptUtils;
 import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.domain.SystemParameter;
 import io.metersphere.system.domain.SystemParameterExample;
 import io.metersphere.system.domain.User;
 import io.metersphere.system.mapper.SystemParameterMapper;
+import io.metersphere.system.notice.MessageDetail;
+import io.metersphere.system.notice.NoticeModel;
+import io.metersphere.system.notice.Receiver;
+import io.metersphere.system.notice.sender.AbstractNoticeSender;
 import jakarta.annotation.Resource;
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeMessage;
@@ -19,10 +20,8 @@ import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
-import io.metersphere.system.notice.Receiver;
 import org.springframework.stereotype.Component;
 
-
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;

backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/impl/WebhookNoticeSender.java

@@ -1,13 +1,12 @@
 package io.metersphere.system.notice.sender.impl;
 
 
+import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.notice.MessageDetail;
 import io.metersphere.system.notice.NoticeModel;
 import io.metersphere.system.notice.Receiver;
 import io.metersphere.system.notice.sender.AbstractNoticeSender;
-import io.metersphere.sdk.util.LogUtils;
 import org.apache.commons.collections4.CollectionUtils;
-
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;

backend/services/system-setting/src/main/java/io/metersphere/system/notice/utils/DingClient.java

@@ -3,7 +3,10 @@ package io.metersphere.system.notice.utils;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 public class DingClient {
 

backend/services/system-setting/src/main/java/io/metersphere/system/notice/utils/LarkClient.java

@@ -3,7 +3,9 @@ package io.metersphere.system.notice.utils;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class LarkClient {
 

backend/services/system-setting/src/main/java/io/metersphere/system/notice/utils/WeComClient.java

@@ -3,7 +3,10 @@ package io.metersphere.system.notice.utils;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 public class WeComClient {
 

backend/services/system-setting/src/main/java/io/metersphere/system/security/CsrfFilter.java

@@ -2,9 +2,9 @@ package io.metersphere.system.security;
 
 
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.system.dto.sdk.SessionUser;
 import io.metersphere.sdk.util.CodingUtils;
 import io.metersphere.sdk.util.CommonBeanFactory;
+import io.metersphere.system.dto.sdk.SessionUser;
 import io.metersphere.system.utils.SessionUtils;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;

backend/services/system-setting/src/main/java/io/metersphere/system/security/realm/LocalRealm.java

@@ -3,11 +3,11 @@ package io.metersphere.system.security.realm;
 
 import io.metersphere.sdk.constants.SessionConstants;
 import io.metersphere.sdk.constants.UserSource;
+import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.dto.sdk.SessionUser;
 import io.metersphere.system.dto.user.UserDTO;
-import io.metersphere.system.utils.SessionUtils;
-import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.service.UserLoginService;
+import io.metersphere.system.utils.SessionUtils;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseDisplayService.java

@@ -2,9 +2,9 @@ package io.metersphere.system.service;
 
 import io.metersphere.sdk.constants.DefaultRepositoryDir;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.system.domain.SystemParameter;
 import io.metersphere.sdk.file.FileRequest;
 import io.metersphere.sdk.file.MinioRepository;
+import io.metersphere.system.domain.SystemParameter;
 import io.metersphere.system.mapper.SystemParameterMapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.io.IOUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserRoleRelationService.java

@@ -1,11 +1,11 @@
 package io.metersphere.system.service;
 
-import io.metersphere.system.dto.user.UserExcludeOptionDTO;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.system.mapper.BaseUserRoleRelationMapper;
 import io.metersphere.system.domain.UserRole;
 import io.metersphere.system.domain.UserRoleRelation;
 import io.metersphere.system.domain.UserRoleRelationExample;
+import io.metersphere.system.dto.user.UserExcludeOptionDTO;
+import io.metersphere.system.mapper.BaseUserRoleRelationMapper;
 import io.metersphere.system.mapper.UserRoleMapper;
 import io.metersphere.system.mapper.UserRoleRelationMapper;
 import jakarta.annotation.Resource;

backend/services/system-setting/src/main/java/io/metersphere/system/service/CreateTemplateResourceService.java

@@ -4,10 +4,10 @@ import io.metersphere.project.domain.Project;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.sdk.constants.TemplateScene;
 import io.metersphere.sdk.constants.TemplateScopeType;
-import io.metersphere.sdk.util.LogUtils;
-import io.metersphere.system.dto.sdk.request.TemplateCustomFieldRequest;
 import io.metersphere.sdk.util.BeanUtils;
+import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.domain.*;
+import io.metersphere.system.dto.sdk.request.TemplateCustomFieldRequest;
 import io.metersphere.system.dto.sdk.request.TemplateSystemCustomFieldRequest;
 import io.metersphere.system.resolver.field.AbstractCustomFieldResolver;
 import io.metersphere.system.resolver.field.CustomFieldResolverFactory;

backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleLogService.java

@@ -1,13 +1,13 @@
 package io.metersphere.system.service;
 
 import io.metersphere.sdk.constants.OperationLogConstants;
-import io.metersphere.system.log.dto.LogDTO;
+import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.domain.UserRole;
 import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
 import io.metersphere.system.dto.sdk.request.UserRoleUpdateRequest;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.domain.UserRole;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleRelationLogService.java

@@ -1,16 +1,16 @@
 package io.metersphere.system.service;
 
 import io.metersphere.sdk.constants.OperationLogConstants;
-import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.dto.sdk.OptionDTO;
-import io.metersphere.system.dto.user.UserDTO;
-import io.metersphere.system.dto.sdk.request.GlobalUserRoleRelationUpdateRequest;
-import io.metersphere.system.log.constants.OperationLogModule;
-import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.system.mapper.BaseUserMapper;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.domain.UserRole;
 import io.metersphere.system.domain.UserRoleRelation;
+import io.metersphere.system.dto.sdk.OptionDTO;
+import io.metersphere.system.dto.sdk.request.GlobalUserRoleRelationUpdateRequest;
+import io.metersphere.system.dto.user.UserDTO;
+import io.metersphere.system.log.constants.OperationLogModule;
+import io.metersphere.system.log.constants.OperationLogType;
+import io.metersphere.system.log.dto.LogDTO;
+import io.metersphere.system.mapper.BaseUserMapper;
 import io.metersphere.system.mapper.UserRoleMapper;
 import io.metersphere.system.mapper.UserRoleRelationMapper;
 import jakarta.annotation.Resource;

backend/services/system-setting/src/main/java/io/metersphere/system/service/JdbcDriverPluginService.java

@@ -3,10 +3,10 @@ package io.metersphere.system.service;
 import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.sdk.constants.PluginScenarioType;
 import io.metersphere.sdk.dto.api.task.ApiExecuteFileInfo;
-import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.domain.Plugin;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationCustomFieldLogService.java

@@ -3,12 +3,12 @@ package io.metersphere.system.service;
 import io.metersphere.sdk.constants.OperationLogConstants;
 import io.metersphere.sdk.constants.TemplateScene;
 import io.metersphere.sdk.util.EnumValidator;
-import io.metersphere.system.log.dto.LogDTO;
+import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.dto.sdk.request.CustomFieldUpdateRequest;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.domain.CustomField;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationCustomFieldService.java

@@ -1,14 +1,14 @@
 package io.metersphere.system.service;
 
 import io.metersphere.sdk.constants.TemplateScopeType;
-import io.metersphere.system.dto.sdk.CustomFieldDTO;
-import io.metersphere.system.dto.sdk.request.CustomFieldOptionRequest;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.SubListUtils;
 import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.domain.CustomFieldExample;
 import io.metersphere.system.domain.CustomFieldOption;
+import io.metersphere.system.dto.sdk.CustomFieldDTO;
+import io.metersphere.system.dto.sdk.request.CustomFieldOptionRequest;
 import io.metersphere.system.mapper.BaseProjectMapper;
 import io.metersphere.system.mapper.ExtOrganizationCustomFieldMapper;
 import jakarta.annotation.Resource;

backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationStatusFlowSettingLogService.java

@@ -3,17 +3,17 @@ package io.metersphere.system.service;
 import io.metersphere.sdk.constants.OperationLogConstants;
 import io.metersphere.sdk.constants.TemplateScene;
 import io.metersphere.sdk.util.EnumValidator;
-import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
-import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
-import io.metersphere.system.dto.sdk.request.StatusItemAddRequest;
-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;
 import io.metersphere.system.dto.StatusItemDTO;
+import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemAddRequest;
+import io.metersphere.system.dto.sdk.request.StatusItemUpdateRequest;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
+import io.metersphere.system.log.dto.LogDTO;
 import io.metersphere.system.mapper.StatusItemMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;

backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateLogService.java

@@ -4,13 +4,13 @@ import com.alibaba.excel.util.BooleanUtils;
 import io.metersphere.sdk.constants.OperationLogConstants;
 import io.metersphere.sdk.constants.TemplateScene;
 import io.metersphere.sdk.util.EnumValidator;
-import io.metersphere.system.log.dto.LogDTO;
+import io.metersphere.sdk.util.JSON;
-import io.metersphere.system.dto.sdk.request.TemplateUpdateRequest;
 import io.metersphere.sdk.util.Translator;
+import io.metersphere.system.domain.Template;
+import io.metersphere.system.dto.sdk.request.TemplateUpdateRequest;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.domain.Template;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginLoadService.java

@@ -4,7 +4,6 @@ import io.metersphere.plugin.sdk.spi.MsPlugin;
 import io.metersphere.sdk.constants.DefaultRepositoryDir;
 import io.metersphere.sdk.constants.LocalRepositoryDir;
 import io.metersphere.sdk.constants.StorageType;
-import io.metersphere.system.controller.handler.result.CommonResultCode;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.file.FileCenter;
 import io.metersphere.sdk.file.FileRequest;
@@ -12,6 +11,7 @@ import io.metersphere.sdk.plugin.MsPluginManager;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.sdk.util.MsFileUtils;
+import io.metersphere.system.controller.handler.result.CommonResultCode;
 import io.metersphere.system.domain.Plugin;
 import io.metersphere.system.domain.PluginExample;
 import io.metersphere.system.domain.PluginScript;

backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginLogService.java

@@ -1,15 +1,15 @@
 package io.metersphere.system.service;
 
-import io.metersphere.system.domain.Plugin;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
 import io.metersphere.sdk.constants.OperationLogConstants;
+import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.domain.Plugin;
+import io.metersphere.system.dto.request.PluginUpdateRequest;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.sdk.util.JSON;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import io.metersphere.system.dto.request.PluginUpdateRequest;
 
 /**
  * @author jianxing

backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginOrganizationService.java

@@ -1,8 +1,8 @@
 package io.metersphere.system.service;
 
-import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.domain.PluginOrganization;
 import io.metersphere.system.domain.PluginOrganizationExample;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.mapper.ExtOrganizationMapper;
 import io.metersphere.system.mapper.PluginOrganizationMapper;
 import jakarta.annotation.Resource;

backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginScriptService.java

@@ -1,13 +1,13 @@
 package io.metersphere.system.service;
 
-import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.system.uid.IDGenerator;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.domain.PluginScript;
 import io.metersphere.system.domain.PluginScriptExample;
+import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.mapper.ExtPluginScriptMapper;
 import io.metersphere.system.mapper.PluginScriptMapper;
+import io.metersphere.system.uid.IDGenerator;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationLogService.java

@@ -1,12 +1,12 @@
 package io.metersphere.system.service;
 
 import io.metersphere.sdk.constants.OperationLogConstants;
-import io.metersphere.system.log.dto.LogDTO;
-import io.metersphere.system.log.constants.OperationLogModule;
-import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.domain.ServiceIntegration;
 import io.metersphere.system.dto.request.ServiceIntegrationUpdateRequest;
+import io.metersphere.system.log.constants.OperationLogModule;
+import io.metersphere.system.log.constants.OperationLogType;
+import io.metersphere.system.log.dto.LogDTO;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

backend/services/system-setting/src/main/java/io/metersphere/system/service/TaskCenterService.java

@@ -29,7 +29,6 @@ import io.metersphere.system.log.service.OperationLogService;
 import io.metersphere.system.mapper.*;
 import io.metersphere.system.notice.constants.NoticeConstants;
 import io.metersphere.system.schedule.ApiScheduleNoticeService;
-import io.metersphere.system.schedule.BaseScheduleJob;
 import io.metersphere.system.schedule.ScheduleService;
 import io.metersphere.system.utils.PageUtils;
 import io.metersphere.system.utils.Pager;

backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleService.java

@@ -1,8 +1,8 @@
 package io.metersphere.system.service;
 
-import io.metersphere.system.dto.user.UserExtendDTO;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.system.domain.*;
+import io.metersphere.system.dto.user.UserExtendDTO;
 import io.metersphere.system.mapper.ExtUserMapper;
 import io.metersphere.system.mapper.UserRoleMapper;
 import io.metersphere.system.mapper.UserRoleRelationMapper;

backend/services/system-setting/src/main/java/io/metersphere/system/service/UserToolService.java

@@ -1,9 +1,9 @@
 package io.metersphere.system.service;
 
-import io.metersphere.system.dto.table.TableBatchProcessDTO;
-import io.metersphere.system.mapper.BaseUserMapper;
 import io.metersphere.system.domain.User;
 import io.metersphere.system.domain.UserExample;
+import io.metersphere.system.dto.table.TableBatchProcessDTO;
+import io.metersphere.system.mapper.BaseUserMapper;
 import io.metersphere.system.mapper.UserMapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;

backend/services/system-setting/src/main/java/io/metersphere/system/uid/impl/DefaultUidGenerator.java

@@ -2,10 +2,10 @@
 package io.metersphere.system.uid.impl;
 
 import io.metersphere.sdk.exception.MSException;
+import io.metersphere.sdk.util.LogUtils;
 import io.metersphere.system.uid.BitsAllocator;
 import io.metersphere.system.uid.utils.TimeUtils;
 import io.metersphere.system.uid.worker.WorkerIdAssigner;
-import io.metersphere.sdk.util.LogUtils;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.DisposableBean;

backend/services/system-setting/src/main/java/io/metersphere/system/utils/TreeNodeParseUtils.java

@@ -1,8 +1,8 @@
 package io.metersphere.system.utils;
 
 import io.metersphere.project.domain.Project;
-import io.metersphere.system.dto.sdk.BaseTreeNode;
 import io.metersphere.system.domain.Organization;
+import io.metersphere.system.dto.sdk.BaseTreeNode;
 
 import java.util.ArrayList;
 import java.util.List;

backend/services/system-setting/src/test/java/io/metersphere/system/mock/CreateTestResourceService.java

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

backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiCaseController.java

@@ -9,7 +9,9 @@ import io.metersphere.plan.dto.request.*;
 import io.metersphere.plan.dto.response.TestPlanApiCasePageResponse;
 import io.metersphere.plan.dto.response.TestPlanAssociationResponse;
 import io.metersphere.plan.dto.response.TestPlanOperationResponse;
-import io.metersphere.plan.service.*;
+import io.metersphere.plan.service.TestPlanApiCaseBatchRunService;
+import io.metersphere.plan.service.TestPlanApiCaseLogService;
+import io.metersphere.plan.service.TestPlanApiCaseService;
 import io.metersphere.sdk.constants.HttpMethodConstants;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.dto.api.task.TaskRequestDTO;

backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseLogService.java

@@ -3,10 +3,8 @@ package io.metersphere.plan.service;
 import io.metersphere.api.domain.ApiTestCase;
 import io.metersphere.api.domain.ApiTestCaseExample;
 import io.metersphere.api.mapper.ApiTestCaseMapper;
-import io.metersphere.functional.domain.FunctionalCase;
 import io.metersphere.plan.domain.TestPlanApiCase;
 import io.metersphere.plan.domain.TestPlanApiCaseExample;
-import io.metersphere.plan.domain.TestPlanFunctionalCase;
 import io.metersphere.plan.dto.request.TestPlanApiCaseBatchMoveRequest;
 import io.metersphere.plan.dto.request.TestPlanApiCaseUpdateRequest;
 import io.metersphere.plan.mapper.TestPlanApiCaseMapper;

backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioLogService.java

@@ -2,18 +2,11 @@ package io.metersphere.plan.service;
 
 import io.metersphere.api.domain.ApiScenario;
 import io.metersphere.api.domain.ApiScenarioExample;
-import io.metersphere.api.domain.ApiTestCase;
-import io.metersphere.api.domain.ApiTestCaseExample;
 import io.metersphere.api.mapper.ApiScenarioMapper;
-import io.metersphere.api.mapper.ApiTestCaseMapper;
-import io.metersphere.plan.domain.TestPlanApiCase;
-import io.metersphere.plan.domain.TestPlanApiCaseExample;
 import io.metersphere.plan.domain.TestPlanApiScenario;
 import io.metersphere.plan.domain.TestPlanApiScenarioExample;
 import io.metersphere.plan.dto.request.BaseBatchMoveRequest;
-import io.metersphere.plan.dto.request.TestPlanApiCaseUpdateRequest;
 import io.metersphere.plan.dto.request.TestPlanApiScenarioUpdateRequest;
-import io.metersphere.plan.mapper.TestPlanApiCaseMapper;
 import io.metersphere.plan.mapper.TestPlanApiScenarioMapper;
 import io.metersphere.sdk.constants.HttpMethodConstants;
 import io.metersphere.sdk.util.JSON;

backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java

@@ -14,8 +14,6 @@ import io.metersphere.plan.mapper.*;
 import io.metersphere.plan.utils.CountUtils;
 import io.metersphere.plan.utils.RateCalculateUtils;
 import io.metersphere.plugin.platform.dto.SelectOption;
-import io.metersphere.system.service.CommonFileService;
-import io.metersphere.system.service.FileService;
 import io.metersphere.sdk.constants.*;
 import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.file.FileCenter;
@@ -28,6 +26,8 @@ import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.mapper.BaseUserMapper;
 import io.metersphere.system.mapper.UserMapper;
 import io.metersphere.system.notice.constants.NoticeConstants;
+import io.metersphere.system.service.CommonFileService;
+import io.metersphere.system.service.FileService;
 import io.metersphere.system.service.SimpleUserService;
 import io.metersphere.system.uid.IDGenerator;
 import io.metersphere.system.utils.ServiceUtils;