mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

命名不规范，不应该按照以前使用pipeline ，应该是以ci为功能分类

Browse Source
This commit is contained in:
mian-bin@hotmail.com 2025-03-24 14:28:57 +08:00
parent bcbac7897d
commit a375388585
249 changed files with 1434 additions and 978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.idea/compiler.xml generated
View File

@ -13,44 +13,62 @@
<entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct-processor/1.6.2/mapstruct-processor-1.6.2.jar" />
<entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.6.2/mapstruct-1.6.2.jar" />
</processorPath>
<module name="ci-scm-repository" />
<module name="spring-boot-starter-protection" />
<module name="pipeline-ci-process-api" />
<module name="spring-boot-starter-monitor" />
<module name="module-system-biz" />
<module name="pipeline-ci-project" />
<module name="ci-quality" />
<module name="module-system-api" />
<module name="spring-boot-starter-mq" />
<module name="spring-boot-starter-mongo" />
<module name="commons" />
<module name="ci-log" />
<module name="spring-boot-starter-plugin" />
<module name="ci-market" />
<module name="ops-server" />
<module name="pipeline-ci-log" />
<module name="spring-boot-starter-biz-data-permission" />
<module name="pipeline-ci-quality" />
<module name="spring-boot-starter-mybatis" />
<module name="pipeline-ci-commons" />
<module name="pipeline-ci-event" />
<module name="ci-event" />
<module name="ci-ticket" />
<module name="module-infra-api" />
<module name="pipeline-ci-scm-repository" />
<module name="spring-boot-starter-test" />
<module name="spring-boot-starter-websocket" />
<module name="pipeline-ci-process" />
<module name="system-plugin-example-web" />
<module name="pipeline-ci-market" />
<module name="spring-boot-starter-biz-ip" />
<module name="module-infra-biz" />
<module name="spring-boot-starter-job" />
<module name="ci-project" />
<module name="spring-boot-starter-web" />
<module name="pipeline-ci-ticket" />
<module name="ci-commons" />
<module name="spring-boot-starter-excel" />
<module name="spring-boot-starter-biz-tenant" />
<module name="spring-boot-starter-redis" />
<module name="spring-boot-starter-security" />
</profile>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="ci-process-api" target="17" />
<module name="ci-process-base" target="17" />
</bytecodeTargetLevel>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="app-plugins" options="-parameters" />
<module name="ci-commons" options="-parameters" />
<module name="ci-event" options="-parameters" />
<module name="ci-log" options="-parameters" />
<module name="ci-market" options="-parameters" />
<module name="ci-process" options="-parameters" />
<module name="ci-project" options="-parameters" />
<module name="ci-quality" options="-parameters" />
<module name="ci-scm-repository" options="-parameters" />
<module name="ci-ticket" options="-parameters" />
<module name="commons" options="-parameters" />
<module name="framework" options="-parameters" />
<module name="module-infra-api" options="-parameters" />
@ -60,15 +78,7 @@
<module name="modules" options="-parameters" />
<module name="ops-pro" options="-parameters" />
<module name="ops-server" options="-parameters" />
<module name="pipeline-ci-commons" options="-parameters" />
<module name="pipeline-ci-event" options="-parameters" />
<module name="pipeline-ci-log" options="-parameters" />
<module name="pipeline-ci-market" options="-parameters" />
<module name="pipeline-ci-process" options="-parameters" />
<module name="pipeline-ci-project" options="-parameters" />
<module name="pipeline-ci-quality" options="-parameters" />
<module name="pipeline-ci-scm-repository" options="-parameters" />
<module name="pipeline-ci-ticket" options="-parameters" />
<module name="pipeline-ci-process-api" options="-parameters" />
<module name="spring-boot-starter-biz-data-permission" options="-parameters" />
<module name="spring-boot-starter-biz-ip" options="-parameters" />
<module name="spring-boot-starter-biz-tenant" options="-parameters" />

38
.idea/encodings.xml generated
View File

@ -39,6 +39,26 @@
<file url="file://$PROJECT_DIR$/framework/spring-boot-starter-websocket/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/framework/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/framework/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-commons/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-commons/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-event/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-event/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-log/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-log/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-market/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-market/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-process/pipeline-ci-process-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-process/pipeline-ci-process-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-process/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-process/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-project/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-project/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-quality/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-quality/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-scm-repository/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-scm-repository/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-ticket/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/ci-ticket/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-infra-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-infra-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-infra-biz/src/main/java" charset="UTF-8" />
@ -47,24 +67,6 @@
<file url="file://$PROJECT_DIR$/modules/module-system-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-system-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-system-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-commons/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-commons/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-event/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-event/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-log/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-log/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-market/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-market/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-process/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-process/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-project/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-project/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-quality/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-quality/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-scm-repository/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-scm-repository/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-ticket/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/pipeline-ci-ticket/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ops-server/src/main/java" charset="UTF-8" />

23
.idea/gradle.xml generated Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$/modules/pipeline-ci-process/ci-process-api" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$/modules/pipeline-ci-process/ci-process-api" />
</set>
</option>
</GradleProjectSettings>
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$/modules/pipeline-ci-process/ci-process-base" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$/modules/pipeline-ci-process/ci-process-base" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>

5
.idea/jarRepositories.xml generated
View File

@ -6,6 +6,11 @@
<option name="name" value="aliyun" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />

6
.idea/misc.xml generated
View File

@ -26,10 +26,16 @@
<option name="priority" value="Medium" />
<option name="excludeFilter" value="" />
</component>
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$/modules/ci-process/ci-process-api" />
<file type="web" url="file://$PROJECT_DIR$/modules/ci-process/ci-process-base" />
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/modules/pipeline-ci-process/pipeline-ci-process-api/pom.xml" />
<option value="$PROJECT_DIR$/modules/ci-process/pipeline-ci-process-api/pom.xml" />
</list>
</option>
</component>

