修改了ci-common的路径,里面有很多没用的残留的,后期删除,增加了获取jar包路径的函数

This commit is contained in:
mianbin 2025-05-25 14:52:25 +08:00
parent 6ac4a14ded
commit 1d64da41bb
150 changed files with 372 additions and 202 deletions

5
.idea/compiler.xml generated
View File

@ -28,6 +28,7 @@
<module name="commons" /> <module name="commons" />
<module name="spring-boot-starter-plugin" /> <module name="spring-boot-starter-plugin" />
<module name="module-ci-engine" /> <module name="module-ci-engine" />
<module name="module-ci-execute" />
<module name="ops-server" /> <module name="ops-server" />
<module name="spring-boot-starter-biz-data-permission" /> <module name="spring-boot-starter-biz-data-permission" />
<module name="spring-boot-starter-mybatis" /> <module name="spring-boot-starter-mybatis" />
@ -39,7 +40,6 @@
<module name="module-infra-biz" /> <module name="module-infra-biz" />
<module name="module-ci-commons" /> <module name="module-ci-commons" />
<module name="spring-boot-starter-job" /> <module name="spring-boot-starter-job" />
<module name="module-ci-store" />
<module name="spring-boot-starter-web" /> <module name="spring-boot-starter-web" />
<module name="module-ci-plugin" /> <module name="module-ci-plugin" />
<module name="spring-boot-starter-excel" /> <module name="spring-boot-starter-excel" />
@ -71,10 +71,11 @@
<module name="framework" options="-parameters" /> <module name="framework" options="-parameters" />
<module name="module-ci-commons" options="-parameters" /> <module name="module-ci-commons" options="-parameters" />
<module name="module-ci-engine" options="-parameters" /> <module name="module-ci-engine" options="-parameters" />
<module name="module-ci-execute" options="-parameters" />
<module name="module-ci-market" options="-parameters" />
<module name="module-ci-plugin" options="-parameters" /> <module name="module-ci-plugin" options="-parameters" />
<module name="module-ci-process-api" options="-parameters" /> <module name="module-ci-process-api" options="-parameters" />
<module name="module-ci-process-biz" options="-parameters" /> <module name="module-ci-process-biz" options="-parameters" />
<module name="module-ci-store" options="-parameters" />
<module name="module-infra-api" options="-parameters" /> <module name="module-infra-api" options="-parameters" />
<module name="module-infra-biz" options="-parameters" /> <module name="module-infra-biz" options="-parameters" />
<module name="module-system-api" options="-parameters" /> <module name="module-system-api" options="-parameters" />

4
.idea/encodings.xml generated
View File

@ -61,6 +61,8 @@
<file url="file://$PROJECT_DIR$/modules/module-ci-environment/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-environment/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-execute/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-execute/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-market/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-market/src/main/java" charset="UTF-8" />
@ -83,8 +85,6 @@
<file url="file://$PROJECT_DIR$/modules/module-ci-repository/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-repository/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-worker/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-worker/src/main/java" charset="UTF-8" />

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="RemoteRepositoriesConfiguration"> <component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="huaweicloud" /> <option name="id" value="huaweicloud" />
<option name="name" value="huawei" /> <option name="name" value="huawei" />
<option name="url" value="https://maven.aliyun.com/repository/public" /> <option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="aliyunmaven" /> <option name="id" value="aliyunmaven" />
<option name="name" value="aliyun" /> <option name="name" value="aliyun" />
@ -31,16 +31,16 @@
<option name="name" value="aliyun" /> <option name="name" value="aliyun" />
<option name="url" value="https://repo.maven.apache.org/maven2/" /> <option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="huaweicloud" />
<option name="name" value="huawei" />
<option name="url" value="https://mirrors.huaweicloud.com/repository/maven/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="central" /> <option name="id" value="central" />
<option name="name" value="Central Repository" /> <option name="name" value="Central Repository" />
<option name="url" value="https://maven.aliyun.com/repository/public" /> <option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="huaweicloud" />
<option name="name" value="huawei" />
<option name="url" value="https://mirrors.huaweicloud.com/repository/maven/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="aliyunmaven" /> <option name="id" value="aliyunmaven" />
<option name="name" value="aliyun" /> <option name="name" value="aliyun" />

View File

