소스 검색

refactor: reorganize web packages

weipengtao 3 달 전
부모
커밋
d845f27df5
100개의 변경된 파일316개의 추가작업 그리고 316개의 파일을 삭제
  1. 4 4
      web/src/main/java/cn/seecoder/web/controller/apitest/ApiTestController.java
  2. 2 2
      web/src/main/java/cn/seecoder/web/controller/autotest/AutoTestController.java
  3. 4 4
      web/src/main/java/cn/seecoder/web/controller/buglist/BugListController.java
  4. 9 9
      web/src/main/java/cn/seecoder/web/controller/codereview/CodeReviewController.java
  5. 3 3
      web/src/main/java/cn/seecoder/web/controller/codereview/CommentController.java
  6. 1 1
      web/src/main/java/cn/seecoder/web/controller/commit/BranchController.java
  7. 2 2
      web/src/main/java/cn/seecoder/web/controller/commit/CommitController.java
  8. 4 4
      web/src/main/java/cn/seecoder/web/controller/commit/CommitLinkController.java
  9. 3 3
      web/src/main/java/cn/seecoder/web/controller/commit/CommitQualityController.java
  10. 3 3
      web/src/main/java/cn/seecoder/web/controller/devmanage/DevmanageController.java
  11. 2 2
      web/src/main/java/cn/seecoder/web/controller/fork/ForkController.java
  12. 5 5
      web/src/main/java/cn/seecoder/web/controller/functest/FuncTestController.java
  13. 3 3
      web/src/main/java/cn/seecoder/web/controller/interfacetest/InterfaceTestController.java
  14. 2 2
      web/src/main/java/cn/seecoder/web/controller/message/MessageController.java
  15. 2 2
      web/src/main/java/cn/seecoder/web/controller/pipeline/DeploymentController.java
  16. 6 6
      web/src/main/java/cn/seecoder/web/controller/pipeline/PipelineController.java
  17. 2 2
      web/src/main/java/cn/seecoder/web/controller/pipeline/StageController.java
  18. 4 4
      web/src/main/java/cn/seecoder/web/controller/project/ProjectController.java
  19. 1 1
      web/src/main/java/cn/seecoder/web/controller/scheduler/SchedulerController.java
  20. 3 3
      web/src/main/java/cn/seecoder/web/controller/sql/SqlController.java
  21. 4 4
      web/src/main/java/cn/seecoder/web/controller/tree/TreeNodesController.java
  22. 3 3
      web/src/main/java/cn/seecoder/web/controller/user/UserController.java
  23. 2 2
      web/src/main/java/cn/seecoder/web/core/pipeline/Context.java
  24. 21 21
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/DeployHandler.java
  25. 5 5
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/JavaImageBuildHandler.java
  26. 12 12
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sDeploymentHandler.java
  27. 8 8
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sIngressHandler.java
  28. 15 15
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sJobHandler.java
  29. 5 5
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sNamespaceHandler.java
  30. 6 6
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/K8sServiceHandler.java
  31. 19 19
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/MysqlDeployHandler.java
  32. 5 5
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/NodeImageBuildHandler.java
  33. 6 6
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/SonarJavaImageBuildHandler.java
  34. 12 12
      web/src/main/java/cn/seecoder/web/core/pipeline/inspector/PipelineInspector.java
  35. 1 1
      web/src/main/java/cn/seecoder/web/dto/Response.java
  36. 2 2
      web/src/main/java/cn/seecoder/web/dto/apitest/ApiTestBodyVO.java
  37. 2 2
      web/src/main/java/cn/seecoder/web/dto/apitest/ApiTestInfoVO.java
  38. 2 2
      web/src/main/java/cn/seecoder/web/dto/apitest/ApiTestResultVO.java
  39. 2 2
      web/src/main/java/cn/seecoder/web/dto/apitest/TestInfoVO.java
  40. 2 2
      web/src/main/java/cn/seecoder/web/dto/apitest/TestResultVO.java
  41. 2 2
      web/src/main/java/cn/seecoder/web/dto/buglist/BugListCreateVO.java
  42. 3 3
      web/src/main/java/cn/seecoder/web/dto/buglist/BugListUpdateBasicVO.java
  43. 4 4
      web/src/main/java/cn/seecoder/web/dto/buglist/BugListVO.java
  44. 1 1
      web/src/main/java/cn/seecoder/web/dto/codereview/CodeReviewCreateVO.java
  45. 1 1
      web/src/main/java/cn/seecoder/web/dto/codereview/CodeReviewSortedList.java
  46. 3 3
      web/src/main/java/cn/seecoder/web/dto/codereview/CodeReviewVO.java
  47. 2 2
      web/src/main/java/cn/seecoder/web/dto/codereview/CommentCreateVO.java
  48. 3 3
      web/src/main/java/cn/seecoder/web/dto/codereview/CommentVO.java
  49. 1 1
      web/src/main/java/cn/seecoder/web/dto/codereview/FileNodeCreateVO.java
  50. 1 1
      web/src/main/java/cn/seecoder/web/dto/codereview/FileNodeVO.java
  51. 1 1
      web/src/main/java/cn/seecoder/web/dto/codereview/FileReviewCreateVO.java
  52. 3 3
      web/src/main/java/cn/seecoder/web/dto/codereview/FileReviewVO.java
  53. 2 2
      web/src/main/java/cn/seecoder/web/dto/commit/CommitQualityVO.java
  54. 4 4
      web/src/main/java/cn/seecoder/web/dto/commit/CommitVO.java
  55. 1 1
      web/src/main/java/cn/seecoder/web/dto/commit/GitWebHookVO.java
  56. 2 2
      web/src/main/java/cn/seecoder/web/dto/devmanage/DeploymentVO.java
  57. 1 1
      web/src/main/java/cn/seecoder/web/dto/fork/ForkVO.java
  58. 2 2
      web/src/main/java/cn/seecoder/web/dto/functest/FuncTestCaseVO.java
  59. 2 2
      web/src/main/java/cn/seecoder/web/dto/functest/FuncTestRecordVO.java
  60. 3 3
      web/src/main/java/cn/seecoder/web/dto/functest/FuncTestStepVO.java
  61. 1 1
      web/src/main/java/cn/seecoder/web/dto/hook/SonarResultHookVO.java
  62. 2 2
      web/src/main/java/cn/seecoder/web/dto/interfacetest/InterfaceTestInfoVO.java
  63. 2 2
      web/src/main/java/cn/seecoder/web/dto/interfacetest/InterfaceTestResultVO.java
  64. 1 1
      web/src/main/java/cn/seecoder/web/dto/message/MessageCreateVO.java
  65. 3 3
      web/src/main/java/cn/seecoder/web/dto/message/MessageVO.java
  66. 1 1
      web/src/main/java/cn/seecoder/web/dto/pipeline/DeploymentInfoVO.java
  67. 2 2
      web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineConfigVO.java
  68. 1 1
      web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineCreateVO.java
  69. 3 3
      web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineInfoVO.java
  70. 2 2
      web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineRecordVO.java
  71. 1 1
      web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineUpdateConfigVO.java
  72. 3 3
      web/src/main/java/cn/seecoder/web/dto/pipeline/StageVO.java
  73. 1 1
      web/src/main/java/cn/seecoder/web/dto/project/ProjectCreateVO.java
  74. 2 2
      web/src/main/java/cn/seecoder/web/dto/project/ProjectVO.java
  75. 1 1
      web/src/main/java/cn/seecoder/web/dto/scheduler/StatusVO.java
  76. 1 1
      web/src/main/java/cn/seecoder/web/dto/sql/DBInstanceVO.java
  77. 1 1
      web/src/main/java/cn/seecoder/web/dto/sql/SqlExecVO.java
  78. 4 4
      web/src/main/java/cn/seecoder/web/dto/tree/TreeNodeCreateVO.java
  79. 3 3
      web/src/main/java/cn/seecoder/web/dto/tree/TreeNodeUpdateBasicVO.java
  80. 7 7
      web/src/main/java/cn/seecoder/web/dto/tree/TreeNodeVO.java
  81. 1 1
      web/src/main/java/cn/seecoder/web/dto/user/GitlabUserCreateVO.java
  82. 3 3
      web/src/main/java/cn/seecoder/web/dto/user/UserVO.java
  83. 1 1
      web/src/main/java/cn/seecoder/web/entity/apitest/ApiTestBody.java
  84. 1 1
      web/src/main/java/cn/seecoder/web/entity/apitest/ApiTestInfo.java
  85. 1 1
      web/src/main/java/cn/seecoder/web/entity/apitest/ApiTestResult.java
  86. 1 1
      web/src/main/java/cn/seecoder/web/entity/apitest/TestInfo.java
  87. 1 1
      web/src/main/java/cn/seecoder/web/entity/apitest/TestResult.java
  88. 3 3
      web/src/main/java/cn/seecoder/web/entity/buglist/BugListPO.java
  89. 2 2
      web/src/main/java/cn/seecoder/web/entity/codereview/CodeReviewPO.java
  90. 2 2
      web/src/main/java/cn/seecoder/web/entity/codereview/CommentPO.java
  91. 3 3
      web/src/main/java/cn/seecoder/web/entity/codereview/FileReviewPO.java
  92. 1 1
      web/src/main/java/cn/seecoder/web/entity/codereview/InspectionResultPO.java
  93. 3 3
      web/src/main/java/cn/seecoder/web/entity/commit/CommitPO.java
  94. 1 1
      web/src/main/java/cn/seecoder/web/entity/commit/CommitQualityPO.java
  95. 1 1
      web/src/main/java/cn/seecoder/web/entity/functest/FuncTestCasePO.java
  96. 2 2
      web/src/main/java/cn/seecoder/web/entity/functest/FuncTestRecordPO.java
  97. 2 2
      web/src/main/java/cn/seecoder/web/entity/functest/FuncTestStepPO.java
  98. 1 1
      web/src/main/java/cn/seecoder/web/entity/interfacetest/InterfaceTestInfo.java
  99. 1 1
      web/src/main/java/cn/seecoder/web/entity/interfacetest/InterfaceTestResult.java
  100. 2 2
      web/src/main/java/cn/seecoder/web/entity/message/MessagePO.java