48
dependencies/pom.xml vendored
View File

@ -205,20 +205,56 @@
</dependency>
<!--pipeline-dependency-->
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-commons</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-commons</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-event</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-event</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-log</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-log</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-market</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-process</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-project</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-quality</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-ticket</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-scm-repository</artifactId>
<version>${revision}</version>
</dependency>

7
modules/pipeline-ci-commons/pom.xml → modules/ci-commons/pom.xml
View File

@ -7,12 +7,15 @@
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-commons</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-commons</artifactId>
<version>${revision}</version>
<packaging>jar</packaging>
<description>
流水线process、流水线engine、流水线work、资源管理层、环境管理、agent、构建调度、项目管理、代码库、凭证、扩展Plugin、日志、流水线外设需要的commons
</description>

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/constant/BaseConstant.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/constant/BaseConstant.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.constant;
package cd.casic.ci.commons.constant;
/**
* @Classname BaseConstant

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/constant/CommonConstants.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/constant/CommonConstants.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.constant;
package cd.casic.ci.commons.constant;
/**
* @Classname CommonConstants

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/constant/CommonMessageCode.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/constant/CommonMessageCode.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.constant;
package cd.casic.ci.commons.constant;
/**
* @Classname CommonMessageCode

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/constant/LeafAllocConstant.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/constant/LeafAllocConstant.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.constant;
package cd.casic.ci.commons.constant;
/**
* @Classname LeafAllocConstant

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/constant/OpsHeader.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/constant/OpsHeader.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.constant;
package cd.casic.ci.commons.constant;
import lombok.NoArgsConstructor;
import lombok.val;

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/enums/BkStyleEnum.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/enums/BkStyleEnum.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.enums;
package cd.casic.ci.commons.enums;
/**
* @Classname StyleEnum

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/enums/CommonStatusEnum.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/enums/CommonStatusEnum.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.enums;
package cd.casic.ci.commons.enums;
import cd.casic.framework.commons.core.IntArrayValuable;
import lombok.AllArgsConstructor;

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/enums/DateIntervalEnum.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/enums/DateIntervalEnum.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.enums;
package cd.casic.ci.commons.enums;
import cd.casic.framework.commons.core.IntArrayValuable;
import cn.hutool.core.util.ArrayUtil;

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/enums/SubjectScopeType.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/enums/SubjectScopeType.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.enums;
package cd.casic.ci.commons.enums;
/**

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/enums/SystemModuleEnum.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/enums/SystemModuleEnum.java
View File

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

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/enums/UserTypeEnum.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/enums/UserTypeEnum.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.enums;
package cd.casic.ci.commons.enums;
import cd.casic.framework.commons.core.IntArrayValuable;
import cn.hutool.core.util.ArrayUtil;

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/functions/Preconditions.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/functions/Preconditions.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.functions;
package cd.casic.ci.commons.functions;
import lombok.SneakyThrows;

4
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/LeafAllocMapper.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/LeafAllocMapper.java
View File

@ -1,7 +1,7 @@
package cd.casic.pipeline.commons.operationid;
package cd.casic.ci.commons.operationid;
import cd.casic.ci.commons.operationid.entity.LeafAlloc;
import cd.casic.framework.mybatis.core.mapper.BaseMapperX;
import cd.casic.pipeline.commons.operationid.entity.LeafAlloc;
import org.apache.ibatis.annotations.Mapper;
/**

5
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/LeafAllocService.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/LeafAllocService.java
View File

@ -1,8 +1,7 @@
package cd.casic.pipeline.commons.operationid;
package cd.casic.ci.commons.operationid;
import cd.casic.framework.mybatis.core.mapper.BaseMapperX;
import cd.casic.pipeline.commons.operationid.entity.LeafAlloc;
import cd.casic.ci.commons.operationid.entity.LeafAlloc;
import java.util.List;
/**

6
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/LeafAllocServiceImpl.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/LeafAllocServiceImpl.java
View File

@ -1,11 +1,9 @@
package cd.casic.pipeline.commons.operationid;
package cd.casic.ci.commons.operationid;
import cd.casic.ci.commons.operationid.entity.LeafAlloc;
import cd.casic.framework.commons.exception.ServiceException;
import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
import cd.casic.framework.commons.util.date.DateUtils;
import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX;
import cd.casic.pipeline.commons.operationid.entity.LeafAlloc;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

11
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/SegmentIdGeneratorImpl.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/SegmentIdGeneratorImpl.java
View File

@ -1,14 +1,13 @@
package cd.casic.pipeline.commons.operationid;
package cd.casic.ci.commons.operationid;
import cd.casic.ci.commons.constant.LeafAllocConstant;
import cd.casic.ci.commons.operationid.entity.LeafAlloc;
import cd.casic.ci.commons.operationid.entity.Segment;
import cd.casic.ci.commons.operationid.entity.SegmentBuffer;
import cd.casic.framework.commons.exception.ErrorCode;
import cd.casic.framework.commons.exception.ServiceException;
import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
import cd.casic.framework.commons.util.generator.IdGenerator;
import cd.casic.pipeline.commons.constant.LeafAllocConstant;
import cd.casic.pipeline.commons.operationid.entity.LeafAlloc;
import cd.casic.pipeline.commons.operationid.entity.Segment;
import cd.casic.pipeline.commons.operationid.entity.SegmentBuffer;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field;

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/entity/LeafAlloc.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/entity/LeafAlloc.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.operationid.entity;
package cd.casic.ci.commons.operationid.entity;
import cd.casic.framework.commons.util.validation.ValidGroup;
import cd.casic.framework.mybatis.core.dataobject.BaseDO;

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/entity/Segment.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/entity/Segment.java
View File

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

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/entity/SegmentBuffer.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/entity/SegmentBuffer.java
View File

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

2
modules/pipeline-ci-commons/src/main/java/cd/casic/pipeline/commons/operationid/entity/Status.java → modules/ci-commons/src/main/java/cd/casic/ci/commons/operationid/entity/Status.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.commons.operationid.entity;
package cd.casic.ci.commons.operationid.entity;
/**
* @author mianbin
* @Classname Segment

10
modules/pipeline-ci-quality/pom.xml → modules/ci-event/pom.xml
View File

@ -7,17 +7,19 @@
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-quality</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-event</artifactId>
<version>${revision}</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-commons</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-commons</artifactId>
</dependency>
</dependencies>

9
modules/pipeline-ci-log/pom.xml → modules/ci-log/pom.xml
View File

@ -7,17 +7,18 @@
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-log</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-log</artifactId>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-commons</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-commons</artifactId>
</dependency>
<dependency>

12
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/AppLogResource.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/AppLogResource.java
View File

@ -1,17 +1,17 @@
package cd.casic.pipeline.api;
package cd.casic.ci.log.api;
import cd.casic.ci.log.dal.pojo.EndPageQueryLogs;
import cd.casic.ci.log.dal.pojo.PageQueryLogs;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.dal.pojo.EndPageQueryLogs;
import cd.casic.pipeline.dal.pojo.PageQueryLogs;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import static cd.casic.pipeline.commons.constant.OpsHeader.*;
import static cd.casic.ci.commons.constant.OpsHeader.*;
@Tag(name = "用户-日志资源")

8
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/BuildLogPrintResource.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/BuildLogPrintResource.java
View File

@ -1,8 +1,8 @@
package cd.casic.pipeline.api;
package cd.casic.ci.log.api;
import cd.casic.ci.log.dal.pojo.TaskBuildLogProperty;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.dal.pojo.TaskBuildLogProperty;
import cd.casic.pipeline.dal.pojo.message.LogMessage;
import cd.casic.ci.log.dal.pojo.message.LogMessage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import static cd.casic.pipeline.commons.constant.OpsHeader.*;
import static cd.casic.ci.commons.constant.OpsHeader.*;
/**
* @author by mianbin

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/OpLogResource.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/OpLogResource.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.api;
package cd.casic.ci.log.api;
import cd.casic.framework.commons.pojo.CommonResult;

8
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/ServiceLogPrintResource.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/ServiceLogPrintResource.java
View File

@ -1,10 +1,10 @@
package cd.casic.pipeline.api;
package cd.casic.ci.log.api;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.enums.LogStorageMode;
import cd.casic.pipeline.dal.pojo.message.LogMessage;
import cd.casic.ci.log.dal.pojo.enums.LogStorageMode;
import cd.casic.ci.log.dal.pojo.message.LogMessage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import static cd.casic.pipeline.commons.constant.OpsHeader.AUTH_HEADER_DEVOPS_BUILD_ID;
import static cd.casic.ci.commons.constant.OpsHeader.AUTH_HEADER_DEVOPS_BUILD_ID;
@RestController

12
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/ServiceLogResource.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/ServiceLogResource.java
View File

@ -1,17 +1,17 @@
package cd.casic.pipeline.api;
package cd.casic.ci.log.api;
import cd.casic.ci.log.dal.pojo.QueryLogLineNum;
import cd.casic.ci.log.dal.pojo.QueryLogStatus;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.dal.pojo.QueryLogLineNum;
import cd.casic.pipeline.dal.pojo.QueryLogStatus;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import static cd.casic.pipeline.commons.constant.OpsHeader.*;
import static cd.casic.ci.commons.constant.OpsHeader.*;
@RestController

10
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/UserLogResource.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/UserLogResource.java
View File

@ -1,17 +1,17 @@
package cd.casic.pipeline.api;
package cd.casic.ci.log.api;
import cd.casic.ci.log.dal.pojo.QueryLogStatus;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.dal.pojo.QueryLogStatus;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import static cd.casic.pipeline.commons.constant.OpsHeader.*;
import static cd.casic.ci.commons.constant.OpsHeader.*;
@RestController

16
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/impl/AppLogResourceImpl.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/impl/AppLogResourceImpl.java
View File

@ -1,14 +1,14 @@
package cd.casic.pipeline.api.impl;
package cd.casic.ci.log.api.impl;
import cd.casic.ci.log.dal.pojo.EndPageQueryLogs;
import cd.casic.ci.log.dal.pojo.PageQueryLogs;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.api.AppLogResource;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.dal.pojo.EndPageQueryLogs;
import cd.casic.pipeline.dal.pojo.PageQueryLogs;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import cd.casic.pipeline.service.BuildLogQueryService;
import cd.casic.pipeline.service.LogTagService;
import cd.casic.ci.log.api.AppLogResource;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.ci.log.service.BuildLogQueryService;
import cd.casic.ci.log.service.LogTagService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RestController;

18
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/impl/BuildLogPrintResourceImpl.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/impl/BuildLogPrintResourceImpl.java
View File

@ -1,20 +1,20 @@
package cd.casic.pipeline.api.impl;
package cd.casic.ci.log.api.impl;
import cd.casic.ci.log.dal.pojo.TaskBuildLogProperty;
import cd.casic.ci.log.dal.pojo.meta.Ansi;
import cd.casic.framework.commons.exception.ErrorCode;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.api.BuildLogPrintResource;
import cd.casic.pipeline.enums.LogStorageMode;
import cd.casic.pipeline.dal.pojo.meta.Ansi;
import cd.casic.pipeline.dal.pojo.TaskBuildLogProperty;
import cd.casic.pipeline.service.BuildLogPrintService;
import cd.casic.pipeline.service.IndexService;
import cd.casic.pipeline.service.LogStatusService;
import cd.casic.ci.log.api.BuildLogPrintResource;
import cd.casic.ci.log.dal.pojo.enums.LogStorageMode;
import cd.casic.ci.log.service.BuildLogPrintService;
import cd.casic.ci.log.service.IndexService;
import cd.casic.ci.log.service.LogStatusService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Value;
import cd.casic.pipeline.dal.pojo.message.LogMessage;
import cd.casic.ci.log.dal.pojo.message.LogMessage;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/impl/OpLogResourceImpl.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/impl/OpLogResourceImpl.java
View File

@ -1,8 +1,8 @@
package cd.casic.pipeline.api.impl;
package cd.casic.ci.log.api.impl;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.api.OpLogResource;
import cd.casic.ci.log.api.OpLogResource;
import org.springframework.web.bind.annotation.RestController;

14
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/impl/ServiceLogPrintResourceImpl.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/impl/ServiceLogPrintResourceImpl.java
View File

@ -1,14 +1,14 @@
package cd.casic.pipeline.api.impl;
package cd.casic.ci.log.api.impl;
import cd.casic.ci.log.api.ServiceLogPrintResource;
import cd.casic.framework.commons.exception.ErrorCode;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.api.ServiceLogPrintResource;
import cd.casic.pipeline.enums.LogStorageMode;
import cd.casic.pipeline.event.log.LogOriginEvent;
import cd.casic.pipeline.dal.pojo.message.LogMessage;
import cd.casic.pipeline.service.BuildLogPrintService;
import cd.casic.pipeline.service.IndexService;
import cd.casic.ci.log.dal.pojo.enums.LogStorageMode;
import cd.casic.ci.log.log.LogOriginEvent;
import cd.casic.ci.log.dal.pojo.message.LogMessage;
import cd.casic.ci.log.service.BuildLogPrintService;
import cd.casic.ci.log.service.IndexService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;

14
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/impl/ServiceLogResourceImpl.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/impl/ServiceLogResourceImpl.java
View File

@ -1,14 +1,14 @@
package cd.casic.pipeline.api.impl;
package cd.casic.ci.log.api.impl;
import cd.casic.ci.log.dal.pojo.QueryLogLineNum;
import cd.casic.ci.log.dal.pojo.QueryLogStatus;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.api.ServiceLogResource;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.dal.pojo.QueryLogLineNum;
import cd.casic.pipeline.dal.pojo.QueryLogStatus;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import cd.casic.pipeline.service.BuildLogQueryService;
import cd.casic.ci.log.api.ServiceLogResource;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.ci.log.service.BuildLogQueryService;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.RestController;

14
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/api/impl/UserLogResourceImpl.java → modules/ci-log/src/main/java/cd/casic/ci/log/api/impl/UserLogResourceImpl.java
View File

@ -1,14 +1,14 @@
package cd.casic.pipeline.api.impl;
package cd.casic.ci.log.api.impl;
import cd.casic.ci.log.dal.pojo.LogLine;
import cd.casic.ci.log.dal.pojo.QueryLogStatus;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.MeterRegistry;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.api.UserLogResource;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.dal.pojo.LogLine;
import cd.casic.pipeline.dal.pojo.QueryLogStatus;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import cd.casic.pipeline.service.BuildLogQueryService;
import cd.casic.ci.log.api.UserLogResource;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.ci.log.service.BuildLogQueryService;
import io.micrometer.core.annotation.Timed;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Value;

27
modules/ci-log/src/main/java/cd/casic/ci/log/config/LogPrinterConfiguration.java Normal file
View File

@ -0,0 +1,27 @@
package cd.casic.ci.log.config;
import lombok.val;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import java.time.Duration;
/**
* @Author：mianbin
* @Package：cd.casic.pipeline.config
* @Project：ops-pro
* @name：LogPrinterConfiguration
* @Date：2025/03/24 10:45
* @Filename：LogPrinterConfiguration
* @description：Todo暂时日志的先放着
*/
@Configuration
@ConditionalOnWebApplication
@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
public class LogPrinterConfiguration {
}

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/dao/IndexMapper.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/dao/IndexMapper.java
View File