@ -52,6 +52,7 @@
<pf4j.version>3.12.1</pf4j.version> <pf4j.version>3.12.1</pf4j.version>
<logback.version>1.2.13</logback.version> <logback.version>1.2.13</logback.version>
<mybatis-plus-join.version>1.4.13</mybatis-plus-join.version> <mybatis-plus-join.version>1.4.13</mybatis-plus-join.version>
<docker-java.version>3.5.0</docker-java.version>
<hutool-5.version>5.8.32</hutool-5.version> <hutool-5.version>5.8.32</hutool-5.version>
<revision>2.0.0-jdk17</revision> <revision>2.0.0-jdk17</revision>
<jsch.version>0.1.55</jsch.version> <jsch.version>0.1.55</jsch.version>
@ -203,6 +204,11 @@
<artifactId>module-ci-process-biz</artifactId> <artifactId>module-ci-process-biz</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>module-ci-process-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency> <dependency>
<groupId>io.github.mouzt</groupId> <groupId>io.github.mouzt</groupId>
<artifactId>bizlog-sdk</artifactId> <artifactId>bizlog-sdk</artifactId>
@ -563,6 +569,16 @@
<artifactId>bcprov-jdk18on</artifactId> <artifactId>bcprov-jdk18on</artifactId>
<version>${bcprov-jdk18on.version}</version> <version>${bcprov-jdk18on.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>${docker-java.version}</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-httpclient5</artifactId>
<version>${docker-java.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jvnet.winp</groupId> <groupId>org.jvnet.winp</groupId>
<artifactId>winp</artifactId> <artifactId>winp</artifactId>

19
dependencies/pom.xml vendored
View File

@ -75,6 +75,7 @@
<jimureport.version>1.7.8</jimureport.version> <jimureport.version>1.7.8</jimureport.version>
<logback.version>1.2.13</logback.version> <!-- 无法使用 1.3.X 版本,启动会报错 --> <logback.version>1.2.13</logback.version> <!-- 无法使用 1.3.X 版本,启动会报错 -->
<bcprov-jdk18on.version>1.80</bcprov-jdk18on.version> <bcprov-jdk18on.version>1.80</bcprov-jdk18on.version>
<docker-java.version>3.5.0</docker-java.version>
<!-- devops ci worker--> <!-- devops ci worker-->
<winp.version>1.28</winp.version> <winp.version>1.28</winp.version>
<version-number.version>1.12</version-number.version> <version-number.version>1.12</version-number.version>
@ -227,6 +228,12 @@
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>module-ci-process-api</artifactId>
<version>${revision}</version>
</dependency>
<!--ci-pipeline-dependency--> <!--ci-pipeline-dependency-->
<!----> <!---->
<dependency> <dependency>
@ -644,6 +651,18 @@
<artifactId>bcprov-jdk18on</artifactId> <artifactId>bcprov-jdk18on</artifactId>
<version>${bcprov-jdk18on.version}</version> <version>${bcprov-jdk18on.version}</version>
</dependency> </dependency>
<!--docker 操作-->
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>${docker-java.version}</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-httpclient5</artifactId>
<version>${docker-java.version}</version>
</dependency>
<!-- devops ci- worker start--> <!-- devops ci- worker start-->
<dependency> <dependency>

View File

@ -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<URL> 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 : ".");
}
}

View File

@ -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());
}
}

View File

@ -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;

View File

@ -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;

View File