+ 4 - 4
web/src/main/java/cn/seecoder/web/controller/apitest/ApiTestController.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.controller.apitest;
 
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.apitest.ApiTestBodyVO;
-import cn.seecoder.web.model.vo.apitest.ApiTestInfoVO;
-import cn.seecoder.web.model.vo.apitest.ApiTestResultVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.apitest.ApiTestBodyVO;
+import cn.seecoder.web.dto.apitest.ApiTestInfoVO;
+import cn.seecoder.web.dto.apitest.ApiTestResultVO;
 import cn.seecoder.web.service.apitest.ApiTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 2 - 2
web/src/main/java/cn/seecoder/web/controller/autotest/AutoTestController.java

@@ -1,7 +1,7 @@
 package cn.seecoder.web.controller.autotest;
 
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.apitest.ApiTestResultVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.apitest.ApiTestResultVO;
 import cn.seecoder.web.service.autotest.AutoTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 4 - 4
web/src/main/java/cn/seecoder/web/controller/buglist/BugListController.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.controller.buglist;
 
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.buglist.BugListCreateVO;
-import cn.seecoder.web.model.vo.buglist.BugListUpdateBasicVO;
-import cn.seecoder.web.model.vo.buglist.BugListVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.buglist.BugListCreateVO;
+import cn.seecoder.web.dto.buglist.BugListUpdateBasicVO;
+import cn.seecoder.web.dto.buglist.BugListVO;
 import cn.seecoder.web.service.buglist.BugListService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 9 - 9
web/src/main/java/cn/seecoder/web/controller/codereview/CodeReviewController.java

@@ -1,15 +1,15 @@
 package cn.seecoder.web.controller.codereview;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.enums.FileReviewStatusEnum;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.codereview.CodeReviewCreateVO;
-import cn.seecoder.web.model.vo.codereview.CodeReviewSortedList;
-import cn.seecoder.web.model.vo.codereview.CodeReviewVO;
-import cn.seecoder.web.model.vo.codereview.FileNodeVO;
-import cn.seecoder.web.model.vo.codereview.FileReviewCreateVO;
-import cn.seecoder.web.model.vo.codereview.FileReviewVO;
-import cn.seecoder.web.model.vo.user.UserVO;
+import cn.seecoder.web.enums.FileReviewStatusEnum;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.codereview.CodeReviewCreateVO;
+import cn.seecoder.web.dto.codereview.CodeReviewSortedList;
+import cn.seecoder.web.dto.codereview.CodeReviewVO;
+import cn.seecoder.web.dto.codereview.FileNodeVO;
+import cn.seecoder.web.dto.codereview.FileReviewCreateVO;
+import cn.seecoder.web.dto.codereview.FileReviewVO;
+import cn.seecoder.web.dto.user.UserVO;
 import cn.seecoder.web.service.codereview.BranchReviewService;
 import cn.seecoder.web.service.codereview.FileReviewService;
 import com.nju.edu.gitlab.vo.BranchVO;

+ 3 - 3
web/src/main/java/cn/seecoder/web/controller/codereview/CommentController.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.controller.codereview;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.codereview.CommentCreateVO;
-import cn.seecoder.web.model.vo.codereview.CommentVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.codereview.CommentCreateVO;
+import cn.seecoder.web.dto.codereview.CommentVO;
 import cn.seecoder.web.service.codereview.CommentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,6 +1,6 @@
 package cn.seecoder.web.controller.commit;
 
-import cn.seecoder.web.model.vo.Response;
+import cn.seecoder.web.dto.Response;
 import cn.seecoder.web.service.branch.BranchService;
 import com.nju.edu.gitlab.vo.BranchVO;
 import io.swagger.annotations.Api;

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