@ -1,7 +1,7 @@
package cd.casic.pipeline.dal.dao;
package cd.casic.ci.log.dal.dao;
import cd.casic.framework.mybatis.core.mapper.BaseMapperX;
import cd.casic.pipeline.dal.dataobject.LogIndicesV2;
import cd.casic.ci.log.dal.dataobject.LogIndicesV2;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.ibatis.annotations.Mapper;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/dao/LogStatusMapper.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/dao/LogStatusMapper.java
View File

@ -1,7 +1,7 @@
package cd.casic.pipeline.dal.dao;
package cd.casic.ci.log.dal.dao;
import cd.casic.framework.mybatis.core.mapper.BaseMapperX;
import cd.casic.pipeline.dal.dataobject.LogStatus;
import cd.casic.ci.log.dal.dataobject.LogStatus;
import org.apache.ibatis.annotations.Mapper;
/**

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/dao/LogTahMapper.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/dao/LogTahMapper.java
View File

@ -1,7 +1,7 @@
package cd.casic.pipeline.dal.dao;
package cd.casic.ci.log.dal.dao;
import cd.casic.framework.mybatis.core.mapper.BaseMapperX;
import cd.casic.pipeline.dal.dataobject.LogSubTags;
import cd.casic.ci.log.dal.dataobject.LogSubTags;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.ibatis.annotations.Mapper;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/dataobject/LogIndicesV2.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/dataobject/LogIndicesV2.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.dal.dataobject;
package cd.casic.ci.log.dal.dataobject;
import cd.casic.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableId;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/dataobject/LogStatus.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/dataobject/LogStatus.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.dal.dataobject;
package cd.casic.ci.log.dal.dataobject;
import cd.casic.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableId;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/dataobject/LogSubTags.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/dataobject/LogSubTags.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.dal.dataobject;
package cd.casic.ci.log.dal.dataobject;
import cd.casic.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableId;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/EndPageQueryLogs.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/EndPageQueryLogs.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.dal.pojo;
package cd.casic.ci.log.dal.pojo;
import cd.casic.pipeline.enums.LogStatusEnum;
import cd.casic.ci.log.dal.pojo.enums.LogStatusEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.ArrayList;

7
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/LogLine.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/LogLine.java
View File

@ -1,9 +1,10 @@
package cd.casic.pipeline.dal.pojo;
package cd.casic.ci.log.dal.pojo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import lombok.val;
/**
* @author by mianbin
@ -30,6 +31,10 @@ public class LogLine {
private String subTag = "";
@Schema(description = "日志jobId", required = true)
private String jobId = "";
@Schema(title = "日志containerHashId", required = true)
private String containerHashId;
@Schema(title = "日志stepId", required = true)
private String stepId;
@Schema(description = "日志执行次数", required = true)
private int executeCount = 1;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/PageQueryLogs.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/PageQueryLogs.java
View File

@ -1,7 +1,7 @@
package cd.casic.pipeline.dal.pojo;
package cd.casic.ci.log.dal.pojo;
import cd.casic.framework.commons.pojo.PageResult;
import cd.casic.pipeline.enums.LogStatusEnum;
import cd.casic.ci.log.dal.pojo.enums.LogStatusEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/QueryLogLineNum.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/QueryLogLineNum.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.dal.pojo;
package cd.casic.ci.log.dal.pojo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/QueryLogStatus.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/QueryLogStatus.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.dal.pojo;
package cd.casic.ci.log.dal.pojo;
import cd.casic.pipeline.enums.LogStorageMode;
import cd.casic.ci.log.dal.pojo.enums.LogStorageMode;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/QueryLogs.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/QueryLogs.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.dal.pojo;
package cd.casic.ci.log.dal.pojo;
import cd.casic.pipeline.enums.LogStatusEnum;
import cd.casic.ci.log.dal.pojo.enums.LogStatusEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/TaskBuildLogProperty.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/TaskBuildLogProperty.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.dal.pojo;
package cd.casic.ci.log.dal.pojo;
import cd.casic.pipeline.enums.LogStorageMode;
import cd.casic.ci.log.dal.pojo.enums.LogStorageMode;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/enums/LogErrorCodeEnum.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/enums/LogErrorCodeEnum.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.enums;
package cd.casic.ci.log.dal.pojo.enums;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/enums/LogStatusEnum.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/enums/LogStatusEnum.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.enums;
package cd.casic.ci.log.dal.pojo.enums;
import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.v3.oas.annotations.media.Schema;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/enums/LogStorageMode.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/enums/LogStorageMode.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.enums;
package cd.casic.ci.log.dal.pojo.enums;
import io.swagger.v3.oas.annotations.media.Schema;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/enums/LogType.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/enums/LogType.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.enums;
package cd.casic.ci.log.dal.pojo.enums;
import io.swagger.v3.oas.annotations.media.Schema;

22
modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/message/LegacyLogMessage.java Normal file
View File

@ -0,0 +1,22 @@
package cd.casic.ci.log.dal.pojo.message;
import lombok.Data;
import lombok.val;
/**
* @Author：mianbin
* @Package：cd.casic.pipeline.dal.pojo.message
* @Project：ops-pro
* @name：LegacyLogMessage
* @Date：2025/03/24 10:37
* @Filename：LegacyLogMessage
* @description：Todo
*/
@Data
public class LegacyLogMessage {
String tag;
String buildId;
String message;
Long timestamp;
Long nanoTime;
}

