diff --git a/.gitignore b/.gitignore index 6433803c..06cb82fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # ---> Java # Compiled class file *.class -.idea +.idea/** # Log file *.log target diff --git a/modules/module-ci-process-api/pom.xml b/modules/module-ci-process-api/pom.xml index 1ab93012..f622b076 100644 --- a/modules/module-ci-process-api/pom.xml +++ b/modules/module-ci-process-api/pom.xml @@ -16,6 +16,10 @@ cd.casic.boot module-ci-commons + + cd.casic.boot + module-ci-process-biz + \ No newline at end of file diff --git a/ops-server/src/main/java/cd/casic/server/controller/AgentController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AgentController.java similarity index 98% rename from ops-server/src/main/java/cd/casic/server/controller/AgentController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/AgentController.java index 99fea4f0..c09974a8 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/AgentController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/DefaultController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/DefaultController.java similarity index 97% rename from ops-server/src/main/java/cd/casic/server/controller/DefaultController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/DefaultController.java index 192666ec..c2ec270a 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/DefaultController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/EnvController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/EnvController.java similarity index 98% rename from ops-server/src/main/java/cd/casic/server/controller/EnvController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/EnvController.java index 904a49fb..817f14d7 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/EnvController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/GroupController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/GroupController.java similarity index 98% rename from ops-server/src/main/java/cd/casic/server/controller/GroupController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/GroupController.java index 76f93343..0655bcac 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/GroupController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/MachineController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/MachineController.java similarity index 95% rename from ops-server/src/main/java/cd/casic/server/controller/MachineController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/MachineController.java index e297ce1a..4a2c632c 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/MachineController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipelineController.java similarity index 99% rename from ops-server/src/main/java/cd/casic/server/controller/PipelineController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/PipelineController.java index d0d5bd32..ef4a083a 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/ResourceManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ResourceManagerController.java similarity index 98% rename from ops-server/src/main/java/cd/casic/server/controller/ResourceManagerController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/ResourceManagerController.java index 940b4c9d..61ed379d 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/ResourceManagerController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/SSEController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SSEController.java similarity index 80% rename from ops-server/src/main/java/cd/casic/server/controller/SSEController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/SSEController.java index 348f6b1c..0c46a132 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/SSEController.java +++ b/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 { diff --git a/ops-server/src/main/java/cd/casic/server/controller/StageController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java similarity index 99% rename from ops-server/src/main/java/cd/casic/server/controller/StageController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/StageController.java index b22788bc..3f275028 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/StageController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/TargetController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java similarity index 98% rename from ops-server/src/main/java/cd/casic/server/controller/TargetController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java index 8a520159..69355218 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/TargetController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/TaskTemplateController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TaskTemplateController.java similarity index 95% rename from ops-server/src/main/java/cd/casic/server/controller/TaskTemplateController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TaskTemplateController.java index 10a298eb..c720e833 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/TaskTemplateController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/TasksController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TasksController.java similarity index 97% rename from ops-server/src/main/java/cd/casic/server/controller/TasksController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TasksController.java index c3d2bac3..e641450c 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/TasksController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/TemplateManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java similarity index 98% rename from ops-server/src/main/java/cd/casic/server/controller/TemplateManagerController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java index 7ed786db..fa7dc347 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/TemplateManagerController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/TriggerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TriggerController.java similarity index 98% rename from ops-server/src/main/java/cd/casic/server/controller/TriggerController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TriggerController.java index 573c2fab..afa44950 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/TriggerController.java +++ b/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; diff --git a/ops-server/src/main/java/cd/casic/server/controller/VariableController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/VariableController.java similarity index 99% rename from ops-server/src/main/java/cd/casic/server/controller/VariableController.java rename to modules/module-ci-process-api/src/main/java/cd/casic/ci/api/VariableController.java index 7a4f99bc..909cb752 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/VariableController.java +++ b/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; diff --git a/ops-server/pom.xml b/ops-server/pom.xml index c6b96c55..26b2b397 100644 --- a/ops-server/pom.xml +++ b/ops-server/pom.xml @@ -46,7 +46,7 @@ cd.casic.boot - module-ci-process-biz + module-ci-process-api diff --git a/ops-server/src/test/java/cd/casic/server/DockerRunTest.java b/ops-server/src/test/java/cd/casic/server/DockerRunTest.java index b8cd089e..37bbcdf2 100644 --- a/ops-server/src/test/java/cd/casic/server/DockerRunTest.java +++ b/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; diff --git a/ops-server/src/test/java/cd/casic/server/DockerTest.java b/ops-server/src/test/java/cd/casic/server/DockerTest.java index 097d1753..c6079a73 100644 --- a/ops-server/src/test/java/cd/casic/server/DockerTest.java +++ b/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 { + private static class ExecStartResultCallback extends com.github.dockerjava.api.async.ResultCallback.Adapter { 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())); } diff --git a/ops-server/src/test/java/cd/casic/server/LogTest.java b/ops-server/src/test/java/cd/casic/server/LogTest.java index cfded76e..389c6b3f 100644 --- a/ops-server/src/test/java/cd/casic/server/LogTest.java +++ b/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") diff --git a/ops-server/src/test/java/cd/casic/server/PipelineTest.java b/ops-server/src/test/java/cd/casic/server/PipelineTest.java index 1e0f7b23..f291cbe2 100644 --- a/ops-server/src/test/java/cd/casic/server/PipelineTest.java +++ b/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}) diff --git a/ops-server/src/test/java/cd/casic/server/RedisMqTest.java b/ops-server/src/test/java/cd/casic/server/RedisMqTest.java index 9436d364..575da365 100644 --- a/ops-server/src/test/java/cd/casic/server/RedisMqTest.java +++ b/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; diff --git a/ops-server/src/test/java/cd/casic/server/ResourceTest.java b/ops-server/src/test/java/cd/casic/server/ResourceTest.java index 6dff698c..e5182b9b 100644 --- a/ops-server/src/test/java/cd/casic/server/ResourceTest.java +++ b/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") diff --git a/ops-server/src/test/java/cd/casic/server/SSETest.java b/ops-server/src/test/java/cd/casic/server/SSETest.java index bfe9c3bb..f23366a5 100644 --- a/ops-server/src/test/java/cd/casic/server/SSETest.java +++ b/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 { diff --git a/ops-server/src/test/java/cd/casic/server/SftpTest.java b/ops-server/src/test/java/cd/casic/server/SftpTest.java index 3d401676..7dce4412 100644 --- a/ops-server/src/test/java/cd/casic/server/SftpTest.java +++ b/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; diff --git a/ops-server/src/test/java/cd/casic/server/TaskTest.java b/ops-server/src/test/java/cd/casic/server/TaskTest.java index da2c7df3..61cf3109 100644 --- a/ops-server/src/test/java/cd/casic/server/TaskTest.java +++ b/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 {