@ -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;
}
}

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.commons; package cd.casic.ci.commons.commons;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.commons; package cd.casic.ci.commons.commons;
/** /**
* @author by mianbin * @author by mianbin

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.exception; package cd.casic.ci.commons.exception;
/** /**
* @author by mianbin * @author by mianbin

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.exception; package cd.casic.ci.commons.exception;
/** /**
* @author by mianbin * @author by mianbin

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.order; package cd.casic.ci.commons.order;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

View File

@ -1,9 +1,4 @@
package cd.casic.ci.commons.bean.order; package cd.casic.ci.commons.order;
//
// Source code recreated from a .class file by IntelliJ IDEA
// (powered by FernFlower decompiler)
//
import java.io.Serializable; import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.order; package cd.casic.ci.commons.order;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.order; package cd.casic.ci.commons.order;
import java.io.Serializable; import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.jdbc; package cd.casic.ci.commons.utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -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 cn.hutool.core.io.FileUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -19,8 +19,8 @@ import java.nio.file.Paths;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import static cd.casic.ci.commons.bean.commons.PipelineConstants.FILE_TEMP_PREFIX; import static cd.casic.ci.commons.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.SIZE_TYPE_MB;
public class PipelineFileUtil { public class PipelineFileUtil {

View File

@ -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 org.apache.commons.lang3.StringUtils;
import java.io.File; import java.io.File;

View File

@ -1,4 +1,4 @@
package cd.casic.ci.commons.bean.utils; package cd.casic.ci.commons.utils;
import lombok.Data; import lombok.Data;

View File

@ -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;
}

View File

@ -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.order.Order;
import cd.casic.ci.commons.bean.order.OrderBuilders; import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam; import cd.casic.framework.commons.pojo.PageParam;
import java.util.List; import java.util.List;

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
</parent>
<artifactId>module-ci-execute</artifactId>
<packaging>jar</packaging>
<version>${revision}</version>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>commons</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-httpclient5</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -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!");
}
}

View File

@ -9,7 +9,7 @@
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>module-ci-store</artifactId> <artifactId>module-ci-market</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>${revision}</version> <version>${revision}</version>

View File

@ -1,6 +1,6 @@
package cd.casic.module.process.core.util; 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.beans.PropertyDescriptor;
import java.lang.reflect.Field; import java.lang.reflect.Field;

View File

@ -1,7 +1,7 @@
package cd.casic.module.process.licence.appauth.model; package cd.casic.module.process.licence.appauth.model;
import cd.casic.ci.commons.bean.order.Order; import cd.casic.ci.commons.order.Order;
import cd.casic.ci.commons.bean.order.OrderBuilders; import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam; import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data; import lombok.Data;

View File

@ -1,7 +1,7 @@
package cd.casic.module.process.message.message.model; package cd.casic.module.process.message.message.model;
import cd.casic.ci.commons.bean.order.Order; import cd.casic.ci.commons.order.Order;
import cd.casic.ci.commons.bean.order.OrderBuilders; import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam; import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data; import lombok.Data;

View File

@ -1,7 +1,7 @@
package cd.casic.module.process.message.model.message; package cd.casic.module.process.message.model.message;
import cd.casic.ci.commons.bean.order.Order; import cd.casic.ci.commons.order.Order;
import cd.casic.ci.commons.bean.order.OrderBuilders; import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam; import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data; import lombok.Data;

View File

@ -1,7 +1,7 @@
package cd.casic.module.process.message.model.setting; package cd.casic.module.process.message.model.setting;
import cd.casic.ci.commons.bean.order.Order; import cd.casic.ci.commons.order.Order;
import cd.casic.ci.commons.bean.order.OrderBuilders; import cd.casic.ci.commons.order.OrderBuilders;
import cd.casic.framework.commons.pojo.PageParam; import cd.casic.framework.commons.pojo.PageParam;
import lombok.Data; import lombok.Data;

View File

@ -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.Pipeline;
import cd.casic.ci.commons.bean.process.definition.PipelineFollow; import cd.casic.ci.commons.bean.process.definition.PipelineFollow;
import cd.casic.ci.commons.bean.process.definition.PipelineFollowQuery; 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.framework.commons.exception.ServiceException;
import cd.casic.module.process.pipeline.definition.entity.PipelineFollowEntity; import cd.casic.module.process.pipeline.definition.entity.PipelineFollowEntity;
import cd.casic.module.process.process.definition.PipelineFollowService; import cd.casic.module.process.process.definition.PipelineFollowService;
import cd.casic.module.process.process.definition.dao.PipelineFollowDao; import cd.casic.module.process.process.definition.dao.PipelineFollowDao;
import cd.casic.module.process.toolkit.beans.BeanMapper; import cd.casic.module.process.toolkit.beans.BeanMapper;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

View File

@ -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.Pipeline;
import cd.casic.ci.commons.bean.process.definition.PipelineOpen; import cd.casic.ci.commons.bean.process.definition.PipelineOpen;
import cd.casic.ci.commons.bean.support.count.PipelineOverview; 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.PipelineOpenService;
import cd.casic.module.process.pipeline.definition.entity.PipelineEntity; 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.beans.BeanMapper;
import cd.casic.module.process.toolkit.join.JoinTemplate; import cd.casic.module.process.toolkit.join.JoinTemplate;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;

Some files were not shown because too many files have changed in this diff Show More