fix: merge 分支版本过低导致的包名不一致

README.md

@@ -30,7 +30,7 @@
 
 ```xml
 <dependency>
-	<groupId>seecoder.devcloud</groupId>
+	<groupId>cn.seecoder</groupId>
 	<artifactId>api</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 </dependency>

web/src/main/java/cn/seecoder/web/controller/APITest/APITestController.java

@@ -1,16 +1,15 @@
-package seecoder.devcloud.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.Response;
+import cn.seecoder.web.service.APITest.APITestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import seecoder.devcloud.web.model.po.APITest.APITestResult;
-import seecoder.devcloud.web.model.vo.APITest.APITestBodyVO;
-import seecoder.devcloud.web.model.vo.APITest.APITestInfoVO;
-import seecoder.devcloud.web.model.vo.APITest.APITestResultVO;
-import seecoder.devcloud.web.model.vo.Response;
-import seecoder.devcloud.web.service.APITest.APITestService;
 
 import java.util.List;
 

web/src/main/java/cn/seecoder/web/dao/APITest/APITestMapper.java

@@ -1,9 +1,10 @@
-package seecoder.devcloud.web.dao.APITest;
+package cn.seecoder.web.dao.APITest;
 
 import org.apache.ibatis.annotations.*;
-import seecoder.devcloud.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import seecoder.devcloud.web.model.po.APITest.TestInfo;
-import seecoder.devcloud.web.model.po.APITest.TestResult;
+import cn.seecoder.web.dao.provider.GeneralInsertUpdateSqlProvider;
+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;
 
@@ -12,7 +13,7 @@ import java.util.List;
  * @date 2021/3/20
  * @description:
  */
-@Mapper
+@Repository
 public interface APITestMapper {
 
     @InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")

web/src/main/java/cn/seecoder/web/model/po/APITest/APITestResult.java

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

web/src/main/java/cn/seecoder/web/model/po/APITest/TestInfo.java

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

web/src/main/java/cn/seecoder/web/model/po/APITest/TestResult.java

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

query/src/main/java/cn/seecoder/query/APITest/APITestResultVO.java → web/src/main/java/cn/seecoder/web/model/vo/APITest/APITestResultVO.java

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

query/src/main/java/cn/seecoder/query/APITest/TestInfoVO.java → web/src/main/java/cn/seecoder/web/model/vo/APITest/TestInfoVO.java

@@ -1,12 +1,13 @@
-package seecoder.devcloud.web.model.vo.APITest;
+package cn.seecoder.web.model.vo.APITest;
 
+
+import cn.seecoder.web.model.po.APITest.TestInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import seecoder.devcloud.web.model.po.APITest.TestInfo;
 
 /**
  * @author zhaoxingrui
@@ -15,7 +16,8 @@ import seecoder.devcloud.web.model.po.APITest.TestInfo;
  */
 @Data
 @NoArgsConstructor
-@AllArgsConstructor@ApiModel("测试任务在mysql数据库中的类型")
+@AllArgsConstructor
+@ApiModel("测试任务在mysql数据库中的类型")
 public class TestInfoVO {
     @ApiModelProperty("测试id")
     private Integer testId;

query/src/main/java/cn/seecoder/query/APITest/TestResultVO.java → web/src/main/java/cn/seecoder/web/model/vo/APITest/TestResultVO.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.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 seecoder.devcloud.web.model.po.APITest.TestResult;
+import cn.seecoder.web.model.po.APITest.TestResult;
 
 /**
  * @author zhaoxingrui

web/src/main/java/cn/seecoder/web/service/APITest/APITestService.java

@@ -1,8 +1,9 @@
-package seecoder.devcloud.web.service.APITest;
+package cn.seecoder.web.service.APITest;
 
-import seecoder.devcloud.web.model.vo.APITest.APITestBodyVO;
-import seecoder.devcloud.web.model.vo.APITest.APITestInfoVO;
-import seecoder.devcloud.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 java.util.List;
 

web/src/main/java/cn/seecoder/web/service/impl/APITest/APITestServiceImpl.java

@@ -1,20 +1,19 @@
-package seecoder.devcloud.web.service.impl.APITest;
+package cn.seecoder.web.service.impl.APITest;
 
+import cn.seecoder.web.dao.APITest.APITestMapper;
+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.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 com.google.gson.Gson;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.web.dao.APITest.APITestMapper;
-import seecoder.devcloud.web.model.po.APITest.APITestInfo;
-import seecoder.devcloud.web.model.po.APITest.APITestResult;
-import seecoder.devcloud.web.model.po.APITest.TestInfo;
-import seecoder.devcloud.web.model.po.APITest.TestResult;
-import seecoder.devcloud.web.model.vo.APITest.APITestBodyVO;
-import seecoder.devcloud.web.model.vo.APITest.APITestInfoVO;
-import seecoder.devcloud.web.model.vo.APITest.APITestResultVO;
-import seecoder.devcloud.web.model.vo.APITest.TestResultVO;
-import seecoder.devcloud.web.service.APITest.APITestService;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -31,8 +30,13 @@ import java.util.concurrent.CountDownLatch;
 @Service
 public class APITestServiceImpl implements APITestService {
 
+
+    private final APITestMapper apiTestMapper;
+
     @Autowired
-    private APITestMapper apiTestMapper;
+    public APITestServiceImpl(APITestMapper apiTestMapper) {
+        this.apiTestMapper = apiTestMapper;
+    }
 
 
     @Override
@@ -190,7 +194,7 @@ public class APITestServiceImpl implements APITestService {
                 }
             }
         };
-        APITestServiceImpl apiTestService = new APITestServiceImpl();
+        APITestServiceImpl apiTestService = new APITestServiceImpl(apiTestMapper);
         apiTestService.startTaskAllInOnce(10, task);
         Integer max_time = Collections.max(timeList);
         Integer min_time = Collections.min(timeList);

web/src/main/java/cn/seecoder/web/service/impl/user/MailServiceImpl.java

@@ -1,4 +1,4 @@
-//package seecoder.devcloud.web.service.impl.user;
+//package cn.seecoder.web.service.impl.user;
 //
 //
 //import lombok.extern.apachecommons.CommonsLog;
@@ -14,8 +14,8 @@
 //import org.springframework.web.servlet.ModelAndView;
 //import org.thymeleaf.TemplateEngine;
 //import org.thymeleaf.context.Context;
-//import seecoder.devcloud.api.ApplicationProperties;
-//import seecoder.devcloud.web.service.user.MailService;
+//import cn.seecoder.api.ApplicationProperties;
+//import cn.seecoder.web.service.user.MailService;
 //
 //import javax.mail.MessagingException;
 //import javax.mail.internet.InternetAddress;

web/src/main/resources/mybatis-config.xml

@@ -3,7 +3,7 @@
 <configuration>
 
     <typeHandlers>
-        <!--<typeHandler handler="org.apache.ibatis.type.EnumOrdinalTypeHandler" javaType="seecoder.devcloud.web.model.enums.Type"/>-->
-        <!--<typeHandler handler="org.apache.ibatis.type.EnumOrdinalTypeHandler" javaType="seecoder.devcloud.web.model.enums.State"/>-->
+        <!--<typeHandler handler="org.apache.ibatis.type.EnumOrdinalTypeHandler" javaType="cn.seecoder.web.model.enums.Type"/>-->
+        <!--<typeHandler handler="org.apache.ibatis.type.EnumOrdinalTypeHandler" javaType="cn.seecoder.web.model.enums.State"/>-->
     </typeHandlers>
 </configuration>

web/src/test/java/cn/seecoder/web/DevcloudWebApplicationTests.java

@@ -11,7 +11,7 @@ import cn.seecoder.web.model.enums.PriorityEnum;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 public class DevcloudWebApplicationTests {
 
 

web/src/test/java/cn/seecoder/web/dao/pipeline/PipelineHistoryMapperTest.java

@@ -17,7 +17,7 @@ import java.util.Arrays;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 class PipelineHistoryMapperTest {
 
     private final PipelineHistoryMapper historyMapper;

web/src/test/java/cn/seecoder/web/dao/pipeline/PipelineMapperTest.java

@@ -16,7 +16,7 @@ import cn.seecoder.web.model.po.pipeline.PipelinePO;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 class PipelineMapperTest {
     private final PipelineMapper pipelineMapper;
 

web/src/test/java/cn/seecoder/web/dao/pipeline/StageMapperTest.java

@@ -15,7 +15,7 @@ import cn.seecoder.web.model.po.pipeline.StagePO;
  */
 @SpringBootTest
 @RunWith(SpringRunner.class)
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 class StageMapperTest {
 
     private final StageMapper stageMapper;

web/src/test/java/cn/seecoder/web/dao/project/BugListMapperTest.java

@@ -17,7 +17,7 @@ import cn.seecoder.web.model.po.project.BugListPO;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 class BugListMapperTest {
 
     private final BugListMapper bugListMapper;

web/src/test/java/cn/seecoder/web/dao/project/CommitMapperTest.java

@@ -16,7 +16,7 @@ import cn.seecoder.web.model.po.project.CommitPO;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 class CommitMapperTest {
 
     private final CommitMapper commitMapper;

web/src/test/java/cn/seecoder/web/dao/user/UserMapperTest.java

@@ -18,7 +18,7 @@ import java.util.Arrays;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 class UserMapperTest {
 
     private final UserMapper userMapper;

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

@@ -1,4 +1,4 @@
-//package seecoder.devcloud.web.service;
+//package cn.seecoder.web.service;
 //
 //import org.junit.Before;
 //import org.junit.Test;
@@ -7,12 +7,12 @@
 //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.model.enums.NodeStateEnum;
-//import seecoder.devcloud.web.model.enums.NodeTypeEnum;
-//import seecoder.devcloud.web.model.po.tree.TreeNodePO;
-//import seecoder.devcloud.web.service.tree.TreeNodeService;
-//import seecoder.devcloud.web.model.vo.tree.TreeNodeVO;
+//import cn.seecoder.web.DevcloudWebApplication;
+//import cn.seecoder.web.model.enums.NodeStateEnum;
+//import cn.seecoder.web.model.enums.NodeTypeEnum;
+//import cn.seecoder.web.model.po.tree.TreeNodePO;
+//import cn.seecoder.web.service.tree.TreeNodeService;
+//import cn.seecoder.web.model.vo.tree.TreeNodeVO;
 //
 //import java.util.List;
 //

web/src/test/java/cn/seecoder/web/service/pipeline/DeploymentServiceTest.java

@@ -15,7 +15,7 @@ import cn.seecoder.common.exceptions.ServiceException;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 class DeploymentServiceTest {
 
     private final DeploymentService deploymentService;

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

@@ -1,4 +1,4 @@
-//package seecoder.devcloud.web.service.project;
+//package cn.seecoder.web.service.project;
 //
 //import io.swagger.annotations.Api;
 //import org.junit.Before;
@@ -8,10 +8,10 @@
 //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.model.po.project.ProjectPO;
-//import seecoder.devcloud.web.model.vo.Response;
-//import seecoder.devcloud.web.model.vo.project.ProjectVO;
+//import cn.seecoder.web.DevcloudWebApplication;
+//import cn.seecoder.web.model.po.project.ProjectPO;
+//import cn.seecoder.web.model.vo.Response;
+//import cn.seecoder.web.model.vo.project.ProjectVO;
 //
 //import java.util.List;
 //

web/src/test/java/cn/seecoder/web/service/tree/TreeNodeServiceTest.java

@@ -18,7 +18,7 @@ import java.util.List;
  **/
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 public class TreeNodeServiceTest {
     @Autowired
     TreeNodeService treeNodeService;

web/src/test/java/cn/seecoder/web/service/user/MailServiceTest.java

@@ -1,4 +1,4 @@
-//package seecoder.devcloud.web.service.user;
+//package cn.seecoder.web.service.user;
 //
 //import org.junit.Assert;
 //import org.junit.jupiter.api.Test;
@@ -11,7 +11,7 @@
 //import org.springframework.mail.javamail.MimeMessageHelper;
 //import org.springframework.scheduling.annotation.EnableAsync;
 //import org.springframework.test.context.junit4.SpringRunner;
-//import seecoder.devcloud.common.exceptions.ServiceException;
+//import cn.seecoder.common.exceptions.ServiceException;
 //
 //import javax.mail.MessagingException;
 //import javax.mail.internet.MimeMessage;
@@ -27,7 +27,7 @@
 // */
 //@RunWith(SpringRunner.class)
 //@SpringBootTest
-//@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+//@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 //class MailServiceTest {
 //
 //    @Autowired

web/src/test/java/cn/seecoder/web/service/user/UserServiceTest.java

@@ -1,4 +1,4 @@
-//package seecoder.devcloud.web.service.user;
+//package cn.seecoder.web.service.user;
 //
 //import org.gitlab4j.api.GitLabApi;
 //import org.gitlab4j.api.models.AbstractUser;
@@ -10,10 +10,10 @@
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.boot.test.context.SpringBootTest;
 //import org.springframework.test.context.junit4.SpringRunner;
-//import seecoder.devcloud.api.ApplicationProperties;
-//import seecoder.devcloud.common.exceptions.ServiceException;
-//import seecoder.devcloud.web.model.vo.user.RegisterVO;
-//import seecoder.devcloud.web.model.vo.user.UserVO;
+//import cn.seecoder.api.ApplicationProperties;
+//import cn.seecoder.common.exceptions.ServiceException;
+//import cn.seecoder.web.model.vo.user.RegisterVO;
+//import cn.seecoder.web.model.vo.user.UserVO;
 //
 //import java.util.stream.Collectors;
 //
@@ -24,7 +24,7 @@
 // */
 //@RunWith(SpringRunner.class)
 //@SpringBootTest
-//@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+//@MapperScan(basePackages = {"cn.seecoder.web.dao"})
 //class UserServiceTest {
 //
 //    @Autowired