@@ -1,7 +1,7 @@
 package cn.seecoder.web.controller.commit;
 
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.commit.CommitVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.commit.CommitVO;
 import cn.seecoder.web.service.commit.CommitService;
 import com.nju.edu.gitlab.vo.DiffVO;
 import io.swagger.annotations.Api;

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

@@ -1,10 +1,10 @@
 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.Response;
-import cn.seecoder.web.model.vo.commit.CommitVO;
-import cn.seecoder.web.model.vo.commit.GitWebHookVO;
+import cn.seecoder.web.enums.CommitRelatedEnum;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.commit.CommitVO;
+import cn.seecoder.web.dto.commit.GitWebHookVO;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,9 +1,9 @@
 package cn.seecoder.web.controller.commit;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.commit.CommitQualityVO;
-import cn.seecoder.web.model.vo.hook.SonarResultHookVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.commit.CommitQualityVO;
+import cn.seecoder.web.dto.hook.SonarResultHookVO;
 import cn.seecoder.web.service.commit.CommitQualityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 3 - 3
web/src/main/java/cn/seecoder/web/controller/devmanage/DevmanageController.java

@@ -1,8 +1,8 @@
 package cn.seecoder.web.controller.devmanage;
 
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.devmanage.DeploymentVO;
-import cn.seecoder.web.model.vo.user.UserVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.devmanage.DeploymentVO;
+import cn.seecoder.web.dto.user.UserVO;
 import cn.seecoder.web.service.devmanage.DevmanageService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;

+ 2 - 2
web/src/main/java/cn/seecoder/web/controller/fork/ForkController.java

@@ -1,7 +1,7 @@
 package cn.seecoder.web.controller.fork;
 
-import cn.seecoder.web.model.po.user.UserPO;
-import cn.seecoder.web.model.vo.fork.ForkVO;
+import cn.seecoder.web.entity.user.UserPO;
+import cn.seecoder.web.dto.fork.ForkVO;
 import cn.seecoder.web.service.fork.ForkService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

+ 5 - 5
web/src/main/java/cn/seecoder/web/controller/functest/FuncTestController.java

@@ -1,10 +1,10 @@
 package cn.seecoder.web.controller.functest;
 
-import cn.seecoder.web.model.enums.FuncTestStepState;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.functest.FuncTestCaseVO;
-import cn.seecoder.web.model.vo.functest.FuncTestRecordVO;
-import cn.seecoder.web.model.vo.functest.FuncTestStepVO;
+import cn.seecoder.web.enums.FuncTestStepState;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.functest.FuncTestCaseVO;
+import cn.seecoder.web.dto.functest.FuncTestRecordVO;
+import cn.seecoder.web.dto.functest.FuncTestStepVO;
 import cn.seecoder.web.service.functest.FuncTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 3 - 3
web/src/main/java/cn/seecoder/web/controller/interfacetest/InterfaceTestController.java

@@ -1,8 +1,8 @@
 package cn.seecoder.web.controller.interfacetest;
 
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.interfacetest.InterfaceTestInfoVO;
-import cn.seecoder.web.model.vo.interfacetest.InterfaceTestResultVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.interfacetest.InterfaceTestInfoVO;
+import cn.seecoder.web.dto.interfacetest.InterfaceTestResultVO;
 import cn.seecoder.web.service.interfacetest.InterfaceTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
web/src/main/java/cn/seecoder/web/controller/message/MessageController.java

@@ -1,7 +1,7 @@
 package cn.seecoder.web.controller.message;
 
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.message.MessageVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.message.MessageVO;
 import cn.seecoder.web.service.message.MessageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -2,8 +2,8 @@ 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.dto.Response;
+import cn.seecoder.web.dto.pipeline.DeploymentInfoVO;
 import cn.seecoder.web.service.pipeline.DeploymentService;
 import cn.seecoder.web.service.user.UserService;
 import io.swagger.annotations.Api;

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

@@ -2,12 +2,12 @@ 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.PipelineConfigVO;
-import cn.seecoder.web.model.vo.pipeline.PipelineCreateVO;
-import cn.seecoder.web.model.vo.pipeline.PipelineInfoVO;
-import cn.seecoder.web.model.vo.pipeline.PipelineRecordVO;
-import cn.seecoder.web.model.vo.pipeline.PipelineUpdateConfigVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.pipeline.PipelineConfigVO;
+import cn.seecoder.web.dto.pipeline.PipelineCreateVO;
+import cn.seecoder.web.dto.pipeline.PipelineInfoVO;
+import cn.seecoder.web.dto.pipeline.PipelineRecordVO;
+import cn.seecoder.web.dto.pipeline.PipelineUpdateConfigVO;
 import cn.seecoder.web.service.pipeline.PipelineService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,7 +1,7 @@
 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.dto.Response;
+import cn.seecoder.web.dto.pipeline.StageVO;
 import cn.seecoder.web.service.pipeline.StageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,10 +1,10 @@
 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.dto.Response;
+import cn.seecoder.web.dto.project.ProjectCreateVO;
+import cn.seecoder.web.dto.project.ProjectVO;
+import cn.seecoder.web.dto.user.UserVO;
 import cn.seecoder.web.service.project.ProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
web/src/main/java/cn/seecoder/web/controller/scheduler/SchedulerController.java

@@ -1,7 +1,7 @@
 package cn.seecoder.web.controller.scheduler;
 
 import cn.seecoder.web.infrastructure.SchedulerHelper;
-import cn.seecoder.web.model.vo.scheduler.StatusVO;
+import cn.seecoder.web.dto.scheduler.StatusVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;

+ 3 - 3
web/src/main/java/cn/seecoder/web/controller/sql/SqlController.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.controller.sql;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.sql.DBInstanceVO;
-import cn.seecoder.web.model.vo.sql.SqlExecVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.sql.DBInstanceVO;
+import cn.seecoder.web.dto.sql.SqlExecVO;
 import cn.seecoder.web.service.sql.SqlService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -2,10 +2,10 @@ 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.dto.Response;
+import cn.seecoder.web.dto.tree.TreeNodeCreateVO;
+import cn.seecoder.web.dto.tree.TreeNodeUpdateBasicVO;
+import cn.seecoder.web.dto.tree.TreeNodeVO;
 import cn.seecoder.web.service.tree.TreeNodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 3 - 3
web/src/main/java/cn/seecoder/web/controller/user/UserController.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.controller.user;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.model.vo.user.GitlabUserCreateVO;
-import cn.seecoder.web.model.vo.user.UserVO;
+import cn.seecoder.web.dto.Response;
+import cn.seecoder.web.dto.user.GitlabUserCreateVO;
+import cn.seecoder.web.dto.user.UserVO;
 import cn.seecoder.web.service.user.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,6 +1,6 @@
 package cn.seecoder.web.core.pipeline;
 
