Ver Fonte

fix: 优化import

wpt há 1 ano atrás
pai
commit
3b1148e371
100 ficheiros alterados com 210 adições e 280 exclusões
  1. 4 4
      api/src/main/java/cn/seecoder/api/DevcloudApiAutoConfiguration.java
  2. 5 5
      api/src/main/java/cn/seecoder/api/docker/impl/DockerApiImpl.java
  3. 1 1
      api/src/main/java/cn/seecoder/api/k8s/SecretApi.java
  4. 4 4
      api/src/main/java/cn/seecoder/api/k8s/impl/ConfigMapApiImpl.java
  5. 5 5
      api/src/main/java/cn/seecoder/api/k8s/impl/DeploymentApiImpl.java
  6. 1 1
      api/src/main/java/cn/seecoder/api/k8s/impl/ExecApiImpl.java
  7. 5 5
      api/src/main/java/cn/seecoder/api/k8s/impl/IngressApiImpl.java
  8. 0 2
      api/src/main/java/cn/seecoder/api/k8s/impl/JobApiImpl.java
  9. 2 2
      api/src/main/java/cn/seecoder/api/k8s/impl/LogApiImpl.java
  10. 1 1
      api/src/main/java/cn/seecoder/api/k8s/impl/NamespaceApiImpl.java
  11. 5 5
      api/src/main/java/cn/seecoder/api/k8s/impl/PersistentVolumeClaimImpl.java
  12. 5 5
      api/src/main/java/cn/seecoder/api/k8s/impl/PodApiImpl.java
  13. 2 2
      api/src/main/java/cn/seecoder/api/k8s/impl/SecretApiImpl.java
  14. 4 4
      api/src/main/java/cn/seecoder/api/k8s/impl/ServiceApiImpl.java
  15. 1 1
      api/src/main/java/cn/seecoder/api/k8s/impl/WatchApiImpl.java
  16. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/Namespace.java
  17. 1 1
      api/src/main/java/cn/seecoder/api/k8s/vo/SecretVO.java
  18. 2 2
      common/src/main/java/cn/seecoder/common/CommonAutoConfiguration.java
  19. 0 1
      common/src/main/java/cn/seecoder/common/util/LogTrackingUtil.java
  20. 0 1
      web/src/main/java/cn/seecoder/web/DevcloudWebApplication.java
  21. 1 1
      web/src/main/java/cn/seecoder/web/controller/InterfaceTest/InterfaceTestController.java
  22. 4 1
      web/src/main/java/cn/seecoder/web/controller/auto_test/AutoTestController.java
  23. 5 5
      web/src/main/java/cn/seecoder/web/controller/bug_list/BugListController.java
  24. 4 3
      web/src/main/java/cn/seecoder/web/controller/code_review/CodeReviewController.java
  25. 0 4
      web/src/main/java/cn/seecoder/web/controller/code_review/CommentController.java
  26. 3 1
      web/src/main/java/cn/seecoder/web/controller/commit/CommitController.java
  27. 1 1
      web/src/main/java/cn/seecoder/web/controller/commit/CommitLinkController.java
  28. 4 4
      web/src/main/java/cn/seecoder/web/controller/func_test/FuncTestController.java
  29. 5 5
      web/src/main/java/cn/seecoder/web/controller/pipeline/DeploymentController.java
  30. 4 4
      web/src/main/java/cn/seecoder/web/controller/pipeline/PipelineController.java
  31. 1 1
      web/src/main/java/cn/seecoder/web/controller/pipeline/StageController.java
  32. 5 6
      web/src/main/java/cn/seecoder/web/controller/project/ProjectController.java
  33. 3 4
      web/src/main/java/cn/seecoder/web/controller/tree/TreeNodesController.java
  34. 2 2
      web/src/main/java/cn/seecoder/web/core/pipeline/PipelineFactory.java
  35. 0 1
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/ApiTestHandler.java
  36. 3 5
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/JavaImageBuildHandler.java
  37. 4 4
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sDeploymentHandler.java
  38. 4 4
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sIngressHandler.java
  39. 0 1
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sJobHandler.java
  40. 4 4
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sNamespaceHandler.java
  41. 4 4
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sServiceHandler.java
  42. 3 3
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/NodeImageBuildHandler.java
  43. 1 1
      web/src/main/java/cn/seecoder/web/core/pipeline/pipeline/PipelineImpl.java
  44. 2 2
      web/src/main/java/cn/seecoder/web/dao/APITest/APITestMapper.java
  45. 2 3
      web/src/main/java/cn/seecoder/web/dao/bug_list/BugListMapper.java
  46. 0 1
      web/src/main/java/cn/seecoder/web/dao/code_review/CommentMapper.java
  47. 0 1
      web/src/main/java/cn/seecoder/web/dao/code_review/FileReviewMapper.java
  48. 0 1
      web/src/main/java/cn/seecoder/web/dao/code_review/InspectionResultMapper.java
  49. 2 2
      web/src/main/java/cn/seecoder/web/dao/commit/CommitMapper.java
  50. 0 1
      web/src/main/java/cn/seecoder/web/dao/commit/CommitQualityMapper.java
  51. 2 2
      web/src/main/java/cn/seecoder/web/dao/func_test/FuncTestCaseMapper.java
  52. 2 2
      web/src/main/java/cn/seecoder/web/dao/func_test/FuncTestStepMapper.java
  53. 2 2
      web/src/main/java/cn/seecoder/web/dao/pipeline/DeploymentMapper.java
  54. 1 1
      web/src/main/java/cn/seecoder/web/dao/pipeline/PipelineMapper.java
  55. 1 1
      web/src/main/java/cn/seecoder/web/dao/pipeline/PipelineRecordMapper.java
  56. 3 3
      web/src/main/java/cn/seecoder/web/dao/pipeline/StageMapper.java
  57. 4 1
      web/src/main/java/cn/seecoder/web/dao/provider/GeneralInsertUpdateSqlProvider.java
  58. 1 1
      web/src/main/java/cn/seecoder/web/dao/user/UserMapper.java
  59. 1 1
      web/src/main/java/cn/seecoder/web/infrastructure/GlobalExceptionHandler.java
  60. 0 2
      web/src/main/java/cn/seecoder/web/infrastructure/config/WebSecurityConfig.java
  61. 3 3
      web/src/main/java/cn/seecoder/web/infrastructure/security/JwtAuthenticationTokenFilter.java
  62. 0 1
      web/src/main/java/cn/seecoder/web/model/po/APITest/APITestBody.java
  63. 0 4
      web/src/main/java/cn/seecoder/web/model/po/APITest/TestInfo.java
  64. 0 2
      web/src/main/java/cn/seecoder/web/model/po/InterfaceTest/InterfaceTestInfo.java
  65. 1 1
      web/src/main/java/cn/seecoder/web/model/po/commit/CommitPO.java
  66. 4 1
      web/src/main/java/cn/seecoder/web/model/po/project/ProjectRelatedPO.java
  67. 2 3
      web/src/main/java/cn/seecoder/web/model/po/tree/TreeNodePO.java
  68. 2 2
      web/src/main/java/cn/seecoder/web/model/po/user/UserPO.java
  69. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestBodyVO.java
  70. 1 2
      web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestInfoVO.java
  71. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/APITest/TestResultVO.java
  72. 0 1
      web/src/main/java/cn/seecoder/web/model/vo/code_review/CodeReviewCreateVO.java
  73. 0 2
      web/src/main/java/cn/seecoder/web/model/vo/code_review/CommentCreateVO.java
  74. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/pipeline/PipelineInfoVO.java
  75. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeCreateVO.java
  76. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeUpdateBasicVO.java
  77. 5 5
      web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeVO.java
  78. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/user/UserVO.java
  79. 0 2
      web/src/main/java/cn/seecoder/web/service/code_review/BranchReviewService.java
  80. 1 1
      web/src/main/java/cn/seecoder/web/service/code_review/FileReviewService.java
  81. 1 1
      web/src/main/java/cn/seecoder/web/service/commit/CommitLinkService.java
  82. 0 4
      web/src/main/java/cn/seecoder/web/service/commit/CommitService.java
  83. 7 3
      web/src/main/java/cn/seecoder/web/service/impl/InterfaceTest/InterfaceTestServiceImpl.java
  84. 0 1
      web/src/main/java/cn/seecoder/web/service/impl/auto_test/AutoTestServiceImpl.java
  85. 5 10
      web/src/main/java/cn/seecoder/web/service/impl/code_review/BranchReviewServiceImpl.java
  86. 0 9
      web/src/main/java/cn/seecoder/web/service/impl/code_review/FileReviewServiceImpl.java
  87. 1 1
      web/src/main/java/cn/seecoder/web/service/impl/commit/CommitLinkServiceImpl.java
  88. 2 21
      web/src/main/java/cn/seecoder/web/service/impl/commit/CommitServiceImpl.java
  89. 12 12
      web/src/main/java/cn/seecoder/web/service/impl/pipeline/DeploymentServiceImpl.java
  90. 1 5
      web/src/main/java/cn/seecoder/web/service/impl/sql/SqlServiceImpl.java
  91. 8 5
      web/src/main/java/cn/seecoder/web/service/impl/tree/TreeNodeServiceImpl.java
  92. 2 2
      web/src/main/java/cn/seecoder/web/service/impl/user/UserServiceImpl.java
  93. 1 1
      web/src/main/java/cn/seecoder/web/service/pipeline/DeploymentService.java
  94. 1 1
      web/src/main/java/cn/seecoder/web/service/pipeline/PipelineService.java
  95. 1 1
      web/src/main/java/cn/seecoder/web/service/project/ProjectService.java
  96. 2 4
      web/src/main/java/cn/seecoder/web/service/tree/TreeNodeService.java
  97. 0 8
      web/src/main/java/cn/seecoder/web/service/user/UserService.java
  98. 1 1
      web/src/test/java/cn/seecoder/web/DevcloudWebApplicationTests.java
  99. 0 2
      web/src/test/java/cn/seecoder/web/dao/commit/CommitQualityMapperTest.java
  100. 2 2
      web/src/test/java/cn/seecoder/web/dao/pipeline/PipelineMapperTest.java

