refactor: 第一次合并，待测试功能是否还完整

代码风格还要统一

web/src/main/java/seecoder/devcloud/web/aspect/TreeLoggingAspect.java

@@ -9,10 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import seecoder.devcloud.web.aop.TreeLogging;
 import seecoder.devcloud.web.dao.tree.TreeLogMapper;
-import seecoder.devcloud.web.enums.ResponseEnums;
-import seecoder.devcloud.web.po.tree.TreeLog;
-import seecoder.devcloud.web.vo.Response;
-import seecoder.devcloud.web.vo.TreeNodeVO;
+
+import seecoder.devcloud.web.model.vo.Response;
+import seecoder.devcloud.web.model.po.tree.TreeLog;
+
+import seecoder.devcloud.web.model.vo.TreeNodeVO;
 
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
@@ -35,7 +36,7 @@ public class TreeLoggingAspect {
     @AfterReturning(pointcut = "logPointCut()", returning = "result")
     public void doAfterReturning(JoinPoint joinPoint, Response result) {
         // 只处理成功的情况
-        if (result.getCode().equals(ResponseEnums.OK.getCode())) {
+        if (result.getCode().equals(200)) {
             TreeLog log = new TreeLog();
             //从切面织入点处通过反射机制获取织入点处的方法
             MethodSignature signature = (MethodSignature) joinPoint.getSignature();

web/src/main/java/seecoder/devcloud/web/controller/project/ProjectController.java

@@ -4,10 +4,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import seecoder.devcloud.web.po.project.Project;
+import seecoder.devcloud.web.model.po.project.Project;
 import seecoder.devcloud.web.service.project.ProjectService;
-import seecoder.devcloud.web.vo.Response;
-import seecoder.devcloud.web.vo.project.ProjectVO;
+import seecoder.devcloud.web.model.vo.Response;
+import seecoder.devcloud.web.model.vo.project.ProjectVO;
 
 import java.util.List;
 

web/src/main/java/seecoder/devcloud/web/controller/tree/TreeNodesController.java

@@ -3,9 +3,9 @@ package seecoder.devcloud.web.controller.tree;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import seecoder.devcloud.web.po.TreeNodePO;
+import seecoder.devcloud.web.model.po.TreeNodePO;
+import seecoder.devcloud.web.model.vo.Response;
 import seecoder.devcloud.web.service.tree.TreeNodeService;
-import seecoder.devcloud.web.vo.Response;
 
 import java.util.List;
 

web/src/main/java/seecoder/devcloud/web/dao/project/ProjectMapper.java

@@ -2,11 +2,8 @@ package seecoder.devcloud.web.dao.project;
 
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
-import seecoder.devcloud.web.dao.GeneralInsertUpdateSqlProvider;
-import seecoder.devcloud.web.po.project.Project;
-import seecoder.devcloud.web.po.user.Group;
-import seecoder.devcloud.web.vo.Response;
-import seecoder.devcloud.web.vo.project.ProjectVO;
+import seecoder.devcloud.web.dao.provider.GeneralInsertUpdateSqlProvider;
+import seecoder.devcloud.web.model.po.project.Project;
 
 import java.util.List;
 

web/src/main/java/seecoder/devcloud/web/dao/tree/TreeLogMapper.java

@@ -3,8 +3,8 @@ package seecoder.devcloud.web.dao.tree;
 
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
-import seecoder.devcloud.web.dao.GeneralInsertUpdateSqlProvider;
-import seecoder.devcloud.web.po.tree.TreeLog;
+import seecoder.devcloud.web.dao.provider.GeneralInsertUpdateSqlProvider;
+import seecoder.devcloud.web.model.po.tree.TreeLog;
 
 import java.util.List;
 

web/src/main/java/seecoder/devcloud/web/model/enums/ResponseEnums.java

@@ -5,6 +5,7 @@ package seecoder.devcloud.web.model.enums;
  * @date 2021/2/1
  * @description:
  */
+@Deprecated
 public enum ResponseEnums {
 
     OK("200", "Ok"),

web/src/main/java/seecoder/devcloud/web/model/po/project/Project.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.web.po.project;
+package seecoder.devcloud.web.model.po.project;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

web/src/main/java/seecoder/devcloud/web/model/po/tree/TreeLog.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.web.po.tree;
+package seecoder.devcloud.web.model.po.tree;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

web/src/main/java/seecoder/devcloud/web/model/vo/TreeNodeVO.java

@@ -1,10 +1,11 @@
-package seecoder.devcloud.web.vo;
+package seecoder.devcloud.web.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import seecoder.devcloud.web.enums.NodeStateEnum;
-import seecoder.devcloud.web.enums.NodeTypeEnum;
+import seecoder.devcloud.web.model.enums.NodeStateEnum;
+import seecoder.devcloud.web.model.enums.NodeTypeEnum;
+
 
 @NoArgsConstructor
 @Data

web/src/main/java/seecoder/devcloud/web/model/vo/project/ProjectVO.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.web.vo.project;
+package seecoder.devcloud.web.model.vo.project;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

web/src/main/java/seecoder/devcloud/web/service/impl/project/ProjectServiceImpl.java

@@ -4,10 +4,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import seecoder.devcloud.web.dao.project.ProjectMapper;
-import seecoder.devcloud.web.po.project.Project;
+import seecoder.devcloud.web.model.po.project.Project;
 import seecoder.devcloud.web.service.project.ProjectService;
-import seecoder.devcloud.web.vo.Response;
-import seecoder.devcloud.web.vo.project.ProjectVO;
+import seecoder.devcloud.web.model.vo.Response;
+import seecoder.devcloud.web.model.vo.project.ProjectVO;
 
 import java.util.List;
 
@@ -20,20 +20,20 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public Response<List<Project>> listProjectsByGroupId(int groupId) {
         List<Project> projects = projectMapper.listProjectsByGroupId(groupId);
-        return Response.ok(projects);
+        return Response.buildSuccess(projects);
     }
 
     @Override
     // TODO:该方法待测试
     public Response<List<Project>> listProjectsByUserId(int userId) {
         List<Project> projects = projectMapper.listProjectsByUserId(userId);
-        return Response.ok(projects);
+        return Response.buildSuccess(projects);
     }
 
     @Override
     public Response<Project> getProjectById(int projectId) {
         Project project = projectMapper.getProjectById(projectId);
-        return Response.ok(project);
+        return Response.buildSuccess(project);
     }
 
     @Override
@@ -43,9 +43,9 @@ public class ProjectServiceImpl implements ProjectService {
         try {
             projectMapper.insertProject(project);
             // TODO:在对应的gitlab仓库中注册WEBHOOK
-            return Response.ok(project);
+            return Response.buildSuccess(project);
         }catch (Exception e){
-            return Response.badRequest("异常错误");
+            return Response.buildFailure(503,"异常错误");
         }
     }
 

web/src/main/java/seecoder/devcloud/web/service/project/ProjectService.java

@@ -1,9 +1,8 @@
 package seecoder.devcloud.web.service.project;
 
-import org.springframework.web.bind.annotation.PathVariable;
-import seecoder.devcloud.web.po.project.Project;
-import seecoder.devcloud.web.vo.Response;
-import seecoder.devcloud.web.vo.project.ProjectVO;
+import seecoder.devcloud.web.model.po.project.Project;
+import seecoder.devcloud.web.model.vo.Response;
+import seecoder.devcloud.web.model.vo.project.ProjectVO;
 
 import java.util.List;
 

web/src/main/java/seecoder/devcloud/web/service/tree/TreeNodeService.java

@@ -2,9 +2,10 @@ package seecoder.devcloud.web.service.tree;
 
 
 
-import seecoder.devcloud.web.po.TreeNodePO;
-import seecoder.devcloud.web.vo.Response;
-import seecoder.devcloud.web.vo.TreeNodeVO;
+
+import seecoder.devcloud.web.model.po.TreeNodePO;
+import seecoder.devcloud.web.model.vo.Response;
+import seecoder.devcloud.web.model.vo.TreeNodeVO;
 
 import java.util.List;
 

web/src/main/resources/application-cyz.yml

@@ -52,4 +52,8 @@ seecoder:
     password: admin123
     nexus-server: 192.168.68.79:18081
     repo-name: sec-repo
-    clean-up-task: 83bb8249-71e8-4367-83b3-50c6f7518860
+    clean-up-task: 83bb8249-71e8-4367-83b3-50c6f7518860
+
+  git:
+    password: mock
+    username: mock

web/src/test/java/seecoder/devcloud/web/dao/project/ProjectMapperTest.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.test.context.junit4.SpringRunner;
 import seecoder.devcloud.web.dao.user.GroupMemberMapper;
-import seecoder.devcloud.web.po.project.Project;
+import seecoder.devcloud.web.model.po.project.Project;
 
 import java.util.List;
 

web/src/test/java/seecoder/devcloud/web/dao/tree/TreeLogMapperTest.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.test.context.junit4.SpringRunner;
 import seecoder.devcloud.web.enums.OperationEnum;
-import seecoder.devcloud.web.po.tree.TreeLog;
+import seecoder.devcloud.web.model.po.tree.TreeLog;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

web/src/test/java/seecoder/devcloud/web/service/TreeNodeServiceTest.java

@@ -3,18 +3,16 @@ package seecoder.devcloud.web.service;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 import seecoder.devcloud.web.DevcloudWebApplication;
-import seecoder.devcloud.web.enums.NodeStateEnum;
-import seecoder.devcloud.web.enums.NodeTypeEnum;
-import seecoder.devcloud.web.po.TreeNodePO;
+import seecoder.devcloud.web.model.enums.NodeStateEnum;
+import seecoder.devcloud.web.model.enums.NodeTypeEnum;
+import seecoder.devcloud.web.model.po.TreeNodePO;
 import seecoder.devcloud.web.service.tree.TreeNodeService;
-import seecoder.devcloud.web.vo.TreeNodeVO;
+import seecoder.devcloud.web.model.vo.TreeNodeVO;
 
 import java.util.List;
 

web/src/test/java/seecoder/devcloud/web/service/project/ProjectServiceTest.java

@@ -9,10 +9,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 import seecoder.devcloud.web.DevcloudWebApplication;
-import seecoder.devcloud.web.enums.ResponseEnums;
-import seecoder.devcloud.web.po.project.Project;
-import seecoder.devcloud.web.vo.Response;
-import seecoder.devcloud.web.vo.project.ProjectVO;
+import seecoder.devcloud.web.model.po.project.Project;
+import seecoder.devcloud.web.model.vo.Response;
+import seecoder.devcloud.web.model.vo.project.ProjectVO;
 
 import java.util.List;
 
@@ -34,7 +33,7 @@ public class ProjectServiceTest {
     @Test
     public void testInsert(){
         Response<Project> projectResponse = projectService.createProject(projectVO);
-        assert projectResponse.getCode().equals(ResponseEnums.OK.getCode());
+        assert projectResponse.getCode().equals(200);
         Project project = projectResponse.getData();
         System.out.println(project);
         assert project.getName().equals(projectVO.getName());
@@ -46,7 +45,7 @@ public class ProjectServiceTest {
     @Test
     public void testListProjectsByGroupId(){
         Response<List<Project>>  listResponse = projectService.listProjectsByGroupId(1);
-        assert listResponse.getCode().equals(ResponseEnums.OK.getCode());
+        assert listResponse.getCode().equals(200);
         for(Project project:listResponse.getData()){
             assert project.getGroupId()==1;
         }