Kaynağa Gözat

refactor: normalize backend naming

weipengtao 3 ay önce
ebeveyn
işleme
6c891e4176
83 değiştirilmiş dosya ile 332 ekleme ve 332 silme
  1. 19 19
      web/src/main/java/cn/seecoder/web/controller/apitest/ApiTestController.java
  2. 4 4
      web/src/main/java/cn/seecoder/web/controller/autotest/AutoTestController.java
  3. 5 5
      web/src/main/java/cn/seecoder/web/controller/buglist/BugListController.java
  4. 7 7
      web/src/main/java/cn/seecoder/web/controller/codereview/CodeReviewController.java
  5. 4 4
      web/src/main/java/cn/seecoder/web/controller/codereview/CommentController.java
  6. 5 5
      web/src/main/java/cn/seecoder/web/controller/functest/FuncTestController.java
  7. 4 4
      web/src/main/java/cn/seecoder/web/controller/interfacetest/InterfaceTestController.java
  8. 5 5
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/ApiTestHandler.java
  9. 1 1
      web/src/main/java/cn/seecoder/web/core/pipeline/handler/InterfaceTestHandler.java
  10. 6 6
      web/src/main/java/cn/seecoder/web/dao/apitest/ApiTestMapper.java
  11. 2 2
      web/src/main/java/cn/seecoder/web/dao/buglist/BugListMapper.java
  12. 2 2
      web/src/main/java/cn/seecoder/web/dao/codereview/BranchReviewMapper.java
  13. 2 2
      web/src/main/java/cn/seecoder/web/dao/codereview/CommentMapper.java
  14. 2 2
      web/src/main/java/cn/seecoder/web/dao/codereview/FileReviewMapper.java
  15. 2 2
      web/src/main/java/cn/seecoder/web/dao/codereview/InspectionResultMapper.java
  16. 2 2
      web/src/main/java/cn/seecoder/web/dao/functest/FuncTestCaseMapper.java
  17. 2 2
      web/src/main/java/cn/seecoder/web/dao/functest/FuncTestRecordMapper.java
  18. 2 2
      web/src/main/java/cn/seecoder/web/dao/functest/FuncTestStepMapper.java
  19. 3 3
      web/src/main/java/cn/seecoder/web/dao/interfacetest/InterfaceTestMapper.java
  20. 9 9
      web/src/main/java/cn/seecoder/web/infrastructure/config/AuthTools.java
  21. 2 2
      web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestBody.java
  22. 2 2
      web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestInfo.java
  23. 2 2
      web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestResult.java
  24. 1 1
      web/src/main/java/cn/seecoder/web/model/po/apitest/TestInfo.java
  25. 1 1
      web/src/main/java/cn/seecoder/web/model/po/apitest/TestResult.java
  26. 1 1
      web/src/main/java/cn/seecoder/web/model/po/buglist/BugListPO.java
  27. 1 1
      web/src/main/java/cn/seecoder/web/model/po/codereview/CodeReviewPO.java
  28. 1 1
      web/src/main/java/cn/seecoder/web/model/po/codereview/CommentPO.java
  29. 2 2
      web/src/main/java/cn/seecoder/web/model/po/codereview/FileReviewPO.java
  30. 1 1
      web/src/main/java/cn/seecoder/web/model/po/codereview/InspectionResultPO.java
  31. 1 1
      web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestCasePO.java
  32. 1 1
      web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestRecordPO.java
  33. 1 1
      web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestStepPO.java
  34. 1 1
      web/src/main/java/cn/seecoder/web/model/po/interfacetest/InterfaceTestInfo.java
  35. 1 1
      web/src/main/java/cn/seecoder/web/model/po/interfacetest/InterfaceTestResult.java
  36. 4 4
      web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestBodyVO.java
  37. 4 4
      web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestInfoVO.java
  38. 5 5
      web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestResultVO.java
  39. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/apitest/TestInfoVO.java
  40. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/apitest/TestResultVO.java
  41. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListCreateVO.java
  42. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListUpdateBasicVO.java
  43. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListVO.java
  44. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewCreateVO.java
  45. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewSortedList.java
  46. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewVO.java
  47. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/codereview/CommentCreateVO.java
  48. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/codereview/CommentVO.java
  49. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/codereview/FileNodeCreateVO.java
  50. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/codereview/FileNodeVO.java
  51. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/codereview/FileReviewCreateVO.java
  52. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/codereview/FileReviewVO.java
  53. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestCaseVO.java
  54. 1 1
      web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestRecordVO.java
  55. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestStepVO.java
  56. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/interfacetest/InterfaceTestInfoVO.java
  57. 2 2
      web/src/main/java/cn/seecoder/web/model/vo/interfacetest/InterfaceTestResultVO.java
  58. 0 45
      web/src/main/java/cn/seecoder/web/service/APITest/APITestService.java
  59. 45 0
      web/src/main/java/cn/seecoder/web/service/apitest/ApiTestService.java
  60. 0 9
      web/src/main/java/cn/seecoder/web/service/auto_test/AutoTestService.java
  61. 9 0
      web/src/main/java/cn/seecoder/web/service/autotest/AutoTestService.java
  62. 5 5
      web/src/main/java/cn/seecoder/web/service/buglist/BugListService.java
  63. 4 4
      web/src/main/java/cn/seecoder/web/service/codereview/BranchReviewService.java
  64. 3 3
      web/src/main/java/cn/seecoder/web/service/codereview/CommentService.java
  65. 4 4
      web/src/main/java/cn/seecoder/web/service/codereview/FileReviewService.java
  66. 4 4
      web/src/main/java/cn/seecoder/web/service/functest/FuncTestService.java
  67. 31 31
      web/src/main/java/cn/seecoder/web/service/impl/apitest/ApiTestServiceImpl.java
  68. 7 7
      web/src/main/java/cn/seecoder/web/service/impl/autotest/AutoTestServiceImpl.java
  69. 7 7
      web/src/main/java/cn/seecoder/web/service/impl/buglist/BugListServiceImpl.java
  70. 7 7
      web/src/main/java/cn/seecoder/web/service/impl/codereview/BranchReviewServiceImpl.java
  71. 9 9
      web/src/main/java/cn/seecoder/web/service/impl/codereview/CommentServiceImpl.java
  72. 10 10
      web/src/main/java/cn/seecoder/web/service/impl/codereview/FileReviewServiceImpl.java
  73. 2 2
      web/src/main/java/cn/seecoder/web/service/impl/commit/CommitLinkServiceImpl.java
  74. 2 2
      web/src/main/java/cn/seecoder/web/service/impl/commit/CommitServiceImpl.java
  75. 13 13
      web/src/main/java/cn/seecoder/web/service/impl/functest/FuncTestServiceImpl.java
  76. 7 7
      web/src/main/java/cn/seecoder/web/service/impl/interfacetest/InterfaceTestServiceImpl.java
  77. 3 3
      web/src/main/java/cn/seecoder/web/service/interfacetest/InterfaceTestService.java
  78. 2 2
      web/src/test/java/cn/seecoder/web/dao/project/BugListMapperTest.java
  79. 4 4
      web/src/test/java/cn/seecoder/web/infrastructure/config/WebSecurityConfigTest.java
  80. 1 1
      web/src/test/java/cn/seecoder/web/service/codereview/BranchReviewServiceTest.java
  81. 2 2
      web/src/test/java/cn/seecoder/web/service/codereview/CommentServiceTest.java
  82. 1 1
      web/src/test/java/cn/seecoder/web/service/codereview/FileReviewServiceTest.java
  83. 1 1
      web/src/test/java/cn/seecoder/web/service/functest/FuncTestServiceTest.java

+ 19 - 19
web/src/main/java/cn/seecoder/web/controller/APITest/APITestController.java → web/src/main/java/cn/seecoder/web/controller/apitest/ApiTestController.java