+ 4 - 4
api/src/main/java/cn/seecoder/api/DevcloudApiAutoConfiguration.java

@@ -1,5 +1,9 @@
 package cn.seecoder.api;
 
+import cn.seecoder.api.docker.DockerApi;
+import cn.seecoder.api.docker.impl.DockerApiImpl;
+import cn.seecoder.api.git.GitApi;
+import cn.seecoder.api.git.impl.GitApiImpl;
 import cn.seecoder.api.k8s.*;
 import cn.seecoder.api.k8s.impl.*;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
@@ -8,10 +12,6 @@ import com.spotify.docker.client.exceptions.DockerCertificateException;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import cn.seecoder.api.docker.DockerApi;
-import cn.seecoder.api.docker.impl.DockerApiImpl;
-import cn.seecoder.api.git.GitApi;
-import cn.seecoder.api.git.impl.GitApiImpl;
 
 
 /**

+ 5 - 5
api/src/main/java/cn/seecoder/api/docker/impl/DockerApiImpl.java

@@ -2,8 +2,11 @@ package cn.seecoder.api.docker.impl;
 
 
 import cn.seecoder.api.ApplicationProperties;
-import com.spotify.docker.client.*;
-import com.spotify.docker.client.auth.ConfigFileRegistryAuthSupplier;
+import cn.seecoder.api.docker.DockerApi;
+import com.spotify.docker.client.DefaultDockerClient;
+import com.spotify.docker.client.DockerCertificates;
+import com.spotify.docker.client.DockerClient;
+import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.auth.FixedRegistryAuthSupplier;
 import com.spotify.docker.client.auth.RegistryAuthSupplier;
 import com.spotify.docker.client.exceptions.DockerCertificateException;
@@ -12,13 +15,10 @@ import com.spotify.docker.client.messages.Image;
 import com.spotify.docker.client.messages.ProgressMessage;
 import com.spotify.docker.client.messages.RegistryAuth;
 import com.spotify.docker.client.messages.RegistryConfigs;
-import lombok.extern.apachecommons.CommonsLog;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Component;
-import cn.seecoder.api.docker.DockerApi;
 
 import java.io.File;
 import java.io.IOException;

+ 1 - 1
api/src/main/java/cn/seecoder/api/k8s/SecretApi.java

@@ -1,7 +1,7 @@
 package cn.seecoder.api.k8s;
 
-import cn.seecoder.api.k8s.vo.SecretVO;
 import cn.seecoder.api.k8s.util.SecretTypeEnum;
+import cn.seecoder.api.k8s.vo.SecretVO;
 
 import java.util.List;
 import java.util.Map;

+ 4 - 4
api/src/main/java/cn/seecoder/api/k8s/impl/ConfigMapApiImpl.java

@@ -1,8 +1,12 @@
 package cn.seecoder.api.k8s.impl;
 
 
+import cn.seecoder.api.k8s.ConfigMapApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
 import cn.seecoder.api.k8s.model.ConfigMap;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.LabelSelector;
+import cn.seecoder.common.util.LoggerUtil;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -13,10 +17,6 @@ import io.kubernetes.client.openapi.models.V1DeleteOptionsBuilder;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.ConfigMapApi;
-import cn.seecoder.api.k8s.exception.K8sApiException;
-import cn.seecoder.api.k8s.model.K8sObjectRequest;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 5 - 5
api/src/main/java/cn/seecoder/api/k8s/impl/DeploymentApiImpl.java

@@ -1,8 +1,13 @@
 package cn.seecoder.api.k8s.impl;
 
 
+import cn.seecoder.api.k8s.DeploymentApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.Deployment;
+import cn.seecoder.api.k8s.model.DeploymentStatus;
 import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.LabelSelector;
+import cn.seecoder.common.util.LoggerUtil;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.AppsV1Api;
@@ -13,11 +18,6 @@ import io.kubernetes.client.openapi.models.V1DeploymentList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.DeploymentApi;
-import cn.seecoder.api.k8s.exception.K8sApiException;
-import cn.seecoder.api.k8s.model.Deployment;
-import cn.seecoder.api.k8s.model.DeploymentStatus;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 1 - 1
api/src/main/java/cn/seecoder/api/k8s/impl/ExecApiImpl.java

@@ -3,12 +3,12 @@ package cn.seecoder.api.k8s.impl;
 
 import cn.seecoder.api.k8s.ExecApi;
 import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.common.util.LoggerUtil;
 import io.kubernetes.client.Exec;
 import io.kubernetes.client.openapi.ApiException;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.io.IOException;
 import java.util.List;

+ 5 - 5
api/src/main/java/cn/seecoder/api/k8s/impl/IngressApiImpl.java

@@ -1,6 +1,11 @@
 package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.IngressApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.Ingress;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.LabelSelector;
+import cn.seecoder.common.util.LoggerUtil;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.ExtensionsV1beta1Api;
@@ -11,11 +16,6 @@ import io.kubernetes.client.openapi.models.V1DeleteOptionsBuilder;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.IngressApi;
-import cn.seecoder.api.k8s.exception.K8sApiException;
-import cn.seecoder.api.k8s.model.Ingress;
-import cn.seecoder.api.k8s.model.K8sObjectRequest;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 0 - 2
api/src/main/java/cn/seecoder/api/k8s/impl/JobApiImpl.java

@@ -4,10 +4,8 @@ import cn.seecoder.api.k8s.JobApi;
 import cn.seecoder.api.k8s.exception.K8sApiException;
 import cn.seecoder.api.k8s.model.Job;
 import cn.seecoder.api.k8s.model.K8sObjectRequest;
-
 import cn.seecoder.api.k8s.model.LabelSelector;
 import cn.seecoder.common.util.LoggerUtil;
-import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.BatchV1Api;
 import io.kubernetes.client.openapi.models.V1DeleteOptions;

+ 2 - 2
api/src/main/java/cn/seecoder/api/k8s/impl/LogApiImpl.java

@@ -2,14 +2,14 @@ package cn.seecoder.api.k8s.impl;
 
 
 import cn.seecoder.api.k8s.K8sConstants;
+import cn.seecoder.api.k8s.LogApi;
 import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.common.util.LoggerUtil;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.LogApi;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.time.LocalDateTime;
 

+ 1 - 1
api/src/main/java/cn/seecoder/api/k8s/impl/NamespaceApiImpl.java

@@ -6,6 +6,7 @@ import cn.seecoder.api.k8s.exception.K8sApiException;
 import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.LabelSelector;
 import cn.seecoder.api.k8s.model.Namespace;
+import cn.seecoder.common.util.LoggerUtil;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -16,7 +17,6 @@ import io.kubernetes.client.openapi.models.V1NamespaceList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 5 - 5
api/src/main/java/cn/seecoder/api/k8s/impl/PersistentVolumeClaimImpl.java

@@ -1,7 +1,12 @@
 package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.DeploymentApi;
+import cn.seecoder.api.k8s.PersistentVolumeClaimApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
 import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.LabelSelector;
+import cn.seecoder.api.k8s.model.PersistentVolumeClaim;
+import cn.seecoder.common.util.LoggerUtil;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiException;
@@ -13,11 +18,6 @@ import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.DeploymentApi;
-import cn.seecoder.api.k8s.PersistentVolumeClaimApi;
-import cn.seecoder.api.k8s.exception.K8sApiException;
-import cn.seecoder.api.k8s.model.PersistentVolumeClaim;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 5 - 5
api/src/main/java/cn/seecoder/api/k8s/impl/PodApiImpl.java

@@ -1,6 +1,11 @@
 package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.PodApi;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.LabelSelector;
+import cn.seecoder.api.k8s.model.Namespace;
+import cn.seecoder.api.k8s.model.Pod;
+import cn.seecoder.common.util.LoggerUtil;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -11,11 +16,6 @@ import io.kubernetes.client.openapi.models.V1PodList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.PodApi;
-import cn.seecoder.api.k8s.model.K8sObjectRequest;
-import cn.seecoder.api.k8s.model.Namespace;
-import cn.seecoder.api.k8s.model.Pod;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 2 - 2
api/src/main/java/cn/seecoder/api/k8s/impl/SecretApiImpl.java

@@ -2,8 +2,10 @@ package cn.seecoder.api.k8s.impl;
 
 
 import cn.seecoder.api.k8s.SecretApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
 import cn.seecoder.api.k8s.util.SecretTypeEnum;
 import cn.seecoder.api.k8s.vo.SecretVO;
+import cn.seecoder.common.util.LoggerUtil;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.*;
@@ -11,8 +13,6 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.exception.K8sApiException;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Base64;
 import java.util.HashMap;

+ 4 - 4
api/src/main/java/cn/seecoder/api/k8s/impl/ServiceApiImpl.java

@@ -1,7 +1,11 @@
 package cn.seecoder.api.k8s.impl;
 
 import cn.seecoder.api.k8s.ServiceApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.LabelSelector;
+import cn.seecoder.api.k8s.model.Service;
+import cn.seecoder.common.util.LoggerUtil;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1DeleteOptions;
@@ -10,10 +14,6 @@ import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import cn.seecoder.api.k8s.exception.K8sApiException;
-import cn.seecoder.api.k8s.model.K8sObjectRequest;
-import cn.seecoder.api.k8s.model.Service;
-import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 1 - 1
api/src/main/java/cn/seecoder/api/k8s/impl/WatchApiImpl.java

@@ -1,5 +1,6 @@
 package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.WatchApi;
 import com.google.common.reflect.TypeToken;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
@@ -8,7 +9,6 @@ import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.util.Watch;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.k8s.WatchApi;
 
 import java.io.IOException;
 

+ 1 - 1
api/src/main/java/cn/seecoder/api/k8s/model/Namespace.java

@@ -1,11 +1,11 @@
 package cn.seecoder.api.k8s.model;
 
+import cn.seecoder.common.util.DateUtil;
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1NamespaceBuilder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import cn.seecoder.common.util.DateUtil;
 
 import java.time.LocalDateTime;
 

+ 1 - 1
api/src/main/java/cn/seecoder/api/k8s/vo/SecretVO.java

@@ -1,10 +1,10 @@
 package cn.seecoder.api.k8s.vo;
 
+import cn.seecoder.api.k8s.util.SecretTypeEnum;
 import io.kubernetes.client.openapi.models.V1Secret;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.util.CollectionUtils;
-import cn.seecoder.api.k8s.util.SecretTypeEnum;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;

+ 2 - 2
common/src/main/java/cn/seecoder/common/CommonAutoConfiguration.java

@@ -1,9 +1,9 @@
 package cn.seecoder.common;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import cn.seecoder.common.util.JwtTokenUtil;
 import cn.seecoder.common.util.SpringUtil;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * @author PuHong Weng

+ 0 - 1
common/src/main/java/cn/seecoder/common/util/LogTrackingUtil.java

@@ -4,7 +4,6 @@ import Utils.LogBuilder;
 import client.LogTrackingClient;
 import com.nju.edu.logTracking.enums.SeecSystem;
 import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 
 public class LogTrackingUtil {
 

+ 0 - 1
web/src/main/java/cn/seecoder/web/DevcloudWebApplication.java

@@ -4,7 +4,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Repository;

+ 1 - 1
web/src/main/java/cn/seecoder/web/controller/InterfaceTest/InterfaceTestController.java

@@ -2,6 +2,7 @@ package cn.seecoder.web.controller.InterfaceTest;
 
 import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestInfoVO;
 import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestResultVO;
+import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.service.InterfaceTest.InterfaceTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -9,7 +10,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import cn.seecoder.web.model.vo.Response;
 
 import java.io.IOException;
 import java.util.List;

+ 4 - 1
web/src/main/java/cn/seecoder/web/controller/auto_test/AutoTestController.java

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

+ 5 - 5
web/src/main/java/cn/seecoder/web/controller/bug_list/BugListController.java

@@ -1,15 +1,15 @@
 package cn.seecoder.web.controller.bug_list;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.model.vo.bug_list.BugListCreateVO;
 import cn.seecoder.web.model.vo.bug_list.BugListUpdateBasicVO;
 import cn.seecoder.web.model.vo.bug_list.BugListVO;
 import cn.seecoder.web.service.bug_list.BugListService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 

+ 4 - 3
web/src/main/java/cn/seecoder/web/controller/code_review/CodeReviewController.java

@@ -8,14 +8,15 @@ import cn.seecoder.web.model.vo.code_review.CodeReviewVO;
 import cn.seecoder.web.model.vo.code_review.FileReviewCreateVO;
 import cn.seecoder.web.service.code_review.BranchReviewService;
 import cn.seecoder.web.service.code_review.FileReviewService;
-import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.SeecoderGitlabException;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.gitlab4j.api.GitLabApiException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.List;
 
 /**

+ 0 - 4
web/src/main/java/cn/seecoder/web/controller/code_review/CommentController.java

@@ -2,7 +2,6 @@ package cn.seecoder.web.controller.code_review;
 
 import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.model.vo.code_review.CommentCreateVO;
-import cn.seecoder.web.model.vo.code_review.CommentVO;
 import cn.seecoder.web.service.code_review.CommentService;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import io.swagger.annotations.Api;
@@ -11,9 +10,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
-import java.util.List;
-
 /**
  * @author Zihe Chen
  * @date 2022/1/12

+ 3 - 1
web/src/main/java/cn/seecoder/web/controller/commit/CommitController.java

@@ -10,7 +10,9 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Set;

+ 1 - 1
web/src/main/java/cn/seecoder/web/controller/commit/CommitLinkController.java

@@ -2,9 +2,9 @@ package cn.seecoder.web.controller.commit;
 
 import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.web.model.enums.CommitRelatedEnum;
-import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.model.vo.commit.CommitVO;
+import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 4 - 4
web/src/main/java/cn/seecoder/web/controller/func_test/FuncTestController.java

@@ -1,17 +1,17 @@
 package cn.seecoder.web.controller.func_test;
 
 import cn.seecoder.web.model.enums.FuncTestStepState;
+import cn.seecoder.web.model.vo.Response;
+import cn.seecoder.web.model.vo.func_test.FuncTestCaseVO;
 import cn.seecoder.web.model.vo.func_test.FuncTestRecordVO;
+import cn.seecoder.web.model.vo.func_test.FuncTestStepVO;
+import cn.seecoder.web.service.func_test.FuncTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.func_test.FuncTestCaseVO;
-import cn.seecoder.web.model.vo.func_test.FuncTestStepVO;
-import cn.seecoder.web.service.func_test.FuncTestService;
 
 import java.util.List;
 

+ 5 - 5
web/src/main/java/cn/seecoder/web/controller/pipeline/DeploymentController.java

@@ -1,5 +1,10 @@
 package cn.seecoder.web.controller.pipeline;
 
+import cn.seecoder.common.exceptions.AccessDeniedException;
+import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.model.vo.Response;
+import cn.seecoder.web.model.vo.pipeline.DeploymentInfoVO;
+import cn.seecoder.web.service.pipeline.DeploymentService;
 import cn.seecoder.web.service.user.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -7,11 +12,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import cn.seecoder.common.exceptions.AccessDeniedException;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.pipeline.DeploymentInfoVO;
-import cn.seecoder.web.service.pipeline.DeploymentService;
 
 import java.util.List;
 

+ 4 - 4
web/src/main/java/cn/seecoder/web/controller/pipeline/PipelineController.java

@@ -1,6 +1,10 @@
 package cn.seecoder.web.controller.pipeline;
 
+import cn.seecoder.common.exceptions.AccessDeniedException;
+import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.model.vo.pipeline.*;
+import cn.seecoder.web.service.pipeline.PipelineService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -8,10 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import cn.seecoder.common.exceptions.AccessDeniedException;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.service.pipeline.PipelineService;
 
 import java.util.List;
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/controller/pipeline/StageController.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.controller.pipeline;
 
+import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.model.vo.pipeline.StageVO;
 import cn.seecoder.web.service.pipeline.StageService;
 import io.swagger.annotations.Api;
@@ -8,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import cn.seecoder.web.model.vo.Response;
 
 import java.util.List;
 

+ 5 - 6
web/src/main/java/cn/seecoder/web/controller/project/ProjectController.java

@@ -1,19 +1,18 @@
 package cn.seecoder.web.controller.project;
 
+import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.model.vo.project.ProjectCreateVO;
+import cn.seecoder.web.model.vo.project.ProjectVO;
+import cn.seecoder.web.model.vo.user.UserVO;
+import cn.seecoder.web.service.project.ProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.project.ProjectVO;
-import cn.seecoder.web.model.vo.user.UserVO;
-import cn.seecoder.web.service.project.ProjectService;
 
 import java.util.List;
 

+ 3 - 4
web/src/main/java/cn/seecoder/web/controller/tree/TreeNodesController.java

@@ -1,18 +1,17 @@
 package cn.seecoder.web.controller.tree;
 
 
+import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.model.vo.Response;
 import cn.seecoder.web.model.vo.tree.TreeNodeCreateVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeUpdateBasicVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeVO;
+import cn.seecoder.web.service.tree.TreeNodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.dao.tree.TreeNodeMapper;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.service.tree.TreeNodeService;
 
 import java.util.List;
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/core/pipeline/PipelineFactory.java

@@ -1,13 +1,13 @@
 package cn.seecoder.web.core.pipeline;
 
+import cn.seecoder.web.core.pipeline.config.HandlerConfigTable;
 import cn.seecoder.web.core.pipeline.handler.AbstractHandler;
+import cn.seecoder.web.core.pipeline.pipeline.PipelineImpl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.HttpStatus;
-import cn.seecoder.web.core.pipeline.config.HandlerConfigTable;
-import cn.seecoder.web.core.pipeline.pipeline.PipelineImpl;
 
 import java.util.List;
 

+ 0 - 1
web/src/main/java/cn/seecoder/web/core/pipeline/handler/ApiTestHandler.java

@@ -3,7 +3,6 @@ package cn.seecoder.web.core.pipeline.handler;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
-import cn.seecoder.web.service.APITest.APITestService;
 import cn.seecoder.web.service.InterfaceTest.InterfaceTestService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;

+ 3 - 5
web/src/main/java/cn/seecoder/web/core/pipeline/handler/JavaImageBuildHandler.java

@@ -1,6 +1,9 @@
 package cn.seecoder.web.core.pipeline.handler;
 
 import cn.seecoder.api.ApplicationProperties;
+import cn.seecoder.api.docker.DockerApi;
+import cn.seecoder.api.git.GitApi;
+import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
 import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
@@ -13,11 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpStatus;
 import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.lib.Ref;
-
-import cn.seecoder.api.docker.DockerApi;
-import cn.seecoder.api.git.GitApi;
-import cn.seecoder.common.util.SpringUtil;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;

+ 4 - 4
web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sDeploymentHandler.java

@@ -1,9 +1,5 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.core.pipeline.Context;
-import cn.seecoder.web.core.pipeline.PipelineException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
 import cn.seecoder.api.ApplicationProperties;
 import cn.seecoder.api.k8s.DeploymentApi;
 import cn.seecoder.api.k8s.K8sConstants;
@@ -15,6 +11,10 @@ import cn.seecoder.api.k8s.model.Deployment;
 import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.vo.SecretVO;
 import cn.seecoder.common.util.SpringUtil;
+import cn.seecoder.web.core.pipeline.Context;
+import cn.seecoder.web.core.pipeline.PipelineException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpStatus;
 
 import java.util.Collections;
 import java.util.List;

+ 4 - 4
web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sIngressHandler.java

@@ -1,9 +1,5 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.core.pipeline.Context;
-import cn.seecoder.web.core.pipeline.PipelineException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
 import cn.seecoder.api.ApplicationProperties;
 import cn.seecoder.api.k8s.IngressApi;
 import cn.seecoder.api.k8s.K8sConstants;
@@ -11,6 +7,10 @@ import cn.seecoder.api.k8s.exception.K8sApiException;
 import cn.seecoder.api.k8s.model.Ingress;
 import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.common.util.SpringUtil;
+import cn.seecoder.web.core.pipeline.Context;
+import cn.seecoder.web.core.pipeline.PipelineException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpStatus;
 
 import java.util.Collections;
 import java.util.List;

+ 0 - 1
web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sJobHandler.java

@@ -9,7 +9,6 @@ import cn.seecoder.api.k8s.vo.SecretVO;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
-import io.kubernetes.client.openapi.models.V1JobStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
 

+ 4 - 4
web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sNamespaceHandler.java

@@ -1,15 +1,15 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.core.pipeline.Context;
-import cn.seecoder.web.core.pipeline.PipelineException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
 import cn.seecoder.api.k8s.NamespaceApi;
 import cn.seecoder.api.k8s.SecretApi;
 import cn.seecoder.api.k8s.exception.K8sApiException;
 import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.Namespace;
 import cn.seecoder.common.util.SpringUtil;
+import cn.seecoder.web.core.pipeline.Context;
+import cn.seecoder.web.core.pipeline.PipelineException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpStatus;
 
 import java.util.List;
 

+ 4 - 4
web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sServiceHandler.java

@@ -1,9 +1,5 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.core.pipeline.Context;
-import cn.seecoder.web.core.pipeline.PipelineException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
 import cn.seecoder.api.k8s.K8sConstants;
 import cn.seecoder.api.k8s.ServiceApi;
 import cn.seecoder.api.k8s.exception.K8sApiException;
@@ -11,6 +7,10 @@ import cn.seecoder.api.k8s.model.K8sObjectRequest;
 import cn.seecoder.api.k8s.model.Service;
 import cn.seecoder.api.k8s.model.ServicePort;
 import cn.seecoder.common.util.SpringUtil;
+import cn.seecoder.web.core.pipeline.Context;
+import cn.seecoder.web.core.pipeline.PipelineException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpStatus;
 
 import java.util.Collections;
 import java.util.List;

+ 3 - 3
web/src/main/java/cn/seecoder/web/core/pipeline/handler/NodeImageBuildHandler.java

@@ -1,6 +1,9 @@
 package cn.seecoder.web.core.pipeline.handler;
 
 import cn.seecoder.api.ApplicationProperties;
+import cn.seecoder.api.docker.DockerApi;
+import cn.seecoder.api.git.GitApi;
+import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
 import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
@@ -14,9 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpStatus;
 import org.eclipse.jgit.api.Git;
-import cn.seecoder.api.docker.DockerApi;
-import cn.seecoder.api.git.GitApi;
-import cn.seecoder.common.util.SpringUtil;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;

+ 1 - 1
web/src/main/java/cn/seecoder/web/core/pipeline/pipeline/PipelineImpl.java

@@ -1,8 +1,8 @@
 package cn.seecoder.web.core.pipeline.pipeline;
 
 import cn.seecoder.web.core.pipeline.Context;
-import cn.seecoder.web.core.pipeline.Pipeline;
 import cn.seecoder.web.core.pipeline.Handler;
+import cn.seecoder.web.core.pipeline.Pipeline;
 import cn.seecoder.web.core.pipeline.PipelineException;
 
 /**

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/APITest/APITestMapper.java

@@ -1,10 +1,10 @@
 package cn.seecoder.web.dao.APITest;
 
-import cn.seecoder.web.model.vo.APITest.APITestResultVO;
-import org.apache.ibatis.annotations.*;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.APITest.TestInfo;
 import cn.seecoder.web.model.po.APITest.TestResult;
+import cn.seecoder.web.model.vo.APITest.APITestResultVO;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

+ 2 - 3
web/src/main/java/cn/seecoder/web/dao/bug_list/BugListMapper.java

@@ -1,10 +1,9 @@
 package cn.seecoder.web.dao.bug_list;
 
-import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Repository;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.bug_list.BugListPO;
-import org.springframework.stereotype.Service;
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

+ 0 - 1
web/src/main/java/cn/seecoder/web/dao/code_review/CommentMapper.java

@@ -3,7 +3,6 @@ package cn.seecoder.web.dao.code_review;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.code_review.CommentPO;
 import org.apache.ibatis.annotations.InsertProvider;
-import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 

+ 0 - 1
web/src/main/java/cn/seecoder/web/dao/code_review/FileReviewMapper.java

@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.springframework.stereotype.Repository;
 
-import javax.swing.*;
 import java.util.List;
 
 @Repository

+ 0 - 1
web/src/main/java/cn/seecoder/web/dao/code_review/InspectionResultMapper.java

@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/commit/CommitMapper.java

@@ -1,10 +1,10 @@
 package cn.seecoder.web.dao.commit;
 
+import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.enums.CommitRelatedEnum;
+import cn.seecoder.web.model.po.commit.CommitPO;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
-import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.commit.CommitPO;
 
 import java.util.List;
 

+ 0 - 1
web/src/main/java/cn/seecoder/web/dao/commit/CommitQualityMapper.java

@@ -3,7 +3,6 @@ package cn.seecoder.web.dao.commit;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.commit.CommitQualityPO;
 import org.apache.ibatis.annotations.*;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/func_test/FuncTestCaseMapper.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.dao.func_test;
 
-import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Repository;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.func_test.FuncTestCasePO;
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/func_test/FuncTestStepMapper.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.dao.func_test;
 
-import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Repository;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.func_test.FuncTestStepPO;
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/pipeline/DeploymentMapper.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.dao.pipeline;
 
-import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Repository;
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.pipeline.DeploymentPO;
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/dao/pipeline/PipelineMapper.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.dao.pipeline;
 
+import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
-import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 
 import java.util.List;
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/dao/pipeline/PipelineRecordMapper.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.dao.pipeline;
 
+import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
-import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 
 import java.util.List;
 

+ 3 - 3
web/src/main/java/cn/seecoder/web/dao/pipeline/StageMapper.java

@@ -1,12 +1,12 @@
 package cn.seecoder.web.dao.pipeline;
 
+import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
+import cn.seecoder.web.model.po.pipeline.StageConfigPO;
+import cn.seecoder.web.model.po.pipeline.StagePO;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
-import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.pipeline.StageConfigPO;
-import cn.seecoder.web.model.po.pipeline.StagePO;
 
 import java.util.List;
 

+ 4 - 1
web/src/main/java/cn/seecoder/web/dao/provider/GeneralInsertUpdateSqlProvider.java

@@ -3,7 +3,10 @@ package cn.seecoder.web.dao.provider;
 import org.apache.ibatis.jdbc.SQL;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/dao/user/UserMapper.java

@@ -1,12 +1,12 @@
 package cn.seecoder.web.dao.user;
 
+import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 import cn.seecoder.web.model.po.user.UserPO;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.springframework.stereotype.Repository;
-import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
 
 import java.util.List;
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/infrastructure/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.infrastructure;
 
+import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.web.model.vo.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
@@ -7,7 +8,6 @@ import org.springframework.validation.BindException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import cn.seecoder.common.exceptions.ServiceException;
 
 import javax.validation.ConstraintViolationException;
 

+ 0 - 2
web/src/main/java/cn/seecoder/web/infrastructure/config/WebSecurityConfig.java

@@ -1,7 +1,6 @@
 package cn.seecoder.web.infrastructure.config;
 
 import cn.seecoder.web.infrastructure.security.JwtAuthenticationTokenFilter;
-import cn.seecoder.web.infrastructure.security.WebSecurityConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,7 +14,6 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.CorsUtils;
 
-import static cn.seecoder.web.infrastructure.security.WebSecurityConstants.SEEC_AUTHORITY;
 import static cn.seecoder.web.infrastructure.security.WebSecurityConstants.SEEC_ROLE;
 import static org.springframework.http.HttpMethod.*;
 

+ 3 - 3
web/src/main/java/cn/seecoder/web/infrastructure/security/JwtAuthenticationTokenFilter.java

@@ -1,6 +1,9 @@
 package cn.seecoder.web.infrastructure.security;
 
+import cn.seecoder.common.util.JwtTokenUtil;
+import cn.seecoder.web.model.enums.UserIdentity;
 import cn.seecoder.web.model.po.user.UserPO;
+import cn.seecoder.web.model.vo.Response;
 import io.jsonwebtoken.Claims;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,9 +15,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
-import cn.seecoder.common.util.JwtTokenUtil;
-import cn.seecoder.web.model.enums.UserIdentity;
-import cn.seecoder.web.model.vo.Response;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;

+ 0 - 1
web/src/main/java/cn/seecoder/web/model/po/APITest/APITestBody.java

@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.sql.Timestamp;
 import java.util.Map;
 
 /**

+ 0 - 4
web/src/main/java/cn/seecoder/web/model/po/APITest/TestInfo.java

@@ -5,10 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author zhaoxingrui
  * @date 2021/3/20

+ 0 - 2
web/src/main/java/cn/seecoder/web/model/po/InterfaceTest/InterfaceTestInfo.java

@@ -4,8 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import java.util.Map;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/commit/CommitPO.java

@@ -1,12 +1,12 @@
 package cn.seecoder.web.model.po.commit;
 
 import cn.seecoder.web.model.enums.CommitRelatedEnum;
+import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 
 /**
  * @author PuHong Weng

+ 4 - 1
web/src/main/java/cn/seecoder/web/model/po/project/ProjectRelatedPO.java

@@ -1,6 +1,9 @@
 package cn.seecoder.web.model.po.project;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author PuHong Weng

+ 2 - 3
web/src/main/java/cn/seecoder/web/model/po/tree/TreeNodePO.java

@@ -1,11 +1,10 @@
 package cn.seecoder.web.model.po.tree;
 
 
-
-import cn.seecoder.web.model.enums.PriorityEnum;
-import lombok.*;
 import cn.seecoder.web.model.enums.NodeStateEnum;
 import cn.seecoder.web.model.enums.NodeTypeEnum;
+import cn.seecoder.web.model.enums.PriorityEnum;
+import lombok.*;
 
 /**
  * 需求节点

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/user/UserPO.java

@@ -1,12 +1,12 @@
 package cn.seecoder.web.model.po.user;
 
 
+import cn.seecoder.web.infrastructure.security.WebSecurityConstants;
+import cn.seecoder.web.model.enums.UserIdentity;
 import lombok.Builder;
 import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
-import cn.seecoder.web.infrastructure.security.WebSecurityConstants;
-import cn.seecoder.web.model.enums.UserIdentity;
 
 import java.util.Collection;
 import java.util.Collections;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestBodyVO.java

@@ -1,12 +1,12 @@
 package cn.seecoder.web.model.vo.APITest;
 
+import cn.seecoder.web.model.po.APITest.APITestBody;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.po.APITest.APITestBody;
 
 import java.util.Map;
 

+ 1 - 2
web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestInfoVO.java

@@ -1,14 +1,13 @@
 package cn.seecoder.web.model.vo.APITest;
 
+import cn.seecoder.web.model.po.APITest.APITestInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.po.APITest.APITestInfo;
 
-import java.util.List;
 import java.util.Map;
 
 /**

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/APITest/TestResultVO.java

@@ -1,12 +1,12 @@
 package cn.seecoder.web.model.vo.APITest;
 
+import cn.seecoder.web.model.po.APITest.TestResult;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.po.APITest.TestResult;
 
 /**
  * @author zhaoxingrui

+ 0 - 1
web/src/main/java/cn/seecoder/web/model/vo/code_review/CodeReviewCreateVO.java

@@ -1,6 +1,5 @@
 package cn.seecoder.web.model.vo.code_review;
 
-import cn.seecoder.web.model.enums.CodeReviewStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 0 - 2
web/src/main/java/cn/seecoder/web/model/vo/code_review/CommentCreateVO.java

@@ -7,8 +7,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.sql.Timestamp;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/pipeline/PipelineInfoVO.java

@@ -1,7 +1,7 @@
 package cn.seecoder.web.model.vo.pipeline;
 
-import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
+import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeCreateVO.java

@@ -1,13 +1,13 @@
 package cn.seecoder.web.model.vo.tree;
 
+import cn.seecoder.web.model.enums.NodeStateEnum;
+import cn.seecoder.web.model.enums.NodeTypeEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import cn.seecoder.web.model.enums.NodeStateEnum;
-import cn.seecoder.web.model.enums.NodeTypeEnum;
 
 /**
  * @author PuHong Weng

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeUpdateBasicVO.java

@@ -1,10 +1,10 @@
 package cn.seecoder.web.model.vo.tree;
 
+import cn.seecoder.web.model.enums.NodeStateEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import cn.seecoder.web.model.enums.NodeStateEnum;
 
 /**
  * @author PuHong Weng

+ 5 - 5
web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeVO.java

@@ -1,17 +1,17 @@
 package cn.seecoder.web.model.vo.tree;
 
+import cn.seecoder.web.model.enums.NodeStateEnum;
+import cn.seecoder.web.model.enums.NodeTypeEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;
+import cn.seecoder.web.model.po.commit.CommitPO;
+import cn.seecoder.web.model.po.tree.TreeNodePO;
+import cn.seecoder.web.model.vo.commit.CommitVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.enums.NodeStateEnum;
-import cn.seecoder.web.model.enums.NodeTypeEnum;
-import cn.seecoder.web.model.po.commit.CommitPO;
-import cn.seecoder.web.model.po.tree.TreeNodePO;
-import cn.seecoder.web.model.vo.commit.CommitVO;
 
 import java.util.List;
 import java.util.stream.Collectors;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/user/UserVO.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.model.vo.user;
 
+import cn.seecoder.web.model.enums.UserIdentity;
 import cn.seecoder.web.model.po.user.UserPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.enums.UserIdentity;
 
 @Data
 @NoArgsConstructor

+ 0 - 2
web/src/main/java/cn/seecoder/web/service/code_review/BranchReviewService.java

@@ -3,13 +3,11 @@ package cn.seecoder.web.service.code_review;
 import cn.seecoder.web.model.vo.code_review.CodeReviewCreateVO;
 import cn.seecoder.web.model.vo.code_review.CodeReviewSortedList;
 import cn.seecoder.web.model.vo.code_review.CodeReviewVO;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import com.nju.edu.gitlab.vo.BranchVO;
 import com.nju.edu.gitlab.vo.DiffVO;
 import org.gitlab4j.api.GitLabApiException;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/code_review/FileReviewService.java

@@ -7,7 +7,7 @@ import cn.seecoder.web.model.vo.code_review.FileReviewCreateVO;
 import cn.seecoder.web.model.vo.code_review.FileReviewVO;
 import cn.seecoder.web.model.vo.user.UserVO;
 import com.nju.edu.gitlab.SeecoderGitlabException;
-import java.io.IOException;
+
 import java.util.List;
 
 /**

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/commit/CommitLinkService.java

@@ -2,8 +2,8 @@ package cn.seecoder.web.service.commit;
 
 import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import cn.seecoder.web.model.po.commit.CommitPO;
-import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 import cn.seecoder.web.model.vo.commit.CommitVO;
+import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 
 import java.util.List;
 

+ 0 - 4
web/src/main/java/cn/seecoder/web/service/commit/CommitService.java

@@ -1,10 +1,6 @@
 package cn.seecoder.web.service.commit;
 
-import cn.seecoder.web.model.enums.CommitRelatedEnum;
-import cn.seecoder.web.model.po.commit.CommitPO;
-import cn.seecoder.web.model.vo.commit.CommitQualityVO;
 import cn.seecoder.web.model.vo.commit.CommitVO;
-import cn.seecoder.web.model.vo.hook.SonarResultHookVO;
 import com.nju.edu.gitlab.vo.DiffVO;
 
 import java.util.List;

+ 7 - 3
web/src/main/java/cn/seecoder/web/service/impl/InterfaceTest/InterfaceTestServiceImpl.java

@@ -6,7 +6,6 @@ import cn.seecoder.web.dao.InterfaceTest.InterfaceTestMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
 import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
 import cn.seecoder.web.dao.user.UserMapper;
-import cn.seecoder.web.model.po.APITest.TestInfo;
 import cn.seecoder.web.model.po.InterfaceTest.InterfaceTestInfo;
 import cn.seecoder.web.model.po.InterfaceTest.InterfaceTestResult;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
@@ -22,8 +21,13 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;

+ 0 - 1
web/src/main/java/cn/seecoder/web/service/impl/auto_test/AutoTestServiceImpl.java

@@ -7,7 +7,6 @@ import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.vo.APITest.APITestResultVO;
 import cn.seecoder.web.service.auto_test.AutoTestService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

+ 5 - 10
web/src/main/java/cn/seecoder/web/service/impl/code_review/BranchReviewServiceImpl.java

@@ -5,32 +5,27 @@ import cn.seecoder.web.model.enums.CodeReviewStatusEnum;
 import cn.seecoder.web.model.enums.CommentTypeEnum;
 import cn.seecoder.web.model.po.code_review.CodeReviewPO;
 import cn.seecoder.web.model.po.user.UserPO;
-import cn.seecoder.web.model.vo.code_review.*;
+import cn.seecoder.web.model.vo.code_review.CodeReviewCreateVO;
+import cn.seecoder.web.model.vo.code_review.CodeReviewSortedList;
+import cn.seecoder.web.model.vo.code_review.CodeReviewVO;
+import cn.seecoder.web.model.vo.code_review.CommentCreateVO;
 import cn.seecoder.web.model.vo.message.MessageCreateVO;
 import cn.seecoder.web.service.code_review.BranchReviewService;
 import cn.seecoder.web.service.code_review.CommentService;
 import cn.seecoder.web.service.code_review.FileReviewService;
 import cn.seecoder.web.service.message.MessageService;
 import cn.seecoder.web.service.user.UserService;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import com.nju.edu.gitlab.vo.BranchVO;
 import com.nju.edu.gitlab.vo.DiffVO;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.*;
-import org.gitlab4j.api.GitLabApi;
+import okhttp3.OkHttpClient;
 import org.gitlab4j.api.GitLabApiException;
-import org.gitlab4j.api.models.MergeRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Set;

+ 0 - 9
web/src/main/java/cn/seecoder/web/service/impl/code_review/FileReviewServiceImpl.java

@@ -7,7 +7,6 @@ import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.enums.FileReviewStatusEnum;
 import cn.seecoder.web.model.po.code_review.FileReviewPO;
 import cn.seecoder.web.model.po.code_review.InspectionResultPO;
-import cn.seecoder.web.model.vo.code_review.FileNodeCreateVO;
 import cn.seecoder.web.model.vo.code_review.FileNodeVO;
 import cn.seecoder.web.model.vo.code_review.FileReviewCreateVO;
 import cn.seecoder.web.model.vo.code_review.FileReviewVO;
@@ -15,22 +14,14 @@ import cn.seecoder.web.model.vo.message.MessageCreateVO;
 import cn.seecoder.web.model.vo.user.UserVO;
 import cn.seecoder.web.service.code_review.FileReviewService;
 import cn.seecoder.web.service.message.MessageService;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.SeecoderGitlabException;
-import jnr.ffi.annotations.In;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 import org.apache.http.HttpStatus;
-import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.models.TreeItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/impl/commit/CommitLinkServiceImpl.java

@@ -10,8 +10,8 @@ import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import cn.seecoder.web.model.po.bug_list.BugListPO;
 import cn.seecoder.web.model.po.commit.CommitPO;
 import cn.seecoder.web.model.po.tree.TreeNodePO;
-import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 import cn.seecoder.web.model.vo.commit.CommitVO;
+import cn.seecoder.web.model.vo.commit.GitWebHookVO;
 import cn.seecoder.web.service.bug_list.BugListService;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import cn.seecoder.web.service.commit.CommitService;

+ 2 - 21
web/src/main/java/cn/seecoder/web/service/impl/commit/CommitServiceImpl.java

@@ -1,38 +1,19 @@
 package cn.seecoder.web.service.impl.commit;
 
-import cn.seecoder.api.ApplicationProperties;
-import cn.seecoder.common.util.LogTrackingUtil;
-import cn.seecoder.common.util.OpType;
-import cn.seecoder.web.dao.commit.CommitQualityMapper;
-import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.enums.CommitCheckResultEnum;
 import cn.seecoder.web.model.enums.CommitRelatedEnum;
-import cn.seecoder.web.model.po.bug_list.BugListPO;
-import cn.seecoder.web.model.po.commit.CommitQualityPO;
-import cn.seecoder.web.model.po.tree.TreeNodePO;
-import cn.seecoder.web.model.vo.commit.CommitQualityVO;
+import cn.seecoder.web.model.po.commit.CommitPO;
 import cn.seecoder.web.model.vo.commit.CommitVO;
-import cn.seecoder.web.model.vo.hook.SonarResultHookVO;
-import cn.seecoder.web.service.bug_list.BugListService;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import cn.seecoder.web.service.commit.CommitQualityService;
-import cn.seecoder.web.service.tree.TreeNodeService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import cn.seecoder.web.service.commit.CommitService;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.vo.DiffVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.seecoder.web.dao.commit.CommitMapper;
-import cn.seecoder.web.model.po.commit.CommitPO;
-import cn.seecoder.web.service.commit.CommitService;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author PuHong Weng

+ 12 - 12
web/src/main/java/cn/seecoder/web/service/impl/pipeline/DeploymentServiceImpl.java

@@ -1,16 +1,26 @@
 package cn.seecoder.web.service.impl.pipeline;
 
+import cn.seecoder.api.ApplicationProperties;
 import cn.seecoder.api.k8s.K8sConstants;
+import cn.seecoder.common.exceptions.AccessDeniedException;
+import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.common.util.LogTrackingUtil;
 import cn.seecoder.common.util.OpType;
+import cn.seecoder.web.core.pipeline.Pipeline;
+import cn.seecoder.web.core.pipeline.PipelineException;
+import cn.seecoder.web.core.pipeline.PipelineFactory;
+import cn.seecoder.web.core.pipeline.inspector.PipelineInspector;
+import cn.seecoder.web.core.pipeline.inspector.PipelineInspectorFactory;
 import cn.seecoder.web.dao.pipeline.DeploymentMapper;
-import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
+import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
 import cn.seecoder.web.dao.project.ProjectMapper;
 import cn.seecoder.web.model.po.pipeline.DeploymentPO;
-import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
+import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.po.project.ProjectPO;
+import cn.seecoder.web.model.vo.pipeline.DeploymentInfoVO;
+import cn.seecoder.web.service.pipeline.DeploymentService;
 import com.alibaba.fastjson.JSONObject;
 import io.kubernetes.client.openapi.models.V1DeploymentStatus;
 import lombok.extern.slf4j.Slf4j;
@@ -18,16 +28,6 @@ import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import cn.seecoder.api.ApplicationProperties;
-import cn.seecoder.common.exceptions.AccessDeniedException;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.core.pipeline.Pipeline;
-import cn.seecoder.web.core.pipeline.PipelineException;
-import cn.seecoder.web.core.pipeline.PipelineFactory;
-import cn.seecoder.web.core.pipeline.inspector.PipelineInspector;
-import cn.seecoder.web.core.pipeline.inspector.PipelineInspectorFactory;
-import cn.seecoder.web.model.vo.pipeline.DeploymentInfoVO;
-import cn.seecoder.web.service.pipeline.DeploymentService;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;

+ 1 - 5
web/src/main/java/cn/seecoder/web/service/impl/sql/SqlServiceImpl.java

@@ -14,11 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.sql.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service

+ 8 - 5
web/src/main/java/cn/seecoder/web/service/impl/tree/TreeNodeServiceImpl.java

@@ -1,11 +1,17 @@
 package cn.seecoder.web.service.impl.tree;
 
+import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.common.util.DateUtil;
 import cn.seecoder.common.util.LogTrackingUtil;
 import cn.seecoder.common.util.OpType;
+import cn.seecoder.web.core.commit.model.CommitState;
 import cn.seecoder.web.dao.commit.CommitMapper;
 import cn.seecoder.web.dao.tree.TreeNodeMapper;
 import cn.seecoder.web.dao.user.UserMapper;
-import cn.seecoder.web.model.enums.*;
+import cn.seecoder.web.model.enums.CommitRelatedEnum;
+import cn.seecoder.web.model.enums.NodeStateEnum;
+import cn.seecoder.web.model.enums.NodeTypeEnum;
+import cn.seecoder.web.model.enums.PriorityEnum;
 import cn.seecoder.web.model.po.commit.CommitPO;
 import cn.seecoder.web.model.po.tree.TreeNodePO;
 import cn.seecoder.web.model.po.user.UserPO;
@@ -13,7 +19,6 @@ import cn.seecoder.web.model.vo.tree.TreeNodeCreateVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeUpdateBasicVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeVO;
 import cn.seecoder.web.service.tree.TreeNodeService;
-
 import cn.seecoder.web.service.user.UserService;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpStatus;
@@ -21,9 +26,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.common.util.DateUtil;
-import cn.seecoder.web.core.commit.model.CommitState;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;

+ 2 - 2
web/src/main/java/cn/seecoder/web/service/impl/user/UserServiceImpl.java

@@ -1,11 +1,13 @@
 package cn.seecoder.web.service.impl.user;
 
 
+import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.common.util.LogTrackingUtil;
 import cn.seecoder.common.util.OpType;
 import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.po.user.UserPO;
 import cn.seecoder.web.model.vo.user.GitlabUserCreateVO;
+import cn.seecoder.web.model.vo.user.UserVO;
 import cn.seecoder.web.service.user.UserService;
 import com.alibaba.fastjson.JSONObject;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
@@ -16,8 +18,6 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.user.UserVO;
 
 @Service
 @Slf4j

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/pipeline/DeploymentService.java

@@ -1,8 +1,8 @@
 package cn.seecoder.web.service.pipeline;
 
-import cn.seecoder.web.model.vo.pipeline.DeploymentInfoVO;
 import cn.seecoder.common.exceptions.AccessDeniedException;
 import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.model.vo.pipeline.DeploymentInfoVO;
 
 import java.util.List;
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/pipeline/PipelineService.java

@@ -1,8 +1,8 @@
 package cn.seecoder.web.service.pipeline;
 
-import cn.seecoder.web.model.vo.pipeline.*;
 import cn.seecoder.common.exceptions.AccessDeniedException;
 import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.model.vo.pipeline.*;
 
 import java.util.List;
 

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/project/ProjectService.java

@@ -1,7 +1,7 @@
 package cn.seecoder.web.service.project;
 
-import cn.seecoder.web.model.vo.project.ProjectCreateVO;
 import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.model.vo.project.ProjectCreateVO;
 import cn.seecoder.web.model.vo.project.ProjectVO;
 import cn.seecoder.web.model.vo.user.UserVO;
 

+ 2 - 4
web/src/main/java/cn/seecoder/web/service/tree/TreeNodeService.java

@@ -1,14 +1,12 @@
 package cn.seecoder.web.service.tree;
 
 
-
-
+import cn.seecoder.common.exceptions.ServiceException;
+import cn.seecoder.web.core.commit.model.CommitState;
 import cn.seecoder.web.model.po.tree.TreeNodePO;
 import cn.seecoder.web.model.vo.tree.TreeNodeCreateVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeUpdateBasicVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeVO;
-import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.core.commit.model.CommitState;
 
 import java.util.List;
 

+ 0 - 8
web/src/main/java/cn/seecoder/web/service/user/UserService.java

@@ -1,20 +1,12 @@
 package cn.seecoder.web.service.user;
 
 
-import cn.seecoder.common.exceptions.AccessDeniedException;
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.model.po.user.UserPO;
 import cn.seecoder.web.model.vo.user.GitlabUserCreateVO;
 import cn.seecoder.web.model.vo.user.UserVO;
-import com.nju.edu.gitlab.SeecoderGitlabApi;
-import com.nju.edu.gitlab.SeecoderGitlabException;
-import com.nju.edu.gitlab.vo.ProjectVO;
-import org.apache.http.HttpStatus;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import java.util.List;
-
 public interface UserService {
 
     UserVO createGitlabUser(GitlabUserCreateVO vo) throws ServiceException;

+ 1 - 1
web/src/test/java/cn/seecoder/web/DevcloudWebApplicationTests.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web;
 
+import cn.seecoder.web.model.enums.PriorityEnum;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
@@ -7,7 +8,6 @@ import org.junit.runner.RunWith;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import cn.seecoder.web.model.enums.PriorityEnum;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest

+ 0 - 2
web/src/test/java/cn/seecoder/web/dao/commit/CommitQualityMapperTest.java

@@ -17,8 +17,6 @@ import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
 
-import static org.junit.Assert.*;
-
 /**
  * @author claws
  */

+ 2 - 2
web/src/test/java/cn/seecoder/web/dao/pipeline/PipelineMapperTest.java

@@ -1,13 +1,13 @@
 package cn.seecoder.web.dao.pipeline;
 
+import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
+import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
-import cn.seecoder.web.model.po.pipeline.PipelinePO;
 
 /**
  * @author PuHong Weng

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff