Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro

.gitignore

@@ -1,7 +1,7 @@
 # ---> Java
 # Compiled class file
 *.class
-.idea
+.idea/**
 # Log file
 *.log
 target

modules/module-ci-process-api/pom.xml

@@ -16,6 +16,10 @@
             <groupId>cd.casic.boot</groupId>
             <artifactId>module-ci-commons</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cd.casic.boot</groupId>
+            <artifactId>module-ci-process-biz</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AgentController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 import cd.casic.ci.process.dal.req.agent.AgentQueryReq;
 import cd.casic.ci.process.dal.resp.agent.AgentResp;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/DefaultController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 import cd.casic.framework.commons.pojo.CommonResult;
 import org.springframework.web.bind.annotation.RequestMapping;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/EnvController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 import cd.casic.ci.process.dal.req.env.EnvQueryReq;
 import cd.casic.ci.process.dal.req.env.EnvReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/GroupController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.group.GroupQueryReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/MachineController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 import cd.casic.ci.process.process.dataObject.machine.MachineInfo;
 import cd.casic.ci.process.process.service.machine.MachineInfoService;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipelineController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.pipeline.PipelineCreateReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ResourceManagerController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.resource.ResourceQueryReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SSEController.java

@@ -1,8 +1,6 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 import cd.casic.ci.process.engine.manager.LoggerManager;
-import cd.casic.framework.commons.util.network.IpUtil;
-import cd.casic.framework.commons.util.util.WebFrameworkUtils;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import java.io.IOException;
-
 @RestController
 @RequestMapping("/sse")
 public class SSEController {

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.stage.StageCreateReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.target.TargetManagerCreateReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TaskTemplateController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 import cd.casic.ci.process.dal.resp.taskTemplate.TaskTemplateResp;
 import cd.casic.ci.process.process.service.taskTemplate.TaskTemplateService;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TasksController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.task.TaskUpdateReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.template.TemplateQueryReq;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TriggerController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 import cd.casic.ci.process.dal.req.trigger.TriggerQueryReq;
 import cd.casic.framework.commons.pojo.CommonResult;

modules/module-ci-process-api/src/main/java/cd/casic/ci/api/VariableController.java

@@ -1,4 +1,4 @@
-package cd.casic.server.controller;
+package cd.casic.ci.api;
 
 
 import cd.casic.ci.process.dal.req.variable.VariableReq;

ops-server/pom.xml

@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>cd.casic.boot</groupId>
-            <artifactId>module-ci-process-biz</artifactId>
+            <artifactId>module-ci-process-api</artifactId>
         </dependency>
 
         <dependency>

ops-server/src/test/java/cd/casic/server/DockerRunTest.java

@@ -1,16 +1,15 @@
 package cd.casic.server;
 
-import cd.casic.module.execute.docker.callback.CommandExecCallback;
 import cd.casic.module.execute.docker.dataobject.model.DockerEndpoint;
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.async.ResultCallbackTemplate;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
-import jodd.util.StringUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -25,9 +24,11 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import static java.lang.String.format;

ops-server/src/test/java/cd/casic/server/DockerTest.java

@@ -2,23 +2,16 @@ package cd.casic.server;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.command.ExecStartResultCallback;
 import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -126,11 +119,11 @@ public class DockerTest {
         }
     }
 
-    private static class ExecStartResultCallback extends com.github.dockerjava.api.async.ResultCallback.Adapter<com.github.dockerjava.api.model.Frame> {
+    private static class ExecStartResultCallback extends com.github.dockerjava.api.async.ResultCallback.Adapter<Frame> {
         private final StringBuilder output = new StringBuilder();
 
         @Override
-        public void onNext(com.github.dockerjava.api.model.Frame frame) {
+        public void onNext(Frame frame) {
             output.append(new String(frame.getPayload()));
         }
 

ops-server/src/test/java/cd/casic/server/LogTest.java

@@ -5,7 +5,6 @@ import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootTest(classes = {OpsServerApplication.class})
 @ActiveProfiles("local")

ops-server/src/test/java/cd/casic/server/PipelineTest.java

@@ -25,9 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.when;
 
 @SpringBootTest(classes = {OpsServerApplication.class})

ops-server/src/test/java/cd/casic/server/RedisMqTest.java

@@ -14,7 +14,6 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 

ops-server/src/test/java/cd/casic/server/ResourceTest.java

@@ -25,10 +25,7 @@ import org.springframework.test.context.ActiveProfiles;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @SpringBootTest(classes = {OpsServerApplication.class})
 @ActiveProfiles("local")

ops-server/src/test/java/cd/casic/server/SSETest.java

@@ -1,23 +1,11 @@
 package cd.casic.server;
 
 import cd.casic.ci.process.engine.manager.LoggerManager;
-import cd.casic.ci.process.engine.manager.RunContextManager;
-import cd.casic.ci.process.engine.message.TaskRunMessage;
-import cd.casic.ci.process.engine.runContext.PipelineRunContext;
-import cd.casic.ci.process.engine.runContext.SecondStageRunContext;
-import cd.casic.ci.process.engine.runContext.TaskRunContext;
-import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
-import cd.casic.ci.process.process.dataObject.stage.PipStage;
-import cd.casic.ci.process.process.dataObject.task.PipTask;
-import cd.casic.framework.mq.redis.core.RedisMQTemplate;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
 @SpringBootTest(classes = {OpsServerApplication.class})
 @ActiveProfiles("local")
 public class SSETest {

ops-server/src/test/java/cd/casic/server/SftpTest.java

@@ -6,9 +6,7 @@ import cd.casic.ci.process.util.CryptogramUtil;
 import cd.casic.ci.process.util.SftpUploadUtil;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestClassOrder;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.stereotype.Service;
 import org.springframework.test.context.ActiveProfiles;
 
 import java.io.File;

ops-server/src/test/java/cd/casic/server/TaskTest.java

@@ -2,27 +2,14 @@ package cd.casic.server;
 
 import cd.casic.ci.process.dal.req.stage.StageCreateReq;
 import cd.casic.ci.process.dal.req.task.TaskUpdateReq;
-import cd.casic.ci.process.engine.manager.RunContextManager;
-import cd.casic.ci.process.engine.message.TaskRunMessage;
-import cd.casic.ci.process.engine.runContext.PipelineRunContext;
-import cd.casic.ci.process.engine.runContext.SecondStageRunContext;
-import cd.casic.ci.process.engine.runContext.TaskRunContext;
-import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
-import cd.casic.ci.process.process.dataObject.stage.PipStage;
-import cd.casic.ci.process.process.dataObject.task.PipTask;
 import cd.casic.ci.process.process.service.stage.StageService;
 import cd.casic.ci.process.process.service.task.TaskService;
-import cd.casic.framework.mq.redis.core.RedisMQTemplate;
 import com.alibaba.fastjson.JSON;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.scheduling.TaskScheduler;
 import org.springframework.test.context.ActiveProfiles;
 
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
 @SpringBootTest(classes = {OpsServerApplication.class})
 @ActiveProfiles("local")
 public class TaskTest {