9
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/message/LogMessage.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/message/LogMessage.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.dal.pojo.message;
package cd.casic.ci.log.dal.pojo.message;
import cd.casic.pipeline.enums.LogType;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -22,13 +22,16 @@ public class LogMessage {
long timestamp;
@Schema(description = "标签")
String tag = "";
@Schema(title = "step Id")
String stepId = "";
@Schema(description = "job id")
String jobId = "";
@Schema(title = "container Hash Id")
String containerHashId = "";
@Schema(description = "日志类型")
LogType logType = LogType.LOG;
@Schema(description = "执行次数")
int executeCount;
@Schema(description = "子标签")
String subTag = null;
}

27
modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/message/LogMessageWithLineNo.java Normal file
View File

@ -0,0 +1,27 @@
package cd.casic.ci.log.dal.pojo.message;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* @author by mianbin
* @Classname LogMessageWithLineNo
* @Date 2025/3/19 17:14
*/
@Data
@Schema(title = "带行号的日志消息")
@AllArgsConstructor
public class LogMessageWithLineNo {
String tag;
String containerHashId = "";
String subTag;
String message;
Long timestamp = 0L;
LogType logType = LogType.LOG;
Long lineNo = 0L;
Integer executeCount = 1;
String jobId;
String stepId;
}