@@ -1,10 +1,10 @@
-package cn.seecoder.web.controller.APITest;
+package cn.seecoder.web.controller.apitest;
 
-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.model.vo.apitest.ApiTestBodyVO;
+import cn.seecoder.web.model.vo.apitest.ApiTestInfoVO;
+import cn.seecoder.web.model.vo.apitest.ApiTestResultVO;
 import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.service.APITest.APITestService;
+import cn.seecoder.web.service.apitest.ApiTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -20,56 +20,56 @@ import java.util.List;
 @Api(tags = "接口测试 API")
 @RestController
 @RequestMapping("/test")
-public class APITestController {
+public class ApiTestController {
 
-    private final APITestService apiTestService;
+    private final ApiTestService apiTestService;
 
     @Autowired
-    public APITestController(APITestService apiTestService) {
+    public ApiTestController(ApiTestService apiTestService) {
         this.apiTestService = apiTestService;
     }
 
     @PostMapping("/create")
     @ApiOperation(value = "创建一个新的测试任务", httpMethod = "POST")
-    public Response createAPITestMission(@RequestBody APITestBodyVO apiTestBodyVO) {
-        apiTestService.createAPITest(apiTestBodyVO);
+    public Response createApiTestMission(@RequestBody ApiTestBodyVO apiTestBodyVO) {
+        apiTestService.createApiTest(apiTestBodyVO);
         return Response.buildSuccess();
     }
 
     @GetMapping("/list/{projectId}")
     @ApiOperation(value = "获取指定项目的所有测试任务", httpMethod = "GET")
     @ApiImplicitParam(name = "projectId", dataType ="int",paramType = "query")
-    public Response<List<APITestInfoVO>> getAPITestInfosByProjectId(@PathVariable("projectId") Integer projectId) {
-        return Response.buildSuccess(apiTestService.getAPITestsByProjectId(projectId));
+    public Response<List<ApiTestInfoVO>> getApiTestInfosByProjectId(@PathVariable("projectId") Integer projectId) {
+        return Response.buildSuccess(apiTestService.getApiTestsByProjectId(projectId));
     }
 
     @GetMapping("/delete/{testId}")
     @ApiOperation(value = "删除指定测试任务", httpMethod = "DELETE")
     @ApiImplicitParam(name = "testId", dataType = "int", paramType = "query")
-    public Response deleteAPITestInfoByTestId(@PathVariable("testId") Integer testId) {
-        apiTestService.deleteAPITest(testId);
+    public Response deleteApiTestInfoByTestId(@PathVariable("testId") Integer testId) {
+        apiTestService.deleteApiTest(testId);
         return Response.buildSuccess();
     }
 
     @GetMapping("/execute/{testId}")
     @ApiOperation(value = "执行制定测试任务", httpMethod = "GET")
     @ApiImplicitParam(name = "testID", dataType = "int", paramType = "query")
-    public Response executeAPITestByTestId(@PathVariable("testId") Integer testId) throws InterruptedException {
-        apiTestService.executeAPITest(testId);
+    public Response executeApiTestByTestId(@PathVariable("testId") Integer testId) throws InterruptedException {
+        apiTestService.executeApiTest(testId);
         return Response.buildSuccess();
     }
 
     @GetMapping("/result/{testId}")
     @ApiOperation(value = "获取执行测试任务的执行结果列表", httpMethod = "GET")
     @ApiImplicitParam(name = "testId", dataType = "int", paramType = "query")
-    public Response<List<APITestResultVO>> getAPITestResultByTestId(@PathVariable("testId") Integer testId) {
-        return Response.buildSuccess(apiTestService.getAPITestResultByTestId(testId));
+    public Response<List<ApiTestResultVO>> getApiTestResultByTestId(@PathVariable("testId") Integer testId) {
+        return Response.buildSuccess(apiTestService.getApiTestResultByTestId(testId));
     }
 
     @GetMapping("/latest/{testId}")
     @ApiOperation(value = "获取测试任务的最近一次执行信息", httpMethod = "GET")
     @ApiImplicitParam(name = "testId", dataType = "int", paramType = "query")
-    public Response<APITestResultVO> getLatestTestResultByTestId(@PathVariable("testId") Integer testId) {
+    public Response<ApiTestResultVO> getLatestTestResultByTestId(@PathVariable("testId") Integer testId) {
         return Response.buildSuccess(apiTestService.getLatestTestResultByTestId(testId));
     }
 }

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

@@ -1,8 +1,8 @@
-package cn.seecoder.web.controller.auto_test;
+package cn.seecoder.web.controller.autotest;
 
-import cn.seecoder.web.model.vo.APITest.APITestResultVO;
+import cn.seecoder.web.model.vo.apitest.ApiTestResultVO;
 import cn.seecoder.web.model.vo.Response;
-import cn.seecoder.web.service.auto_test.AutoTestService;
+import cn.seecoder.web.service.autotest.AutoTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,7 +28,7 @@ public class AutoTestController {
             @ApiImplicitParam(name = "projectId", dataType = "int", paramType = "query"),
             @ApiImplicitParam(name = "testId", dataType = "int", paramType = "query")
     })
-    public Response<List<APITestResultVO>> getAutoTestResultByProjectId(@RequestParam("projectId") Integer projectId, @RequestParam("testId") Integer testId) {
+    public Response<List<ApiTestResultVO>> getAutoTestResultByProjectId(@RequestParam("projectId") Integer projectId, @RequestParam("testId") Integer testId) {
         return Response.buildSuccess(autoTestService.getAutoTestResultByProjectId(projectId, testId));
     }
 }

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

@@ -1,4 +1,4 @@
-package cn.seecoder.web.controller.bug_list;
+package cn.seecoder.web.controller.buglist;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -6,10 +6,10 @@ 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 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.service.buglist.BugListService;
 
 import java.util.List;
 

+ 7 - 7
web/src/main/java/cn/seecoder/web/controller/code_review/CodeReviewController.java → web/src/main/java/cn/seecoder/web/controller/codereview/CodeReviewController.java

@@ -1,13 +1,13 @@
-package cn.seecoder.web.controller.code_review;
+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.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.FileReviewCreateVO;
-import cn.seecoder.web.service.code_review.BranchReviewService;
-import cn.seecoder.web.service.code_review.FileReviewService;
+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.FileReviewCreateVO;
+import cn.seecoder.web.service.codereview.BranchReviewService;
+import cn.seecoder.web.service.codereview.FileReviewService;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import io.swagger.annotations.*;

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

@@ -1,9 +1,9 @@
-package cn.seecoder.web.controller.code_review;
+package cn.seecoder.web.controller.codereview;
 
 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 cn.seecoder.web.model.vo.codereview.CommentCreateVO;
+import cn.seecoder.web.model.vo.codereview.CommentVO;
+import cn.seecoder.web.service.codereview.CommentService;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,7 +1,7 @@
-package cn.seecoder.web.controller.func_test;
+package cn.seecoder.web.controller.functest;
 
 import cn.seecoder.web.model.enums.FuncTestStepState;
-import cn.seecoder.web.model.vo.func_test.FuncTestRecordVO;
+import cn.seecoder.web.model.vo.functest.FuncTestRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -9,9 +9,9 @@ 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 cn.seecoder.web.model.vo.functest.FuncTestCaseVO;
+import cn.seecoder.web.model.vo.functest.FuncTestStepVO;
+import cn.seecoder.web.service.functest.FuncTestService;
 
 import java.util.List;
 

+ 4 - 4
web/src/main/java/cn/seecoder/web/controller/InterfaceTest/InterfaceTestController.java → web/src/main/java/cn/seecoder/web/controller/interfacetest/InterfaceTestController.java

@@ -1,9 +1,9 @@
-package cn.seecoder.web.controller.InterfaceTest;
+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.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 cn.seecoder.web.service.interfacetest.InterfaceTestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

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

@@ -3,8 +3,8 @@ 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 cn.seecoder.web.service.apitest.ApiTestService;
+import cn.seecoder.web.service.interfacetest.InterfaceTestService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,10 +24,10 @@ import java.io.IOException;
 @EqualsAndHashCode(callSuper = false)
 public class ApiTestHandler extends AbstractHandler {
 
-//    private final APITestService apiTestService;
+//    private final ApiTestService apiTestService;
 //
 //    public ApiTestHandler() {
-//        this.apiTestService = SpringUtil.getBean(APITestService.class);
+//        this.apiTestService = SpringUtil.getBean(ApiTestService.class);
 //    }
 //
 //
@@ -51,7 +51,7 @@ public class ApiTestHandler extends AbstractHandler {
 ////        }
 //        for (Integer testId : apiTestIds){
 //            try {
-//                apiTestService.executeAPITest(testId);
+//                apiTestService.executeApiTest(testId);
 //            } catch (InterruptedException e) {
 //                log.warn("api test 出现 InterruptedException, 目前暂无特殊处理。 Test id: {}",testId);
 //            }

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

@@ -3,7 +3,7 @@ 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.InterfaceTest.InterfaceTestService;
+import cn.seecoder.web.service.interfacetest.InterfaceTestService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 6 - 6
web/src/main/java/cn/seecoder/web/dao/APITest/APITestMapper.java → web/src/main/java/cn/seecoder/web/dao/apitest/ApiTestMapper.java

@@ -1,10 +1,10 @@
-package cn.seecoder.web.dao.APITest;
+package cn.seecoder.web.dao.apitest;
 
-import cn.seecoder.web.model.vo.APITest.APITestResultVO;
+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.po.apitest.TestInfo;
+import cn.seecoder.web.model.po.apitest.TestResult;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @description:
  */
 @Repository
-public interface APITestMapper {
+public interface ApiTestMapper {
 
     @InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")
     @Options(useGeneratedKeys = true, keyProperty = "param1.testId")
@@ -44,5 +44,5 @@ public interface APITestMapper {
     TestResult selectLatestTestResultById(@Param("testId") Integer testId,@Param("pipelineRecordId") Integer pipelineRecordId);
 
     @Select("select * from test_result where pipeline_record_id = #{recordId} and test_id = #{testId}")
-    List<APITestResultVO> selectByPipelineRecordId(@Param("recordId") Integer recordId, @Param("testId") Integer testId);
+    List<ApiTestResultVO> selectByPipelineRecordId(@Param("recordId") Integer recordId, @Param("testId") Integer testId);
 }

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

@@ -1,9 +1,9 @@
-package cn.seecoder.web.dao.bug_list;
+package cn.seecoder.web.dao.buglist;
 
 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 cn.seecoder.web.model.po.buglist.BugListPO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/code_review/BranchReviewMapper.java → web/src/main/java/cn/seecoder/web/dao/codereview/BranchReviewMapper.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.dao.code_review;
+package cn.seecoder.web.dao.codereview;
 
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.code_review.CodeReviewPO;
+import cn.seecoder.web.model.po.codereview.CodeReviewPO;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/code_review/CommentMapper.java → web/src/main/java/cn/seecoder/web/dao/codereview/CommentMapper.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.dao.code_review;
+package cn.seecoder.web.dao.codereview;
 
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.code_review.CommentPO;
+import cn.seecoder.web.model.po.codereview.CommentPO;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Select;

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/code_review/FileReviewMapper.java → web/src/main/java/cn/seecoder/web/dao/codereview/FileReviewMapper.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.dao.code_review;
+package cn.seecoder.web.dao.codereview;
 
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.code_review.FileReviewPO;
+import cn.seecoder.web.model.po.codereview.FileReviewPO;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.UpdateProvider;

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/code_review/InspectionResultMapper.java → web/src/main/java/cn/seecoder/web/dao/codereview/InspectionResultMapper.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.dao.code_review;
+package cn.seecoder.web.dao.codereview;
 
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.code_review.InspectionResultPO;
+import cn.seecoder.web.model.po.codereview.InspectionResultPO;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,9 +1,9 @@
-package cn.seecoder.web.dao.func_test;
+package cn.seecoder.web.dao.functest;
 
 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 cn.seecoder.web.model.po.functest.FuncTestCasePO;
 
 import java.util.List;
 

+ 2 - 2
web/src/main/java/cn/seecoder/web/dao/func_test/FuncTestRecordMapper.java → web/src/main/java/cn/seecoder/web/dao/functest/FuncTestRecordMapper.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.dao.func_test;
+package cn.seecoder.web.dao.functest;
 
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.func_test.FuncTestRecordPO;
+import cn.seecoder.web.model.po.functest.FuncTestRecordPO;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Select;

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

@@ -1,9 +1,9 @@
-package cn.seecoder.web.dao.func_test;
+package cn.seecoder.web.dao.functest;
 
 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 cn.seecoder.web.model.po.functest.FuncTestStepPO;
 
 import java.util.List;
 

+ 3 - 3
web/src/main/java/cn/seecoder/web/dao/InterfaceTest/InterfaceTestMapper.java → web/src/main/java/cn/seecoder/web/dao/interfacetest/InterfaceTestMapper.java

@@ -1,8 +1,8 @@
-package cn.seecoder.web.dao.InterfaceTest;
+package cn.seecoder.web.dao.interfacetest;
 
 import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import cn.seecoder.web.model.po.InterfaceTest.InterfaceTestInfo;
-import cn.seecoder.web.model.po.InterfaceTest.InterfaceTestResult;
+import cn.seecoder.web.model.po.interfacetest.InterfaceTestInfo;
+import cn.seecoder.web.model.po.interfacetest.InterfaceTestResult;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 

+ 9 - 9
web/src/main/java/cn/seecoder/web/infrastructure/config/AuthTools.java

@@ -1,17 +1,17 @@
 package cn.seecoder.web.infrastructure.config;
 
 import cn.seecoder.common.util.SpringUtil;
-import cn.seecoder.web.dao.APITest.APITestMapper;
-import cn.seecoder.web.dao.bug_list.BugListMapper;
-import cn.seecoder.web.dao.func_test.FuncTestCaseMapper;
-import cn.seecoder.web.dao.func_test.FuncTestStepMapper;
+import cn.seecoder.web.dao.apitest.ApiTestMapper;
+import cn.seecoder.web.dao.buglist.BugListMapper;
+import cn.seecoder.web.dao.functest.FuncTestCaseMapper;
+import cn.seecoder.web.dao.functest.FuncTestStepMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
 import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
 import cn.seecoder.web.dao.tree.TreeNodeMapper;
-import cn.seecoder.web.model.po.APITest.TestInfo;
-import cn.seecoder.web.model.po.bug_list.BugListPO;
-import cn.seecoder.web.model.po.func_test.FuncTestCasePO;
-import cn.seecoder.web.model.po.func_test.FuncTestStepPO;
+import cn.seecoder.web.model.po.apitest.TestInfo;
+import cn.seecoder.web.model.po.buglist.BugListPO;
+import cn.seecoder.web.model.po.functest.FuncTestCasePO;
+import cn.seecoder.web.model.po.functest.FuncTestStepPO;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.po.tree.TreeNodePO;
@@ -35,7 +35,7 @@ import java.util.Objects;
 @Component
 @Slf4j
 public class AuthTools {
-    private final APITestMapper apiTestMapper;
+    private final ApiTestMapper apiTestMapper;
     private final FuncTestCaseMapper funcTestCaseMapper;
     private final FuncTestStepMapper funcTestStepMapper;
     private final TreeNodeMapper treeNodeMapper;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/APITest/APITestBody.java → web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestBody.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.APITest;
+package cn.seecoder.web.model.po.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -15,7 +15,7 @@ import java.util.Map;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class APITestBody {
+public class ApiTestBody {
     private Integer projectId;
     private String createTime;
     private String username;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/APITest/APITestInfo.java → web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestInfo.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.APITest;
+package cn.seecoder.web.model.po.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +16,7 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class APITestInfo {
+public class ApiTestInfo {
     private Integer testId;
     private String testName;
     private Integer projectId;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/APITest/APITestResult.java → web/src/main/java/cn/seecoder/web/model/po/apitest/ApiTestResult.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.APITest;
+package cn.seecoder.web.model.po.apitest;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +16,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class APITestResult {
+public class ApiTestResult {
     private Integer id;
     private Integer testId;
     private String executeTime;

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

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.APITest;
+package cn.seecoder.web.model.po.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/model/po/apitest/TestResult.java

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

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/bug_list/BugListPO.java → web/src/main/java/cn/seecoder/web/model/po/buglist/BugListPO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.bug_list;
+package cn.seecoder.web.model.po.buglist;
 
 import cn.seecoder.web.model.enums.BugListStateEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/code_review/CodeReviewPO.java → web/src/main/java/cn/seecoder/web/model/po/codereview/CodeReviewPO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.code_review;
+package cn.seecoder.web.model.po.codereview;
 
 import cn.seecoder.web.model.enums.CodeReviewStatusEnum;
 import lombok.AllArgsConstructor;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/code_review/CommentPO.java → web/src/main/java/cn/seecoder/web/model/po/codereview/CommentPO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.code_review;
+package cn.seecoder.web.model.po.codereview;
 
 import cn.seecoder.web.model.enums.CommentTypeEnum;
 import lombok.AllArgsConstructor;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/po/code_review/FileReviewPO.java → web/src/main/java/cn/seecoder/web/model/po/codereview/FileReviewPO.java

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

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

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

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

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

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/func_test/FuncTestRecordPO.java → web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestRecordPO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.func_test;
+package cn.seecoder.web.model.po.functest;
 
 import cn.seecoder.web.model.enums.FuncTestOperatorEnum;
 import lombok.Builder;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/po/func_test/FuncTestStepPO.java → web/src/main/java/cn/seecoder/web/model/po/functest/FuncTestStepPO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.func_test;
+package cn.seecoder.web.model.po.functest;
 
 import cn.seecoder.web.model.enums.FuncTestStepState;
 import lombok.AllArgsConstructor;

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

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.po.InterfaceTest;
+package cn.seecoder.web.model.po.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/model/po/interfacetest/InterfaceTestResult.java

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

+ 4 - 4
web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestBodyVO.java → web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestBodyVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.APITest;
+package cn.seecoder.web.model.vo.apitest;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,7 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.po.APITest.APITestBody;
+import cn.seecoder.web.model.po.apitest.ApiTestBody;
 
 import java.util.Map;
 
@@ -19,7 +19,7 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("新建测试任务@")
-public class APITestBodyVO {
+public class ApiTestBodyVO {
 
     @ApiModelProperty("测试任务所属的project Id")
     private Integer projectId;
@@ -45,7 +45,7 @@ public class APITestBodyVO {
     @ApiModelProperty("测试并发数")
     private Integer qps;
 
-    public APITestBodyVO(APITestBody apiTestBody) {
+    public ApiTestBodyVO(ApiTestBody apiTestBody) {
         BeanUtils.copyProperties(apiTestBody, this);
     }
 }

+ 4 - 4
web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestInfoVO.java → web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestInfoVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.APITest;
+package cn.seecoder.web.model.vo.apitest;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,7 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import cn.seecoder.web.model.po.APITest.APITestInfo;
+import cn.seecoder.web.model.po.apitest.ApiTestInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -20,7 +20,7 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("测试任务的详细信息")
-public class APITestInfoVO {
+public class ApiTestInfoVO {
 
     @ApiModelProperty("测试id")
     private Integer testId;
@@ -49,7 +49,7 @@ public class APITestInfoVO {
     @ApiModelProperty("测试并发数")
     private Integer qps;
 
-    public APITestInfoVO(APITestInfo apiTestInfo) {
+    public ApiTestInfoVO(ApiTestInfo apiTestInfo) {
         BeanUtils.copyProperties(apiTestInfo, this);
     }
 }

+ 5 - 5
web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestResultVO.java → web/src/main/java/cn/seecoder/web/model/vo/apitest/ApiTestResultVO.java

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.APITest;
+package cn.seecoder.web.model.vo.apitest;
 
-import cn.seecoder.web.model.po.APITest.APITestResult;
+import cn.seecoder.web.model.po.apitest.ApiTestResult;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -19,7 +19,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("测试任务返回给前端的执行信息")
-public class APITestResultVO {
+public class ApiTestResultVO {
     @ApiModelProperty("测试结果id")
     private Integer id;
 
@@ -50,11 +50,11 @@ public class APITestResultVO {
     @ApiModelProperty("关联的构建历史信息Id, 无关联则为-1")
     private Integer pipelineRecordId;
 
-    public APITestResultVO(APITestResult apiTestResult) {
+    public ApiTestResultVO(ApiTestResult apiTestResult) {
         BeanUtils.copyProperties(apiTestResult, this);
     }
 
-//    public APITestResultVO() {
+//    public ApiTestResultVO() {
 //
 //    }
 }

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

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.APITest;
+package cn.seecoder.web.model.vo.apitest;
 
 
-import cn.seecoder.web.model.po.APITest.TestInfo;
+import cn.seecoder.web.model.po.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/model/vo/apitest/TestResultVO.java

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

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/bug_list/BugListCreateVO.java → web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListCreateVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.bug_list;
+package cn.seecoder.web.model.vo.buglist;
 
 import cn.seecoder.web.model.enums.PriorityEnum;
 import io.swagger.annotations.ApiModel;

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/bug_list/BugListUpdateBasicVO.java → web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListUpdateBasicVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.bug_list;
+package cn.seecoder.web.model.vo.buglist;
 
 import cn.seecoder.web.model.enums.BugListStateEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/bug_list/BugListVO.java → web/src/main/java/cn/seecoder/web/model/vo/buglist/BugListVO.java

@@ -1,8 +1,8 @@
-package cn.seecoder.web.model.vo.bug_list;
+package cn.seecoder.web.model.vo.buglist;
 
 import cn.seecoder.web.model.enums.BugListStateEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;
-import cn.seecoder.web.model.po.bug_list.BugListPO;
+import cn.seecoder.web.model.po.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/code_review/CodeReviewCreateVO.java → web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewCreateVO.java

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

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

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

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/code_review/CodeReviewVO.java → web/src/main/java/cn/seecoder/web/model/vo/codereview/CodeReviewVO.java

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

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/code_review/CommentCreateVO.java → web/src/main/java/cn/seecoder/web/model/vo/codereview/CommentCreateVO.java

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

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/code_review/CommentVO.java → web/src/main/java/cn/seecoder/web/model/vo/codereview/CommentVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.code_review;
+package cn.seecoder.web.model.vo.codereview;
 
 import cn.seecoder.web.model.enums.CommentTypeEnum;
-import cn.seecoder.web.model.po.code_review.CommentPO;
+import cn.seecoder.web.model.po.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/code_review/FileNodeCreateVO.java → web/src/main/java/cn/seecoder/web/model/vo/codereview/FileNodeCreateVO.java

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

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

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

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

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

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/code_review/FileReviewVO.java → web/src/main/java/cn/seecoder/web/model/vo/codereview/FileReviewVO.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.model.vo.code_review;
+package cn.seecoder.web.model.vo.codereview;
 
 import cn.seecoder.web.model.enums.FileReviewStatusEnum;
-import cn.seecoder.web.model.po.code_review.FileReviewPO;
+import cn.seecoder.web.model.po.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/func_test/FuncTestCaseVO.java → web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestCaseVO.java

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

+ 1 - 1
web/src/main/java/cn/seecoder/web/model/vo/func_test/FuncTestRecordVO.java → web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestRecordVO.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.model.vo.func_test;
+package cn.seecoder.web.model.vo.functest;
 
 import cn.seecoder.web.model.enums.FuncTestOperatorEnum;
 import io.swagger.annotations.ApiModel;

+ 2 - 2
web/src/main/java/cn/seecoder/web/model/vo/func_test/FuncTestStepVO.java → web/src/main/java/cn/seecoder/web/model/vo/functest/FuncTestStepVO.java

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

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

@@ -1,6 +1,6 @@
-package cn.seecoder.web.model.vo.InterfaceTest;
+package cn.seecoder.web.model.vo.interfacetest;
 
-import cn.seecoder.web.model.po.InterfaceTest.InterfaceTestInfo;
+import cn.seecoder.web.model.po.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/model/vo/interfacetest/InterfaceTestResultVO.java

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

+ 0 - 45
web/src/main/java/cn/seecoder/web/service/APITest/APITestService.java

@@ -1,45 +0,0 @@
-package cn.seecoder.web.service.APITest;
-
-
-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 java.util.List;
-
-/**
- * @author zhaoxingrui
- * @date 2021/3/19
- * @description: 接口测试相关的service
- */
-public interface APITestService {
-    /**
-     * 新建一个接口测试任务
-     */
-    void createAPITest(APITestBodyVO apiTestBodyVO);
-
-    /**
-     * 获取指定项目的所有测试任务
-     */
-    List<APITestInfoVO> getAPITestsByProjectId(Integer projectId);
-
-    /**
-     * 删除指定测试任务
-     */
-    void deleteAPITest(Integer testId);
-
-    /**
-     * 执行指定测试任务
-     */
-    void executeAPITest(Integer testId) throws InterruptedException;
-
-    /**
-     * 获取指定测试任务的所有测试结果
-     */
-    List<APITestResultVO> getAPITestResultByTestId(Integer testId);
-
-    /**
-     * 获取指定测试任务的最近一次执行结果信息
-     */
-    APITestResultVO getLatestTestResultByTestId(Integer testId);
-}

+ 45 - 0
web/src/main/java/cn/seecoder/web/service/apitest/ApiTestService.java

@@ -0,0 +1,45 @@
+package cn.seecoder.web.service.apitest;
+
+
+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 java.util.List;
+
+/**
+ * @author zhaoxingrui
+ * @date 2021/3/19
+ * @description: 接口测试相关的service
+ */
+public interface ApiTestService {
+    /**
+     * 新建一个接口测试任务
+     */
+    void createApiTest(ApiTestBodyVO apiTestBodyVO);
+
+    /**
+     * 获取指定项目的所有测试任务
+     */
+    List<ApiTestInfoVO> getApiTestsByProjectId(Integer projectId);
+
+    /**
+     * 删除指定测试任务
+     */
+    void deleteApiTest(Integer testId);
+
+    /**
+     * 执行指定测试任务
+     */
+    void executeApiTest(Integer testId) throws InterruptedException;
+
+    /**
+     * 获取指定测试任务的所有测试结果
+     */
+    List<ApiTestResultVO> getApiTestResultByTestId(Integer testId);
+
+    /**
+     * 获取指定测试任务的最近一次执行结果信息
+     */
+    ApiTestResultVO getLatestTestResultByTestId(Integer testId);
+}

+ 0 - 9
web/src/main/java/cn/seecoder/web/service/auto_test/AutoTestService.java

@@ -1,9 +0,0 @@
-package cn.seecoder.web.service.auto_test;
-
-import cn.seecoder.web.model.vo.APITest.APITestResultVO;
-
-import java.util.List;
-
-public interface AutoTestService {
-    List<APITestResultVO> getAutoTestResultByProjectId(Integer projectId, Integer testId);
-}

+ 9 - 0
web/src/main/java/cn/seecoder/web/service/autotest/AutoTestService.java

@@ -0,0 +1,9 @@
+package cn.seecoder.web.service.autotest;
+
+import cn.seecoder.web.model.vo.apitest.ApiTestResultVO;
+
+import java.util.List;
+
+public interface AutoTestService {
+    List<ApiTestResultVO> getAutoTestResultByProjectId(Integer projectId, Integer testId);
+}

+ 5 - 5
web/src/main/java/cn/seecoder/web/service/bug_list/BugListService.java → web/src/main/java/cn/seecoder/web/service/buglist/BugListService.java

@@ -1,10 +1,10 @@
-package cn.seecoder.web.service.bug_list;
+package cn.seecoder.web.service.buglist;
 
 import cn.seecoder.web.core.commit.model.CommitState;
-import cn.seecoder.web.model.po.bug_list.BugListPO;
-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.model.po.buglist.BugListPO;
+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 java.util.List;
 

+ 4 - 4
web/src/main/java/cn/seecoder/web/service/code_review/BranchReviewService.java → web/src/main/java/cn/seecoder/web/service/codereview/BranchReviewService.java

@@ -1,8 +1,8 @@
-package cn.seecoder.web.service.code_review;
+package cn.seecoder.web.service.codereview;
 
-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.codereview.CodeReviewCreateVO;
+import cn.seecoder.web.model.vo.codereview.CodeReviewSortedList;
+import cn.seecoder.web.model.vo.codereview.CodeReviewVO;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import com.nju.edu.gitlab.vo.BranchVO;

+ 3 - 3
web/src/main/java/cn/seecoder/web/service/code_review/CommentService.java → web/src/main/java/cn/seecoder/web/service/codereview/CommentService.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.service.code_review;
+package cn.seecoder.web.service.codereview;
 
-import cn.seecoder.web.model.vo.code_review.CommentCreateVO;
-import cn.seecoder.web.model.vo.code_review.CommentVO;
+import cn.seecoder.web.model.vo.codereview.CommentCreateVO;
+import cn.seecoder.web.model.vo.codereview.CommentVO;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 
 import java.util.List;

+ 4 - 4
web/src/main/java/cn/seecoder/web/service/code_review/FileReviewService.java → web/src/main/java/cn/seecoder/web/service/codereview/FileReviewService.java

@@ -1,10 +1,10 @@
-package cn.seecoder.web.service.code_review;
+package cn.seecoder.web.service.codereview;
 
 import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.web.model.enums.FileReviewStatusEnum;
-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;
+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 com.nju.edu.gitlab.SeecoderGitlabException;
 import java.io.IOException;

+ 4 - 4
web/src/main/java/cn/seecoder/web/service/func_test/FuncTestService.java → web/src/main/java/cn/seecoder/web/service/functest/FuncTestService.java

@@ -1,9 +1,9 @@
-package cn.seecoder.web.service.func_test;
+package cn.seecoder.web.service.functest;
 
 import cn.seecoder.web.model.enums.FuncTestStepState;
-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.model.vo.functest.FuncTestCaseVO;
+import cn.seecoder.web.model.vo.functest.FuncTestRecordVO;
+import cn.seecoder.web.model.vo.functest.FuncTestStepVO;
 
 import java.util.List;
 

+ 31 - 31
web/src/main/java/cn/seecoder/web/service/impl/APITest/APITestServiceImpl.java → web/src/main/java/cn/seecoder/web/service/impl/apitest/ApiTestServiceImpl.java

@@ -1,21 +1,21 @@
-package cn.seecoder.web.service.impl.APITest;
+package cn.seecoder.web.service.impl.apitest;
 
 import cn.seecoder.common.util.LogTrackingUtil;
 import cn.seecoder.common.util.OpType;
-import cn.seecoder.web.dao.APITest.APITestMapper;
+import cn.seecoder.web.dao.apitest.ApiTestMapper;
 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.APITestInfo;
-import cn.seecoder.web.model.po.APITest.APITestResult;
-import cn.seecoder.web.model.po.APITest.TestInfo;
-import cn.seecoder.web.model.po.APITest.TestResult;
+import cn.seecoder.web.model.po.apitest.ApiTestInfo;
+import cn.seecoder.web.model.po.apitest.ApiTestResult;
+import cn.seecoder.web.model.po.apitest.TestInfo;
+import cn.seecoder.web.model.po.apitest.TestResult;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
-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.service.APITest.APITestService;
+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.service.apitest.ApiTestService;
 import cn.seecoder.web.service.user.UserService;
 import com.google.gson.Gson;
 import net.sf.json.JSONArray;
@@ -40,10 +40,10 @@ import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 
 @Service
-public class APITestServiceImpl implements APITestService {
+public class ApiTestServiceImpl implements ApiTestService {
 
-    private static final Logger log = LoggerFactory.getLogger(APITestServiceImpl.class);
-    private final APITestMapper apiTestMapper;
+    private static final Logger log = LoggerFactory.getLogger(ApiTestServiceImpl.class);
+    private final ApiTestMapper apiTestMapper;
 
     private final PipelineMapper pipelineMapper;
 
@@ -53,7 +53,7 @@ public class APITestServiceImpl implements APITestService {
     private UserMapper userMapper;
 
     @Autowired
-    public APITestServiceImpl(APITestMapper apiTestMapper, PipelineMapper pipelineMapper, PipelineRecordMapper pipelineRecordMapper) {
+    public ApiTestServiceImpl(ApiTestMapper apiTestMapper, PipelineMapper pipelineMapper, PipelineRecordMapper pipelineRecordMapper) {
         this.apiTestMapper = apiTestMapper;
         this.pipelineMapper = pipelineMapper;
         this.pipelineRecordMapper = pipelineRecordMapper;
@@ -61,7 +61,7 @@ public class APITestServiceImpl implements APITestService {
 
 
     @Override
-    public void createAPITest(APITestBodyVO apiTestBodyVO) {
+    public void createApiTest(ApiTestBodyVO apiTestBodyVO) {
         TestInfo testInfo = TestInfo.builder()
              .testName(apiTestBodyVO.getTestName())
              .projectId(apiTestBodyVO.getProjectId())
@@ -76,24 +76,24 @@ public class APITestServiceImpl implements APITestService {
     }
 
     @Override
-    public List<APITestInfoVO> getAPITestsByProjectId(Integer projectId) {
+    public List<ApiTestInfoVO> getApiTestsByProjectId(Integer projectId) {
         List<TestInfo> apiTestInfos = apiTestMapper.selectByProjectId(projectId);
-        List<APITestInfoVO> apiTestInfoVOList = new ArrayList<>();
+        List<ApiTestInfoVO> apiTestInfoVOList = new ArrayList<>();
         for (TestInfo testInfo: apiTestInfos) {
-            apiTestInfoVOList.add(new APITestInfoVO(transform(testInfo)));
+            apiTestInfoVOList.add(new ApiTestInfoVO(transform(testInfo)));
         }
         return apiTestInfoVOList;
     }
 
     @Override
-    public void deleteAPITest(Integer testId) {
+    public void deleteApiTest(Integer testId) {
         apiTestMapper.delete(testId);
         apiTestMapper.deleteTestResult(testId);
     }
 
 
     @Override
-    public void executeAPITest(Integer testId) throws InterruptedException {
+    public void executeApiTest(Integer testId) throws InterruptedException {
         TestInfo testInfo = apiTestMapper.selectByTestId(testId);
         String url = testInfo.getUrl();
         Map<String, Object> params = parseJson2Map(testInfo.getParams());
@@ -112,7 +112,7 @@ public class APITestServiceImpl implements APITestService {
     }
 
     @Override
-    public List<APITestResultVO> getAPITestResultByTestId(Integer testId) {
+    public List<ApiTestResultVO> getApiTestResultByTestId(Integer testId) {
 
         TestInfo testInfo = apiTestMapper.selectByTestId(testId);
 
@@ -126,15 +126,15 @@ public class APITestServiceImpl implements APITestService {
         }
         Integer recordId = latestRecord==null? -1:latestRecord.getId();
         List<TestResult> testResultVOS = apiTestMapper.selectTestResultByTestId(testId, recordId);
-        List<APITestResultVO> apiTestResultVOList = new ArrayList<>();
+        List<ApiTestResultVO> apiTestResultVOList = new ArrayList<>();
         for (TestResult testResult: testResultVOS) {
-            apiTestResultVOList.add(new APITestResultVO(transform1(testResult)));
+            apiTestResultVOList.add(new ApiTestResultVO(transform1(testResult)));
         }
         return apiTestResultVOList;
     }
 
     @Override
-    public APITestResultVO getLatestTestResultByTestId(Integer testId) {
+    public ApiTestResultVO getLatestTestResultByTestId(Integer testId) {
         TestInfo testInfo = apiTestMapper.selectByTestId(testId);
 
         List<Integer> pipelineIds = pipelineMapper.selectByProjectId(testInfo.getProjectId()).stream().map(PipelinePO::getId).collect(Collectors.toList());
@@ -150,7 +150,7 @@ public class APITestServiceImpl implements APITestService {
         if (testResult == null) {
             return null;
         }
-        return new APITestResultVO(transform1(testResult));
+        return new ApiTestResultVO(transform1(testResult));
     }
     // 将JSON格式的字符串转为 Map类型
     public Map<String, Object> parseJson2Map(String str) {
@@ -170,9 +170,9 @@ public class APITestServiceImpl implements APITestService {
         }
         return map;
     }
-    // 将数据库中读取的TestInfo转为APITestInfo
-    public APITestInfo transform(TestInfo testInfo) {
-        APITestInfo apiTestInfo = new APITestInfo();
+    // 将数据库中读取的TestInfo转为ApiTestInfo
+    public ApiTestInfo transform(TestInfo testInfo) {
+        ApiTestInfo apiTestInfo = new ApiTestInfo();
         apiTestInfo.setTestId(testInfo.getTestId());
         apiTestInfo.setTestName(testInfo.getTestName());
         apiTestInfo.setProjectId(testInfo.getProjectId());
@@ -185,8 +185,8 @@ public class APITestServiceImpl implements APITestService {
         return apiTestInfo;
     }
 
-    public APITestResult transform1(TestResult testResult) {
-        APITestResult apiTestResult = new APITestResult();
+    public ApiTestResult transform1(TestResult testResult) {
+        ApiTestResult apiTestResult = new ApiTestResult();
         apiTestResult.setId(testResult.getId());
         apiTestResult.setTestId(testResult.getTestId());
         apiTestResult.setExecuteTime(testResult.getExecuteTime());
@@ -241,7 +241,7 @@ public class APITestServiceImpl implements APITestService {
                 }
             }
         };
-        APITestServiceImpl apiTestService = new APITestServiceImpl(apiTestMapper, pipelineMapper, pipelineRecordMapper);
+        ApiTestServiceImpl apiTestService = new ApiTestServiceImpl(apiTestMapper, pipelineMapper, pipelineRecordMapper);
         apiTestService.startTaskAllInOnce(10, task);
         Integer max_time = Collections.max(timeList);
         Integer min_time = Collections.min(timeList);

+ 7 - 7
web/src/main/java/cn/seecoder/web/service/impl/auto_test/AutoTestServiceImpl.java → web/src/main/java/cn/seecoder/web/service/impl/autotest/AutoTestServiceImpl.java

@@ -1,12 +1,12 @@
-package cn.seecoder.web.service.impl.auto_test;
+package cn.seecoder.web.service.impl.autotest;
 
-import cn.seecoder.web.dao.APITest.APITestMapper;
+import cn.seecoder.web.dao.apitest.ApiTestMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
 import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
 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 cn.seecoder.web.model.vo.apitest.ApiTestResultVO;
+import cn.seecoder.web.service.autotest.AutoTestService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -21,16 +21,16 @@ public class AutoTestServiceImpl implements AutoTestService {
 
     private final PipelineRecordMapper pipelineRecordMapper;
 
-    private final APITestMapper apiTestMapper;
+    private final ApiTestMapper apiTestMapper;
 
-    public AutoTestServiceImpl(PipelineMapper pipelineMapper, PipelineRecordMapper pipelineRecordMapper, APITestMapper apiTestMapper) {
+    public AutoTestServiceImpl(PipelineMapper pipelineMapper, PipelineRecordMapper pipelineRecordMapper, ApiTestMapper apiTestMapper) {
         this.pipelineMapper = pipelineMapper;
         this.pipelineRecordMapper = pipelineRecordMapper;
         this.apiTestMapper = apiTestMapper;
     }
 
     @Override
-    public List<APITestResultVO> getAutoTestResultByProjectId(Integer projectId, Integer testId) {
+    public List<ApiTestResultVO> getAutoTestResultByProjectId(Integer projectId, Integer testId) {
         List<Integer> pipelineIds = pipelineMapper.selectByProjectId(projectId).stream().map(PipelinePO::getId).collect(Collectors.toList());
 
         if (pipelineIds.size() == 0) {

+ 7 - 7
web/src/main/java/cn/seecoder/web/service/impl/bug_list/BugListServiceImpl.java → web/src/main/java/cn/seecoder/web/service/impl/buglist/BugListServiceImpl.java

@@ -1,20 +1,20 @@
-package cn.seecoder.web.service.impl.bug_list;
+package cn.seecoder.web.service.impl.buglist;
 
 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.bug_list.BugListMapper;
+import cn.seecoder.web.dao.buglist.BugListMapper;
 import cn.seecoder.web.dao.commit.CommitMapper;
 import cn.seecoder.web.dao.project.ProjectRelatedMapper;
 import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.enums.BugListStateEnum;
-import cn.seecoder.web.model.po.bug_list.BugListPO;
+import cn.seecoder.web.model.po.buglist.BugListPO;
 import cn.seecoder.web.model.po.project.ProjectRelatedPO;
 import cn.seecoder.web.model.po.user.UserPO;
-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 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.service.buglist.BugListService;
 import cn.seecoder.web.service.user.UserService;
 import net.sf.json.JSONObject;
 import org.springframework.beans.BeanUtils;

+ 7 - 7
web/src/main/java/cn/seecoder/web/service/impl/code_review/BranchReviewServiceImpl.java → web/src/main/java/cn/seecoder/web/service/impl/codereview/BranchReviewServiceImpl.java

@@ -1,15 +1,15 @@
-package cn.seecoder.web.service.impl.code_review;
+package cn.seecoder.web.service.impl.codereview;
 
-import cn.seecoder.web.dao.code_review.BranchReviewMapper;
+import cn.seecoder.web.dao.codereview.BranchReviewMapper;
 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.codereview.CodeReviewPO;
 import cn.seecoder.web.model.po.user.UserPO;
-import cn.seecoder.web.model.vo.code_review.*;
+import cn.seecoder.web.model.vo.codereview.*;
 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.codereview.BranchReviewService;
+import cn.seecoder.web.service.codereview.CommentService;
+import cn.seecoder.web.service.codereview.FileReviewService;
 import cn.seecoder.web.service.message.MessageService;
 import cn.seecoder.web.service.user.UserService;
 import com.fasterxml.jackson.databind.JsonNode;

+ 9 - 9
web/src/main/java/cn/seecoder/web/service/impl/code_review/CommentServiceImpl.java → web/src/main/java/cn/seecoder/web/service/impl/codereview/CommentServiceImpl.java

@@ -1,15 +1,15 @@
-package cn.seecoder.web.service.impl.code_review;
+package cn.seecoder.web.service.impl.codereview;
 
-import cn.seecoder.web.dao.code_review.BranchReviewMapper;
-import cn.seecoder.web.dao.code_review.CommentMapper;
+import cn.seecoder.web.dao.codereview.BranchReviewMapper;
+import cn.seecoder.web.dao.codereview.CommentMapper;
 import cn.seecoder.web.model.enums.CommentTypeEnum;
-import cn.seecoder.web.model.po.code_review.CodeReviewPO;
-import cn.seecoder.web.model.po.code_review.CommentPO;
-import cn.seecoder.web.model.vo.code_review.CommentCreateVO;
-import cn.seecoder.web.model.vo.code_review.CommentVO;
+import cn.seecoder.web.model.po.codereview.CodeReviewPO;
+import cn.seecoder.web.model.po.codereview.CommentPO;
+import cn.seecoder.web.model.vo.codereview.CommentCreateVO;
+import cn.seecoder.web.model.vo.codereview.CommentVO;
 import cn.seecoder.web.model.vo.message.MessageCreateVO;
-import cn.seecoder.web.service.code_review.CommentService;
-import cn.seecoder.web.service.code_review.FileReviewService;
+import cn.seecoder.web.service.codereview.CommentService;
+import cn.seecoder.web.service.codereview.FileReviewService;
 import cn.seecoder.web.service.message.MessageService;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.SeecoderGitlabException;

+ 10 - 10
web/src/main/java/cn/seecoder/web/service/impl/code_review/FileReviewServiceImpl.java → web/src/main/java/cn/seecoder/web/service/impl/codereview/FileReviewServiceImpl.java

@@ -1,19 +1,19 @@
-package cn.seecoder.web.service.impl.code_review;
+package cn.seecoder.web.service.impl.codereview;
 
 import cn.seecoder.common.exceptions.ServiceException;
-import cn.seecoder.web.dao.code_review.FileReviewMapper;
-import cn.seecoder.web.dao.code_review.InspectionResultMapper;
+import cn.seecoder.web.dao.codereview.FileReviewMapper;
+import cn.seecoder.web.dao.codereview.InspectionResultMapper;
 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;
+import cn.seecoder.web.model.po.codereview.FileReviewPO;
+import cn.seecoder.web.model.po.codereview.InspectionResultPO;
+import cn.seecoder.web.model.vo.codereview.FileNodeCreateVO;
+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.message.MessageCreateVO;
 import cn.seecoder.web.model.vo.user.UserVO;
-import cn.seecoder.web.service.code_review.FileReviewService;
+import cn.seecoder.web.service.codereview.FileReviewService;
 import cn.seecoder.web.service.message.MessageService;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;

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

@@ -7,12 +7,12 @@ import cn.seecoder.web.core.commit.model.CommitRule;
 import cn.seecoder.web.dao.commit.CommitMapper;
 import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.enums.CommitRelatedEnum;
-import cn.seecoder.web.model.po.bug_list.BugListPO;
+import cn.seecoder.web.model.po.buglist.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.service.bug_list.BugListService;
+import cn.seecoder.web.service.buglist.BugListService;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import cn.seecoder.web.service.commit.CommitService;
 import cn.seecoder.web.service.tree.TreeNodeService;

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

@@ -7,13 +7,13 @@ 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.buglist.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.vo.commit.CommitVO;
 import cn.seecoder.web.model.vo.hook.SonarResultHookVO;
-import cn.seecoder.web.service.bug_list.BugListService;
+import cn.seecoder.web.service.buglist.BugListService;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import cn.seecoder.web.service.commit.CommitQualityService;
 import cn.seecoder.web.service.tree.TreeNodeService;

+ 13 - 13
web/src/main/java/cn/seecoder/web/service/impl/func_test/FuncFuncTestServiceImpl.java → web/src/main/java/cn/seecoder/web/service/impl/functest/FuncTestServiceImpl.java

@@ -1,23 +1,23 @@
-package cn.seecoder.web.service.impl.func_test;
+package cn.seecoder.web.service.impl.functest;
 
-import cn.seecoder.web.dao.func_test.FuncTestCaseMapper;
-import cn.seecoder.web.dao.func_test.FuncTestRecordMapper;
-import cn.seecoder.web.dao.func_test.FuncTestStepMapper;
+import cn.seecoder.web.dao.functest.FuncTestCaseMapper;
+import cn.seecoder.web.dao.functest.FuncTestRecordMapper;
+import cn.seecoder.web.dao.functest.FuncTestStepMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
 import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
 import cn.seecoder.web.dao.tree.TreeNodeMapper;
 import cn.seecoder.web.model.enums.FuncTestOperatorEnum;
 import cn.seecoder.web.model.enums.FuncTestStepState;
-import cn.seecoder.web.model.po.func_test.FuncTestCasePO;
-import cn.seecoder.web.model.po.func_test.FuncTestRecordPO;
-import cn.seecoder.web.model.po.func_test.FuncTestStepPO;
+import cn.seecoder.web.model.po.functest.FuncTestCasePO;
+import cn.seecoder.web.model.po.functest.FuncTestRecordPO;
+import cn.seecoder.web.model.po.functest.FuncTestStepPO;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.po.tree.TreeNodePO;
-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 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.service.functest.FuncTestService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  * @description:
  */
 @Service
-public class FuncFuncTestServiceImpl implements FuncTestService {
+public class FuncTestServiceImpl implements FuncTestService {
 
     private final FuncTestCaseMapper funcTestCaseMapper;
 
@@ -49,7 +49,7 @@ public class FuncFuncTestServiceImpl implements FuncTestService {
     private final TreeNodeMapper treeNodeMapper;
 
     @Autowired
-    public FuncFuncTestServiceImpl(FuncTestCaseMapper funcTestCaseMapper, FuncTestStepMapper funcTestStepMapper, FuncTestRecordMapper funcTestRecordMapper, PipelineMapper pipelineMapper, PipelineRecordMapper pipelineRecordMapper, TreeNodeMapper treeNodeMapper) {
+    public FuncTestServiceImpl(FuncTestCaseMapper funcTestCaseMapper, FuncTestStepMapper funcTestStepMapper, FuncTestRecordMapper funcTestRecordMapper, PipelineMapper pipelineMapper, PipelineRecordMapper pipelineRecordMapper, TreeNodeMapper treeNodeMapper) {
         this.funcTestCaseMapper = funcTestCaseMapper;
         this.funcTestStepMapper = funcTestStepMapper;
         this.funcTestRecordMapper = funcTestRecordMapper;

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

@@ -1,17 +1,17 @@
-package cn.seecoder.web.service.impl.InterfaceTest;
+package cn.seecoder.web.service.impl.interfacetest;
 
 import cn.seecoder.common.util.LogTrackingUtil;
 import cn.seecoder.common.util.OpType;
-import cn.seecoder.web.dao.InterfaceTest.InterfaceTestMapper;
+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.model.po.InterfaceTest.InterfaceTestInfo;
-import cn.seecoder.web.model.po.InterfaceTest.InterfaceTestResult;
+import cn.seecoder.web.model.po.interfacetest.InterfaceTestInfo;
+import cn.seecoder.web.model.po.interfacetest.InterfaceTestResult;
 import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
-import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestInfoVO;
-import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestResultVO;
-import cn.seecoder.web.service.InterfaceTest.InterfaceTestService;
+import cn.seecoder.web.model.vo.interfacetest.InterfaceTestInfoVO;
+import cn.seecoder.web.model.vo.interfacetest.InterfaceTestResultVO;
+import cn.seecoder.web.service.interfacetest.InterfaceTestService;
 import cn.seecoder.web.service.user.UserService;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;

+ 3 - 3
web/src/main/java/cn/seecoder/web/service/InterfaceTest/InterfaceTestService.java → web/src/main/java/cn/seecoder/web/service/interfacetest/InterfaceTestService.java

@@ -1,7 +1,7 @@
-package cn.seecoder.web.service.InterfaceTest;
+package cn.seecoder.web.service.interfacetest;
 
-import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestInfoVO;
-import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestResultVO;
+import cn.seecoder.web.model.vo.interfacetest.InterfaceTestInfoVO;
+import cn.seecoder.web.model.vo.interfacetest.InterfaceTestResultVO;
 
 import java.io.IOException;
 import java.util.List;

+ 2 - 2
web/src/test/java/cn/seecoder/web/dao/project/BugListMapperTest.java

@@ -1,6 +1,6 @@
 package cn.seecoder.web.dao.project;
 
-import cn.seecoder.web.dao.bug_list.BugListMapper;
+import cn.seecoder.web.dao.buglist.BugListMapper;
 import cn.seecoder.web.model.enums.BugListStateEnum;
 import cn.seecoder.web.model.enums.PriorityEnum;
 import org.junit.jupiter.api.Test;
@@ -9,7 +9,7 @@ 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.model.po.bug_list.BugListPO;
+import cn.seecoder.web.model.po.buglist.BugListPO;
 
 /**
  * @author PuHong Weng

+ 4 - 4
web/src/test/java/cn/seecoder/web/infrastructure/config/WebSecurityConfigTest.java

@@ -1,9 +1,9 @@
 package cn.seecoder.web.infrastructure.config;
 
-import cn.seecoder.web.controller.APITest.APITestController;
+import cn.seecoder.web.controller.apitest.ApiTestController;
 import cn.seecoder.web.model.enums.UserIdentity;
 import cn.seecoder.web.model.po.user.UserPO;
-import cn.seecoder.web.model.vo.APITest.APITestInfoVO;
+import cn.seecoder.web.model.vo.apitest.ApiTestInfoVO;
 import cn.seecoder.web.model.vo.Response;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -37,7 +37,7 @@ class WebSecurityConfigTest {
 //    @Mock
 //    private AuthTools authTools;
 //    @Mock
-//    private APITestController apiTestController;
+//    private ApiTestController apiTestController;
 //    @Autowired
 //    private MockMvc mockMvc;
 //    private final Map<String, Object> userInfo = new HashMap<String, Object>() {{
@@ -74,7 +74,7 @@ class WebSecurityConfigTest {
 //    void apiTestControllerTestList () throws Exception {
 //        Integer projectId = 142857;
 //        given(authTools.checkProjOwnership(projectId)).willReturn(true);
-//        given(apiTestController.getAPITestInfosByProjectId(projectId)).willReturn(Response.buildSuccess(null));
+//        given(apiTestController.getApiTestInfosByProjectId(projectId)).willReturn(Response.buildSuccess(null));
 //        MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.get("/api/test/list/" + projectId))
 //                .andExpect(MockMvcResultMatchers.status().is2xxSuccessful())
 //                .andReturn();

+ 1 - 1
web/src/test/java/cn/seecoder/web/service/code_review/BranchReviewServiceTest.java → web/src/test/java/cn/seecoder/web/service/codereview/BranchReviewServiceTest.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.service.code_review;
+package cn.seecoder.web.service.codereview;
 
 import cn.seecoder.web.DevcloudWebApplication;
 import com.nju.edu.gitlab.SeecoderGitlabException;

+ 2 - 2
web/src/test/java/cn/seecoder/web/service/code_review/CommentServiceTest.java → web/src/test/java/cn/seecoder/web/service/codereview/CommentServiceTest.java

@@ -1,8 +1,8 @@
-package cn.seecoder.web.service.code_review;
+package cn.seecoder.web.service.codereview;
 
 import cn.seecoder.web.DevcloudWebApplication;
 import cn.seecoder.web.model.enums.CommentTypeEnum;
-import cn.seecoder.web.model.vo.code_review.CommentCreateVO;
+import cn.seecoder.web.model.vo.codereview.CommentCreateVO;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+ 1 - 1
web/src/test/java/cn/seecoder/web/service/code_review/FileReviewServiceTest.java → web/src/test/java/cn/seecoder/web/service/codereview/FileReviewServiceTest.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.service.code_review;
+package cn.seecoder.web.service.codereview;
 
 import cn.seecoder.web.DevcloudWebApplication;
 import org.junit.Test;

+ 1 - 1
web/src/test/java/cn/seecoder/web/service/func_test/FuncTestServiceTest.java → web/src/test/java/cn/seecoder/web/service/functest/FuncTestServiceTest.java

@@ -1,4 +1,4 @@
-package cn.seecoder.web.service.func_test;
+package cn.seecoder.web.service.functest;
 
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;