-import cn.seecoder.web.infra.ApplicationProperties;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,7 +20,7 @@ import java.util.Map;
 @AllArgsConstructor
 public class Context {
 
-	private ApplicationProperties applicationProperties;
+	private DevcloudProperties applicationProperties;
 
 	private Integer pipelineId;
 

+ 21 - 21
web/src/main/java/cn/seecoder/web/core/pipeline/handler/DeployHandler.java

@@ -1,24 +1,24 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.k8s.DeploymentApi;
-import cn.seecoder.web.infra.k8s.IngressApi;
-import cn.seecoder.web.infra.k8s.K8sConstants;
-import cn.seecoder.web.infra.k8s.LimitRangeApi;
-import cn.seecoder.web.infra.k8s.NamespaceApi;
-import cn.seecoder.web.infra.k8s.SecretApi;
-import cn.seecoder.web.infra.k8s.ServiceApi;
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
-import cn.seecoder.web.infra.k8s.model.Container;
-import cn.seecoder.web.infra.k8s.model.ContainerPort;
-import cn.seecoder.web.infra.k8s.model.Deployment;
-import cn.seecoder.web.infra.k8s.model.Ingress;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
-import cn.seecoder.web.infra.k8s.model.LimitRange;
-import cn.seecoder.web.infra.k8s.model.Namespace;
-import cn.seecoder.web.infra.k8s.model.Service;
-import cn.seecoder.web.infra.k8s.model.ServicePort;
-import cn.seecoder.web.infra.k8s.vo.SecretVO;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.k8s.DeploymentApi;
+import cn.seecoder.web.infrastructure.external.k8s.IngressApi;
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
+import cn.seecoder.web.infrastructure.external.k8s.LimitRangeApi;
+import cn.seecoder.web.infrastructure.external.k8s.NamespaceApi;
+import cn.seecoder.web.infrastructure.external.k8s.SecretApi;
+import cn.seecoder.web.infrastructure.external.k8s.ServiceApi;
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
+import cn.seecoder.web.infrastructure.external.k8s.model.Container;
+import cn.seecoder.web.infrastructure.external.k8s.model.ContainerPort;
+import cn.seecoder.web.infrastructure.external.k8s.model.Deployment;
+import cn.seecoder.web.infrastructure.external.k8s.model.Ingress;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.external.k8s.model.LimitRange;
+import cn.seecoder.web.infrastructure.external.k8s.model.Namespace;
+import cn.seecoder.web.infrastructure.external.k8s.model.Service;
+import cn.seecoder.web.infrastructure.external.k8s.model.ServicePort;
+import cn.seecoder.web.infrastructure.external.k8s.vo.SecretVO;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
@@ -39,7 +39,7 @@ public class DeployHandler extends AbstractHandler {
 	private final static String DEFAULT_IMAGE_PULL_SECRET_NAME = "seecoder-devcloud-image-pull-secret";
 	private final SecretApi secretApi;
 	private final DeploymentApi deploymentApi;
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 	private final NamespaceApi namespaceApi;
 	private final ServiceApi serviceApi;
 	private final IngressApi ingressApi;
@@ -48,7 +48,7 @@ public class DeployHandler extends AbstractHandler {
 
 	public DeployHandler() {
 		this.limitRangeApi = SpringUtil.getBean(LimitRangeApi.class);
-		this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 		secretApi = SpringUtil.getBean(SecretApi.class);
 		deploymentApi = SpringUtil.getBean(DeploymentApi.class);
 		namespaceApi = SpringUtil.getBean(NamespaceApi.class);

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

@@ -1,8 +1,8 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.docker.DockerApi;
-import cn.seecoder.web.infra.git.GitApi;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.docker.DockerApi;
+import cn.seecoder.web.infrastructure.external.git.GitApi;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
@@ -41,7 +41,7 @@ public class JavaImageBuildHandler extends AbstractHandler {
 
 	private final GitApi gitApi;
 
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 	private String repoUrl;
 	private String branchName;
 	private String jarName;
@@ -49,7 +49,7 @@ public class JavaImageBuildHandler extends AbstractHandler {
 	public JavaImageBuildHandler() {
 		dockerApi = SpringUtil.getBean(DockerApi.class);
 		gitApi = SpringUtil.getBean(GitApi.class);
-		this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 	}
 
 	@Override

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

@@ -1,15 +1,15 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.k8s.DeploymentApi;
-import cn.seecoder.web.infra.k8s.K8sConstants;
-import cn.seecoder.web.infra.k8s.SecretApi;
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
-import cn.seecoder.web.infra.k8s.model.Container;
-import cn.seecoder.web.infra.k8s.model.ContainerPort;
-import cn.seecoder.web.infra.k8s.model.Deployment;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
-import cn.seecoder.web.infra.k8s.vo.SecretVO;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.k8s.DeploymentApi;
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
+import cn.seecoder.web.infrastructure.external.k8s.SecretApi;
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
+import cn.seecoder.web.infrastructure.external.k8s.model.Container;
+import cn.seecoder.web.infrastructure.external.k8s.model.ContainerPort;
+import cn.seecoder.web.infrastructure.external.k8s.model.Deployment;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.external.k8s.vo.SecretVO;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
@@ -34,11 +34,11 @@ public class K8sDeploymentHandler extends AbstractHandler {
 	private final static String DEFAULT_IMAGE_PULL_SECRET_NAME = "seecoder-devcloud-image-pull-secret";
 	private final SecretApi secretApi;
 	private final DeploymentApi deploymentApi;
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 	private Integer port;
 
 	public K8sDeploymentHandler() {
-		this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 		secretApi = SpringUtil.getBean(SecretApi.class);
 		deploymentApi = SpringUtil.getBean(DeploymentApi.class);
 	}

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

@@ -1,11 +1,11 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.k8s.IngressApi;
-import cn.seecoder.web.infra.k8s.K8sConstants;
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
-import cn.seecoder.web.infra.k8s.model.Ingress;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.k8s.IngressApi;
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
+import cn.seecoder.web.infrastructure.external.k8s.model.Ingress;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
@@ -23,13 +23,13 @@ import java.util.List;
 @Slf4j
 public class K8sIngressHandler extends AbstractHandler {
 
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 
 	private final IngressApi ingressApi;
 
 	public K8sIngressHandler() {
 		this.ingressApi = SpringUtil.getBean(IngressApi.class);
-		this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 	}
 
 

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

@@ -1,19 +1,19 @@
 package cn.seecoder.web.core.pipeline.handler;
 
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.k8s.JobApi;
-import cn.seecoder.web.infra.k8s.K8sConstants;
-import cn.seecoder.web.infra.k8s.LimitRangeApi;
-import cn.seecoder.web.infra.k8s.NamespaceApi;
-import cn.seecoder.web.infra.k8s.SecretApi;
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
-import cn.seecoder.web.infra.k8s.model.Container;
-import cn.seecoder.web.infra.k8s.model.Job;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
-import cn.seecoder.web.infra.k8s.model.LimitRange;
-import cn.seecoder.web.infra.k8s.model.Namespace;
-import cn.seecoder.web.infra.k8s.vo.SecretVO;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.k8s.JobApi;
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
+import cn.seecoder.web.infrastructure.external.k8s.LimitRangeApi;
+import cn.seecoder.web.infrastructure.external.k8s.NamespaceApi;
+import cn.seecoder.web.infrastructure.external.k8s.SecretApi;
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
+import cn.seecoder.web.infrastructure.external.k8s.model.Container;
+import cn.seecoder.web.infrastructure.external.k8s.model.Job;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.external.k8s.model.LimitRange;
+import cn.seecoder.web.infrastructure.external.k8s.model.Namespace;
+import cn.seecoder.web.infrastructure.external.k8s.vo.SecretVO;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
@@ -31,10 +31,10 @@ public class K8sJobHandler extends AbstractHandler {
 	private final JobApi jobApi;
 	private final NamespaceApi namespaceApi;
 	private final LimitRangeApi limitRangeApi;
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 
 	public K8sJobHandler() {
-		this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 		secretApi = SpringUtil.getBean(SecretApi.class);
 		jobApi = SpringUtil.getBean(JobApi.class);
 		namespaceApi = SpringUtil.getBean(NamespaceApi.class);

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

@@ -1,10 +1,10 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.k8s.NamespaceApi;
-import cn.seecoder.web.infra.k8s.SecretApi;
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
-import cn.seecoder.web.infra.k8s.model.Namespace;
+import cn.seecoder.web.infrastructure.external.k8s.NamespaceApi;
+import cn.seecoder.web.infrastructure.external.k8s.SecretApi;
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.external.k8s.model.Namespace;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;

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

@@ -1,11 +1,11 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.k8s.K8sConstants;
-import cn.seecoder.web.infra.k8s.ServiceApi;
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
-import cn.seecoder.web.infra.k8s.model.Service;
-import cn.seecoder.web.infra.k8s.model.ServicePort;
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
+import cn.seecoder.web.infrastructure.external.k8s.ServiceApi;
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.external.k8s.model.Service;
+import cn.seecoder.web.infrastructure.external.k8s.model.ServicePort;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;

+ 19 - 19
web/src/main/java/cn/seecoder/web/core/pipeline/handler/MysqlDeployHandler.java

@@ -1,23 +1,23 @@
 package cn.seecoder.web.core.pipeline.handler;
 
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.k8s.DeploymentApi;
-import cn.seecoder.web.infra.k8s.K8sConstants;
-import cn.seecoder.web.infra.k8s.LimitRangeApi;
-import cn.seecoder.web.infra.k8s.NamespaceApi;
-import cn.seecoder.web.infra.k8s.SecretApi;
-import cn.seecoder.web.infra.k8s.ServiceApi;
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
-import cn.seecoder.web.infra.k8s.model.Container;
-import cn.seecoder.web.infra.k8s.model.ContainerPort;
-import cn.seecoder.web.infra.k8s.model.Deployment;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
-import cn.seecoder.web.infra.k8s.model.LimitRange;
-import cn.seecoder.web.infra.k8s.model.Namespace;
-import cn.seecoder.web.infra.k8s.model.Service;
-import cn.seecoder.web.infra.k8s.model.ServicePort;
-import cn.seecoder.web.infra.k8s.vo.SecretVO;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.k8s.DeploymentApi;
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
+import cn.seecoder.web.infrastructure.external.k8s.LimitRangeApi;
+import cn.seecoder.web.infrastructure.external.k8s.NamespaceApi;
+import cn.seecoder.web.infrastructure.external.k8s.SecretApi;
+import cn.seecoder.web.infrastructure.external.k8s.ServiceApi;
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
+import cn.seecoder.web.infrastructure.external.k8s.model.Container;
+import cn.seecoder.web.infrastructure.external.k8s.model.ContainerPort;
+import cn.seecoder.web.infrastructure.external.k8s.model.Deployment;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.external.k8s.model.LimitRange;
+import cn.seecoder.web.infrastructure.external.k8s.model.Namespace;
+import cn.seecoder.web.infrastructure.external.k8s.model.Service;
+import cn.seecoder.web.infrastructure.external.k8s.model.ServicePort;
+import cn.seecoder.web.infrastructure.external.k8s.vo.SecretVO;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
@@ -43,7 +43,7 @@ public class MysqlDeployHandler extends AbstractHandler {
 	private final static String DEFAULT_IMAGE_PULL_SECRET_NAME = "seecoder-devcloud-image-pull-secret";
 	private final SecretApi secretApi;
 	private final DeploymentApi deploymentApi;
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 	private final NamespaceApi namespaceApi;
 	private final ServiceApi serviceApi;
 	private final LimitRangeApi limitRangeApi;
@@ -52,7 +52,7 @@ public class MysqlDeployHandler extends AbstractHandler {
 	private String password = "root";
 
 	public MysqlDeployHandler() {
-		this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 		secretApi = SpringUtil.getBean(SecretApi.class);
 		deploymentApi = SpringUtil.getBean(DeploymentApi.class);
 		namespaceApi = SpringUtil.getBean(NamespaceApi.class);

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

@@ -1,8 +1,8 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.docker.DockerApi;
-import cn.seecoder.web.infra.git.GitApi;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.docker.DockerApi;
+import cn.seecoder.web.infrastructure.external.git.GitApi;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
@@ -40,7 +40,7 @@ public class NodeImageBuildHandler extends AbstractHandler {
 
 	private final PipelineService pipelineService;
 
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 	private String repoUrl;
 	private String branchName;
 	private String nginxConfig;
@@ -49,7 +49,7 @@ public class NodeImageBuildHandler extends AbstractHandler {
 		dockerApi = SpringUtil.getBean(DockerApi.class);
 		gitApi = SpringUtil.getBean(GitApi.class);
 		pipelineService = SpringUtil.getBean(PipelineService.class);
-		applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 	}
 
 	@Override

+ 6 - 6
web/src/main/java/cn/seecoder/web/core/pipeline/handler/SonarJavaImageBuildHandler.java

@@ -1,13 +1,13 @@
 package cn.seecoder.web.core.pipeline.handler;
 
-import cn.seecoder.web.infra.ApplicationProperties;
-import cn.seecoder.web.infra.docker.DockerApi;
-import cn.seecoder.web.infra.git.GitApi;
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
+import cn.seecoder.web.infrastructure.external.docker.DockerApi;
+import cn.seecoder.web.infrastructure.external.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;
-import cn.seecoder.web.model.vo.project.ProjectVO;
+import cn.seecoder.web.dto.project.ProjectVO;
 import cn.seecoder.web.service.branch.BranchService;
 import cn.seecoder.web.service.project.ProjectService;
 import com.nju.edu.gitlab.vo.BranchVO;
@@ -38,7 +38,7 @@ public class SonarJavaImageBuildHandler extends AbstractHandler {
 	private final DockerApi dockerApi;
 	private final ProjectService projectService;
 	private final BranchService branchService;
-	private final ApplicationProperties applicationProperties;
+	private final DevcloudProperties applicationProperties;
 
 	// properties from pipeline config json
 //    private String repoUrl;
@@ -51,7 +51,7 @@ public class SonarJavaImageBuildHandler extends AbstractHandler {
 		this.dockerApi = SpringUtil.getBean(DockerApi.class);
 		this.projectService = SpringUtil.getBean(ProjectService.class);
 		this.branchService = SpringUtil.getBean(BranchService.class);
-		this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
+		this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
 	}
 
 	@Override

+ 12 - 12
web/src/main/java/cn/seecoder/web/core/pipeline/inspector/PipelineInspector.java

@@ -1,17 +1,17 @@
 package cn.seecoder.web.core.pipeline.inspector;
 
-import cn.seecoder.web.infra.k8s.DeploymentApi;
-import cn.seecoder.web.infra.k8s.IngressApi;
-import cn.seecoder.web.infra.k8s.K8sConstants;
-import cn.seecoder.web.infra.k8s.LogApi;
-import cn.seecoder.web.infra.k8s.NamespaceApi;
-import cn.seecoder.web.infra.k8s.PodApi;
-import cn.seecoder.web.infra.k8s.ServiceApi;
-import cn.seecoder.web.infra.k8s.model.Deployment;
-import cn.seecoder.web.infra.k8s.model.Ingress;
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
-import cn.seecoder.web.infra.k8s.model.Pod;
-import cn.seecoder.web.infra.k8s.model.Service;
+import cn.seecoder.web.infrastructure.external.k8s.DeploymentApi;
+import cn.seecoder.web.infrastructure.external.k8s.IngressApi;
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
+import cn.seecoder.web.infrastructure.external.k8s.LogApi;
+import cn.seecoder.web.infrastructure.external.k8s.NamespaceApi;
+import cn.seecoder.web.infrastructure.external.k8s.PodApi;
+import cn.seecoder.web.infrastructure.external.k8s.ServiceApi;
+import cn.seecoder.web.infrastructure.external.k8s.model.Deployment;
+import cn.seecoder.web.infrastructure.external.k8s.model.Ingress;
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
+import cn.seecoder.web.infrastructure.external.k8s.model.Pod;
+import cn.seecoder.web.infrastructure.external.k8s.model.Service;
 import cn.seecoder.common.util.SpringUtil;
 import cn.seecoder.web.core.pipeline.Context;
 import io.kubernetes.client.openapi.models.V1DeploymentStatus;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/Response.java → web/src/main/java/cn/seecoder/web/dto/Response.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo;
+package cn.seecoder.web.dto;
 
 import lombok.Data;
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestBodyVO.java → web/src/main/java/cn/seecoder/web/dto/apitest/ApiTestBodyVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.apitest;
+package cn.seecoder.web.dto.apitest;
 
-import cn.seecoder.web.model.po.apitest.ApiTestBody;
+import cn.seecoder.web.entity.apitest.ApiTestBody;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestInfoVO.java → web/src/main/java/cn/seecoder/web/dto/apitest/ApiTestInfoVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.apitest;
+package cn.seecoder.web.dto.apitest;
 
-import cn.seecoder.web.model.po.apitest.ApiTestInfo;
+import cn.seecoder.web.entity.apitest.ApiTestInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestResultVO.java → web/src/main/java/cn/seecoder/web/dto/apitest/ApiTestResultVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.apitest;
+package cn.seecoder.web.dto.apitest;
 
-import cn.seecoder.web.model.po.apitest.ApiTestResult;
+import cn.seecoder.web.entity.apitest.ApiTestResult;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/apitest/TestInfoVO.java → web/src/main/java/cn/seecoder/web/dto/apitest/TestInfoVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.apitest;
+package cn.seecoder.web.dto.apitest;
 
 
-import cn.seecoder.web.model.po.apitest.TestInfo;
+import cn.seecoder.web.entity.apitest.TestInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/apitest/TestResultVO.java → web/src/main/java/cn/seecoder/web/dto/apitest/TestResultVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.apitest;
+package cn.seecoder.web.dto.apitest;
 
-import cn.seecoder.web.model.po.apitest.TestResult;
+import cn.seecoder.web.entity.apitest.TestResult;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListCreateVO.java → web/src/main/java/cn/seecoder/web/dto/buglist/BugListCreateVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.buglist;
+package cn.seecoder.web.dto.buglist;
 
-import cn.seecoder.web.model.enums.PriorityEnum;
+import cn.seecoder.web.enums.PriorityEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListUpdateBasicVO.java → web/src/main/java/cn/seecoder/web/dto/buglist/BugListUpdateBasicVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.buglist;
+package cn.seecoder.web.dto.buglist;
 
-import cn.seecoder.web.model.enums.BugListStateEnum;
-import cn.seecoder.web.model.enums.PriorityEnum;
+import cn.seecoder.web.enums.BugListStateEnum;
+import cn.seecoder.web.enums.PriorityEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 4 - 4
web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListVO.java → web/src/main/java/cn/seecoder/web/dto/buglist/BugListVO.java

@@ -1,8 +1,8 @@
-package cn.seecoder.web.model.vo.buglist;
+package cn.seecoder.web.dto.buglist;
 
-import cn.seecoder.web.model.enums.BugListStateEnum;
-import cn.seecoder.web.model.enums.PriorityEnum;
-import cn.seecoder.web.model.po.buglist.BugListPO;
+import cn.seecoder.web.enums.BugListStateEnum;
+import cn.seecoder.web.enums.PriorityEnum;
+import cn.seecoder.web.entity.buglist.BugListPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewCreateVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/CodeReviewCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewSortedList.java → web/src/main/java/cn/seecoder/web/dto/codereview/CodeReviewSortedList.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/CodeReviewVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
-import cn.seecoder.web.model.enums.CodeReviewStatusEnum;
-import cn.seecoder.web.model.po.codereview.CodeReviewPO;
+import cn.seecoder.web.enums.CodeReviewStatusEnum;
+import cn.seecoder.web.entity.codereview.CodeReviewPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/codereview/CommentCreateVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/CommentCreateVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
-import cn.seecoder.web.model.enums.CommentTypeEnum;
+import cn.seecoder.web.enums.CommentTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/codereview/CommentVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/CommentVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
-import cn.seecoder.web.model.enums.CommentTypeEnum;
-import cn.seecoder.web.model.po.codereview.CommentPO;
+import cn.seecoder.web.enums.CommentTypeEnum;
+import cn.seecoder.web.entity.codereview.CommentPO;
 import com.nju.edu.gitlab.vo.commit.CommitVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/codereview/FileNodeCreateVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/FileNodeCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/codereview/FileNodeVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/FileNodeVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/codereview/FileReviewCreateVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/FileReviewCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/codereview/FileReviewVO.java → web/src/main/java/cn/seecoder/web/dto/codereview/FileReviewVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.codereview;
+package cn.seecoder.web.dto.codereview;
 
-import cn.seecoder.web.model.enums.FileReviewStatusEnum;
-import cn.seecoder.web.model.po.codereview.FileReviewPO;
+import cn.seecoder.web.enums.FileReviewStatusEnum;
+import cn.seecoder.web.entity.codereview.FileReviewPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/commit/CommitQualityVO.java → web/src/main/java/cn/seecoder/web/dto/commit/CommitQualityVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.commit;
+package cn.seecoder.web.dto.commit;
 
-import cn.seecoder.web.model.enums.CommitCheckResultEnum;
+import cn.seecoder.web.enums.CommitCheckResultEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

+ 4 - 4
web/src/main/java/cn/seecoder/web/model/vo/commit/CommitVO.java → web/src/main/java/cn/seecoder/web/dto/commit/CommitVO.java

@@ -1,8 +1,8 @@
-package cn.seecoder.web.model.vo.commit;
+package cn.seecoder.web.dto.commit;
 
-import cn.seecoder.web.model.enums.CommitCheckResultEnum;
-import cn.seecoder.web.model.enums.CommitRelatedEnum;
-import cn.seecoder.web.model.po.commit.CommitPO;
+import cn.seecoder.web.enums.CommitCheckResultEnum;
+import cn.seecoder.web.enums.CommitRelatedEnum;
+import cn.seecoder.web.entity.commit.CommitPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/commit/GitWebHookVO.java → web/src/main/java/cn/seecoder/web/dto/commit/GitWebHookVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.commit;
+package cn.seecoder.web.dto.commit;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/devmanage/DeploymentVO.java → web/src/main/java/cn/seecoder/web/dto/devmanage/DeploymentVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.devmanage;
+package cn.seecoder.web.dto.devmanage;
 
-import cn.seecoder.web.model.po.pipeline.DeploymentPO;
+import cn.seecoder.web.entity.pipeline.DeploymentPO;
 import lombok.Data;
 
 import java.text.SimpleDateFormat;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/fork/ForkVO.java → web/src/main/java/cn/seecoder/web/dto/fork/ForkVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.fork;
+package cn.seecoder.web.dto.fork;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestCaseVO.java → web/src/main/java/cn/seecoder/web/dto/functest/FuncTestCaseVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.functest;
+package cn.seecoder.web.dto.functest;
 
-import cn.seecoder.web.model.po.functest.FuncTestCasePO;
+import cn.seecoder.web.entity.functest.FuncTestCasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestRecordVO.java → web/src/main/java/cn/seecoder/web/dto/functest/FuncTestRecordVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.functest;
+package cn.seecoder.web.dto.functest;
 
-import cn.seecoder.web.model.enums.FuncTestOperatorEnum;
+import cn.seecoder.web.enums.FuncTestOperatorEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestStepVO.java → web/src/main/java/cn/seecoder/web/dto/functest/FuncTestStepVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.functest;
+package cn.seecoder.web.dto.functest;
 
-import cn.seecoder.web.model.enums.FuncTestStepState;
-import cn.seecoder.web.model.po.functest.FuncTestStepPO;
+import cn.seecoder.web.enums.FuncTestStepState;
+import cn.seecoder.web.entity.functest.FuncTestStepPO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/hook/SonarResultHookVO.java → web/src/main/java/cn/seecoder/web/dto/hook/SonarResultHookVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.hook;
+package cn.seecoder.web.dto.hook;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/interfacetest/InterfaceTestInfoVO.java → web/src/main/java/cn/seecoder/web/dto/interfacetest/InterfaceTestInfoVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.interfacetest;
+package cn.seecoder.web.dto.interfacetest;
 
-import cn.seecoder.web.model.po.interfacetest.InterfaceTestInfo;
+import cn.seecoder.web.entity.interfacetest.InterfaceTestInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/interfacetest/InterfaceTestResultVO.java → web/src/main/java/cn/seecoder/web/dto/interfacetest/InterfaceTestResultVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.interfacetest;
+package cn.seecoder.web.dto.interfacetest;
 
-import cn.seecoder.web.model.po.interfacetest.InterfaceTestResult;
+import cn.seecoder.web.entity.interfacetest.InterfaceTestResult;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/message/MessageCreateVO.java → web/src/main/java/cn/seecoder/web/dto/message/MessageCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.message;
+package cn.seecoder.web.dto.message;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/message/MessageVO.java → web/src/main/java/cn/seecoder/web/dto/message/MessageVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.message;
+package cn.seecoder.web.dto.message;
 
-import cn.seecoder.web.model.enums.MessageStatusEnum;
-import cn.seecoder.web.model.po.message.MessagePO;
+import cn.seecoder.web.enums.MessageStatusEnum;
+import cn.seecoder.web.entity.message.MessagePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/pipeline/DeploymentInfoVO.java → web/src/main/java/cn/seecoder/web/dto/pipeline/DeploymentInfoVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.pipeline;
+package cn.seecoder.web.dto.pipeline;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/pipeline/PipelineConfigVO.java → web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineConfigVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.pipeline;
+package cn.seecoder.web.dto.pipeline;
 
-import cn.seecoder.web.model.po.pipeline.PipelinePO;
+import cn.seecoder.web.entity.pipeline.PipelinePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/pipeline/PipelineCreateVO.java → web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.pipeline;
+package cn.seecoder.web.dto.pipeline;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/pipeline/PipelineInfoVO.java → web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineInfoVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.pipeline;
+package cn.seecoder.web.dto.pipeline;
 
-import cn.seecoder.web.model.po.pipeline.PipelinePO;
-import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
+import cn.seecoder.web.entity.pipeline.PipelinePO;
+import cn.seecoder.web.entity.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/pipeline/PipelineRecordVO.java → web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineRecordVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.pipeline;
+package cn.seecoder.web.dto.pipeline;
 
-import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
+import cn.seecoder.web.entity.pipeline.PipelineRecordPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/pipeline/PipelineUpdateConfigVO.java → web/src/main/java/cn/seecoder/web/dto/pipeline/PipelineUpdateConfigVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.pipeline;
+package cn.seecoder.web.dto.pipeline;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/pipeline/StageVO.java → web/src/main/java/cn/seecoder/web/dto/pipeline/StageVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.pipeline;
+package cn.seecoder.web.dto.pipeline;
 
-import cn.seecoder.web.model.po.pipeline.StageConfigPO;
-import cn.seecoder.web.model.po.pipeline.StagePO;
+import cn.seecoder.web.entity.pipeline.StageConfigPO;
+import cn.seecoder.web.entity.pipeline.StagePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/project/ProjectCreateVO.java → web/src/main/java/cn/seecoder/web/dto/project/ProjectCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.project;
+package cn.seecoder.web.dto.project;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/project/ProjectVO.java → web/src/main/java/cn/seecoder/web/dto/project/ProjectVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.project;
+package cn.seecoder.web.dto.project;
 
-import cn.seecoder.web.model.po.project.ProjectPO;
+import cn.seecoder.web.entity.project.ProjectPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/scheduler/StatusVO.java → web/src/main/java/cn/seecoder/web/dto/scheduler/StatusVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.scheduler;
+package cn.seecoder.web.dto.scheduler;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/sql/DBInstanceVO.java → web/src/main/java/cn/seecoder/web/dto/sql/DBInstanceVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.sql;
+package cn.seecoder.web.dto.sql;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/sql/SqlExecVO.java → web/src/main/java/cn/seecoder/web/dto/sql/SqlExecVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.sql;
+package cn.seecoder.web.dto.sql;
 
 
 import io.swagger.annotations.ApiModel;

+ 4 - 4
web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeCreateVO.java → web/src/main/java/cn/seecoder/web/dto/tree/TreeNodeCreateVO.java

@@ -1,8 +1,8 @@
-package cn.seecoder.web.model.vo.tree;
+package cn.seecoder.web.dto.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.enums.NodeStateEnum;
+import cn.seecoder.web.enums.NodeTypeEnum;
+import cn.seecoder.web.enums.PriorityEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeUpdateBasicVO.java → web/src/main/java/cn/seecoder/web/dto/tree/TreeNodeUpdateBasicVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.tree;
+package cn.seecoder.web.dto.tree;
 
-import cn.seecoder.web.model.enums.NodeStateEnum;
-import cn.seecoder.web.model.enums.PriorityEnum;
+import cn.seecoder.web.enums.NodeStateEnum;
+import cn.seecoder.web.enums.PriorityEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 7 - 7
web/src/main/java/cn/seecoder/web/model/vo/tree/TreeNodeVO.java → web/src/main/java/cn/seecoder/web/dto/tree/TreeNodeVO.java

@@ -1,11 +1,11 @@
-package cn.seecoder.web.model.vo.tree;
+package cn.seecoder.web.dto.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 cn.seecoder.web.enums.NodeStateEnum;
+import cn.seecoder.web.enums.NodeTypeEnum;
+import cn.seecoder.web.enums.PriorityEnum;
+import cn.seecoder.web.entity.commit.CommitPO;
+import cn.seecoder.web.entity.tree.TreeNodePO;
+import cn.seecoder.web.dto.commit.CommitVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/user/GitlabUserCreateVO.java → web/src/main/java/cn/seecoder/web/dto/user/GitlabUserCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.user;
+package cn.seecoder.web.dto.user;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/vo/user/UserVO.java → web/src/main/java/cn/seecoder/web/dto/user/UserVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.user;
+package cn.seecoder.web.dto.user;
 
-import cn.seecoder.web.model.enums.UserIdentity;
-import cn.seecoder.web.model.po.user.UserPO;
+import cn.seecoder.web.enums.UserIdentity;
+import cn.seecoder.web.entity.user.UserPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestBody.java → web/src/main/java/cn/seecoder/web/entity/apitest/ApiTestBody.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.apitest;
+package cn.seecoder.web.entity.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestInfo.java → web/src/main/java/cn/seecoder/web/entity/apitest/ApiTestInfo.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.apitest;
+package cn.seecoder.web.entity.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestResult.java → web/src/main/java/cn/seecoder/web/entity/apitest/ApiTestResult.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.apitest;
+package cn.seecoder.web.entity.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/apitest/TestInfo.java → web/src/main/java/cn/seecoder/web/entity/apitest/TestInfo.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.apitest;
+package cn.seecoder.web.entity.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/apitest/TestResult.java → web/src/main/java/cn/seecoder/web/entity/apitest/TestResult.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.apitest;
+package cn.seecoder.web.entity.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/po/buglist/BugListPO.java → web/src/main/java/cn/seecoder/web/entity/buglist/BugListPO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.po.buglist;
+package cn.seecoder.web.entity.buglist;
 
-import cn.seecoder.web.model.enums.BugListStateEnum;
-import cn.seecoder.web.model.enums.PriorityEnum;
+import cn.seecoder.web.enums.BugListStateEnum;
+import cn.seecoder.web.enums.PriorityEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/codereview/CodeReviewPO.java → web/src/main/java/cn/seecoder/web/entity/codereview/CodeReviewPO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.po.codereview;
+package cn.seecoder.web.entity.codereview;
 
-import cn.seecoder.web.model.enums.CodeReviewStatusEnum;
+import cn.seecoder.web.enums.CodeReviewStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/codereview/CommentPO.java → web/src/main/java/cn/seecoder/web/entity/codereview/CommentPO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.po.codereview;
+package cn.seecoder.web.entity.codereview;
 
-import cn.seecoder.web.model.enums.CommentTypeEnum;
+import cn.seecoder.web.enums.CommentTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/po/codereview/FileReviewPO.java → web/src/main/java/cn/seecoder/web/entity/codereview/FileReviewPO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.po.codereview;
+package cn.seecoder.web.entity.codereview;
 
-import cn.seecoder.web.model.enums.FileReviewStatusEnum;
-import cn.seecoder.web.model.vo.codereview.FileReviewCreateVO;
+import cn.seecoder.web.enums.FileReviewStatusEnum;
+import cn.seecoder.web.dto.codereview.FileReviewCreateVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/codereview/InspectionResultPO.java → web/src/main/java/cn/seecoder/web/entity/codereview/InspectionResultPO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.codereview;
+package cn.seecoder.web.entity.codereview;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 3 - 3
web/src/main/java/cn/seecoder/web/model/po/commit/CommitPO.java → web/src/main/java/cn/seecoder/web/entity/commit/CommitPO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.po.commit;
+package cn.seecoder.web.entity.commit;
 
-import cn.seecoder.web.model.enums.CommitRelatedEnum;
-import cn.seecoder.web.model.vo.commit.GitWebHookVO;
+import cn.seecoder.web.enums.CommitRelatedEnum;
+import cn.seecoder.web.dto.commit.GitWebHookVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/commit/CommitQualityPO.java → web/src/main/java/cn/seecoder/web/entity/commit/CommitQualityPO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.commit;
+package cn.seecoder.web.entity.commit;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestCasePO.java → web/src/main/java/cn/seecoder/web/entity/functest/FuncTestCasePO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.functest;
+package cn.seecoder.web.entity.functest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestRecordPO.java → web/src/main/java/cn/seecoder/web/entity/functest/FuncTestRecordPO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.po.functest;
+package cn.seecoder.web.entity.functest;
 
-import cn.seecoder.web.model.enums.FuncTestOperatorEnum;
+import cn.seecoder.web.enums.FuncTestOperatorEnum;
 import lombok.Builder;
 import lombok.Data;
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestStepPO.java → web/src/main/java/cn/seecoder/web/entity/functest/FuncTestStepPO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.po.functest;
+package cn.seecoder.web.entity.functest;
 
-import cn.seecoder.web.model.enums.FuncTestStepState;
+import cn.seecoder.web.enums.FuncTestStepState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/interfacetest/InterfaceTestInfo.java → web/src/main/java/cn/seecoder/web/entity/interfacetest/InterfaceTestInfo.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.interfacetest;
+package cn.seecoder.web.entity.interfacetest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/interfacetest/InterfaceTestResult.java → web/src/main/java/cn/seecoder/web/entity/interfacetest/InterfaceTestResult.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.interfacetest;
+package cn.seecoder.web.entity.interfacetest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/message/MessagePO.java → web/src/main/java/cn/seecoder/web/entity/message/MessagePO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.po.message;
+package cn.seecoder.web.entity.message;
 
-import cn.seecoder.web.model.enums.MessageStatusEnum;
+import cn.seecoder.web.enums.MessageStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.