20
modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/message/LogStatus.java Normal file
View File

@ -0,0 +1,20 @@
package cd.casic.ci.log.dal.pojo.message;
import lombok.Data;
import lombok.val;
/**
* @Author：mianbin
* @Package：cd.casic.pipeline.dal.pojo.message
* @Project：ops-pro
* @name：LogStatus
* @Date：2025/03/24 10:38
* @Filename：LogStatus
* @description：Todo
*/
@Data
public class LogStatus {
String buildId;
Boolean finished;
Long updateTime;
}

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/meta/Ansi.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/meta/Ansi.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.dal.pojo.meta;
package cd.casic.ci.log.dal.pojo.meta;
import org.apache.logging.log4j.util.Strings;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/meta/AnsiAttribute.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/meta/AnsiAttribute.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.dal.pojo.meta;
package cd.casic.ci.log.dal.pojo.meta;
public enum AnsiAttribute {
RESET(0),

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/dal/pojo/meta/AnsiColor.java → modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/meta/AnsiColor.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.dal.pojo.meta;
package cd.casic.ci.log.dal.pojo.meta;
public enum AnsiColor {
BLACK(0),

22
modules/ci-log/src/main/java/cd/casic/ci/log/dal/pojo/meta/AnsiErase.java Normal file
View File

@ -0,0 +1,22 @@
package cd.casic.ci.log.dal.pojo.meta;
/**
* @Author：mianbin
* @Package：cd.casic.pipeline.dal.pojo.meta
* @Project：ops-pro
* @name：AnsiErase
* @Date：2025/03/24 10:41
* @Filename：AnsiErase
* @description：Todo
*/
public enum AnsiErase {
FORWARD(0),
BACKWARD(1),
ALL(2);
private int value;
AnsiErase(int value) {
this.value = value;
}
}

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/jmx/CreateIndexBean.java → modules/ci-log/src/main/java/cd/casic/ci/log/jmx/CreateIndexBean.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.jmx;
package cd.casic.ci.log.jmx;
import lombok.Synchronized;
import org.springframework.jmx.export.annotation.ManagedAttribute;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/jmx/LogStorageBean.java → modules/ci-log/src/main/java/cd/casic/ci/log/jmx/LogStorageBean.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.jmx;
package cd.casic.ci.log.jmx;
import lombok.Synchronized;
import org.springframework.jmx.export.annotation.ManagedResource;

2
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/event/log/IEvent.java → modules/ci-log/src/main/java/cd/casic/ci/log/log/IEvent.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.event.log;
package cd.casic.ci.log.log;
import org.springframework.context.ApplicationEvent;

3
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/event/log/ILogEvent.java → modules/ci-log/src/main/java/cd/casic/ci/log/log/ILogEvent.java
View File

@ -1,8 +1,7 @@
package cd.casic.pipeline.event.log;
package cd.casic.ci.log.log;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
/**
* @author by mianbin

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/event/log/LogOriginEvent.java → modules/ci-log/src/main/java/cd/casic/ci/log/log/LogOriginEvent.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.event.log;
package cd.casic.ci.log.log;
import cd.casic.pipeline.dal.pojo.message.LogMessage;
import cd.casic.ci.log.dal.pojo.message.LogMessage;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;

3
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/event/log/LogStatusEvent.java → modules/ci-log/src/main/java/cd/casic/ci/log/log/LogStatusEvent.java
View File

@ -1,8 +1,7 @@
package cd.casic.pipeline.event.log;
package cd.casic.ci.log.log;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
/**
* @author by mianbin

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/event/log/LogStorageEvent.java → modules/ci-log/src/main/java/cd/casic/ci/log/log/LogStorageEvent.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.event.log;
package cd.casic.ci.log.log;
import cd.casic.pipeline.dal.pojo.message.LogMessageWithLineNo;
import cd.casic.ci.log.dal.pojo.message.LogMessageWithLineNo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;

8
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/BuildLogListenerService.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/BuildLogListenerService.java
View File

@ -1,8 +1,8 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.pipeline.event.log.LogOriginEvent;
import cd.casic.pipeline.event.log.LogStatusEvent;
import cd.casic.pipeline.event.log.LogStorageEvent;
import cd.casic.ci.log.log.LogStorageEvent;
import cd.casic.ci.log.log.LogOriginEvent;
import cd.casic.ci.log.log.LogStatusEvent;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;

8
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/BuildLogPrintService.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/BuildLogPrintService.java
View File

@ -1,12 +1,10 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.ci.log.log.ILogEvent;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.framework.commons.util.spring.SpringUtils;
import cd.casic.pipeline.enums.LogErrorCodeEnum;
import cd.casic.pipeline.event.log.ILogEvent;
import cd.casic.ci.log.dal.pojo.enums.LogErrorCodeEnum;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.util.concurrent.LinkedBlockingQueue;

10
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/BuildLogQueryService.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/BuildLogQueryService.java
View File

@ -1,10 +1,10 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.ci.log.dal.pojo.*;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.dal.pojo.*;
import cd.casic.pipeline.enums.LogStatusEnum;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.jmx.LogStorageBean;
import cd.casic.ci.log.dal.pojo.enums.LogStatusEnum;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.ci.log.jmx.LogStorageBean;
import jakarta.annotation.Resource;
import org.springframework.http.ResponseEntity;

6
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/IndexService.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/IndexService.java
View File

@ -1,8 +1,8 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.ci.log.dal.dao.IndexMapper;
import cd.casic.framework.redis.core.RedisTemplateUtils;
import cd.casic.pipeline.dal.dao.IndexMapper;
import cd.casic.pipeline.dal.dataobject.LogIndicesV2;
import cd.casic.ci.log.dal.dataobject.LogIndicesV2;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import jakarta.annotation.Resource;

16
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/LogService.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/LogService.java
View File

@ -1,12 +1,12 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.event.log.LogOriginEvent;
import cd.casic.pipeline.event.log.LogStatusEvent;
import cd.casic.pipeline.event.log.LogStorageEvent;
import cd.casic.pipeline.dal.pojo.EndPageQueryLogs;
import cd.casic.pipeline.dal.pojo.PageQueryLogs;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import cd.casic.ci.log.dal.pojo.EndPageQueryLogs;
import cd.casic.ci.log.dal.pojo.PageQueryLogs;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import cd.casic.ci.log.log.LogStorageEvent;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.ci.log.log.LogOriginEvent;
import cd.casic.ci.log.log.LogStatusEvent;
/**
* @author by mianbin

27
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/LogServiceImpl.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/LogServiceImpl.java
View File

@ -1,16 +1,16 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.pipeline.enums.LogType;
import cd.casic.pipeline.event.log.LogOriginEvent;
import cd.casic.pipeline.event.log.LogStatusEvent;
import cd.casic.pipeline.event.log.LogStorageEvent;
import cd.casic.pipeline.jmx.CreateIndexBean;
import cd.casic.pipeline.jmx.LogStorageBean;
import cd.casic.pipeline.dal.pojo.EndPageQueryLogs;
import cd.casic.pipeline.dal.pojo.PageQueryLogs;
import cd.casic.pipeline.dal.pojo.QueryLogs;
import cd.casic.pipeline.dal.pojo.message.LogMessage;
import cd.casic.pipeline.dal.pojo.message.LogMessageWithLineNo;
import cd.casic.ci.log.dal.pojo.EndPageQueryLogs;
import cd.casic.ci.log.dal.pojo.PageQueryLogs;
import cd.casic.ci.log.dal.pojo.QueryLogs;
import cd.casic.ci.log.log.LogStorageEvent;
import cd.casic.ci.log.dal.pojo.enums.LogType;
import cd.casic.ci.log.log.LogOriginEvent;
import cd.casic.ci.log.log.LogStatusEvent;
import cd.casic.ci.log.jmx.CreateIndexBean;
import cd.casic.ci.log.jmx.LogStorageBean;
import cd.casic.ci.log.dal.pojo.message.LogMessage;
import cd.casic.ci.log.dal.pojo.message.LogMessageWithLineNo;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import jakarta.annotation.Resource;
@ -194,9 +194,10 @@ public class LogServiceImpl implements LogService {
if (!StringUtils.isEmpty((logMessage.getSubTag()))) {
logTagService.saveSubTag(buildId, logMessage.getTag(), logMessage.getSubTag());
}
//todo 这个传参先null，后面再弄
res.add(new LogMessageWithLineNo(logMessage.getTag(), logMessage.getSubTag(),
logMessage.getJobId(), logMessage.getMessage(),
timestamp, logMessage.getLogType(), startLineNum++, logMessage.getExecuteCount())
timestamp, logMessage.getLogType(), startLineNum++, logMessage.getExecuteCount(), null, null)
);
}
return res;

12
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/LogStatusService.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/LogStatusService.java
View File

@ -1,10 +1,10 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.pipeline.dal.dao.LogStatusMapper;
import cd.casic.pipeline.enums.LogStorageMode;
import cd.casic.pipeline.dal.pojo.QueryLogStatus;
import cd.casic.pipeline.dal.pojo.TaskBuildLogProperty;
import cd.casic.pipeline.dal.dataobject.LogStatus;
import cd.casic.ci.log.dal.pojo.QueryLogStatus;
import cd.casic.ci.log.dal.pojo.TaskBuildLogProperty;
import cd.casic.ci.log.dal.dao.LogStatusMapper;
import cd.casic.ci.log.dal.pojo.enums.LogStorageMode;
import cd.casic.ci.log.dal.dataobject.LogStatus;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.annotation.Resource;

4
modules/pipeline-ci-log/src/main/java/cd/casic/pipeline/service/LogTagService.java → modules/ci-log/src/main/java/cd/casic/ci/log/service/LogTagService.java
View File

@ -1,8 +1,8 @@
package cd.casic.pipeline.service;
package cd.casic.ci.log.service;
import cd.casic.ci.log.dal.dao.LogTahMapper;
import cd.casic.framework.commons.util.json.JsonUtils;
import cd.casic.framework.redis.core.RedisTemplateUtils;
import cd.casic.pipeline.dal.dao.LogTahMapper;
import com.fasterxml.jackson.core.type.TypeReference;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;

11
modules/pipeline-ci-event/pom.xml → modules/ci-market/pom.xml
View File

@ -7,15 +7,18 @@
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-event</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-market</artifactId>
<packaging>jar</packaging>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-commons</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-commons</artifactId>
</dependency>
</dependencies>

2
modules/pipeline-ci-market/src/main/java/cd/casic/pipeline/market/constant/StoreMessageCode.java → modules/ci-market/src/main/java/cd/casic/ci/event/market/constant/StoreMessageCode.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.market.constant;
package cd.casic.ci.event.market.constant;
/**
* 流水线微服务模块请求返回状态码

22
modules/ci-process/pipeline-ci-process-api/pom.xml Normal file
View File

@ -0,0 +1,22 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-process</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cd.casic.ci</groupId>
<artifactId>pipeline-ci-process-api</artifactId>
<name>pipeline-ci-process-api</name>
<description>pipeline-ci-process-api</description>
<version>${revision}</version>
<packaging>jar</packaging>
</project>

14
modules/ci-process/pipeline-ci-process-api/src/main/java/cd/casic/ci/pipelineciprocessapi/PipelineCiProcessApiApplication.java Normal file
View File

@ -0,0 +1,14 @@
package cd.casic.ci.pipelineciprocessapi;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class PipelineCiProcessApiApplication {
public static void main(String[] args) {
SpringApplication.run(PipelineCiProcessApiApplication.class, args);
}
}

1
modules/ci-process/pipeline-ci-process-api/src/main/resources/application.properties Normal file
View File

@ -0,0 +1 @@
spring.application.name=pipeline-ci-process-api

13
modules/ci-process/pipeline-ci-process-api/src/test/java/cd/casic/ci/pipelineciprocessapi/PipelineCiProcessApiApplicationTests.java Normal file
View File

@ -0,0 +1,13 @@
package cd.casic.ci.pipelineciprocessapi;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class PipelineCiProcessApiApplicationTests {
@Test
void contextLoads() {
}
}

44
modules/pipeline-ci-process/pom.xml → modules/ci-process/pom.xml
View File

@ -7,54 +7,54 @@
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-process</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-process</artifactId>
<packaging>pom</packaging>
<version>${revision}</version>
<modules>
<module>pipeline-ci-process-api</module>
</modules>
<dependencies>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-commons</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-commons</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-event</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-event</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-log</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-log</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-project</artifactId>
<version>2.0.0-jdk17</version>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-project</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-quality</artifactId>
<version>2.0.0-jdk17</version>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-quality</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-scm-repository</artifactId>
<version>2.0.0-jdk17</version>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-scm-repository</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-ticket</artifactId>
<version>2.0.0-jdk17</version>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-ticket</artifactId>
</dependency>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>spring-boot-starter-redis</artifactId>

9
modules/pipeline-ci-project/pom.xml → modules/ci-project/pom.xml
View File

@ -7,17 +7,18 @@
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-project</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-project</artifactId>
<version>${revision}</version>
<dependencies>
<dependency>
<groupId>cd.casic.pipeline</groupId>
<artifactId>pipeline-ci-commons</artifactId>
<groupId>cd.casic.ci</groupId>
<artifactId>ci-commons</artifactId>
</dependency>
<dependency>

2
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/constant/ProjectConstants.java → modules/ci-project/src/main/java/cd/casic/ci/project/constant/ProjectConstants.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.project.constant;
package cd.casic.ci.project.constant;
/**
* @author by mianbin

6
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/controller/UserProjectResourceController.java → modules/ci-project/src/main/java/cd/casic/ci/project/controller/UserProjectResourceController.java
View File

@ -1,9 +1,9 @@
package cd.casic.pipeline.project.controller;
package cd.casic.ci.project.controller;
import cd.casic.ci.project.dal.pojo.ProjectCreateInfo;
import cd.casic.framework.commons.pojo.CommonResult;
import cd.casic.pipeline.project.dal.pojo.ProjectCreateInfo;
import cd.casic.pipeline.project.service.UserProjectResourceService;
import cd.casic.ci.project.service.UserProjectResourceService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;

14
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/dao/ProjectMapper.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/dao/ProjectMapper.java
View File

@ -1,12 +1,12 @@
package cd.casic.pipeline.project.dal.dao;
package cd.casic.ci.project.dal.dao;
import cd.casic.ci.project.dal.pojo.ProjectCreateInfo;
import cd.casic.ci.project.dal.pojo.ProjectVO;
import cd.casic.ci.project.enums.ProjectChannelCode;
import cd.casic.ci.project.enums.ProjectValidateType;
import cd.casic.framework.mybatis.core.mapper.BaseMapperX;
import cd.casic.pipeline.project.dal.dto.Project;
import cd.casic.pipeline.project.dal.pojo.ProjectCreateExtInfo;
import cd.casic.pipeline.project.dal.pojo.ProjectCreateInfo;
import cd.casic.pipeline.project.dal.pojo.ProjectVO;
import cd.casic.pipeline.project.enums.ProjectChannelCode;
import cd.casic.pipeline.project.enums.ProjectValidateType;
import cd.casic.ci.project.dal.dto.Project;
import cd.casic.ci.project.dal.pojo.ProjectCreateExtInfo;
import org.apache.ibatis.annotations.Mapper;
@Mapper

2
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/dto/Project.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/dto/Project.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.project.dal.dto;
package cd.casic.ci.project.dal.dto;
import cd.casic.framework.mybatis.core.dataobject.BaseDO;

4
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/pojo/AuthProjectCreateInfo.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/pojo/AuthProjectCreateInfo.java
View File

@ -1,7 +1,7 @@
package cd.casic.pipeline.project.dal.pojo;
package cd.casic.ci.project.dal.pojo;
import cd.casic.pipeline.project.dal.pojo.user.UserDeptDetail;
import cd.casic.ci.project.dal.pojo.user.UserDeptDetail;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;

2
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/pojo/PipelineAsCodeSettings.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/pojo/PipelineAsCodeSettings.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.project.dal.pojo;
package cd.casic.ci.project.dal.pojo;
import lombok.Data;

2
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/pojo/ProjectCreateExtInfo.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/pojo/ProjectCreateExtInfo.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.project.dal.pojo;
package cd.casic.ci.project.dal.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;

4
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/pojo/ProjectCreateInfo.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/pojo/ProjectCreateInfo.java
View File

@ -1,6 +1,6 @@
package cd.casic.pipeline.project.dal.pojo;
package cd.casic.ci.project.dal.pojo;
import cd.casic.pipeline.project.enums.ProjectAuthSecrecyStatus;
import cd.casic.ci.project.enums.ProjectAuthSecrecyStatus;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/pojo/ProjectProperties.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/pojo/ProjectProperties.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.project.dal.pojo;
package cd.casic.ci.project.dal.pojo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
modules/pipeline-ci-project/src/main/java/cd/casic/pipeline/project/dal/pojo/ProjectVO.java → modules/ci-project/src/main/java/cd/casic/ci/project/dal/pojo/ProjectVO.java
View File

@ -1,4 +1,4 @@
package cd.casic.pipeline.project.dal.pojo;
package cd.casic.ci.project.dal.pojo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

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