diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0f3f9116..d24abdb3 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -28,6 +28,7 @@
+
@@ -39,7 +40,6 @@
-
@@ -71,10 +71,11 @@
+
+
-
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index bbfbfb10..85aa9669 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -61,6 +61,8 @@
+
+
@@ -83,8 +85,6 @@
-
-
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 1945c076..1ae4942f 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,16 +1,16 @@
-
-
-
-
-
+
+
+
+
+
@@ -31,16 +31,16 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/dependencies/.flattened-pom.xml b/dependencies/.flattened-pom.xml
index e9339d32..3c5f83c2 100644
--- a/dependencies/.flattened-pom.xml
+++ b/dependencies/.flattened-pom.xml
@@ -52,6 +52,7 @@
3.12.1
1.2.13
1.4.13
+ 3.5.0
5.8.32
2.0.0-jdk17
0.1.55
@@ -203,6 +204,11 @@
module-ci-process-biz
${revision}
+
+ cd.casic.boot
+ module-ci-process-api
+ ${revision}
+
io.github.mouzt
bizlog-sdk
@@ -563,6 +569,16 @@
bcprov-jdk18on
${bcprov-jdk18on.version}
+
+ com.github.docker-java
+ docker-java
+ ${docker-java.version}
+
+
+ com.github.docker-java
+ docker-java-transport-httpclient5
+ ${docker-java.version}
+
org.jvnet.winp
winp
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 52725ec2..12bc9668 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -75,6 +75,7 @@
1.7.8
1.2.13
1.80
+ 3.5.0
1.28
1.12
@@ -227,6 +228,12 @@
${revision}
+
+ cd.casic.boot
+ module-ci-process-api
+ ${revision}
+
+
@@ -644,6 +651,18 @@
bcprov-jdk18on
${bcprov-jdk18on.version}
+
+
+ com.github.docker-java
+ docker-java
+ ${docker-java.version}
+
+
+ com.github.docker-java
+ docker-java-transport-httpclient5
+ ${docker-java.version}
+
+
diff --git a/framework/commons/src/main/java/cd/casic/framework/commons/util/spring/SpringBootApplicationHome.java b/framework/commons/src/main/java/cd/casic/framework/commons/util/spring/SpringBootApplicationHome.java
new file mode 100644
index 00000000..b93e1fad
--- /dev/null
+++ b/framework/commons/src/main/java/cd/casic/framework/commons/util/spring/SpringBootApplicationHome.java
@@ -0,0 +1,123 @@
+package cd.casic.framework.commons.util.spring;
+
+import lombok.Getter;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.JarURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
+import java.util.Enumeration;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+/**
+ * @description: 供对应用程序主目录的访问
+ * @author: mianbin
+ * @date: 2025/5/25 14:32
+ * @version: 1.0
+ */
+@Getter
+public class SpringBootApplicationHome {
+ private final File source;
+
+ private final File dir;
+
+ public SpringBootApplicationHome() {
+ this(null);
+ }
+
+ public SpringBootApplicationHome(Class> sourceClass) {
+ this.source = findSource((sourceClass != null) ? sourceClass : getStartClass());
+ this.dir = findHomeDir(this.source);
+ }
+
+ private Class> getStartClass() {
+ try {
+ ClassLoader classLoader = getClass().getClassLoader();
+ return getStartClass(classLoader.getResources("META-INF/MANIFEST.MF"));
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+
+ private Class> getStartClass(Enumeration manifestResources) {
+ while (manifestResources.hasMoreElements()) {
+ try (InputStream inputStream = manifestResources.nextElement().openStream()) {
+ Manifest manifest = new Manifest(inputStream);
+ String startClass = manifest.getMainAttributes().getValue("Start-Class");
+ if (startClass != null) {
+ return ClassUtils.forName(startClass, getClass().getClassLoader());
+ }
+ } catch (Exception ex) {
+ }
+ }
+ return null;
+ }
+
+ private File findSource(Class> sourceClass) {
+ try {
+ ProtectionDomain domain = (sourceClass != null) ? sourceClass.getProtectionDomain() : null;
+ CodeSource codeSource = (domain != null) ? domain.getCodeSource() : null;
+ URL location = (codeSource != null) ? codeSource.getLocation() : null;
+ File source = (location != null) ? findSource(location) : null;
+ if (source != null && source.exists() && !isUnitTest()) {
+ return source.getAbsoluteFile();
+ }
+ } catch (Exception ex) {
+ }
+ return null;
+ }
+
+ private boolean isUnitTest() {
+ try {
+ StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+ for (int i = stackTrace.length - 1; i >= 0; i--) {
+ if (stackTrace[i].getClassName().startsWith("org.junit.")) {
+ return true;
+ }
+ }
+ } catch (Exception ex) {
+ }
+ return false;
+ }
+
+ private File findSource(URL location) throws IOException, URISyntaxException {
+ URLConnection connection = location.openConnection();
+ if (connection instanceof JarURLConnection) {
+ return getRootJarFile(((JarURLConnection) connection).getJarFile());
+ }
+ return new File(location.toURI());
+ }
+
+ private File getRootJarFile(JarFile jarFile) {
+ String name = jarFile.getName();
+ int separator = name.indexOf("!/");
+ if (separator > 0) {
+ name = name.substring(0, separator);
+ }
+ return new File(name);
+ }
+
+ private File findHomeDir(File source) {
+ File homeDir = source;
+ homeDir = (homeDir != null) ? homeDir : findDefaultHomeDir();
+ if (homeDir.isFile()) {
+ homeDir = homeDir.getParentFile();
+ }
+ homeDir = homeDir.exists() ? homeDir : new File(".");
+ return homeDir.getAbsoluteFile();
+ }
+
+ private File findDefaultHomeDir() {
+ String userDir = System.getProperty("user.dir");
+ return new File(StringUtils.hasLength(userDir) ? userDir : ".");
+ }
+
+}
diff --git a/framework/commons/src/test/java/collection/SpringBootApplicationHomeTests.java b/framework/commons/src/test/java/collection/SpringBootApplicationHomeTests.java
new file mode 100644
index 00000000..0769a9d1
--- /dev/null
+++ b/framework/commons/src/test/java/collection/SpringBootApplicationHomeTests.java
@@ -0,0 +1,19 @@
+package collection;
+
+import cd.casic.framework.commons.util.spring.SpringBootApplicationHome;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @description: 测试jar路径
+ * @author: mianbin
+ * @date: 2025/5/25 14:36
+ * @version: 1.0
+ */
+public class SpringBootApplicationHomeTests {
+ @Test
+ public void getJarHome() {
+ SpringBootApplicationHome home = new SpringBootApplicationHome();
+ System.out.println(home.getDir());
+ }
+
+}
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/dispatch/package-info.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/dispatch/package-info.java
deleted file mode 100644
index bc92c36e..00000000
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/dispatch/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @Classname package-info
- * @Description TODO
- * @Date 2025/4/21 21:06
- * @author by mianbin
- */
-package cd.casic.ci.commons.bean.dispatch;
\ No newline at end of file
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/package-info.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/package-info.java
deleted file mode 100644
index 911d02a6..00000000
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @Classname package-info
- * @Description TODO
- * @Date 2025/4/21 21:06
- * @author by mianbin
- */
-package cd.casic.ci.commons.bean.engine;
\ No newline at end of file
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/AgentMessage.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/AgentMessage.java
deleted file mode 100644
index a9de9df5..00000000
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/AgentMessage.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cd.casic.ci.commons.bean.work.agent;
-
-public class AgentMessage {
-
- private String type;
-
- private Object message;
-
- private String pipelineId;
-
- private String tenantId;
-
- public String getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(String tenantId) {
- this.tenantId = tenantId;
- }
-
- public String getPipelineId() {
- return pipelineId;
- }
-
- public void setPipelineId(String pipelineId) {
- this.pipelineId = pipelineId;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Object getMessage() {
- return message;
- }
-
- public void setMessage(Object message) {
- this.message = message;
- }
-}
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/commons/Pagination.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/commons/Pagination.java
similarity index 92%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/commons/Pagination.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/commons/Pagination.java
index 5edebf77..148c49ac 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/commons/Pagination.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/commons/Pagination.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.commons;
+package cd.casic.ci.commons.commons;
import lombok.Data;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/commons/PipelineConstants.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/commons/PipelineConstants.java
similarity index 99%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/commons/PipelineConstants.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/commons/PipelineConstants.java
index 7e183cc8..0fa62cf0 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/commons/PipelineConstants.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/commons/PipelineConstants.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.commons;
+package cd.casic.ci.commons.commons;
/**
* @author by mianbin
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/execute/PipelineDetails.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/execute/PipelineDetails.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/execute/PipelineDetails.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/execute/PipelineDetails.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/execute/PipelineRunMsg.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/execute/PipelineRunMsg.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/execute/PipelineRunMsg.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/execute/PipelineRunMsg.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TaskExecMessage.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TaskExecMessage.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TaskExecMessage.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TaskExecMessage.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TaskInstance.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TaskInstance.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TaskInstance.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TaskInstance.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TaskInstanceQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TaskInstanceQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TaskInstanceQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TaskInstanceQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/Tasks.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/Tasks.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/Tasks.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/Tasks.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TasksQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TasksQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/job/TasksQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/job/TasksQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/postprocess/Postprocess.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/postprocess/Postprocess.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/postprocess/Postprocess.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/postprocess/Postprocess.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/postprocess/PostprocessInstance.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/postprocess/PostprocessInstance.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/postprocess/PostprocessInstance.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/postprocess/PostprocessInstance.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/postprocess/PostprocessQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/postprocess/PostprocessQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/postprocess/PostprocessQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/engine/postprocess/PostprocessQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/exception/ApplicationException.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/exception/ApplicationException.java
similarity index 90%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/exception/ApplicationException.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/exception/ApplicationException.java
index f01edee7..17d219bd 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/exception/ApplicationException.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/exception/ApplicationException.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.exception;
+package cd.casic.ci.commons.exception;
/**
* @author by mianbin
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/exception/SystemException.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/exception/SystemException.java
similarity index 84%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/exception/SystemException.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/exception/SystemException.java
index 8ee8cae4..8304b1cc 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/exception/SystemException.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/exception/SystemException.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.exception;
+package cd.casic.ci.commons.exception;
/**
* @author by mianbin
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/Order.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/Order.java
similarity index 84%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/Order.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/Order.java
index bacbfc55..58d2f881 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/Order.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/Order.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.order;
+package cd.casic.ci.commons.order;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderBuilder.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderBuilder.java
similarity index 70%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderBuilder.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderBuilder.java
index 56b4b5f3..debdaee1 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderBuilder.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderBuilder.java
@@ -1,9 +1,4 @@
-package cd.casic.ci.commons.bean.order;
-
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by FernFlower decompiler)
-//
+package cd.casic.ci.commons.order;
import java.io.Serializable;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderBuilders.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderBuilders.java
similarity index 94%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderBuilders.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderBuilders.java
index 53c49991..e5b397b7 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderBuilders.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderBuilders.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.order;
+package cd.casic.ci.commons.order;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderTypeEnum.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderTypeEnum.java
similarity index 77%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderTypeEnum.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderTypeEnum.java
index a63430e8..9ee219ee 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/order/OrderTypeEnum.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/order/OrderTypeEnum.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.order;
+package cd.casic.ci.commons.order;
import java.io.Serializable;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/Condition.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/Condition.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/Condition.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/Condition.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/Pipeline.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/Pipeline.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/Pipeline.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/Pipeline.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineFollow.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineFollow.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineFollow.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineFollow.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineFollowQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineFollowQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineFollowQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineFollowQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineOpen.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineOpen.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineOpen.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineOpen.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineOpenQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineOpenQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineOpenQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineOpenQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineRecently.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineRecently.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/PipelineRecently.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/PipelineRecently.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/Variable.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/Variable.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/definition/Variable.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/definition/Variable.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/instance/PipelineInstance.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/instance/PipelineInstance.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/instance/PipelineInstance.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/instance/PipelineInstance.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/instance/PipelineInstanceQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/instance/PipelineInstanceQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/instance/PipelineInstanceQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/instance/PipelineInstanceQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/package-info.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/package-info.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/package-info.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/package-info.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Auth.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Auth.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Auth.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Auth.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHost.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHost.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHost.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHost.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostGroup.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostGroup.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostGroup.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostGroup.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostGroupDetails.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostGroupDetails.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostGroupDetails.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostGroupDetails.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostGroupQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostGroupQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostGroupQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostGroupQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostK8s.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostK8s.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostK8s.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostK8s.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostK8sQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostK8sQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostK8sQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostK8sQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthHostQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthHostQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthThird.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthThird.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthThird.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthThird.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthThirdQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthThirdQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/AuthThirdQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/AuthThirdQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Cache.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Cache.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Cache.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Cache.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Env.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Env.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Env.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Env.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/EnvQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/EnvQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/EnvQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/EnvQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Group.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Group.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Group.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Group.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/GroupQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/GroupQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/GroupQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/GroupQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/HostGroup.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/HostGroup.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/HostGroup.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/HostGroup.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Resources.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Resources.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Resources.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Resources.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/ResourcesDetails.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/ResourcesDetails.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/ResourcesDetails.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/ResourcesDetails.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Scm.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Scm.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/Scm.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/Scm.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/ScmQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/ScmQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/ScmQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/ScmQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/SystemMassage.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/SystemMassage.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/setting/SystemMassage.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/setting/SystemMassage.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/stage/Stage.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/stage/Stage.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/stage/Stage.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/stage/Stage.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/stage/StageInstance.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/stage/StageInstance.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/stage/StageInstance.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/stage/StageInstance.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/stage/StageInstanceQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/stage/StageInstanceQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/process/stage/StageInstanceQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/process/stage/StageInstanceQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineDayCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineDayCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineDayCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineDayCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineDayRateCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineDayRateCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineDayRateCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineDayRateCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineOverview.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineOverview.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineOverview.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineOverview.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunCountQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunCountQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunCountQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunCountQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunDayCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunDayCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunDayCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunDayCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunResultCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunResultCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunResultCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunResultCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunTimeCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunTimeCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineRunTimeCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineRunTimeCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineSurveyCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineSurveyCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineSurveyCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineSurveyCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineSurveyResultCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineSurveyResultCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineSurveyResultCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineSurveyResultCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineTimeCount.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineTimeCount.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/count/PipelineTimeCount.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/count/PipelineTimeCount.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeploy.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeploy.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeploy.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeploy.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeployInstance.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeployInstance.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeployInstance.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeployInstance.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeployInstanceQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeployInstanceQuery.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeployInstanceQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeployInstanceQuery.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeployStrategy.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeployStrategy.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/deploy/TaskDeployStrategy.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/deploy/TaskDeployStrategy.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/package-info.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/package-info.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/package-info.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/package-info.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/webhook/WebHook.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/webhook/WebHook.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/support/webhook/WebHook.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/support/webhook/WebHook.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/jdbc/JdbcTemplate.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/JdbcTemplate.java
similarity index 93%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/jdbc/JdbcTemplate.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/JdbcTemplate.java
index c6d08f6b..f42c3ad3 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/jdbc/JdbcTemplate.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/JdbcTemplate.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.jdbc;
+package cd.casic.ci.commons.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/PipelineFileUtil.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/PipelineFileUtil.java
similarity index 97%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/PipelineFileUtil.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/PipelineFileUtil.java
index f2047e74..d2e86132 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/PipelineFileUtil.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/PipelineFileUtil.java
@@ -1,7 +1,7 @@
-package cd.casic.ci.commons.bean.utils;
+package cd.casic.ci.commons.utils;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
+import cd.casic.ci.commons.exception.ApplicationException;
import cn.hutool.core.io.FileUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -19,8 +19,8 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.Objects;
-import static cd.casic.ci.commons.bean.commons.PipelineConstants.FILE_TEMP_PREFIX;
-import static cd.casic.ci.commons.bean.commons.PipelineConstants.SIZE_TYPE_MB;
+import static cd.casic.ci.commons.commons.PipelineConstants.FILE_TEMP_PREFIX;
+import static cd.casic.ci.commons.commons.PipelineConstants.SIZE_TYPE_MB;
public class PipelineFileUtil {
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/PipelineUtil.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/PipelineUtil.java
similarity index 99%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/PipelineUtil.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/PipelineUtil.java
index 2a0d3b08..299ed399 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/PipelineUtil.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/PipelineUtil.java
@@ -1,6 +1,6 @@
-package cd.casic.ci.commons.bean.utils;
+package cd.casic.ci.commons.utils;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
+import cd.casic.ci.commons.exception.ApplicationException;
import org.apache.commons.lang3.StringUtils;
import java.io.File;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/Result.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/Result.java
similarity index 97%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/Result.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/Result.java
index a0870fb6..8e449052 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/utils/Result.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/utils/Result.java
@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.bean.utils;
+package cd.casic.ci.commons.utils;
import lombok.Data;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/AgentMessage.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/AgentMessage.java
new file mode 100644
index 00000000..0e4c8631
--- /dev/null
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/AgentMessage.java
@@ -0,0 +1,16 @@
+package cd.casic.ci.commons.bean.work.agent;
+
+import lombok.Data;
+
+@Data
+public class AgentMessage {
+
+ private String type;
+
+ private Object message;
+
+ private String pipelineId;
+
+ private String tenantId;
+
+}
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/AgentQuery.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/AgentQuery.java
similarity index 81%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/AgentQuery.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/AgentQuery.java
index 7d229c54..9364fd83 100644
--- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/AgentQuery.java
+++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/AgentQuery.java
@@ -2,8 +2,8 @@ package cd.casic.ci.commons.bean.work.agent;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import java.util.List;
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/model/Agent.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/model/Agent.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/model/Agent.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/model/Agent.java
diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/package-info.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/package-info.java
similarity index 100%
rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/package-info.java
rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/package-info.java
diff --git a/modules/module-ci-execute/pom.xml b/modules/module-ci-execute/pom.xml
new file mode 100644
index 00000000..18b0ff8d
--- /dev/null
+++ b/modules/module-ci-execute/pom.xml
@@ -0,0 +1,40 @@
+
+
+ 4.0.0
+
+ cd.casic.boot
+ modules
+ ${revision}
+
+
+ module-ci-execute
+ jar
+ ${revision}
+ ${project.artifactId}
+
+
+
+ cd.casic.boot
+ commons
+
+
+
+ cd.casic.boot
+ spring-boot-starter-test
+
+
+
+ com.github.docker-java
+ docker-java
+
+
+
+ com.github.docker-java
+ docker-java-transport-httpclient5
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/Main.java b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/Main.java
new file mode 100644
index 00000000..c5fc8930
--- /dev/null
+++ b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/Main.java
@@ -0,0 +1,13 @@
+package cd.casic.module.execute;
+
+/**
+ * @description: TODO
+ * @author: mianbin
+ * @date: 2025/5/23 17:29
+ * @version: 1.0
+ */
+public class Main {
+ public static void main(String[] args) {
+ System.out.println("Hello world!");
+ }
+}
\ No newline at end of file
diff --git a/modules/module-ci-store/pom.xml b/modules/module-ci-market/pom.xml
similarity index 94%
rename from modules/module-ci-store/pom.xml
rename to modules/module-ci-market/pom.xml
index df18fcf0..4f9c0d06 100644
--- a/modules/module-ci-store/pom.xml
+++ b/modules/module-ci-market/pom.xml
@@ -9,7 +9,7 @@
${revision}
- module-ci-store
+ module-ci-market
jar
${revision}
diff --git a/modules/module-ci-store/src/main/java/cd/casic/ci/store/Main.java b/modules/module-ci-market/src/main/java/cd/casic/ci/store/Main.java
similarity index 100%
rename from modules/module-ci-store/src/main/java/cd/casic/ci/store/Main.java
rename to modules/module-ci-market/src/main/java/cd/casic/ci/store/Main.java
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/util/BeanUtils.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/util/BeanUtils.java
index accccda0..8e6cde94 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/util/BeanUtils.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/util/BeanUtils.java
@@ -1,6 +1,6 @@
package cd.casic.module.process.core.util;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.SystemException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUserQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUserQuery.java
index f3db92a3..deaae184 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUserQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUserQuery.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.licence.appauth.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNoticeQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNoticeQuery.java
index 7fab5c8d..8ac757a4 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNoticeQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNoticeQuery.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.message.message.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageNoticeQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageNoticeQuery.java
index 90a31ddb..391b6cbb 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageNoticeQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageNoticeQuery.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.message.model.message;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendTypeQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendTypeQuery.java
index 1fda2009..86e24d1c 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendTypeQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendTypeQuery.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.message.model.setting;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineFollowServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineFollowServiceImpl.java
index 48b6a332..5a56b6f9 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineFollowServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineFollowServiceImpl.java
@@ -3,14 +3,13 @@ package cd.casic.module.process.pipeline.definition.impl;
import cd.casic.ci.commons.bean.process.definition.Pipeline;
import cd.casic.ci.commons.bean.process.definition.PipelineFollow;
import cd.casic.ci.commons.bean.process.definition.PipelineFollowQuery;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.framework.commons.exception.ServiceException;
import cd.casic.module.process.pipeline.definition.entity.PipelineFollowEntity;
import cd.casic.module.process.process.definition.PipelineFollowService;
import cd.casic.module.process.process.definition.dao.PipelineFollowDao;
import cd.casic.module.process.toolkit.beans.BeanMapper;
import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collections;
import java.util.List;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineOpenServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineOpenServiceImpl.java
index d030fe15..4ea4cbf2 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineOpenServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineOpenServiceImpl.java
@@ -3,7 +3,7 @@ package cd.casic.module.process.pipeline.definition.impl;
import cd.casic.ci.commons.bean.process.definition.Pipeline;
import cd.casic.ci.commons.bean.process.definition.PipelineOpen;
import cd.casic.ci.commons.bean.support.count.PipelineOverview;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.module.process.pipeline.definition.PipelineOpenService;
import cd.casic.module.process.pipeline.definition.entity.PipelineEntity;
@@ -15,7 +15,6 @@ import cd.casic.module.process.support.authority.service.PipelineAuthorityServic
import cd.casic.module.process.toolkit.beans.BeanMapper;
import cd.casic.module.process.toolkit.join.JoinTemplate;
import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineServiceImpl.java
index 5b966474..c5fa6dd7 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineServiceImpl.java
@@ -3,8 +3,8 @@ package cd.casic.module.process.pipeline.definition.impl;
import cd.casic.ci.commons.bean.process.definition.*;
import cd.casic.ci.commons.bean.process.instance.PipelineInstance;
-import cd.casic.ci.commons.bean.utils.PipelineFileUtil;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineFileUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.framework.commons.exception.ServiceException;
import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
import cd.casic.framework.commons.pojo.PageResult;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java
index 28286802..bff3eb43 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java
@@ -4,7 +4,7 @@ package cd.casic.module.process.pipeline.execute.service.impl;
import cd.casic.ci.commons.bean.engine.execute.PipelineDetails;
import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg;
import cd.casic.ci.commons.bean.engine.postprocess.Postprocess;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.ci.commons.bean.process.definition.Pipeline;
import cd.casic.ci.commons.bean.process.definition.Variable;
import cd.casic.ci.commons.bean.process.instance.PipelineInstance;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupServiceImpl.java
index 9aeb6a94..fb4cd6df 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupServiceImpl.java
@@ -1,11 +1,11 @@
package cd.casic.module.process.process.setting.impl;
-import cd.casic.ci.commons.bean.commons.PipelineConstants;
+import cd.casic.ci.commons.commons.PipelineConstants;
import cd.casic.ci.commons.bean.process.setting.AuthHostGroup;
import cd.casic.ci.commons.bean.process.setting.AuthHostGroupDetails;
import cd.casic.ci.commons.bean.process.setting.AuthHostGroupQuery;
import cd.casic.ci.commons.bean.process.setting.HostGroup;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.module.process.convert.setting.AuthHostGroupConvert;
import cd.casic.module.process.process.setting.AuthHostGroupDetailsService;
import cd.casic.module.process.process.setting.AuthHostGroupService;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/EnvServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/EnvServiceImpl.java
index d37a4fd3..de0c8b75 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/EnvServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/EnvServiceImpl.java
@@ -3,7 +3,7 @@ package cd.casic.module.process.process.setting.impl;
import cd.casic.ci.commons.bean.process.setting.Env;
import cd.casic.ci.commons.bean.process.setting.EnvQuery;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.framework.commons.pojo.PageResult;
import cd.casic.module.process.process.setting.EnvService;
import cd.casic.module.process.process.setting.dao.EnvDao;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/GroupServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/GroupServiceImpl.java
index 0636cb30..605ae1d9 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/GroupServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/GroupServiceImpl.java
@@ -2,7 +2,6 @@ package cd.casic.module.process.process.setting.impl;
import cd.casic.ci.commons.bean.process.setting.Group;
import cd.casic.ci.commons.bean.process.setting.GroupQuery;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
import cd.casic.framework.commons.pojo.PageResult;
import cd.casic.module.process.process.setting.GroupService;
import cd.casic.module.process.process.setting.dao.GroupDao;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ResourcesServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ResourcesServiceImpl.java
index 7ae3e9f7..369e7962 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ResourcesServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ResourcesServiceImpl.java
@@ -1,12 +1,10 @@
package cd.casic.module.process.process.setting.impl;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.process.definition.PipelineQuery;
+import cd.casic.ci.commons.exception.ApplicationException;
import cd.casic.ci.commons.bean.process.setting.Resources;
import cd.casic.ci.commons.bean.process.setting.ResourcesDetails;
-import cd.casic.ci.commons.bean.utils.PipelineFileUtil;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineFileUtil;
import cd.casic.module.process.process.definition.dao.PipelineDao;
import cd.casic.module.process.process.setting.ResourcesService;
import cd.casic.module.process.process.setting.dao.ResourcesDao;
@@ -14,11 +12,7 @@ import cd.casic.module.process.support.util.PipelineUtilService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Objects;
@Service
public class ResourcesServiceImpl implements ResourcesService {
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java
index fc6de11c..8e87fb17 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.support.postprocess.controller;
import cd.casic.ci.commons.bean.engine.postprocess.Postprocess;
-import cd.casic.ci.commons.bean.utils.Result;
+import cd.casic.ci.commons.utils.Result;
import cd.casic.module.process.support.postprocess.service.PostprocessService;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessServiceImpl.java
index 4b71cfec..a6a5e1c0 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessServiceImpl.java
@@ -2,7 +2,7 @@ package cd.casic.module.process.support.postprocess.service.impl;
import cd.casic.ci.commons.bean.engine.job.Tasks;
import cd.casic.ci.commons.bean.engine.postprocess.Postprocess;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
+import cd.casic.ci.commons.exception.ApplicationException;
import cd.casic.module.process.engine.task.TasksCloneService;
import cd.casic.module.process.engine.task.TasksService;
import cd.casic.module.process.support.postprocess.dao.PostprocessDao;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/Job.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/Job.java
index b365b94e..cb46c78d 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/Job.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/Job.java
@@ -1,6 +1,6 @@
package cd.casic.module.process.support.trigger.quartz;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.module.process.support.trigger.service.CronUtils;
import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/CronUtils.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/CronUtils.java
index 35e5a9b1..8fda028d 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/CronUtils.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/CronUtils.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.support.trigger.service;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.utils.PipelineUtil;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java
index 8de5e825..278582b3 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.support.trigger.service.impl;
import cd.casic.ci.commons.bean.process.definition.Pipeline;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.ci.commons.annotation.rpc.Exporter;
import cd.casic.module.process.support.trigger.dao.TriggerDao;
import cd.casic.module.process.support.trigger.dateObject.Trigger;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java
index 925db3ad..bbd35ffe 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java
@@ -2,7 +2,7 @@ package cd.casic.module.process.support.trigger.service.impl;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
+import cd.casic.ci.commons.exception.ApplicationException;
import cd.casic.ci.commons.annotation.rpc.Exporter;
import cd.casic.module.process.support.trigger.dao.TriggerTimeDao;
import cd.casic.module.process.support.trigger.dateObject.TriggerTime;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineUtilServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineUtilServiceImpl.java
index 080babad..13f83b92 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineUtilServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineUtilServiceImpl.java
@@ -1,8 +1,8 @@
package cd.casic.module.process.support.util.impl;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.utils.PipelineFileUtil;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.utils.PipelineFileUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.module.process.core.context.AppHomeContext;
import cd.casic.module.process.support.util.PipelineUtilService;
import cd.casic.module.process.support.util.util.PipelineFinal;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineRequestUtil.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineRequestUtil.java
index 0e12c273..190ac9a0 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineRequestUtil.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineRequestUtil.java
@@ -7,8 +7,8 @@ package cd.casic.module.process.support.util.util;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.exception.SystemException;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/VariableServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/VariableServiceImpl.java
index 15239fd8..b0d0939a 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/VariableServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/VariableServiceImpl.java
@@ -1,6 +1,6 @@
package cd.casic.module.process.support.variable.service.impl;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.module.process.support.variable.dao.VariableDao;
import cd.casic.module.process.support.variable.dataobject.VariableDo;
import cd.casic.ci.commons.bean.process.definition.Variable;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepositoryQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepositoryQuery.java
index 75f9ed8d..48e3849b 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepositoryQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepositoryQuery.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.task.artifact.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactXpackServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactXpackServiceImpl.java
index 79bc54d4..84368856 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactXpackServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactXpackServiceImpl.java
@@ -1,6 +1,6 @@
package cd.casic.module.process.task.artifact.service.impl;
-import cd.casic.ci.commons.bean.exception.ApplicationException;
+import cd.casic.ci.commons.exception.ApplicationException;
import cd.casic.ci.commons.bean.process.setting.AuthThird;
import cd.casic.module.process.process.setting.AuthThirdService;
import cd.casic.module.process.support.util.util.PipelineRequestUtil;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitHubController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitHubController.java
index d8f466cb..97f6c80f 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitHubController.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitHubController.java
@@ -7,7 +7,7 @@ package cd.casic.module.process.task.code.controller;
* @Date 2025/5/2 20:25
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.utils.Result;
+import cd.casic.ci.commons.utils.Result;
import cd.casic.module.process.task.code.model.ThirdBranch;
import cd.casic.module.process.task.code.model.ThirdHouse;
import cd.casic.module.process.task.code.model.ThirdQuery;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitLabController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitLabController.java
index ae78675f..3968ed14 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitLabController.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitLabController.java
@@ -8,7 +8,7 @@ package cd.casic.module.process.task.code.controller;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.utils.Result;
+import cd.casic.ci.commons.utils.Result;
import cd.casic.module.process.task.code.model.ThirdBranch;
import cd.casic.module.process.task.code.model.ThirdHouse;
import cd.casic.module.process.task.code.model.ThirdQuery;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGiteeController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGiteeController.java
index d26f0655..5a84f358 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGiteeController.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGiteeController.java
@@ -8,7 +8,7 @@ package cd.casic.module.process.task.code.controller;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.utils.Result;
+import cd.casic.ci.commons.utils.Result;
import cd.casic.module.process.task.code.model.ThirdBranch;
import cd.casic.module.process.task.code.model.ThirdHouse;
import cd.casic.module.process.task.code.model.ThirdQuery;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGittokController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGittokController.java
index 2de6914c..d733bc2b 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGittokController.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGittokController.java
@@ -7,7 +7,7 @@ package cd.casic.module.process.task.code.controller;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.utils.Result;
+import cd.casic.ci.commons.utils.Result;
import cd.casic.module.process.task.code.model.ThirdBranch;
import cd.casic.module.process.task.code.model.ThirdHouse;
import cd.casic.module.process.task.code.model.ThirdQuery;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodePriGitLabController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodePriGitLabController.java
index 4ab476bb..0007f1a5 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodePriGitLabController.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodePriGitLabController.java
@@ -7,7 +7,7 @@ package cd.casic.module.process.task.code.controller;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.utils.Result;
+import cd.casic.ci.commons.utils.Result;
import cd.casic.module.process.task.code.model.ThirdBranch;
import cd.casic.module.process.task.code.model.ThirdHouse;
import cd.casic.module.process.task.code.model.ThirdQuery;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaTemplate.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaTemplate.java
index d0d4a70e..bfdeba00 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaTemplate.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaTemplate.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.task.code.jpa;
-import cd.casic.ci.commons.bean.commons.Pagination;
-import cd.casic.ci.commons.bean.jdbc.JdbcTemplate;
+import cd.casic.ci.commons.commons.Pagination;
+import cd.casic.ci.commons.utils.JdbcTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitHubServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitHubServiceImpl.java
index 1d72d5b7..23acde3c 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitHubServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitHubServiceImpl.java
@@ -8,8 +8,8 @@ package cd.casic.module.process.task.code.service.impl;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.ci.commons.bean.process.setting.AuthThird;
import cd.casic.module.process.process.setting.AuthThirdService;
import cd.casic.module.process.task.code.model.ThirdBranch;
@@ -20,7 +20,6 @@ import cd.casic.module.process.task.code.service.TaskCodeGitHubService;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitLabServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitLabServiceImpl.java
index 1e08b9a0..70ae7ee6 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitLabServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitLabServiceImpl.java
@@ -8,8 +8,8 @@ package cd.casic.module.process.task.code.service.impl;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.ci.commons.bean.process.setting.AuthThird;
import cd.casic.module.process.process.setting.AuthThirdService;
import cd.casic.module.process.task.code.model.ThirdBranch;
@@ -20,7 +20,6 @@ import cd.casic.module.process.task.code.service.TaskCodeGitLabService;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGiteeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGiteeServiceImpl.java
index 0e14bcbc..bf74820e 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGiteeServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGiteeServiceImpl.java
@@ -7,8 +7,8 @@ package cd.casic.module.process.task.code.service.impl;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.ci.commons.bean.process.setting.AuthThird;
import cd.casic.module.process.process.setting.AuthThirdService;
import cd.casic.module.process.task.code.model.ThirdBranch;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGittokServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGittokServiceImpl.java
index 989837d6..38ec6e19 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGittokServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGittokServiceImpl.java
@@ -8,8 +8,8 @@ package cd.casic.module.process.task.code.service.impl;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.ci.commons.bean.process.setting.AuthThird;
import cd.casic.module.process.process.setting.AuthThirdService;
import cd.casic.module.process.support.util.util.PipelineRequestUtil;
@@ -22,7 +22,6 @@ import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodePriGitLabServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodePriGitLabServiceImpl.java
index 42632667..f4e0563b 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodePriGitLabServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodePriGitLabServiceImpl.java
@@ -8,8 +8,8 @@ package cd.casic.module.process.task.code.service.impl;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.ci.commons.bean.process.setting.AuthThird;
import cd.casic.module.process.process.setting.AuthThirdService;
import cd.casic.module.process.task.code.model.ThirdBranch;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java
index a6221207..ce9d9f11 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java
@@ -32,9 +32,9 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
-import static cd.casic.ci.commons.bean.commons.PipelineConstants.AUTH_NONE;
-import static cd.casic.ci.commons.bean.commons.PipelineConstants.AUTH_USER_PASS;
-import static cd.casic.ci.commons.bean.commons.PipelineConstants.TASK_CODE_PRI_GITLAB;
+import static cd.casic.ci.commons.commons.PipelineConstants.AUTH_NONE;
+import static cd.casic.ci.commons.commons.PipelineConstants.AUTH_USER_PASS;
+import static cd.casic.ci.commons.commons.PipelineConstants.TASK_CODE_PRI_GITLAB;
import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_GITEE;
import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_GITHUB;
import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_GITLAB;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/controller/SpotbugsScanController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/controller/SpotbugsScanController.java
index a96491aa..771c2978 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/controller/SpotbugsScanController.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/controller/SpotbugsScanController.java
@@ -8,8 +8,8 @@ package cd.casic.module.process.task.codescan.controller;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.commons.Pagination;
-import cd.casic.ci.commons.bean.utils.Result;
+import cd.casic.ci.commons.commons.Pagination;
+import cd.casic.ci.commons.utils.Result;
import cd.casic.framework.commons.pojo.PageResult;
import cd.casic.module.process.task.code.service.SpotbugsScanService;
import cd.casic.module.process.task.codescan.model.SpotbugsBugInstance;
@@ -20,7 +20,6 @@ import cd.casic.module.process.task.codescan.service.impl.SpotbugsXmlConfig;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/SpotbugsScanDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/SpotbugsScanDao.java
index b50a1576..177d54a6 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/SpotbugsScanDao.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/SpotbugsScanDao.java
@@ -8,7 +8,6 @@ package cd.casic.module.process.task.codescan.dao;
*/
-import cd.casic.ci.commons.bean.commons.Pagination;
import cd.casic.framework.commons.pojo.PageResult;
import cd.casic.module.process.task.code.jpa.JpaTemplate;
import cd.casic.module.process.task.codescan.dataobject.SpotbugsScanEntity;
@@ -16,12 +15,10 @@ import cd.casic.module.process.task.codescan.model.SpotbugsBugQuery;
import cd.casic.module.process.task.codescan.model.SpotbugsBugSummary;
import cd.casic.module.process.toolkit.beans.BeanMapper;
import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.util.Collections;
import java.util.List;
-import java.util.Objects;
/**
* Spotbugs代码扫描数据操作
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugQuery.java
index 965102e2..8cd01c5d 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugQuery.java
@@ -1,8 +1,8 @@
package cd.casic.module.process.task.codescan.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import java.util.List;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsXmlConfig.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsXmlConfig.java
index 7c6d1ee8..a5bc9638 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsXmlConfig.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsXmlConfig.java
@@ -7,9 +7,9 @@ package cd.casic.module.process.task.codescan.service.impl;
* @Version 1.0
*/
-import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.bean.exception.SystemException;
-import cd.casic.ci.commons.bean.utils.PipelineFileUtil;
+import cd.casic.ci.commons.exception.ApplicationException;
+import cd.casic.ci.commons.exception.SystemException;
+import cd.casic.ci.commons.utils.PipelineFileUtil;
import cd.casic.module.process.task.codescan.model.SpotbugsBugCategory;
import cd.casic.module.process.task.codescan.model.SpotbugsBugClass;
import cd.casic.module.process.task.codescan.model.SpotbugsBugClassStats;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java
index f18b464e..cb9577d3 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java
@@ -8,7 +8,7 @@ package cd.casic.module.process.task.codescan.service.impl;
*/
import cd.casic.ci.commons.bean.process.setting.AuthThird;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.ci.commons.annotation.rpc.Exporter;
import cd.casic.module.process.process.setting.AuthHostService;
import cd.casic.module.process.process.setting.AuthThirdService;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksExecServiceImpl.java
index 17108ab7..afa613db 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksExecServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksExecServiceImpl.java
@@ -5,7 +5,7 @@ import cd.casic.ci.commons.bean.engine.job.Tasks;
import cd.casic.ci.commons.bean.process.setting.HostGroup;
import cd.casic.ci.commons.bean.support.deploy.TaskDeploy;
import cd.casic.ci.commons.bean.support.deploy.TaskDeployInstance;
-import cd.casic.ci.commons.bean.utils.PipelineFileUtil;
+import cd.casic.ci.commons.utils.PipelineFileUtil;
import cd.casic.module.process.engine.task.TasksExecService;
import cd.casic.module.process.engine.task.TasksInstanceService;
import cd.casic.module.process.support.util.util.PipelineFinal;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksInstanceServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksInstanceServiceImpl.java
index 25ede91b..3d95ded2 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksInstanceServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksInstanceServiceImpl.java
@@ -5,8 +5,8 @@ import cd.casic.ci.commons.bean.engine.job.TaskInstance;
import cd.casic.ci.commons.bean.engine.job.TaskInstanceQuery;
import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance;
import cd.casic.ci.commons.bean.support.deploy.TaskDeployInstance;
-import cd.casic.ci.commons.bean.utils.PipelineFileUtil;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineFileUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.module.process.engine.task.TasksInstanceService;
import cd.casic.module.process.engine.task.dao.TaskInstanceDao;
import cd.casic.module.process.support.postprocess.service.PostprocessInstanceService;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTestQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTestQuery.java
index c963c73d..c8f3e7a2 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTestQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTestQuery.java
@@ -1,8 +1,8 @@
package cd.casic.module.process.task.test.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOnQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOnQuery.java
index b743444e..31804ef8 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOnQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOnQuery.java
@@ -2,8 +2,8 @@ package cd.casic.module.process.task.test.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnvQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnvQuery.java
index f1ccf51f..e5545f47 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnvQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnvQuery.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.task.test.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnvQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnvQuery.java
index d8e6c823..87c3e333 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnvQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnvQuery.java
@@ -2,8 +2,8 @@ package cd.casic.module.process.task.test.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstanceBindQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstanceBindQuery.java
index 3bd365ae..a31c941e 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstanceBindQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstanceBindQuery.java
@@ -1,8 +1,8 @@
package cd.casic.module.process.task.test.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanQuery.java
index 065bb0aa..5b3690d9 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanQuery.java
@@ -1,8 +1,8 @@
package cd.casic.module.process.task.test.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnvQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnvQuery.java
index 62ea4dda..8b41d170 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnvQuery.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnvQuery.java
@@ -1,8 +1,8 @@
package cd.casic.module.process.task.test.model;
-import cd.casic.ci.commons.bean.order.Order;
-import cd.casic.ci.commons.bean.order.OrderBuilders;
+import cd.casic.ci.commons.order.Order;
+import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/BeanMapper.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/BeanMapper.java
index cd3ecef4..c69d3198 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/BeanMapper.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/BeanMapper.java
@@ -1,6 +1,6 @@
package cd.casic.module.process.toolkit.beans;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.module.process.core.util.BeanUtils;
import cd.casic.module.process.toolkit.beans.metadata.BeanMapperRegister;
import cd.casic.module.process.toolkit.beans.model.BeanMapping;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/metadata/BeanMapperRegister.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/metadata/BeanMapperRegister.java
index f31ef2ff..8a318435 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/metadata/BeanMapperRegister.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/metadata/BeanMapperRegister.java
@@ -1,6 +1,6 @@
package cd.casic.module.process.toolkit.beans.metadata;
-import cd.casic.ci.commons.bean.exception.SystemException;
+import cd.casic.ci.commons.exception.SystemException;
import cd.casic.module.process.core.resolver.AnnotationResourceResolver;
import cd.casic.module.process.toolkit.beans.annotation.Mapper;
import cd.casic.module.process.toolkit.beans.annotation.Mappers;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/SocketServerHandler.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/SocketServerHandler.java
index f761e3ce..374c0707 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/SocketServerHandler.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/SocketServerHandler.java
@@ -1,7 +1,7 @@
package cd.casic.module.process.ws.server;
-import cd.casic.ci.commons.bean.exception.SystemException;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.exception.SystemException;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.ci.commons.bean.work.agent.AgentMessage;
import cd.casic.ci.commons.bean.work.agent.model.Agent;
import cd.casic.module.process.support.agent.service.AgentService;
@@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.web.socket.*;
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/impl/WebSocketMessageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/impl/WebSocketMessageServiceImpl.java
index 459d8237..26ef37b7 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/impl/WebSocketMessageServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/impl/WebSocketMessageServiceImpl.java
@@ -7,8 +7,8 @@ import cd.casic.ci.commons.bean.process.instance.PipelineInstance;
import cd.casic.ci.commons.bean.process.stage.StageInstance;
import cd.casic.ci.commons.bean.support.deploy.TaskDeployInstance;
-import cd.casic.ci.commons.bean.utils.PipelineFileUtil;
-import cd.casic.ci.commons.bean.utils.PipelineUtil;
+import cd.casic.ci.commons.utils.PipelineFileUtil;
+import cd.casic.ci.commons.utils.PipelineUtil;
import cd.casic.ci.commons.bean.work.agent.AgentMessage;
import cd.casic.module.process.engine.task.TasksInstanceService;
import cd.casic.module.process.home.service.PipelineHomeService;
diff --git a/modules/pom.xml b/modules/pom.xml
index 6b1d1d77..297e9f53 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -14,6 +14,7 @@
module-infra-biz
module-system-api
module-system-biz
+ module-ci-execute
modules
diff --git a/ops-server/pom.xml b/ops-server/pom.xml
index 1c4d2f4f..a64aa125 100644
--- a/ops-server/pom.xml
+++ b/ops-server/pom.xml
@@ -25,7 +25,6 @@
module-system-biz
${revision}
-
cd.casic.boot
module-infra-biz
@@ -37,12 +36,15 @@
spring-boot-configuration-processor
true
-
cd.casic.boot
spring-boot-starter-protection
+
+ cd.casic.boot
+ spring-boot-starter-test
+
diff --git a/pom.xml b/pom.xml
index b75a703a..f11c2024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
modules/module-ci-commons
modules/module-ci-plugin
modules/module-ci-engine
- modules/module-ci-store
+ modules/module-ci-market
modules/module-ci-process-api
modules/module-ci-process-biz