diff --git a/.idea/compiler.xml b/.idea/compiler.xml index d24abdb3..3a7333fb 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,35 +18,319 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,9 +339,9 @@ + - @@ -76,6 +360,7 @@ + diff --git a/dependencies/.flattened-pom.xml b/dependencies/.flattened-pom.xml index b7224864..6efd46b9 100644 --- a/dependencies/.flattened-pom.xml +++ b/dependencies/.flattened-pom.xml @@ -13,7 +13,6 @@ 8.0.0.RELEASE 1.6.0 5.1.0 - 4.12.0 1.6.2 1.2.83 3.47.1.0 @@ -23,6 +22,7 @@ 20250107 8.6.0 1.27.1 + 2.3.1 2.7.0 4.3.1 3.36.0 @@ -35,8 +35,9 @@ 1.12 2.2.7 2.17.0 + 1.5.8 2.6.10 - 3.2.1 + 3.4.7 6.0.0-M16 2.3.0 1.18.1 @@ -45,6 +46,7 @@ 1.18.34 9.0.0 5.2.0 + 1.5.8 1.4.0 2.4 0.10.2 @@ -52,8 +54,8 @@ 2.0.8.3 3.12.1 1.2.13 + 0.12.0 1.4.13 - 3.2.13 5.8.32 2.0.0-jdk17 0.1.55 @@ -135,6 +137,11 @@ spring-boot-starter-mq ${revision} + + org.apache.rocketmq + rocketmq-spring-boot-starter + ${rocketmq-spring.version} + cd.casic.boot spring-boot-starter-mybatis @@ -197,17 +204,62 @@ cd.casic.boot - module-ci-process-api + module-ci-environment ${revision} cd.casic.boot - module-ci-process-biz + module-ci-event ${revision} cd.casic.boot - module-ci-process-api + module-ci-log + ${revision} + + + cd.casic.boot + module-ci-market + ${revision} + + + cd.casic.boot + module-ci-project + ${revision} + + + cd.casic.boot + module-ci-quality + ${revision} + + + cd.casic.boot + module-ci-ticket + ${revision} + + + cd.casic.boot + module-ci-repository + ${revision} + + + cd.casic.boot + module-ci-worker + ${revision} + + + cd.casic.boot + module-ci-dispatch-api + ${revision} + + + cd.casic.boot + module-ci-store-api + ${revision} + + + cd.casic.boot + module-ci-execute ${revision} @@ -359,21 +411,6 @@ spring-boot-admin-starter-client ${spring-boot-admin.version} - - org.springframework.security - spring-security-oauth2-jose - 6.3.4 - - - org.springframework.security - spring-security-oauth2-client - 6.3.4 - - - org.springframework.security - spring-security-oauth2-resource-server - 6.3.4 - org.mockito mockito-inline @@ -526,9 +563,9 @@ - org.pf4j - pf4j-spring - ${pf4j-spring.version} + io.cloudsoft.windows + winrm4j + ${winrm4j.version} com.dameng @@ -570,37 +607,6 @@ bcprov-jdk18on ${bcprov-jdk18on.version} - - com.github.docker-java - docker-java - ${docker-java.version} - - - com.google.guava - guava - - - commons-io - commons-io - - - - - com.github.docker-java - docker-java-transport-httpclient5 - ${docker-java.version} - - - org.slf4j - slf4j-log4j12 - - - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - org.jvnet.winp winp @@ -626,6 +632,16 @@ apk-parser ${apk-parser.version} + + ch.qos.logback + logback-core + ${logback-core.version} + + + ch.qos.logback + logback-classic + ${logback-classic.version} + com.github.ben-manes.caffeine caffeine diff --git a/dependencies/pom.xml b/dependencies/pom.xml index e7efb852..1b34c452 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -89,7 +89,8 @@ 1.5.8 2.9.3 2.3.0 - + 0.12.0 + 3.4.7 @@ -223,7 +224,7 @@ cd.casic.boot - module-ci-process-api + module-ci-commons ${revision} @@ -251,12 +252,6 @@ ${revision} - - cd.casic.boot - module-ci-process-api - ${revision} - - cd.casic.boot module-ci-project @@ -299,6 +294,12 @@ ${revision} + + cd.casic.boot + module-ci-execute + ${revision} + + io.github.mouzt @@ -647,7 +648,7 @@ io.cloudsoft.windows winrm4j - 0.12.0 + ${winrm4j.version} @@ -714,6 +715,7 @@ ${reflections.version} + org.apache.commons commons-exec @@ -727,40 +729,45 @@ ${dd-plist.version} + net.dongliu apk-parser ${apk-parser.version} + ch.qos.logback logback-core ${logback-core.version} + ch.qos.logback logback-classic ${logback-classic.version} + com.github.ben-manes.caffeine caffeine ${caffeine.version} + io.github.resilience4j resilience4j-circuitbreaker ${resilience4j-circuitbreaker.version} - + - io.cloudsoft.windows - winrm4j - 0.12.3 + ognl + ognl + ${ognl.version} diff --git a/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginInformation.java b/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginInformation.java index 7eaa0a5c..18321f24 100644 --- a/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginInformation.java +++ b/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginInformation.java @@ -1,6 +1,6 @@ package cd.casic.plugin.dataobject.dto; -import cd.casic.framework.mybatis.core.dataobject.BaseDO; +import cd.casic.framework.commons.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; diff --git a/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginSpecStorage.java b/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginSpecStorage.java index 5287476a..6429314e 100644 --- a/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginSpecStorage.java +++ b/framework/spring-boot-starter-plugin/src/main/java/cd/casic/plugin/dataobject/dto/PluginSpecStorage.java @@ -1,6 +1,6 @@ package cd.casic.plugin.dataobject.dto; -import cd.casic.framework.mybatis.core.dataobject.BaseDO; +import cd.casic.framework.commons.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/modules/module-ci-process-api/pom.xml b/modules/module-ci-commons/pom.xml similarity index 55% rename from modules/module-ci-process-api/pom.xml rename to modules/module-ci-commons/pom.xml index 8f753d9f..94750763 100644 --- a/modules/module-ci-process-api/pom.xml +++ b/modules/module-ci-commons/pom.xml @@ -9,16 +9,24 @@ ${revision} - module-ci-process-api - - ${project.artifactId} - - ${revision} - jar + ${revision} + ${project.artifactId} + module-ci-commons - - + + cd.casic.boot + commons + + + cd.casic.boot + module-system-api + + + org.springframework.boot + spring-boot-starter-jdbc + + \ No newline at end of file diff --git a/modules/module-ci-execute/pom.xml b/modules/module-ci-execute/pom.xml new file mode 100644 index 00000000..135f79de --- /dev/null +++ b/modules/module-ci-execute/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + cd.casic.boot + modules + ${revision} + + + module-ci-execute + jar + ${revision} + ${project.artifactId} + + + + cd.casic.boot + commons + + + cd.casic.boot + spring-boot-starter-security + + + cd.casic.boot + spring-boot-starter-test + + + com.github.docker-java + docker-java + 3.2.13 + + + com.github.docker-java + docker-java-transport-httpclient5 + 3.2.13 + + + org.apache.httpcomponents.client5 + httpclient5 + 5.4 + + + org.apache.httpcomponents.core5 + httpcore5 + 5.3.4 + + + commons-io + commons-io + 2.17.0 + + + + \ No newline at end of file diff --git a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/DockerEndpointDo.java b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/DockerEndpointDo.java index 1ae91d8d..51c6626a 100644 --- a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/DockerEndpointDo.java +++ b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/DockerEndpointDo.java @@ -1,6 +1,6 @@ package cd.casic.module.execute.docker.dataobject.dto; -import cd.casic.framework.mybatis.core.dataobject.BaseDO; +import cd.casic.framework.commons.dataobject.BaseDO; import cd.casic.module.execute.docker.dataobject.model.DockerEndpoint; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/OperateRecordDo.java b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/OperateRecordDo.java index b2dd6837..c674fe2a 100644 --- a/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/OperateRecordDo.java +++ b/modules/module-ci-execute/src/main/java/cd/casic/module/execute/docker/dataobject/dto/OperateRecordDo.java @@ -1,6 +1,6 @@ package cd.casic.module.execute.docker.dataobject.dto; -import cd.casic.framework.mybatis.core.dataobject.BaseDO; +import cd.casic.framework.commons.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/modules/module-ci-market/src/main/java/cd/casic/ci/store/Main.java b/modules/module-ci-market/src/main/java/cd/casic/ci/store/Main.java deleted file mode 100644 index bfc092b0..00000000 --- a/modules/module-ci-market/src/main/java/cd/casic/ci/store/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package cd.casic.ci.store; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/modules/module-ci-plugin/src/main/java/cd/casic/ci/plugin/Main.java b/modules/module-ci-plugin/src/main/java/cd/casic/ci/plugin/Main.java deleted file mode 100644 index 269cfd80..00000000 --- a/modules/module-ci-plugin/src/main/java/cd/casic/ci/plugin/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package cd.casic.ci.plugin; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/module/process/api/package-info.java b/modules/module-ci-process-api/src/main/java/cd/casic/module/process/api/package-info.java deleted file mode 100644 index eff4a43b..00000000 --- a/modules/module-ci-process-api/src/main/java/cd/casic/module/process/api/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cd.casic.module.process.api; \ No newline at end of file diff --git a/modules/module-ci-process-biz/pom.xml b/modules/module-ci-process-biz/pom.xml index 0bf1807e..eece7187 100644 --- a/modules/module-ci-process-biz/pom.xml +++ b/modules/module-ci-process-biz/pom.xml @@ -16,19 +16,23 @@ ${project.artifactId} - - cd.casic.boot - module-ci-process-api - + cd.casic.boot module-ci-commons compile + cd.casic.boot module-system-api + + + cd.casic.boot + spring-boot-starter-mq + + cd.casic.boot spring-boot-starter-mybatis @@ -38,10 +42,7 @@ cd.casic.boot spring-boot-starter-security - - ognl - ognl - + org.springframework spring-websocket @@ -51,26 +52,13 @@ cd.casic.boot spring-boot-starter-biz-tenant - - - io.cloudsoft.windows - winrm4j - - - com.jcraft - jsch - - - - - - - + org.bouncycastle bcprov-jdk18on 1.80 + com.hierynomus sshj @@ -81,11 +69,22 @@ expectit-core 0.9.0 + + + com.jcraft + jsch + + io.cloudsoft.windows winrm4j - 0.12.0 + + + ognl + ognl + + org.apache.httpcomponents.client5 httpclient5 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java index ce4dda1c..7f20abeb 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java @@ -5,19 +5,13 @@ import cd.casic.ci.process.engine.enums.ContextStateEnum; import cd.casic.ci.process.engine.manager.RunContextManager; import cd.casic.ci.process.engine.runContext.PipelineRunContext; import cd.casic.ci.process.engine.runContext.SecondStageRunContext; -import cd.casic.ci.process.process.dataObject.base.PipBaseElement; import cd.casic.ci.process.process.dataObject.stage.PipStage; import cd.casic.framework.mq.redis.core.RedisMQTemplate; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.task.TaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.util.CollectionUtils; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; @Slf4j @@ -30,7 +24,7 @@ public class ParallelDispatcher implements BaseDispatcher{ private RedisMQTemplate redisMQTemplate; private ThreadPoolTaskExecutor taskExecutor; - public ParallelDispatcher(List firstStageList, PipelineRunContext context,RunContextManager contextManager,RedisMQTemplate redisMQTemplate,ThreadPoolTaskExecutor taskExecutor) { + public ParallelDispatcher(List firstStageList, PipelineRunContext context, RunContextManager contextManager, RedisMQTemplate redisMQTemplate, ThreadPoolTaskExecutor taskExecutor) { this.firstStageList = firstStageList; this.pipelineRunContext = context; this.stageIndex = 0; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/snowflake/SnowflakeIdWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/snowflake/SnowflakeIdWorker.java similarity index 98% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/snowflake/SnowflakeIdWorker.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/snowflake/SnowflakeIdWorker.java index d08c3c18..5ed632eb 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/snowflake/SnowflakeIdWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/snowflake/SnowflakeIdWorker.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.snowflake; +package cd.casic.ci.process.util.snowflake; public class SnowflakeIdWorker { // 开始时间戳 (2020-01-01) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/snowflake/SnowflakeIdentifierGenerator.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/snowflake/SnowflakeIdentifierGenerator.java similarity index 94% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/snowflake/SnowflakeIdentifierGenerator.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/snowflake/SnowflakeIdentifierGenerator.java index 2ac94911..a279048a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/snowflake/SnowflakeIdentifierGenerator.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/snowflake/SnowflakeIdentifierGenerator.java @@ -1,4 +1,4 @@ -package cd.casic.ci.process.snowflake; +package cd.casic.ci.process.util.snowflake; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import org.springframework.stereotype.Component; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/controller/app/ProcessFlowController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/controller/app/ProcessFlowController.java deleted file mode 100644 index 76de913e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/controller/app/ProcessFlowController.java +++ /dev/null @@ -1,4 +0,0 @@ -package cd.casic.module.process.controller.app; - -public class ProcessFlowController { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/controller/package-info.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/controller/package-info.java deleted file mode 100644 index 05019a00..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/controller/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cd.casic.module.process.controller; \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthConvert.java deleted file mode 100644 index 17fa0cf0..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.Auth; -import cd.casic.module.process.process.setting.dataobject.AuthDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname AuthConvert - * @Description TODO - * @Date 2025/4/24 16:37 - */ -@Mapper -public interface AuthConvert { - AuthConvert INSTANCE = Mappers.getMapper(AuthConvert.class); - - Auth convert(AuthDo authDo); - - AuthDo convertDo(Auth auth); - - List convertList(List authDos); - - List convertDoList(List auths); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostConvert.java deleted file mode 100644 index d0fdd189..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.AuthHost; -import cd.casic.module.process.process.setting.dataobject.AuthHostDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname AuthHost - * @Description TODO - * @Date 2025/4/24 15:56 - */ -@Mapper -public interface AuthHostConvert { - AuthHostConvert INSTANCE = Mappers.getMapper(AuthHostConvert.class); - - AuthHostDo convertDo(AuthHost authHost); - - AuthHost convert(AuthHostDo authHostDo); - - List convertList(List authHostGroupDos); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostGroupConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostGroupConvert.java deleted file mode 100644 index 73eddab8..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostGroupConvert.java +++ /dev/null @@ -1,26 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.AuthHostGroup; -import cd.casic.module.process.process.setting.dataobject.AuthHostGroupDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname AuthHostGroupConvert - * @Description TODO - * @Date 2025/4/24 10:58 - */ -@Mapper -public interface AuthHostGroupConvert { - - AuthHostGroupConvert INSTANCE = Mappers.getMapper(AuthHostGroupConvert.class); - - AuthHostGroupDo convertDo(AuthHostGroup authHostGroup); - - AuthHostGroup convert(AuthHostGroupDo authHostGroupDo); - - List convertList(List authHostGroupDos); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostGroupDetailsConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostGroupDetailsConvert.java deleted file mode 100644 index daa47e11..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostGroupDetailsConvert.java +++ /dev/null @@ -1,25 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupDetails; -import cd.casic.module.process.process.setting.dataobject.AuthHostGroupDetailsDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname AuthHostGroupDetailsConvert - * @Description TODO - * @Date 2025/4/24 10:09 - */ -@Mapper -public interface AuthHostGroupDetailsConvert { - AuthHostGroupDetailsConvert INSTANCE = Mappers.getMapper(AuthHostGroupDetailsConvert.class); - - AuthHostGroupDetailsDo convertDo(AuthHostGroupDetails authHostGroupDetails); - - AuthHostGroupDetails convert(AuthHostGroupDetailsDo authHostGroupDetailsDo); - - List convertList(List list); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostK8sConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostK8sConvert.java deleted file mode 100644 index 54c4263f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthHostK8sConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.AuthHostK8s; -import cd.casic.module.process.process.setting.dataobject.AuthHostK8sDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname AuthHostK8sConvert - * @Description TODO - * @Date 2025/4/24 14:26 - */ -@Mapper -public interface AuthHostK8sConvert { - AuthHostK8sConvert INSTANCE = Mappers.getMapper(AuthHostK8sConvert.class); - - AuthHostK8s convert(AuthHostK8sDo authHostK8sDo); - - AuthHostK8sDo convertDo(AuthHostK8s authHostK8s); - - List convertList(List list); - - List convertDoList(List list); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthThirdConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthThirdConvert.java deleted file mode 100644 index 2543ae03..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/AuthThirdConvert.java +++ /dev/null @@ -1,28 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.module.process.process.setting.dataobject.AuthThirdDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname AuthThirdConvert - * @Description TODO - * @Date 2025/4/24 16:38 - */ -@Mapper -public interface AuthThirdConvert { - - AuthThirdConvert INSTANCE = Mappers.getMapper(AuthThirdConvert.class); - - AuthThird convert(AuthThirdDo authThirdDo); - - AuthThirdDo convertDo(AuthThird authThird); - - List convertList(List authThirdDos); - - List convertDoList(List authThirds); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/CacheConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/CacheConvert.java deleted file mode 100644 index a5b81ee5..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/CacheConvert.java +++ /dev/null @@ -1,28 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.Cache; -import cd.casic.module.process.process.setting.dataobject.CacheDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname CacheConvert - * @Description TODO - * @Date 2025/4/24 16:39 - */ -@Mapper -public interface CacheConvert { - - CacheConvert INSTANCE = Mappers.getMapper(CacheConvert.class); - - Cache convert(CacheDo cacheDo); - - CacheDo convert(Cache cache); - - List convert(List cacheDos); - - List convertDoList(List caches); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/EnvConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/EnvConvert.java deleted file mode 100644 index 3b409bde..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/EnvConvert.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.Env; -import cd.casic.module.process.process.setting.dataobject.EnvDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname EnvConvert - * @Description TODO - * @Date 2025/4/24 16:40 - */ -@Mapper -public interface EnvConvert { - - EnvConvert INSTANCE = Mappers.getMapper(EnvConvert.class); - - EnvDo convertDo(Env env); - - Env convert(EnvDo envDo); - - List convertList(List envDos); - - List convertDoList(List envs); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/GroupConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/GroupConvert.java deleted file mode 100644 index 0512b64a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/GroupConvert.java +++ /dev/null @@ -1,31 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.Group; -import cd.casic.module.process.process.setting.dataobject.GroupDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname Group - * @Description TODO - * @Date 2025/4/24 16:41 - */ -@Mapper -public interface GroupConvert { - - GroupConvert INSTANCE = Mappers.getMapper(GroupConvert.class); - - Group convert(GroupDo groupDo); - - GroupDo convertDo(Group group); - - List convertList(List groupDos); - - List convertDoList(List groups); - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/ResourcesConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/ResourcesConvert.java deleted file mode 100644 index 9b869dd1..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/ResourcesConvert.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.ci.commons.bean.process.setting.Resources; -import cd.casic.module.process.process.setting.dataobject.ResourcesDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname ResourcesConvert - * @Description TODO - * @Date 2025/4/24 16:47 - */ -@Mapper -public interface ResourcesConvert { - - ResourcesConvert INSTANCE = Mappers.getMapper(ResourcesConvert.class); - - ResourcesDo convert(Resources resources); - - Resources convert(ResourcesDo resourcesDo); - - List convertList(List resourcesDos); - - List convertListDo(List resources); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/ScmConvert.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/ScmConvert.java deleted file mode 100644 index e79fb547..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/setting/ScmConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cd.casic.module.process.convert.setting; - -import cd.casic.module.process.process.setting.dataobject.ScmDo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @author by mianbin - * @Classname Scm - * @Description TODO - * @Date 2025/4/24 16:49 - */ -@Mapper -public interface ScmConvert { - - ScmConvert INSTANCE = Mappers.getMapper(ScmConvert.class); - - ScmDo convert(ScmDo scmDo); -// TODO 同下 -// ScmDo convertDo(ScmDo scmDo); - - List convertList(List scmDos); -// TODO 重复了 -// List convertDoList(List scmDos); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/AppHomeContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/AppHomeContext.java deleted file mode 100644 index 3dbeed68..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/AppHomeContext.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.core.context; - -/** - * @ClassName AppHomeContext - * @Author hopeli - * @Date 2025/5/2 18:25 - * @Version 1.0 - */ -public class AppHomeContext { - private static String appHome; - - public AppHomeContext() { - } - - public static String getAppHome() { - return appHome; - } - - public static void setAppHome(String appHome) { - AppHomeContext.appHome = appHome; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/ApplicationContextContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/ApplicationContextContext.java deleted file mode 100644 index a33bb129..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/ApplicationContextContext.java +++ /dev/null @@ -1,18 +0,0 @@ -package cd.casic.module.process.core.context; - -import org.springframework.context.ConfigurableApplicationContext; - -public class ApplicationContextContext { - private static ConfigurableApplicationContext applicationContext; - - public ApplicationContextContext() { - } - - public static ConfigurableApplicationContext getApplicationContext() { - return applicationContext; - } - - public static void setApplicationContext(ConfigurableApplicationContext applicationContext) { - ApplicationContextContext.applicationContext = applicationContext; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/LoginContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/LoginContext.java deleted file mode 100644 index 0ea16a48..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/context/LoginContext.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.core.context; - -/** - * @ClassName LoginContext - * @Author hopeli - * @Date 2025/5/5 20:54 - * @Version 1.0 - */ -public class LoginContext { - private static String loginId; - - public LoginContext() { - } - - public static String getLoginId() { - return loginId; - } - - public static void setLoginId(String loginId) { - LoginContext.loginId = loginId; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/resolver/AnnotationResourceResolver.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/resolver/AnnotationResourceResolver.java deleted file mode 100644 index 4485c94e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/resolver/AnnotationResourceResolver.java +++ /dev/null @@ -1,126 +0,0 @@ -package cd.casic.module.process.core.resolver; - -import cd.casic.module.process.core.context.ApplicationContextContext; -import org.springframework.beans.BeansException; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.StandardEnvironment; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.type.AnnotationMetadata; -import org.springframework.core.type.ClassMetadata; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; -import org.springframework.util.ClassUtils; -import org.springframework.util.StringUtils; - -import java.lang.annotation.Annotation; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -public class AnnotationResourceResolver { - private static final PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - private static final SimpleMetadataReaderFactory register = new SimpleMetadataReaderFactory(); - private static final StandardEnvironment environment = new StandardEnvironment(); - - public AnnotationResourceResolver() { - } - - public static Set resolveBeans(String pkgPath, Class annoClazz) { - Set clazzSet = new HashSet(); - ConfigurableApplicationContext applicationContext = ApplicationContextContext.getApplicationContext(); - Map beansWithAnnotationMap = applicationContext.getBeansWithAnnotation(annoClazz); - Iterator var5 = beansWithAnnotationMap.entrySet().iterator(); - - while(var5.hasNext()) { - Map.Entry entry = (Map.Entry)var5.next(); - Object object = entry.getValue(); - Class clazz = object.getClass(); - clazzSet.add(clazz); - } - - return clazzSet; - } - - public static Set resolve(String pkgPath, Class annoClazz) { - Set paths = new HashSet(); - - try { - String pathPackage = getResourcePath(pkgPath); - Resource[] resources = resolver.getResources(pathPackage); - - for(int i = 0; i < resources.length; ++i) { - Resource resource = resources[i]; - MetadataReader metadataReader = register.getMetadataReader(resource); - AnnotationMetadata annotationMetadata = metadataReader.getAnnotationMetadata(); - if (annotationMetadata.hasAnnotation(annoClazz.getName())) { - ClassMetadata classMetadata = metadataReader.getClassMetadata(); - String className = classMetadata.getClassName(); - ClassLoader classLoader = getClassLoader(); - Class clazz = classLoader.loadClass(className); - paths.add(clazz); - } - } - - return paths; - } catch (Exception var13) { - throw new RuntimeException(var13); - } - } - - public static Set resolveFromBeans(String pkgPath, Class annoClazz) { - Set paths = new HashSet(); - ConfigurableApplicationContext applicationContext = ApplicationContextContext.getApplicationContext(); - - try { - String pathPackage = getResourcePath(pkgPath); - Resource[] resources = resolver.getResources(pathPackage); - - for(int i = 0; i < resources.length; ++i) { - Resource resource = resources[i]; - MetadataReader metadataReader = register.getMetadataReader(resource); - AnnotationMetadata annotationMetadata = metadataReader.getAnnotationMetadata(); - if (annotationMetadata.hasAnnotation(annoClazz.getName())) { - ClassMetadata classMetadata = metadataReader.getClassMetadata(); - String className = classMetadata.getClassName(); - ClassLoader classLoader = getClassLoader(); - Class clazz = classLoader.loadClass(className); - - try { - Object bean = applicationContext.getBean(clazz); - if (bean == null) { - continue; - } - } catch (BeansException var15) { - continue; - } - - paths.add(clazz); - } - } - - return paths; - } catch (Exception var16) { - throw new RuntimeException(var16); - } - } - - public static String getResourcePath(String packagePath) { - if (StringUtils.isEmpty(packagePath)) { - return ""; - } else { - String resourcePath = "classpath*:" + ClassUtils.convertClassNameToResourcePath(environment.resolveRequiredPlaceholders(packagePath)) + "/**/*.class"; - return resourcePath; - } - } - - static ClassLoader getClassLoader() { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if (classLoader == null) { - classLoader = ClassLoader.getSystemClassLoader(); - } - - return classLoader; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/util/BeanUtils.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/util/BeanUtils.java deleted file mode 100644 index 8e6cde94..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/core/util/BeanUtils.java +++ /dev/null @@ -1,42 +0,0 @@ -package cd.casic.module.process.core.util; - -import cd.casic.ci.commons.exception.SystemException; - -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -public class BeanUtils { - public BeanUtils() { - } - - public static PropertyDescriptor getPropertyDescriptor(Class clazz, String propertyName) { - try { - StringBuffer sb = new StringBuffer(); - Field f = null; - - try { - f = clazz.getDeclaredField(propertyName); - } catch (NoSuchFieldException var8) { - return null; - } - - if (f == null) { - throw new SystemException("propertyName:" + propertyName + " not found."); - } else { - String var10000 = propertyName.substring(0, 1).toUpperCase(); - String methodEnd = var10000 + propertyName.substring(1); - sb.append("set" + methodEnd); - Method setMethod = clazz.getDeclaredMethod(sb.toString(), f.getType()); - sb.delete(0, sb.length()); - sb.append("get" + methodEnd); - Method getMethod = clazz.getDeclaredMethod(sb.toString()); - PropertyDescriptor pd = new PropertyDescriptor(propertyName, getMethod, setMethod); - return pd; - } - } catch (Exception var9) { - throw new SystemException("系统错误"); -// throw new SystemException(var9); - } - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/dispatch/package-info.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/dispatch/package-info.java deleted file mode 100644 index 9be32fe9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/dispatch/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @Classname package-info - * @Description TODO - * @Date 2025/4/21 23:20 - * @author by mianbin - */ -package cd.casic.module.process.dispatch; \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/PipelineExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/PipelineExecService.java deleted file mode 100644 index 85d3eb2a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/PipelineExecService.java +++ /dev/null @@ -1,77 +0,0 @@ -package cd.casic.module.process.engine.execute; - - -import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; - -/** - * 流水线运行服务接口 - */ -public interface PipelineExecService { - - /** - * 开始构建 - * - * @param runMsg 流水线id - * @return 开始构建（true:开始运行 false:正在运行） - */ - PipelineInstance start(PipelineRunMsg runMsg); - -// /** -// * 回滚构建 -// * -// * @param runMsg 流水线id -// * @return 开始构建（true:开始运行 false:正在运行） -// */ -// PipelineInstance rollBackStart(PipelineRunMsg runMsg); - - /** - * 停止流水线运行 - * - * @param pipelineId 流水线id - */ - void stop(String pipelineId); - - /** - * 保持运行 - * - * @param pipelineId 流水线id - */ - void keepOn(String pipelineId); - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/impl/PipelineExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/impl/PipelineExecServiceImpl.java deleted file mode 100644 index 39109ae0..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/execute/impl/PipelineExecServiceImpl.java +++ /dev/null @@ -1,368 +0,0 @@ -package cd.casic.module.process.engine.execute.impl; - -import cd.casic.ci.commons.bean.engine.execute.PipelineDetails; -import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg; -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.definition.Variable; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; -import cd.casic.ci.commons.bean.process.instance.PipelineInstanceQuery; -import cd.casic.ci.commons.bean.process.setting.Scm; -import cd.casic.ci.commons.bean.process.stage.Stage; -import cd.casic.ci.commons.bean.work.agent.model.Agent; -import cd.casic.ci.commons.bean.work.agent.AgentMessage; -import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; -import cd.casic.module.process.engine.execute.PipelineExecService; - -import cd.casic.module.process.support.postprocess.service.PostprocessExecService; -import cd.casic.module.process.engine.task.TasksExecService; -import cd.casic.module.process.pipeline.instance.service.PipelineInstanceServiceImpl; -import cd.casic.module.process.process.definition.PipelineService; -import cd.casic.module.process.support.variable.service.VariableService; -import cd.casic.module.process.process.instance.PipelineInstanceService; -import cd.casic.module.process.process.setting.ResourcesService; -import cd.casic.module.process.process.setting.ScmService; -import cd.casic.module.process.process.stage.StageExecService; -import cd.casic.module.process.process.stage.StageService; -import cd.casic.module.process.support.agent.service.AgentService; -import cd.casic.module.process.support.disk.service.DiskService; -import cd.casic.module.process.support.version.service.PipelineVersionService; -import cd.casic.module.process.support.util.PipelineUtilService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.toolkit.join.JoinTemplate; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 流水线运行服务 - */ -@Service -// 这个注解含义不明 -//@Exporter -public class PipelineExecServiceImpl implements PipelineExecService { - - @Autowired - PipelineService pipelineService; - - @Autowired - PostprocessExecService postExecService; - - @Autowired - PipelineInstanceService pipelineInstanceService; - - @Autowired - TasksExecService tasksExecService; - - @Autowired - StageExecService stageExecService; - - @Autowired - ResourcesService resourcesService; - - @Autowired - PipelineVersionService versionService; - - @Autowired - PipelineUtilService utilService; - - @Autowired - DiskService diskService; - - @Autowired - StageService stageService; - - @Autowired - JoinTemplate joinTemplate; - - @Autowired - ScmService scmService; - - @Autowired - VariableService variableService; - - @Autowired - AgentService agentService; - - public final Logger logger = LoggerFactory.getLogger(PipelineExecServiceImpl.class); - - //流水线id:流水线实例id - public static final Map pipelineIdOrInstanceId = new HashMap<>(); - - //流水线id:agent - public static final Map pipelineIdOrAgentId = new HashMap<>(); - - - /** - * 流水线开始运行 - * @param runMsg 流水线id - * @return 是否正在运行 - */ - @Override - public PipelineInstance start(PipelineRunMsg runMsg) { - Agent agent; - if (StringUtils.isEmpty(runMsg.getAgentId())){ - agent = agentService.findDefaultAgent(); - }else { - agent = agentService.findAgent(runMsg.getAgentId()); - } - if (Objects.isNull(agent)){ - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(),"无法获取到流水线执行Agent！"); - } -// TODO 需要引入新依赖，是重写还是直接引入 -// WebSocketSession session = SocketServerHandler.sessionMap.get(agent.getAddress()); -// if (Objects.isNull(session)){ -// throw new ApplicationException("流水线Agent断开连接，无法执行。"); -// } -// -// // 判断同一任务是否在运行 - Pipeline pipeline = validExecPipeline(runMsg); -// String pipelineId = pipeline.getId(); -// pipelineIdOrAgentId.put(pipelineId, agent); - - // 判断磁盘空间是否足够 - diskService.validationStorageSpace(); - - // 资源限制 - resourcesService.judgeResources(); - - // 进入执行 - runMsg.setPipeline(pipeline); - runMsg.setAgent(agent); - return beginExecPipeline(runMsg); - } - - /** - * 放入正在执行的流水线缓存中 - * @param runMsg 流水线id - * @return 流水线信息 - */ - public Pipeline validExecPipeline(PipelineRunMsg runMsg){ - String pipelineId = runMsg.getPipelineId(); - - List allMainStage = stageService.findAllMainStage(pipelineId); - if (allMainStage.isEmpty()){ - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(),"当前流水线不存在可构建任务！"); - } - - Boolean isVip = versionService.isVip(); - - Pipeline pipeline = pipelineService.findPipelineById(pipelineId); - - int size = pipelineIdOrInstanceId.size(); - - // 资源限制放入缓存中等待执行 - if ((!isVip && size >= 2) || (isVip && size >= 4) ){ - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(),"并行任务已满，等待执行！"); - } - return pipeline; - } - - /** - * 执行流水线 - * @param runMsg 流水线信息 - * @return 流水线实例 - */ - public PipelineInstance beginExecPipeline(PipelineRunMsg runMsg){ - String pipelineId = runMsg.getPipelineId(); - Pipeline pipeline = pipelineService.findPipelineById(pipelineId); - pipeline.setState(2); - pipelineService.updatePipeline(pipeline); - runMsg.setPipeline(pipeline); - - logger.info("流水线{}开始运行",pipeline.getName()); - PipelineInstance pipelineInstance = pipelineInstanceService.initializeInstance(runMsg); - // 添加到缓存 - String instanceId = pipelineInstance.getInstanceId(); - pipelineInstanceService.instanceRuntime(pipelineInstance.getInstanceId()); - joinTemplate.joinQuery(pipelineInstance); - - // 运行实例放入内存中 - pipelineIdOrInstanceId.put(pipelineId, instanceId); - - try { - // 创建多阶段运行实例 - List stageList = stageExecService.createStageExecInstance(pipelineId, instanceId); - - List postprocessList = postExecService.createPipelinePostInstance(pipelineId, instanceId); - - PipelineDetails pipelineDetails = new PipelineDetails(); - - // 流水线基本运行信息 - pipelineDetails.setPipelineId(pipelineId); - pipelineDetails.setInstanceId(instanceId); - pipelineDetails.setRunWay(runMsg.getRunWay()); - pipelineDetails.setAgent(runMsg.getAgent()); - - // 流水线运行任务 - pipelineDetails.setStageList(stageList); - - // 流水线后置处理 - pipelineDetails.setPostprocessList(postprocessList); - - // 数据路径，源码，日志保存 - String sourceDir = utilService.findPipelineDefaultAddress(pipelineId,1); - String logDir = utilService.findPipelineDefaultAddress(pipelineId,2); - pipelineDetails.setSourceDir(sourceDir); - pipelineDetails.setLogDir(logDir); - - // 环境 - List scmList = scmService.findAllPipelineScm(); - pipelineDetails.setScmList(scmList); - - // 变量 - List variableList = variableService.findAllVariable(pipelineId); - pipelineDetails.setVariableList(variableList); - - AgentMessage agentMessage = new AgentMessage(); - agentMessage.setType("exec"); - agentMessage.setMessage(pipelineDetails); - agentMessage.setPipelineId(pipelineId); - - Agent agent = pipelineDetails.getAgent(); - - String id = agent.getAddress(); - // TODO 看看是否需要换个实现 -// WebSocketSession session = SocketServerHandler.sessionMap.get(id); -// if (Objects.isNull(session)) { -// throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息："+id); -// } -// -// try { -// SocketServerHandler.instance().sendHandleMessage(id,agentMessage); -// } catch (Exception e) { -// throw new SystemException("客户端推送消息失败,错误信息：" + e.getMessage()); -// } - }catch (Exception e){ - logger.error("流水线执行出错了：{}",e.getMessage() ); - stop(pipelineId); - } - return pipelineInstance; - } - - @Override - public void stop(String pipelineId){ - Pipeline pipeline = pipelineService.findPipelineById(pipelineId); - - Agent agent = pipelineIdOrAgentId.get(pipelineId); - if (Objects.isNull(agent)){ - pipeline.setState(1); - pipelineService.updatePipeline(pipeline); - - PipelineInstanceQuery pipelineInstanceQuery = new PipelineInstanceQuery(); - pipelineInstanceQuery.setState(PipelineFinal.RUN_RUN); - pipelineInstanceQuery.setPipelineId(pipelineId); - List pipelineInstanceList = pipelineInstanceService.findPipelineInstanceList(pipelineInstanceQuery); - for (PipelineInstance pipelineInstance : pipelineInstanceList) { - String instanceId = pipelineInstance.getInstanceId(); - pipelineInstance.setRunStatus(PipelineFinal.RUN_HALT); - int runtime = pipelineInstanceService.findInstanceRuntime(instanceId); - pipelineInstance.setRunTime(runtime); - pipelineInstanceService.updateInstance(pipelineInstance); - } - removeExecCache(pipelineId); - return; - } - - try { - AgentMessage agentMessage = new AgentMessage(); - agentMessage.setType("stop"); - agentMessage.setMessage(pipelineId); - agentMessage.setPipelineId(pipelineId); - // TODO 先放着 -// SocketServerHandler.instance().sendHandleMessage(agent.getAddress(),agentMessage); - }catch (Exception e){ - logger.error(e.getMessage()); - } - - // 添加资源配置 - // resourcesService.instanceResources(integer); - - // 更新流水线状态 - pipeline.setState(1); - pipelineService.updatePipeline(pipeline); - - PipelineInstanceQuery pipelineInstanceQuery = new PipelineInstanceQuery(); - pipelineInstanceQuery.setState(PipelineFinal.RUN_RUN); - pipelineInstanceQuery.setPipelineId(pipelineId); - List pipelineInstanceList = pipelineInstanceService.findPipelineInstanceList(pipelineInstanceQuery); - for (PipelineInstance pipelineInstance : pipelineInstanceList) { - pipelineInstance.setRunStatus(PipelineFinal.RUN_HALT); - int runtime = pipelineInstanceService.findInstanceRuntime(pipelineInstance.getInstanceId()); - pipelineInstance.setRunTime(runtime); - pipelineInstanceService.updateInstance(pipelineInstance); - } - removeExecCache(pipelineId); - } - - public void removeExecCache(String pipelineId){ - String instanceId = pipelineIdOrInstanceId.get(pipelineId); - PipelineInstanceServiceImpl.runTimeMap.remove(instanceId); - pipelineInstanceService.stopThread(instanceId); - pipelineIdOrInstanceId.remove(pipelineId); - } - - @Override - public void keepOn(String pipelineId){ - Agent agent = pipelineIdOrAgentId.get(pipelineId); - String id = agent.getAddress(); - AgentMessage agentMessage = new AgentMessage(); - agentMessage.setType("keepOn"); - agentMessage.setMessage(pipelineId); - agentMessage.setPipelineId(pipelineId); - //TODO -// WebSocketSession session = SocketServerHandler.sessionMap.get(id); -// if (Objects.isNull(session)) { -// throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息："+id); -// } -// -// try { -// SocketServerHandler.instance().sendHandleMessage(id,agentMessage); -// } catch (Exception e) { -// throw new SystemException("客户端推送消息失败,错误信息：" + e.getMessage()); -// } - } - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksCloneService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksCloneService.java deleted file mode 100644 index 93ea3d0f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksCloneService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cd.casic.module.process.engine.task; - - -public interface TasksCloneService { - - - void clonePostTasks(String id, String cloneId); - - void clonePipelineTasks(String id, String cloneId); - - void cloneStageTasks(String id, String cloneId); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksExecService.java deleted file mode 100644 index 65c1dfca..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksExecService.java +++ /dev/null @@ -1,30 +0,0 @@ -package cd.casic.module.process.engine.task; - - -import cd.casic.ci.commons.bean.engine.job.Tasks; - -/** - * 任务执行服务接口 - */ -public interface TasksExecService { - - - /** - * 创建任务或阶段运行实例 - * - * @param task 任务运行信息 - * @param id 流水线实例id或阶段实例id或后置处理实例id - * @param type 1.实例id 2.阶段id 3.后置处理实例id - */ - String createTaskExecInstance(Tasks task, String id, int type, String logPath); - - - /** - * 创建部署任务实例 - * - * @param task 任务运行信息 - * @param taskInstanceId 任务实例id - */ - void createDeployInstance(Tasks task, String taskInstanceId); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksInstanceService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksInstanceService.java deleted file mode 100644 index eea78a69..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksInstanceService.java +++ /dev/null @@ -1,127 +0,0 @@ -package cd.casic.module.process.engine.task; - - -import cd.casic.ci.commons.bean.engine.job.TaskInstance; -import cd.casic.ci.commons.bean.engine.job.TaskInstanceQuery; - -import java.util.List; -import java.util.Map; - -/** - * 任务执行实例服务接口 - */ -public interface TasksInstanceService { - - /** - * 创建任务日志 - * - * @param taskInstance 日志实体 - * @return 任务日志id - */ - String createTaskInstance(TaskInstance taskInstance); - - /** - * 删除实例下的运行实例 - * - * @param instanceId 历史id - */ - void deleteAllInstanceInstance(String instanceId); - - - List findAllInstanceLogs(String instanceId); - - /** - * 删除阶段下的运行实例 - * - * @param stageId 阶段id - */ - void deleteAllStageInstance(String stageId); - - /** - * 查询单个任务运行实例 - * - * @param taskInstanceId 任务实例id - * @return 任务运行实例 - */ - TaskInstance findOneTaskInstance(String taskInstanceId); - - /** - * 更新任务运行实例 - * - * @param taskInstance 任务实例模型 - */ - void updateTaskInstance(TaskInstance taskInstance); - - - /** - * 查询流水线实例下的任务实例 - * - * @param instanceId 实例id - * @return 任务运行实例集合 - */ - List findAllInstanceInstance(String instanceId); - - - /** - * 获取流水线实例的后置任务信息 - * - * @param instanceId 任务实例id - * @return 后置任务信息 - */ - TaskInstance findPostPipelineRunMessage(String instanceId); - - - /** - * 查询阶段下的后置任务实例 - * - * @param id 后置任务阶段id - * @return 后置任务实例集合 - */ - List findStagePostRunMessage(String id); - - /** - * 查询阶段下的任务运行实例 - * - * @param stageId 阶段id - * @return 任务运行实例集合 - */ - List findAllStageInstance(String stageId); - - /** - * 添加任务执行日志 - * - * @param taskId 任务id - * @param log 日志 - */ - void writeExecLog(String taskId, String log); - - - void writeAllExecLog(String taskId, String execLog); - - /** - * 获取Command执行结果 - * - * @param process Command执行实例 - * @param enCode Command编码 - * @param error Command错误编码 - * @param taskId 任务id - * @return 执行结果 true:执行完成 false:执行失败 - */ - boolean readCommandExecResult(Process process, String enCode, Map error, String taskId); - - - String validStatus(String s, Map errors); - - /** - * 查询所有任务日志 - * - * @return 任务日志列表 - */ - List findAllTaskInstance(); - - - List findTaskInstanceList(TaskInstanceQuery query); - - - List findAllInstanceList(List idList); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksService.java deleted file mode 100644 index 9b97863b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/TasksService.java +++ /dev/null @@ -1,179 +0,0 @@ -package cd.casic.module.process.engine.task; - - -import cd.casic.ci.commons.bean.engine.job.Tasks; - -import java.util.List; - -/** - * 流水线流任务服务接口 - */ -public interface TasksService { - - - /** - * 创建任务及详情 - * - * @param tasks 任务详情 - * @return 任务id - */ - String createTasksOrTask(Tasks tasks); - - /** - * 更新任务信息 - * - * @param tasks 更新内容 - */ - void updateTasksTask(Tasks tasks); - - /** - * 更新任务名称 - * - * @param tasks 任务id - */ - void updateTaskName(Tasks tasks); - - /** - * 删除配置及任务 - * - * @param tasksId 配置id - */ - void deleteTasksOrTask(String tasksId); - - /** - * 删除流水线所有配置及任务 - * - * @param pipelineId 流水线id - */ - void deleteAllTasksOrTask(String pipelineId, int pipelineType); - - /** - * 获取流水线任务 - * - * @param pipelineId 流水线id - * @return 任务列表 - */ - List finAllPipelineTask(String pipelineId); - - /** - * 获取阶段任务 - * - * @param stageId 阶段id - * @return 任务列表 - */ - List finAllStageTask(String stageId); - - /** - * 获取后置任务 - * - * @param postId 阶段id - * @return 任务列表 - */ - Tasks findOnePostTask(String postId); - - /** - * 获取后置任务及任务详情 - * - * @param postId 阶段id - * @return 任务列表 - */ - Tasks findOnePostTaskOrTask(String postId); - - /** - * 获取阶段任务及任务详情 - * - * @param stageId 流水线 - * @return 任务列表 - */ - List finStageTaskOrTask(String stageId); - - /** - * 获取阶段任务及任务详情 - * - * @param stageId 流水线 - * @return 任务列表 - */ - List finStageTaskOrTaskNoAuth(String stageId); - - /** - * 效验配置必填字段 - * - * @param tasksList 任务 - * @return 配置id集合 - */ - List validTasksMustField(List tasksList); - - - /** - * 创建任务模板 - * - * @param pipelineId 流水线id - * @param template 模板 - */ - void createTaskTemplate(String pipelineId, String[] template); - - /** - * 删除任务 - * - * @param tasksId 任务id - */ - void deleteTasks(String tasksId); - - /** - * 查询单个任务 - * - * @param tasksId 任务id - * @return 任务 - */ - Tasks findOneTasks(String tasksId); - - /** - * 查询单个任务及任务详情 - * - * @param tasksId 任务id - * @return 任务详细信息 - */ - Tasks findOneTasksOrTask(String tasksId); - - - /** - * 划分任务类型 - * - * @param taskType 任务类型 - * @return 任务类型 - */ - String findTaskType(String taskType); - - - String initDifferentTaskName(String taskType); - - - List findAllTasks(); - - List findTasksList(List idList); - - /** - * 更新任务 - * - * @param tasks 任务 - */ - void updateTasks(Tasks tasks); - -} - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dao/TaskInstanceDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dao/TaskInstanceDao.java deleted file mode 100644 index d1aeb078..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dao/TaskInstanceDao.java +++ /dev/null @@ -1,61 +0,0 @@ -package cd.casic.module.process.engine.task.dao; - -import cd.casic.ci.commons.bean.engine.job.TaskInstanceQuery; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.engine.task.dataobject.TaskInstanceDo; -import cd.casic.module.process.task.task.entity.TaskInstanceEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author by mianbin - * @Classname TaskInstanceDao - * @Description TODO - * @Date 2025/4/23 16:59 - */ -@Mapper -public interface TaskInstanceDao extends BaseMapperX { - /** - * 创建流水线日志 - * @param taskInstanceEntity 流水线历史日志 - * @return 流水线日志id - */ - public String createInstance(TaskInstanceEntity taskInstanceEntity); - - /** - * 删除流水线日志 - * @param id 流水线日志id - */ - public void deleteInstance(String id); - - /** - * 更新流水线日志 - * @param taskInstanceEntity 更新后流水线日志信息 - */ - public void updateInstance(TaskInstanceEntity taskInstanceEntity); - - /** - * 查询流水线日志 - * @param id 查询id - * @return 流水线日志信息 - */ - public TaskInstanceEntity findOne(String id); - - /** - * 查询所有流水线日志 - * @return 流水线日志列表 - */ - public List findAllInstance(); - - public List findStageInstance(String stageId); - - public List findPipelineInstance(String instanceId); - public List findTaskInstanceList(TaskInstanceQuery query); - - - public List findPostInstance(String postprocessId); - - - public List findAllInstanceList(List idList); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dao/TasksDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dao/TasksDo.java deleted file mode 100644 index f54d1cf5..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dao/TasksDo.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.process.engine.task.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname TasksDo - * @Description TODO - * @Date 2025/4/23 17:00 - */ -@Mapper -public interface TasksDo extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dataobject/TaskInstanceDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dataobject/TaskInstanceDo.java deleted file mode 100644 index ce11091e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dataobject/TaskInstanceDo.java +++ /dev/null @@ -1,49 +0,0 @@ -package cd.casic.module.process.engine.task.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 流水线日志 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_instance", autoResultMap = true) -public class TaskInstanceDo extends BaseDO { - - //日志id - @TableId - private String id; - - private String instanceId; - - //运行类型 - private String taskType; - - private int taskSort; - - //运行日志 - private String logAddress; - - //运行时间 - private int runTime; - - //运行状态 - private String runState; - - //阶段id - private String stagesId; - - //任务名称 - private String taskName; - - private String postprocessId; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dataobject/TasksDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dataobject/TasksDo.java deleted file mode 100644 index 63fc2dac..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/engine/task/dataobject/TasksDo.java +++ /dev/null @@ -1,41 +0,0 @@ -package cd.casic.module.process.engine.task.dataobject; - - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 流水线顺序配置实体 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task", autoResultMap = true) -public class TasksDo extends BaseDO { - - //流水线配置id - @TableId - private String taskId; - - //流水线 - private String pipelineId; - - private String stageId; - - private String postprocessId; - - private String taskName; - - //源码类型 - private String taskType; - - //顺序 - private int taskSort; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/HomeCountService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/HomeCountService.java deleted file mode 100644 index c82176e7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/HomeCountService.java +++ /dev/null @@ -1,11 +0,0 @@ -package cd.casic.module.process.home.service; - -import java.util.Map; - -public interface HomeCountService { - - - Map findCount(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/PipelineHomeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/PipelineHomeService.java deleted file mode 100644 index 0c7713c3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/PipelineHomeService.java +++ /dev/null @@ -1,55 +0,0 @@ -package cd.casic.module.process.home.service; - - - -import cd.casic.ci.commons.bean.process.definition.Pipeline; - -import java.util.List; -import java.util.Map; - -/** - * 流水线首页服务接口 - */ - -public interface PipelineHomeService { - - /** - * 创建日志 - * @param logType 日志类型 (创建 create，删除 delete，执行 exec，更新 update) - * @param map 日志信息 - */ - void log(String logType, Map map); - - - /** - * 配置全局消息 - * @param templateId 方案id - * @param map 信息 - */ - void settingMessage(String templateId, Map map); - - - /** - * 创建消息 - * @param receiver 接收信息 - * @param map 信息 - */ - void message(Map map, List receiver); - - /** - * 发送短信 - * @param map 短信内容 - */ - void smsMessage(Map map); - - /** - * 初始化消息，日志信息 - * @param pipeline 流水线 - * @return 信息 - */ - Map initMap(Pipeline pipeline); - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/impl/HomeCountServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/impl/HomeCountServiceImpl.java deleted file mode 100644 index 8b654861..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/impl/HomeCountServiceImpl.java +++ /dev/null @@ -1,159 +0,0 @@ -package cd.casic.module.process.home.service.impl; - - -import cd.casic.module.process.home.service.HomeCountService; -import cd.casic.module.process.licence.appauth.service.ApplyAuthService; -import cd.casic.module.process.licence.licence.model.Version; -import cd.casic.module.process.licence.licence.service.VersionService; -import cd.casic.module.process.message.MessageNoticeService; -import cd.casic.module.process.message.setting.MessageSendTypeService; -import cd.casic.module.process.security.backups.service.BackupsDbService; -import cd.casic.module.process.setting.service.*; -import cd.casic.module.process.support.util.util.PipelineFinal; -import jakarta.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -@Service -public class HomeCountServiceImpl implements HomeCountService { - - -// @Resource -// UserService userService; -// -// @Resource -// OrgaService orgaService; -// -// @Resource -// UserDirService userDirService; -// -// @Resource -// UserGroupService userGroupService; -// -// @Resource -// RoleService roleService; - - @Resource - MessageNoticeService noticeService; - - @Resource - MessageSendTypeService sendTypeService; - - @Resource - VersionService versionService; - - @Resource - ApplyAuthService applyAuthService; - - @Resource - BackupsDbService backupsDbService; - - @Resource - EnvService envService; - - @Resource - ScmService scmService; - - @Resource - GroupService groupService; - - @Resource - AuthService authService; - - @Resource - AuthHostService authHostService; - - @Resource - AuthThirdService authThirdService; - - @Resource - AuthHostGroupService authHostGroupService; - - @Override - public Map findCount(){ - - Map map = new HashMap<>(); - // TODO 用户相关先空置 -// Integer userNumber = userService.findUserNumber(); -// map.put("userNumber",userNumber); -// -// Integer orgaNumber = orgaService.findOrgaNumber(); -// map.put("orgaNumber",orgaNumber); -// -// Integer userDirNumber = userDirService.findUserDirNumber(); -// map.put("userDirNumber",userDirNumber); -// -// Integer userGroupNumber = userGroupService.findUserGroupNumber(); -// map.put("userGroupNumber",userGroupNumber); -// -// Integer roleNumber = roleService.findRoleNumber(); -// map.put("roleNumber",roleNumber); - - Integer noticeNumber = noticeService.findNoticeNumber(PipelineFinal.appName); - map.put("noticeNumber",noticeNumber); - - Integer sendTypeNumber = sendTypeService.findSendTypeNumber(); - map.put("sendTypeNumber",sendTypeNumber); - - Version version = versionService.getVersion(); - map.put("version",version.getExpired()); - - Integer applyAuthNumber = applyAuthService.findApplyAuthNumber(); - map.put("applyAuthNumber",applyAuthNumber); - - String lastBackupsTime = backupsDbService.findLastBackupsTime(); - map.put("lastBackupsTime",lastBackupsTime); - - Integer envNumber = envService.findEnvNumber(); - map.put("envNumber",envNumber); - - Integer scmNumber = scmService.findScmNumber(); - map.put("scmNumber",scmNumber); - - Integer groupNumber = groupService.findGroupNumber(); - map.put("groupNumber",groupNumber); - - Integer authNumber = authService.findAuthNumber(); - map.put("authNumber",authNumber); - - Integer hostNumber = authHostService.findHostNumber(); - map.put("hostNumber",hostNumber); - - Integer serverNumber = authThirdService.findAuthServerNumber(); - map.put("serverNumber",serverNumber); - - Integer hostGroupNumber = authHostGroupService.findHostGroupNumber(); - map.put("hostGroupNumber",hostGroupNumber); - - return map; - } - - - -} - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/impl/PipelineHomeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/impl/PipelineHomeServiceImpl.java deleted file mode 100644 index e8b19919..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/home/service/impl/PipelineHomeServiceImpl.java +++ /dev/null @@ -1,197 +0,0 @@ -package cd.casic.module.process.home.service.impl; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.module.process.home.service.PipelineHomeService; -import cd.casic.module.process.message.message.SendMessageNoticeService; -import cd.casic.module.process.message.message.model.Message; -import cd.casic.module.process.message.message.model.MessageReceiver; -import cd.casic.module.process.message.message.model.SendMessageNotice; -import cd.casic.module.process.message.model.setting.MessageType; -import cd.casic.module.process.security.logging.logging.model.Logging; -import cd.casic.module.process.security.logging.logging.model.LoggingType; -import cd.casic.module.process.security.logging.logging.service.LoggingByTempService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.user.user.User; -import com.alibaba.fastjson.JSONObject; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; - -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -public class PipelineHomeServiceImpl implements PipelineHomeService { -// @Resource -// UserService userService; - - @Resource - LoggingByTempService logService; - - @Resource - SendMessageNoticeService dispatchNoticeService; - - @Value("${base.url:null}") - String baseUrl; - - String appName = PipelineFinal.appName; - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - public final ExecutorService executorService = Executors.newCachedThreadPool(); - - /** - * 初始化消息，日志信息 - * @param pipeline 流水线 - * @return 信息 - */ - @Override - public HashMap initMap(Pipeline pipeline){ - HashMap map = new HashMap<>(); - // TODO 整合成我们自己的用户体系 -// String userId = LoginContext.getLoginId(); -// if (Objects.isNull(userId)){ -// userId = pipeline.getUser().getId(); -// } -// User user = userService.findOne(userId); -// map.put("pipelineId", pipeline.getId()); -// map.put("pipelineName", pipeline.getName()); -// map.put("userName", user.getName()); -// if (user.getNickname() != null){ -// map.put("userName", user.getNickname()); -// } - return map; - } - - /** - * 创建日志 - * @param logType 日志类型 - * @param map 日志信息 - */ - @Override - public void log(String logType, Map map){ - logger.info("创建日志......"); - executorService.submit(() -> { - try { - Logging log = new Logging(); - - //消息类型 - LoggingType opLogType = new LoggingType(); - opLogType.setId(logType); - log.setActionType(opLogType); - log.setModule("pipeline"); - -// //用户信息 -// String userId = LoginContext.getLoginId(); -// User user = userService.findOne(userId); - - String link = (String) map.get("link"); - String pipelineName = (String) map.get("pipelineName"); - -// log.setUser(user); - log.setLink(link); - log.setAction(pipelineName); - log.setBaseUrl(baseUrl); - log.setBgroup(appName); - log.setData(JSONObject.toJSONString(map)); - - logService.createLog(log); - }catch (Exception e){ - logger.error("日志创建失败:{}",e.getMessage()); - } - }); - } - - /** - * 配置全局消息 - * @param templateId 方案id - * @param map 信息 - */ - @Override - public void settingMessage(String templateId,Map map){ - logger.info("发送消息......"); - executorService.submit(() -> { - try { - String link = (String) map.get("link"); - map.put("qywxurl", link); - SendMessageNotice dispatchNotice = new SendMessageNotice(); - dispatchNotice.setId(templateId); - String jsonString = JSONObject.toJSONString(map); - dispatchNotice.setEmailData(jsonString); - dispatchNotice.setDingdingData(jsonString); - dispatchNotice.setSiteData(jsonString); - dispatchNotice.setQywechatData(jsonString); - dispatchNotice.setBaseUrl(baseUrl); - String pipelineName = (String) map.get("pipelineName"); - dispatchNotice.setLink(link); - dispatchNotice.setAction(pipelineName); - // TODO 替换成系统自带的上下文 -// dispatchNotice.setSendId(LoginContext.getLoginId()); - if (!Objects.isNull(map.get("dmMessage")) && (Boolean)map.get("dmMessage")){ - String pipelineId = (String) map.get("pipelineId"); - dispatchNotice.setDomainId(pipelineId); - dispatchNoticeService.sendDmMessageNotice(dispatchNotice); - }else { - dispatchNoticeService.sendMessageNotice(dispatchNotice); - } - }catch (Exception e){ - logger.error(e.getMessage()); - }; - }); - - - } - - /** - * 发送消息（指定类型） - * @param receiver 接收信息 - * @param map 信息 - */ - @Override - public void message(Map map, List receiver){ - logger.info("发送指定类型消息......"); - Message message = new Message(); - - String sendWay = (String)map.get("sendWay"); - String mesType = (String)map.get("mesType"); - - //消息类型 - MessageType messageType = new MessageType(); - messageType.setId(mesType); - message.setMessageType(messageType); - - //发送方式 - message.setMessageSendTypeId(sendWay); - message.setData(map); - message.setBaseUrl(baseUrl); - - List list = new ArrayList<>(); - for (String s : receiver) { - MessageReceiver messageReceiver = new MessageReceiver(); - messageReceiver.setUserId(s); - messageReceiver.setPhone(s); - messageReceiver.setEmail(s); - list.add(messageReceiver); - } - message.setMessageReceiverList(list); -// message.setSendId(LoginContext.getLoginId()); - String pipelineName = (String) map.get("pipelineName"); - message.setAction(pipelineName); - dispatchNoticeService.sendMessage(message); - } - - - - /** - * 发送短信 - * @param map 短信内容 - */ - @Override - public void smsMessage(Map map){ - - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuth.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuth.java deleted file mode 100644 index 2075c256..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuth.java +++ /dev/null @@ -1,10 +0,0 @@ -package cd.casic.module.process.licence.appauth.model; - -import java.util.List; - -public class ApplyAuth { - private Integer userNumber; - private Integer residueNumber; - private Integer allUserNumber; - private List userList; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUser.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUser.java deleted file mode 100644 index 5de10488..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUser.java +++ /dev/null @@ -1,19 +0,0 @@ -package cd.casic.module.process.licence.appauth.model; - -import cd.casic.module.process.user.user.User; -import jakarta.validation.constraints.NotNull; - -public class ApplyAuthUser { - private String id; - @NotNull -// @Mappings({@Mapping( -// source = "user.id", -// target = "userId" -// )}) -// @JoinQuery( -// key = "id" -// ) - private User user; - private Integer type; - private String state; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUserQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUserQuery.java deleted file mode 100644 index deaae184..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/model/ApplyAuthUserQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.process.licence.appauth.model; - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class ApplyAuthUserQuery { - private String id; - private String userId; - private String state; - private List orderParams = OrderBuilders.instance().desc("id").get(); - private PageParam pageParam = new PageParam(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/service/ApplyAuthService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/service/ApplyAuthService.java deleted file mode 100644 index 76369542..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/appauth/service/ApplyAuthService.java +++ /dev/null @@ -1,24 +0,0 @@ -package cd.casic.module.process.licence.appauth.service; - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.licence.appauth.model.ApplyAuth; -import cd.casic.module.process.licence.appauth.model.ApplyAuthUser; -import cd.casic.module.process.licence.appauth.model.ApplyAuthUserQuery; - -public interface ApplyAuthService { - ApplyAuth findApplyAuth(); - - Integer findApplyAuthNumber(); - - void createUserApplyAuth(String var1, String var2); - - void addUserApplyAuth(String var1); - - void deleteUserApplyAuth(String var1); - - String findUserApplyAuth(String var1); - - void removeUserApplyAuth(String var1); - - PageResult findApplyAuthPage(ApplyAuthUserQuery var1); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/licence/model/Version.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/licence/model/Version.java deleted file mode 100644 index bb22ef55..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/licence/model/Version.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.licence.licence.model; - -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class Version { - @NotNull - private Integer release; - @NotNull - private Boolean expired; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/licence/service/VersionService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/licence/service/VersionService.java deleted file mode 100644 index 49d54bfb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/licence/licence/service/VersionService.java +++ /dev/null @@ -1,7 +0,0 @@ -package cd.casic.module.process.licence.licence.service; - -import cd.casic.module.process.licence.licence.model.Version; - -public interface VersionService { - Version getVersion(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/MessageNoticeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/MessageNoticeService.java deleted file mode 100644 index 6be76c8a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/MessageNoticeService.java +++ /dev/null @@ -1,36 +0,0 @@ -package cd.casic.module.process.message; - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.message.model.MessageNotice; -import cd.casic.module.process.message.model.message.MessageNoticeQuery; -import cd.casic.module.process.message.model.message.MessageSync; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -import java.util.List; - -public interface MessageNoticeService { - String createMessageNotice(@NotNull @Valid MessageNotice var1); - - String cloneMessageNotice(String var1); - - void updateMessageNotice(@NotNull @Valid MessageNotice var1); - - void deleteMessageNotice(@NotNull String var1); - -// @FindOne - MessageNotice findOne(@NotNull String var1); - -// @FindList - List findList(List var1); - - void updateMessageNoticeState(String var1); - - List findMessageNoticeList(MessageNoticeQuery var1); - - PageResult findMessageNoticePage(MessageNoticeQuery var1); - - void syncMessageNotice(MessageSync var1); - - Integer findNoticeNumber(String var1); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/MessageDmNoticeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/MessageDmNoticeService.java deleted file mode 100644 index 9d86d382..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/MessageDmNoticeService.java +++ /dev/null @@ -1,32 +0,0 @@ -package cd.casic.module.process.message.message; - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.message.message.model.MessageDmNotice; -import cd.casic.module.process.message.message.model.MessageDmNoticeQuery; -import cd.casic.module.process.message.message.model.MessageNoticePatch; - -import java.util.List; - -public interface MessageDmNoticeService { - void initMessageDmNotice(MessageNoticePatch var1); - - String createMessageDmNotice(MessageDmNotice var1); - - void addMessageDmNotice(MessageDmNotice var1); - - void updateMessageDmNotice(MessageDmNotice var1); - - void deleteMessageDmNotice(String var1); - - MessageDmNotice findOneMessageDmNotice(String var1); - - List findAllMessageDmNotice(); - - void updateMessageDmNoticeState(String var1); - - List findMessageDmNoticeList(List var1); - - List findMessageDmNoticeList(MessageDmNoticeQuery var1); - - PageResult findMessageDmNoticePage(MessageDmNoticeQuery var1); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/SendMessageNoticeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/SendMessageNoticeService.java deleted file mode 100644 index 9f2e7412..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/SendMessageNoticeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.process.message.message; - -import cd.casic.module.process.message.message.model.Message; -import cd.casic.module.process.message.message.model.SendMessageNotice; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -public interface SendMessageNoticeService { - String sendMessageNotice(@NotNull @Valid SendMessageNotice var1); - - String sendDmMessageNotice(SendMessageNotice var1); - - String sendMessage(Message var1); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/Message.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/Message.java deleted file mode 100644 index fe7c1e3f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/Message.java +++ /dev/null @@ -1,35 +0,0 @@ -package cd.casic.module.process.message.message.model; - -import cd.casic.module.process.message.model.setting.MessageType; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -@Data -public class Message { - private String id; - @NotNull -// @Mappings({@Mapping( -// source = "messageType.id", -// target = "messageTypeId" -// )}) -// @JoinQuery( -// key = "id" -// ) - private MessageType messageType; - @NotNull - private String baseUrl; - private String messageSendTypeId; - private Map data; - private List messageReceiverList = new ArrayList(); - private String link; - private String action; - private String sendId; - private String receiverName; - private String receiverAccent; - private String sendUserName; - private String sendUserAccent; - private String otherMessage; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNotice.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNotice.java deleted file mode 100644 index cd27ff9b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNotice.java +++ /dev/null @@ -1,23 +0,0 @@ -package cd.casic.module.process.message.message.model; - -import cd.casic.module.process.message.model.MessageNotice; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class MessageDmNotice { - private String id; - @NotNull -// @Mappings({@Mapping( -// source = "messageNotice.id", -// target = "messageNoticeId" -// )}) -// @JoinQuery( -// key = "id" -// ) - private MessageNotice messageNotice; - private String domainId; - private String sourceNoticeId; - private String messageSendTypeId; - private Boolean open; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNoticeQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNoticeQuery.java deleted file mode 100644 index 8ac757a4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageDmNoticeQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.process.message.message.model; - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class MessageDmNoticeQuery { - private String messageNoticeId; - private String domainId; - private String sourceNoticeId; - private List orderParams = OrderBuilders.instance().desc("id").get(); - private PageParam pageParam = new PageParam(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageNoticePatch.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageNoticePatch.java deleted file mode 100644 index b5e9985a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageNoticePatch.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.process.message.message.model; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; -@Data -public class MessageNoticePatch { - private String messageNoticeId; - private String domainId; - private List userGroupList = new ArrayList(); - private List orgaList = new ArrayList(); - private List userList = new ArrayList(); - private List roleList = new ArrayList(); - private List vRoleList = new ArrayList(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageReceiver.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageReceiver.java deleted file mode 100644 index b7895ba2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/MessageReceiver.java +++ /dev/null @@ -1,10 +0,0 @@ -package cd.casic.module.process.message.message.model; - -import lombok.Data; - -@Data -public class MessageReceiver { - private String userId; - private String phone; - private String email; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/SendMessageNotice.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/SendMessageNotice.java deleted file mode 100644 index 4f896199..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/message/model/SendMessageNotice.java +++ /dev/null @@ -1,25 +0,0 @@ -package cd.casic.module.process.message.message.model; - -import cd.casic.module.process.privilege.vRole.model.VRoleDomain; -import cd.casic.module.process.user.user.User; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -import java.util.List; -@Data -public class SendMessageNotice { - private String id; - private String siteData; - private String emailData; - private String qywechatData; - private String dingdingData; - private String appData; - private String domainId; - private VRoleDomain vRoleDomain = new VRoleDomain(); - @NotNull - private String baseUrl; - private String link; - private String action; - private String sendId; - private List userList; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/MessageNotice.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/MessageNotice.java deleted file mode 100644 index 455966a1..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/MessageNotice.java +++ /dev/null @@ -1,34 +0,0 @@ -package cd.casic.module.process.message.model; - -import cd.casic.module.process.message.model.setting.MessageType; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -import java.util.List; - -@Data -public class MessageNotice { - private String id; - @NotNull -// @Mappings({@Mapping( -// source = "messageType.id", -// target = "messageTypeId" -// )}) -// @JoinQuery( -// key = "id" -// ) - private MessageType messageType; - @NotNull - private Integer type; - @NotNull - private String bgroup; - private int scope = 1; - @NotNull - private String messageSendTypeId; - private Boolean open; - private List sendTypeList; - private List groupList; - private List orgaList; - private List userList; - private List roleList; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageNoticeQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageNoticeQuery.java deleted file mode 100644 index 391b6cbb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageNoticeQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -package cd.casic.module.process.message.model.message; - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -@Data -public class MessageNoticeQuery implements Serializable { - private String messageTypeId; - private String messageSendTypeId; - private Integer type; - private int scope = 1; - private String bgroup; - private List orderParams = OrderBuilders.instance().desc("type").get(); - private PageParam pageParam = new PageParam(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageSync.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageSync.java deleted file mode 100644 index fd6e0342..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageSync.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.message.model.message; - -import cd.casic.module.process.message.model.MessageNotice; -import cd.casic.module.process.message.model.setting.MessageType; -import lombok.Data; - -import java.util.List; -@Data -public class MessageSync { - private String id; - private String bGroup; - private List messageTemplateList; - private List messageTypeList; - private List messageNoticeList; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageTemplate.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageTemplate.java deleted file mode 100644 index 5739c711..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/message/MessageTemplate.java +++ /dev/null @@ -1,34 +0,0 @@ -package cd.casic.module.process.message.model.message; - -import cd.casic.module.process.message.model.setting.MessageSendType; -import cd.casic.module.process.message.model.setting.MessageType; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class MessageTemplate { - private String id; - @NotNull -// @Mappings({@Mapping( -// source = "msgType.id", -// target = "msgTypeId" -// )}) -// @JoinQuery( -// key = "id" -// ) - private MessageType msgType; - @NotNull -// @Mappings({@Mapping( -// source = "msgSendType.id", -// target = "msgSendTypeId" -// )}) -// @JoinQuery( -// key = "id" -// ) - private MessageSendType msgSendType; - private String title; - private String content; - private String link; - private String linkParams; - private String bgroup; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendType.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendType.java deleted file mode 100644 index 9f96e0d4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendType.java +++ /dev/null @@ -1,11 +0,0 @@ -package cd.casic.module.process.message.model.setting; - -import jakarta.validation.constraints.NotNull; - -public class MessageSendType { - @NotNull - private String id; - @NotNull - private String name; - private String desc; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendTypeQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendTypeQuery.java deleted file mode 100644 index 86e24d1c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageSendTypeQuery.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.process.message.model.setting; - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class MessageSendTypeQuery { - private String name; - private List orderParams = OrderBuilders.instance().asc("name").get(); - private PageParam pageParam = new PageParam(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageType.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageType.java deleted file mode 100644 index 330ff11d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/model/setting/MessageType.java +++ /dev/null @@ -1,13 +0,0 @@ -package cd.casic.module.process.message.model.setting; - -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class MessageType { - private String id; - @NotNull - private String name; - private String desc; - private String bgroup; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/setting/MessageSendTypeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/setting/MessageSendTypeService.java deleted file mode 100644 index 38558aca..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/message/setting/MessageSendTypeService.java +++ /dev/null @@ -1,34 +0,0 @@ -package cd.casic.module.process.message.setting; - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.message.model.setting.MessageSendType; -import cd.casic.module.process.message.model.setting.MessageSendTypeQuery; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -import java.util.List; - -public interface MessageSendTypeService { - String createMessageSendType(@NotNull @Valid MessageSendType var1); - - void updateMessageSendType(@NotNull @Valid MessageSendType var1); - - void deleteMessageSendType(@NotNull String var1); - -// @FindOne - MessageSendType findOne(@NotNull String var1); - -// @FindList - List findList(List var1); - - MessageSendType findMessageSendType(@NotNull String var1); - -// @FindAll - List findAllMessageSendType(); - - List findMessageSendTypeList(MessageSendTypeQuery var1); - - PageResult findMessageSendTypePage(MessageSendTypeQuery var1); - - Integer findSendTypeNumber(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineFollowService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineFollowService.java deleted file mode 100644 index 5a7bfbb9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineFollowService.java +++ /dev/null @@ -1,59 +0,0 @@ -package cd.casic.module.process.pipeline.definition; - - - -import cd.casic.ci.commons.bean.process.definition.PipelineFollow; -import cd.casic.ci.commons.bean.process.definition.PipelineFollowQuery; - -import java.util.List; - -/** - * 流水线收藏服务接口 - */ -public interface PipelineFollowService { - - /** - * 创建收藏 - * @param pipelineFollow 收藏模型 - */ - void updateFollow(PipelineFollow pipelineFollow); - - /** - * 获取用户收藏的流水线 - * @param userId 用户id - * @return 收藏的流水线 - */ - List findUserFollowPipeline(String userId); - - /** - * 条件查询 - * @param followQuery 条件 - * @return 查询结果 - */ - List findFollowQueryList(PipelineFollowQuery followQuery); - - /** - * 删除收藏 - * @param followId 收藏id - */ - void deleteFollow(String followId); - - - void deletePipelineFollow(String pipelineId); - - /** - * 查询单个信息 - * @param followId 收藏id - * @return 收藏信息 - */ - PipelineFollow findOneFollow(String followId); - - /** - * 查询所有收藏 - * @return 收藏集合 - */ - List findAllFollow(); - - List findAllFollowList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineOpenService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineOpenService.java deleted file mode 100644 index ce36775b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineOpenService.java +++ /dev/null @@ -1,60 +0,0 @@ -package cd.casic.module.process.pipeline.definition; - - - -import cd.casic.ci.commons.bean.process.definition.PipelineOpen; - -import java.util.List; - -/** - * 流水线最近打开服务接口 - */ -// todo -//@JoinProvider(model = PipelineOpen.class) -public interface PipelineOpenService { - - /** - * 查询用户最近打开流水线(详细信息) - * @param number 查询数量 - * @return 最近打开的流水线 - */ - List findUserAllOpen(int number); - - /** - * 查询用户最近打开流水线 - * @param number 查询数量 - * @return 最近打开的流水线 - */ - List findUserOpen(int number); - - /** - * 删除流水线收藏 - * @param pipelineId 流水线id - */ - void deleteAllOpen(String pipelineId); - - /** - * 获取打开的流水线 - * @param pipelineId 流水线id - */ - void updatePipelineOpen(String pipelineId); - - /** - * 查询单个次数信息 - * @param openId 次数id - * @return 次数信息 - */ -// @FindOne - PipelineOpen findOneOpen(String openId); - - /** - * 查询所有次数 - * @return 次数集合 - */ -// @FindAll - List findAllOpen(); - -// @FindList - List findAllOpenList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineService.java deleted file mode 100644 index 5b5daff6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineService.java +++ /dev/null @@ -1,165 +0,0 @@ -package cd.casic.module.process.pipeline.definition; - - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.definition.PipelineQuery; -import cd.casic.ci.commons.bean.process.definition.PipelineRecently; -import cd.casic.framework.commons.pojo.PageResult; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -import java.util.List; - -/** - * 流水线服务接口 - */ -//@JoinProvider(model = Pipeline.class) -public interface PipelineService { - - /** - * 创建流水线 - * @param pipeline 流水线信息 - * @return 流水线id - */ - String createPipeline(@NotNull @Valid Pipeline pipeline); - - /** - * 删除流水线 - * @param pipelineId 流水线id - */ - void deletePipeline(@NotNull String pipelineId); - - /** - * 更新流水线 - * @param pipeline 更新后流水线信息 - */ - void updatePipeline(@NotNull @Valid Pipeline pipeline); - - /** - * 查询单个流水线 - * @param pipelineId 流水线id - * @return 流水线信息 - */ -// @FindOne - Pipeline findPipelineById(@NotNull String pipelineId); - - - Pipeline findPipelineByIdNoQuery(String pipelineId); - - /** - * 该接口返回用户流水线 - * @param pipelineId 流水线Id - * @return 流水线 - */ - Pipeline findOnePipeline(String pipelineId); - - /** - * 该接口返回用户流水线 - * @param pipelineId 流水线Id - * @return 流水线 - */ - Pipeline findPipelineNoQuery(String pipelineId); - - /** - * 查询所有流水线 - * @return 流水线列表 - */ -// @FindAll - List findAllPipeline(); - - - List findAllPipelineNoQuery(); - -// @FindList - List findAllPipelineList(List idList); - - /** - * 获取用户流水线 - * @return 流水线信息 - */ - List findUserPipeline(PipelineQuery query); - - /** - * 分页查询流水线信息 - * @param query 查询条件 - * @return 流水线信息 - */ - PageResult findUserPipelinePage(PipelineQuery query); - - - List findPipelineList(PipelineQuery query); - - - /** - * 查询拥有此流水线的用户 - * @param pipelineId 流水线id - * @return 用户信息 - */ - // todo 当前系统不知道有无用户先注释掉 -// List findPipelineUser(String pipelineId); - - - /** - * 查询当前用户最近构建的流水线 - * @return 流水线信息 - */ - List findPipelineRecently(String userId, int number); - - - /** - * 获取clone的流水线名称 - * @param pipelineId 流水线ID - * @return 流水线民初 - */ - String findPipelineCloneName(String pipelineId); - - - /** - * 流水线克隆 - * @param pipelineId 流水线id - */ - void pipelineClone(String pipelineId,String pipelineName); - - - /** - * 获取最近打开的流水线 - * @param number 数量 - * @return 流水线 - */ - List findRecentlyPipeline(Integer number,String pipelineId); - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineYamlService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineYamlService.java deleted file mode 100644 index cd917fce..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/PipelineYamlService.java +++ /dev/null @@ -1,8 +0,0 @@ -package cd.casic.module.process.pipeline.definition; - -public interface PipelineYamlService { - - String importPipelineYaml(String pipelineId); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineEntity.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineEntity.java deleted file mode 100644 index d294e471..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -package cd.casic.module.process.pipeline.definition.entity; - -import lombok.Data; - -@Data -public class PipelineEntity { - //流水线id -// @Id -// @GeneratorValue(length = 12) -// @Column(name = "id") - private String id; - - //流水线名称 -// @Column(name = "name") - private String name; - - //流水线创建人 -// @Column(name = "user_id") - private String userId; - - //流水线创建时间 -// @Column(name = "create_time") - private String createTime; - - //流水线类型 1.多任务 2.多阶段 -// @Column(name = "type") - private int type; - - //运行状态 1.运行中 2.停止中 -// @Column(name = "state") - private int state; - - //项目作用域 1.全局 2.项目 -// @Column(name = "power") - private int power; - - //颜色 1~5随机生成 -// @Column(name="color") - private int color; - -// @Column(name="env_id") - private String envId; - -// @Column(name="group_id") - private String groupId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineFollowEntity.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineFollowEntity.java deleted file mode 100644 index b3957326..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineFollowEntity.java +++ /dev/null @@ -1,20 +0,0 @@ -package cd.casic.module.process.pipeline.definition.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -//@Table(name="pip_other_follow") -@Data -public class PipelineFollowEntity { -// @Id -// @GeneratorValue(length = 12) -// @Column(name = "id") - @TableId - private String id; - -// @Column(name = "pipeline_id") - private String pipelineId; - -// @Column(name = "user_id") - private String userId ; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineOpenEntity.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineOpenEntity.java deleted file mode 100644 index 3994f3d5..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/entity/PipelineOpenEntity.java +++ /dev/null @@ -1,28 +0,0 @@ -package cd.casic.module.process.pipeline.definition.entity; - -import lombok.Data; - -//@Entity -//@Table(name="pip_other_open") -@Data -public class PipelineOpenEntity { - -// @Id -// @GeneratorValue(length = 12) -// @Column(name = "open_id") - private String openId; - -// @Column(name = "pipeline_id") - private String pipelineId; - - //打开次数 -// @Column(name = "number") - private int number ; - -// @Column(name = "user_id") - private String userId ; - -// @Column(name = "create_time") - private String createTime; - -} \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineFollowServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineFollowServiceImpl.java deleted file mode 100644 index 5a56b6f9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineFollowServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package cd.casic.module.process.pipeline.definition.impl; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.definition.PipelineFollow; -import cd.casic.ci.commons.bean.process.definition.PipelineFollowQuery; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.module.process.pipeline.definition.entity.PipelineFollowEntity; -import cd.casic.module.process.process.definition.PipelineFollowService; -import cd.casic.module.process.process.definition.dao.PipelineFollowDao; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; - -import java.util.Collections; -import java.util.List; - -public class PipelineFollowServiceImpl implements PipelineFollowService { - @Resource - PipelineFollowDao pipelineFollowDao; - - @Override - public void updateFollow(PipelineFollow pipelineFollow) { - Pipeline pipeline = pipelineFollow.getPipeline(); - String pipelineId = pipeline.getId(); - if (!PipelineUtil.isNoNull(pipelineId)){ - throw new ServiceException(50001,"流水线id不能为空。"); - } -// TODO -// String userId = LoginContext.getLoginId(); - String userId = ""; - List list = - pipelineFollowDao.findOneUserFollowPipeline(userId, pipelineId); - //用户为收藏该流水线 - if (list.isEmpty()){ - PipelineFollowEntity followEntity = BeanMapper.map(pipelineFollow, PipelineFollowEntity.class); - followEntity.setUserId(userId); - String follow = pipelineFollowDao.createFollow(followEntity); - if (!PipelineUtil.isNoNull(follow)){ - throw new ServiceException(50001,"收藏失败"); - } - //用户已收藏该流水线 - }else { - deleteFollow(list.get(0).getId()); - } - } - - @Override - public List findUserFollowPipeline(String userId){ - List list = - pipelineFollowDao.findUserFollowPipeline(userId); - return BeanMapper.mapList(list, PipelineFollow.class); - } - - @Override - public List findFollowQueryList(PipelineFollowQuery followQuery){ - List list = - pipelineFollowDao.findFollowQueryList(followQuery); - if (list == null || list.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(list, PipelineFollow.class); - } - - @Override - public void deleteFollow(String followId) { - pipelineFollowDao.deleteFollow(followId); - } - - - public void deletePipelineFollow(String pipelineId){ - PipelineFollowQuery followQuery = new PipelineFollowQuery(); - followQuery.setPipelineId(pipelineId); - List list = pipelineFollowDao.findFollowQueryList(followQuery); - - for (PipelineFollowEntity pipelineFollowEntity : list) { - deleteFollow(pipelineFollowEntity.getId()); - } - - } - - @Override - public PipelineFollow findOneFollow(String followId) { - return BeanMapper.map(pipelineFollowDao.findOneFollow(followId), PipelineFollow.class); - } - - @Override - public List findAllFollow() { - return BeanMapper.mapList(pipelineFollowDao.findAllFollow(), PipelineFollow.class); - } - - @Override - public List findAllFollowList(List idList) { - List followList = pipelineFollowDao.findAllFollowList(idList); - return BeanMapper.mapList(followList, PipelineFollow.class); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineOpenServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineOpenServiceImpl.java deleted file mode 100644 index 4ea4cbf2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineOpenServiceImpl.java +++ /dev/null @@ -1,196 +0,0 @@ -package cd.casic.module.process.pipeline.definition.impl; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.definition.PipelineOpen; -import cd.casic.ci.commons.bean.support.count.PipelineOverview; -import cd.casic.ci.commons.utils.PipelineUtil; -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.PipelineOpenEntity; -import cd.casic.module.process.pipeline.overview.service.PipelineOverviewService; -import cd.casic.module.process.process.definition.dao.PipelineDao; -import cd.casic.module.process.process.definition.dao.PipelineOpenDao; -import cd.casic.module.process.support.authority.service.PipelineAuthorityService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import cd.casic.module.process.toolkit.join.JoinTemplate; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -@Service -//@Exporter -public class PipelineOpenServiceImpl implements PipelineOpenService { - - @Resource - PipelineOpenDao pipelineOpenDao; - - @Resource - PipelineAuthorityService authorityService; - - @Resource - PipelineOverviewService overviewService; - - @Resource - JoinTemplate joinTemplate; - - @Resource - PipelineDao pipelineDao; - - - @Override - public void deleteAllOpen(String pipelineId){ - List allOpen = findAllOpenNoQuery(); - if (allOpen.isEmpty()){ - return; - } - for (PipelineOpen pipelineOpen : allOpen) { - Pipeline pipeline = pipelineOpen.getPipeline(); - if (!pipeline.getId().equals(pipelineId)){ - continue; - } - deleteOpen(pipelineOpen.getOpenId()); - } - } - - @Override - public void updatePipelineOpen(String pipelineId) { - if (pipelineId.equals("undefined")){ - return; - } -// TODO -// String userId = LoginContext.getLoginId(); - String userId = ""; - PipelineOpen pipelineOpen = new PipelineOpen(); - pipelineOpen.setPipeline(new Pipeline(pipelineId)); - pipelineOpen.setCreateTime(PipelineUtil.date(1)); - pipelineOpen.setUserId(userId); - createOpen(pipelineOpen); - } - - @Override - public PipelineOpen findOneOpen(String openId) { - PipelineOpenEntity openEntity = pipelineOpenDao.findOneOpen(openId); - PipelineOpen pipelineOpen = BeanMapper.map(openEntity, PipelineOpen.class); - joinTemplate.joinQuery(pipelineOpen); - return pipelineOpen; - } - - public PipelineOpen findOneOpenNoQuery(String openId) { - PipelineOpenEntity openEntity = pipelineOpenDao.findOneOpen(openId); - return BeanMapper.map(openEntity, PipelineOpen.class); - } - - @Override - public List findAllOpen() { - List allOpen = pipelineOpenDao.findAllOpen(); - if (Objects.isNull(allOpen)){ - return Collections.emptyList(); - } - List list = BeanMapper.mapList(allOpen, PipelineOpen.class); - joinTemplate.joinQuery(list); - return list; - } - - public List findAllOpenNoQuery() { - List allOpen = pipelineOpenDao.findAllOpen(); - if (Objects.isNull(allOpen)){ - return Collections.emptyList(); - } - return BeanMapper.mapList(allOpen, PipelineOpen.class); - } - - @Override - public List findAllOpenList(List idList) { - List openList = pipelineOpenDao.findAllOpenList(idList); - return BeanMapper.mapList(openList, PipelineOpen.class); - } - - //更新最近打开 - private void updateOpen(PipelineOpen pipelineOpen) { - pipelineOpenDao.updateOpen(BeanMapper.map(pipelineOpen, PipelineOpenEntity.class)); - } - - //删除最近打开 - private void deleteOpen(String openId) { - pipelineOpenDao.deleteOpen(openId); - } - - //创建最近打开 - private void createOpen(PipelineOpen pipelineOpen) { - pipelineOpenDao.createOpen(BeanMapper.map(pipelineOpen, PipelineOpenEntity.class)); - } - - public List findUserOpen(int number){ - // 获取用户流水线 -// TODO -// String userId = LoginContext.getLoginId(); - String userId = ""; - String[] userPipeline = authorityService.findUserPipelineIdString(userId); - if (userPipeline.length == 0){ - return Collections.emptyList(); - } - - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < userPipeline.length; i++) { - builder.append("'").append(userPipeline[i]).append("'"); - if (i != userPipeline.length-1){ - builder.append(","); - } - } - - List pipelineIds = pipelineOpenDao.findUserOpen(userId, number,builder.toString()); - if (pipelineIds.isEmpty()){ - return Collections.emptyList(); - } - return pipelineIds; - } - - /** - * 查询流水线最近打开 - * @param number 查询数量 - * @return 最近打开的流水线 - */ - @Override - public List findUserAllOpen(int number) { - - // 获取用户流水线 -// String userId = LoginContext.getLoginId(); - String userId = ""; - - List pipelineIds = findUserOpen(number); - if (pipelineIds.isEmpty()){ - return Collections.emptyList(); - } - - List openList = new ArrayList<>(); - - for (String pipelineId : pipelineIds) { - PipelineOpen pipelineOpen = new PipelineOpen(); - - PipelineEntity pipelineEntity = pipelineDao.findPipelineById(pipelineId); - Pipeline pipeline = BeanMapper.map(pipelineEntity, Pipeline.class); - pipelineOpen.setPipeline(pipeline); - - Integer openNumber = pipelineOpenDao.findUserOpenNumber(userId, pipelineId); - pipelineOpen.setNumber(openNumber); - - PipelineOverview pipelineOverview = overviewService.pipelineOverview(pipelineId); - pipelineOpen.setPipelineExecState(pipelineOverview); - - if (Objects.isNull(pipeline) || Objects.isNull(pipeline.getName())){ - deleteOpen(pipelineOpen.getOpenId()); - continue; - } - - openList.add(pipelineOpen); - } - return openList; - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineServiceImpl.java deleted file mode 100644 index c5fa6dd7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineServiceImpl.java +++ /dev/null @@ -1,628 +0,0 @@ -package cd.casic.module.process.pipeline.definition.impl; - - -import cd.casic.ci.commons.bean.process.definition.*; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; -import cd.casic.ci.commons.utils.PipelineFileUtil; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.engine.task.TasksCloneService; -import cd.casic.module.process.engine.task.TasksService; -import cd.casic.module.process.home.service.PipelineHomeService; -import cd.casic.module.process.message.message.MessageDmNoticeService; -import cd.casic.module.process.message.message.model.MessageNoticePatch; -import cd.casic.module.process.pipeline.definition.PipelineFollowService; -import cd.casic.module.process.pipeline.definition.PipelineOpenService; -import cd.casic.module.process.pipeline.definition.PipelineService; -import cd.casic.module.process.pipeline.definition.entity.PipelineEntity; - -import cd.casic.module.process.support.variable.service.VariableService; -import cd.casic.module.process.process.definition.dao.PipelineDao; -import cd.casic.module.process.process.instance.PipelineInstanceService; -import cd.casic.module.process.process.stage.StageService; -import cd.casic.module.process.support.authority.service.PipelineAuthorityService; -import cd.casic.module.process.support.condition.service.ConditionService; -import cd.casic.module.process.support.postprocess.service.PostprocessService; -import cd.casic.module.process.support.trigger.service.TriggerService; -import cd.casic.module.process.support.util.PipelineUtilService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import cd.casic.module.process.toolkit.join.JoinTemplate; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.*; -import java.util.stream.Stream; - -public class PipelineServiceImpl implements PipelineService { - @Resource - JoinTemplate joinTemplate; - -// @Resource -// UserService userService; - - @Resource - PipelineDao pipelineDao; - - @Resource - PipelineInstanceService instanceService; - - @Resource - PipelineHomeService homeService; - - @Resource - PipelineAuthorityService authorityService; - - @Resource - TasksService tasksService; - - @Resource - TasksCloneService tasksCloneService; - - @Resource - StageService stageService; - - @Resource - PipelineFollowService followService; - - @Resource - PipelineUtilService utilService; - - @Resource - PipelineOpenService openService; - - @Resource - PostprocessService postprocessService; - - @Resource - TriggerService triggerService; - - @Resource - VariableService variableService; - - @Resource - ConditionService conditionService; - - @Resource - MessageDmNoticeService messageDmNoticeService; - - - private static final Logger logger = LoggerFactory.getLogger(PipelineServiceImpl.class); - - @Override - public String createPipeline(Pipeline pipeline) { - //随机颜色 - Random random ; - try { - random = SecureRandom.getInstanceStrong(); - } catch (NoSuchAlgorithmException e) { - throw new ServiceException(); - } - pipeline.setColor((random.nextInt(5) + 1)); - pipeline.setCreateTime(PipelineUtil.date(1)); -// if (Objects.isNull(pipeline.getUser()) || StringUtils.isEmpty(pipeline.getUser().getId())){ -// String loginId = LoginContext.getLoginId(); -// pipeline.setUser(new User(loginId)); -// } - - //创建流水线 - PipelineEntity pipelineEntity = BeanMapper.map(pipeline, PipelineEntity.class); - pipelineEntity.setState(1); - String pipelineId = pipelineDao.createPipeline(pipelineEntity); - joinTemplate.joinQuery(pipeline); - pipeline.setId(pipelineId); - - //创建对应流水线模板 - String template = pipeline.getTemplate(); - String[] ints; - switch (template) { - case "2131" -> ints = - new String[]{PipelineFinal.TASK_CODE_GIT, PipelineFinal.TASK_BUILD_MAVEN, PipelineFinal.TASK_DEPLOY_LINUX}; - case "112131" -> ints = - new String[]{PipelineFinal.TASK_CODE_GIT, PipelineFinal.TASK_TEST_MAVENTEST, PipelineFinal.TASK_BUILD_MAVEN, PipelineFinal.TASK_DEPLOY_LINUX}; - case "2231" -> ints = - new String[]{PipelineFinal.TASK_CODE_GIT, PipelineFinal.TASK_TEST_MAVENTEST, PipelineFinal.TASK_DEPLOY_LINUX}; - default -> ints = new String[]{PipelineFinal.TASK_CODE_GIT}; - } - if (pipeline.getType() == 1) { - tasksService.createTaskTemplate(pipelineId , ints); - } - if (pipeline.getType() == 2) { - stageService.createStageTemplate(pipelineId , ints); - } - -// String userId = pipeline.getUser().getId(); -// //流水线关联角色，用户信息 -// authorityService.createDmUser(pipelineId,userId,pipeline.getUserList()); - - // 消息通知方案 - MessageNoticePatch messageNoticePatch = new MessageNoticePatch(); - messageNoticePatch.setDomainId(pipelineId); -// messageNoticePatch.setUserList(List.of(userId)); - messageDmNoticeService.initMessageDmNotice(messageNoticePatch); - - //动态与消息 - Map map =homeService.initMap(pipeline); - map.put("link",PipelineFinal.CREATE_LINK); - map.put("pipelineName",pipeline.getName()); - homeService.log(PipelineFinal.LOG_TYPE_CREATE, map); - homeService.settingMessage(PipelineFinal.MES_CREATE, map); - - return pipelineId; - } - - @Override - public void deletePipeline(String pipelineId) { - Pipeline pipeline = findPipelineById(pipelineId); - // joinTemplate.joinQuery(pipeline); - //删除关联信息 - pipelineDao.deletePipeline(pipelineId); //删除流水线 - - new Thread(() -> { - authorityService.deleteDmUser(pipelineId); //删除关联用户 - logger.warn("删除流水线历史信息...."); - deleteOther(pipelineId); //删除历史,日志,收藏,最近打开 - - //删除配置信息 - logger.warn("删除流水线关联配置信息...."); - if (pipeline.getType() == 1){ - tasksService.deleteAllTasksOrTask(pipelineId,1); - } - if (pipeline.getType() == 2){ - stageService.deleteAllStagesOrTask(pipelineId); - } - }).start(); - - //动态与消息 - Map map = homeService.initMap(pipeline); - homeService.log(PipelineFinal.LOG_TYPE_DELETE, map); - homeService.settingMessage(PipelineFinal.MES_DELETE, map); - - } - - @Override - public void updatePipeline(Pipeline pipeline) { - //更新名称 - Pipeline flow = findPipelineById(pipeline.getId()); - joinTemplate.joinQuery(flow); - //判断名称是否改变 - if (!pipeline.getName().equals(flow.getName())){ - Map map = homeService.initMap(pipeline); - map.put("link",PipelineFinal.UPDATE_LINK); - map.put("message", flow.getName() +"更改为："+pipeline.getName()); - map.put("lastName", flow.getName()); - flow.setName(pipeline.getName()); - map.put("dmMessage",true); - homeService.log(PipelineFinal.LOG_TYPE_UPDATE, map); - homeService.settingMessage(PipelineFinal.MES_UPDATE, map); - } - - //判断权限是否改变 - int pipelinePower = pipeline.getPower(); - if (pipelinePower != flow.getPower() && pipelinePower != 0){ - flow.setPower(pipelinePower); - } - if (pipeline.getState() !=0 ){ - flow.setState(pipeline.getState()); - } - - flow.setEnv(pipeline.getEnv()); - flow.setGroup(pipeline.getGroup()); - - PipelineEntity pipelineEntity = BeanMapper.map(flow, PipelineEntity.class); - pipelineDao.updatePipeline(pipelineEntity); - - } - - //查询 - @Override - public Pipeline findPipelineById(String pipelineId) { - PipelineEntity pipelineEntity = pipelineDao.findPipelineById(pipelineId); - Pipeline pipeline = BeanMapper.map(pipelineEntity, Pipeline.class); - joinTemplate.joinQuery(pipeline); - return pipeline; - } - - @Override - public Pipeline findPipelineByIdNoQuery(String pipelineId) { - PipelineEntity pipelineEntity = pipelineDao.findPipelineById(pipelineId); - return BeanMapper.map(pipelineEntity, Pipeline.class); - } - - @Override - public Pipeline findOnePipeline(String pipelineId){ - return findPipelineById(pipelineId); - } - - @Override - public Pipeline findPipelineNoQuery(String pipelineId){ - PipelineEntity pipelineEntity = pipelineDao.findPipelineById(pipelineId); - return BeanMapper.map(pipelineEntity, Pipeline.class); - } - - //查询所有 - @Override - public List findAllPipeline() { - List list = BeanMapper.mapList(pipelineDao.findAllPipeline(), Pipeline.class); - joinTemplate.joinQuery(list); - return list; - } - - - @Override - public List findAllPipelineNoQuery() { - List list = BeanMapper.mapList(pipelineDao.findAllPipeline(), Pipeline.class); - joinTemplate.joinQuery(list); - return list; - } - - @Override - public List findAllPipelineList(List idList) { - List pipelineEntityList = pipelineDao.findAllPipelineList(idList); - return BeanMapper.mapList(pipelineEntityList, Pipeline.class); - } - - @Override - public List findUserPipeline(PipelineQuery query){ - String[] builder = authorityService.findUserPipelineIdString(query.getUserId()); - query.setIdString(builder); - List userPipeline = findPipelineList(query); - if (Objects.isNull(userPipeline)){ - return Collections.emptyList(); - } - return userPipeline; - } - - @Override - public PageResult findUserPipelinePage(PipelineQuery query){ - String userId = query.getUserId(); - - String[] builders = authorityService.findUserPipelineIdString(userId); - query.setIdString(builders); - // 用户收藏的流水线 - Integer follow = query.getPipelineFollow(); - if (!Objects.isNull(follow) && follow == 1){ - PageResult pipelineListQuery = pipelineDao.findPipelineListQuery(query); - List dataList = pipelineListQuery.getList(); - if (dataList.isEmpty()){ - return PageResult.empty(); - } - - List pipelineList = BeanMapper.mapList(dataList, Pipeline.class); - // TODO 流水线关联上用户 -// List list = new ArrayList<>(); - return new PageResult(pipelineList, pipelineListQuery.getTotal()); -// List userIdList = new ArrayList<>(); -// for (Pipeline pipeline : pipelineList) { -//// userIdList.add(pipeline.getUser().getId()); -// pipeline.setCollect(1); -// Pipeline pipelineMessage = findPipelineExecMessage(pipeline); -// list.add(pipelineMessage); -// } - -// // 查询用户信息 -// Map pipelineUser = findPipelineUser(userIdList); -// -// List pipelines = list.stream() -// .peek(pipeline -> pipeline.setUser(pipelineUser.get(pipeline.getUser().getId()))) -// .toList(); - -// return PaginationBuilder.build(pipelineListQuery,pipelines); - } - - // 查询用户流水线 - PipelineFollowQuery followQuery = new PipelineFollowQuery(); - followQuery.setUserId(userId); - List followPipeline = followService.findFollowQueryList(followQuery); - Map map = new HashMap<>(); - for (PipelineFollow pipelineFollow : followPipeline) { - Pipeline pipeline = pipelineFollow.getPipeline(); - if (Objects.isNull(pipeline)){ - continue; - } - map.put(pipeline.getId(),pipeline.getId()); - } - PageResult pipelinePage = pipelineDao.findPipelinePage(query); - List dataList = pipelinePage.getList(); - List pipelineList = BeanMapper.mapList(dataList, Pipeline.class); - if (pipelineList.isEmpty()){ -// return PaginationBuilder.build(pipelinePage, Collections.emptyList()); - return PageResult.empty(); - } - return new PageResult<>(pipelineList,Long.valueOf(String.valueOf(followPipeline.size())) ); - // TODO 关联上用户信息 -// List list = new ArrayList<>(); -// List userIdList = new ArrayList<>(); -// for (Pipeline pipeline : pipelineList) { -// // 判断是否收藏 -// String s = map.get(pipeline.getId()); -// pipeline.setCollect(0); -// if (!Objects.isNull(s)){ -// pipeline.setCollect(1); -// } -// userIdList.add(pipeline.getUser().getId()); -// list.add(findPipelineExecMessage(pipeline)); -// } -// Map pipelineUser = findPipelineUser(userIdList); -// -// List pipelines = list.stream() -// .peek(pipeline -> pipeline.setUser(pipelineUser.get(pipeline.getUser().getId()))) -// .toList(); -// -// return PaginationBuilder.build(pipelinePage,pipelines); - } - - @Override - public List findPipelineList(PipelineQuery query){ - List pipelineEntityList = pipelineDao.findPipelineList(query); - if (Objects.isNull(pipelineEntityList)){ - return Collections.emptyList(); - } - return BeanMapper.mapList(pipelineEntityList,Pipeline.class); - } -// TODO -// @Override -// public List findPipelineUser(String pipelineId) { -// return authorityService.findPipelineUser(pipelineId); -// } - - @Override - public List findPipelineRecently(String userId, int number){ - - // 筛选出用户拥有的流水线的历史 - String[] userPipeline = authorityService.findUserPipelineIdString(userId); - if (userPipeline.length == 0){ - return Collections.emptyList(); - } - - List instanceList = instanceService.findUserPipelineInstance(userId,number); - if (instanceList.isEmpty()){ - return Collections.emptyList(); - } - - List pipelineInstanceList = new ArrayList<>(); - List pipelineIdList = Arrays.stream(userPipeline).toList(); - for (PipelineInstance instance : instanceList) { - String id = instance.getPipeline().getId(); - boolean containsElement = pipelineIdList.contains(id); - if (!containsElement){ - continue; - } - pipelineInstanceList.add(instance); - } - List list = new ArrayList<>(); - for (PipelineInstance lastInstance : pipelineInstanceList) { - String pipelineId = lastInstance.getPipeline().getId(); - Pipeline pipeline = findPipelineByIdNoQuery(pipelineId); - - PipelineRecently recently = new PipelineRecently(); - recently.setPipelineId(pipelineId); - recently.setPipelineName(pipeline.getName()); - recently.setLastRunState(lastInstance.getRunStatus()); - recently.setNumber(lastInstance.getFindNumber()); - String createTime = lastInstance.getCreateTime(); - recently.setCreateTime(createTime); - Date date = PipelineUtil.StringChengeDate(createTime); - String dateTime = PipelineUtil.findDateTime(date, 3000); - recently.setExecTime(dateTime); - // String formatted = PipelineUtil.formatDateTime(lastInstance.getRunTime()); - // recently.setLastRunTime(formatted); -// recently.setColor(pipeline.getColor()); - recently.setInstanceId(lastInstance.getInstanceId()); - recently.setLastRunType(lastInstance.getRunWay()); - list.add(recently); - } - return list; - } - - @Override - public String findPipelineCloneName(String pipelineId){ - Pipeline pipeline = findPipelineById(pipelineId); - - if (Objects.isNull(pipeline)){ - logger.error("没有查询到当前流水线信息,pipelineId:{}",pipelineId); -// throw new ApplicationException("没有查询到当前流水线信息！"); - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(),"没有查询到当前流水线信息！"); - } - String name = pipeline.getName() + "_copy"; - - // 匹配流水线名称 - int i = 1; - PipelineQuery pipelineQuery = new PipelineQuery(); - pipelineQuery.setPipelineName(name); - pipelineQuery.setEqName(true); - List userPipelineList = findPipelineList(pipelineQuery); - while (!userPipelineList.isEmpty() && i < 10){ - name = pipeline.getName() + "_copy_"+ i ; - pipelineQuery.setPipelineName(name); - userPipelineList = findPipelineList(pipelineQuery); - i ++ ; - } - return name; - } - - @Override - public void pipelineClone(String pipelineId,String pipelineName) { - Pipeline pipeline = findPipelineById(pipelineId); - - if (Objects.isNull(pipeline)){ - logger.error("没有查询到当前流水线信息,pipelineId:{}",pipelineId); - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(),"克隆失败，没有查询到当前流水线信息！"); - } - - pipeline.setName(pipelineName); - - // 克隆流水线 - PipelineEntity pipelineEntity = BeanMapper.map(pipeline, PipelineEntity.class); - String clonePipelineId = pipelineDao.createPipeline(pipelineEntity); - - // 克隆流水线成员以及权限信息 - authorityService.cloneDomainRole(pipelineId,clonePipelineId); - - // 克隆任务 - int type = pipeline.getType(); - if (type == 1){ - // 多任务 - tasksCloneService.clonePipelineTasks(pipelineId,clonePipelineId); - }else { - // 多阶段 - stageService.cloneStage(pipelineId, clonePipelineId); - } - - // 克隆后置任务 - postprocessService.clonePostTask(pipelineId,clonePipelineId); - - // 克隆触发器 - triggerService.cloneTrigger(pipelineId,clonePipelineId); - - // 克隆流水线变量 - variableService.cloneVariable(pipelineId,clonePipelineId); - - } - - @Override - public List findRecentlyPipeline(Integer number,String pipelineId){ - - int i = number + 1; - List userOpenList = openService.findUserOpen(i); - -// String loginId = LoginContext.getLoginId(); - // TODO - String loginId = ""; - String[] builders = authorityService.findUserPipelineIdString(loginId); - - Pipeline pipeline = findPipelineNoQuery(pipelineId); - - // 过滤出当前流水线 - List strings = Stream.of(builders).filter(a -> !a.equals(pipelineId)).toList(); - if (strings.isEmpty()){ - List objects = new ArrayList<>(); - objects.add(pipeline); - return objects; - } - - // 最近没有打开流水线 - if (userOpenList.isEmpty()){ - List pipelineEntityList = pipelineDao.findAllPipelineList(strings); - if (pipelineEntityList.size() > number){ - pipelineEntityList.subList(0, number); - } - List pipelineList = BeanMapper.mapList(pipelineEntityList, Pipeline.class); - pipelineList.add(0,pipeline); - return pipelineList; - } - - // 过滤出当前流水线 - List pieplineIdList = userOpenList.stream().filter(s -> !s.equals(pipelineId)) - .toList(); - - // 获取最近打开以及拥有权限的流水线 - List collect = strings.stream() - .filter(pieplineIdList::contains).distinct().toList(); - - List idStrings = new ArrayList<>(collect); - - // 判断是否超出数量 - if (collect.size() >= number){ - idStrings = idStrings.subList(0, number); - }else { - List collect1 = strings.stream().filter(element -> !pieplineIdList.contains(element)).toList(); - if (collect1.size() >= number - collect.size()){ - idStrings.addAll(collect.size()-1,collect1.subList(0,number - collect.size())); - }else { - idStrings.addAll(collect.size()-1,collect1); - } - } - // if (strings.isEmpty()){ - // List objects = new ArrayList<>(); - // objects.add(pipeline); - // return objects; - // } - - List pipelineList = findAllPipelineList(idStrings); - pipelineList.add(0,pipeline); - - return pipelineList; - } - - /** - * 删除关联信息 - * @param pipelineId 流水线Id - */ - private void deleteOther(String pipelineId){ - - //删除对应的历史 - instanceService.deleteAllInstance(pipelineId); - - //删除对应源码文件 - String fileAddress = utilService.findPipelineDefaultAddress(pipelineId,1); - PipelineFileUtil.deleteFile(new File(fileAddress)); - - //删除对应日志 - String logAddress = utilService.findPipelineDefaultAddress(pipelineId,2); - PipelineFileUtil.deleteFile(new File(logAddress)); - - // 删除最近打开 - openService.deleteAllOpen(pipelineId); - - // 删除收藏 - followService.deletePipelineFollow(pipelineId); - } - - /** - * 添加流水线执行信息 - * @param pipeline 流水线 - * @return 流水线 - */ - public Pipeline findPipelineExecMessage(Pipeline pipeline){ - PipelineInstance latelyHistory = instanceService.findLatelyInstance(pipeline.getId()); - if (!Objects.isNull(latelyHistory)){ - - pipeline.setBuildStatus(latelyHistory.getRunStatus()); - pipeline.setNumber(latelyHistory.getFindNumber()); - pipeline.setInstanceId(latelyHistory.getInstanceId()); - - String createTime = latelyHistory.getCreateTime(); - Date date = PipelineUtil.StringChengeDate(createTime); - String dateTime = PipelineUtil.findDateTime(date, 1000); - if (!Objects.isNull(dateTime)){ - pipeline.setLastBuildTime(dateTime); - // pipeline.setBuildStatus(latelyHistory.getRunStatus()); - // pipeline.setNumber(latelyHistory.getFindNumber()); - // pipeline.setInstanceId(latelyHistory.getInstanceId()); - } - } - return pipeline; - } - - /** - * 根据用户Id查询用户 - * @param userIdString 用户Id - * @return 用户 - */ -// public Map findPipelineUser(List userIdString){ -// -// // 使用Stream API去除重复元素 -// List uniqueList = userIdString.stream() -// .distinct() -// .toList(); -// -// Map map = new HashMap<>(); -// -// List list = userService.findList(uniqueList); -// for (User user : list) { -// if (Objects.isNull(user)){ -// continue; -// } -// map.put(user.getId(),user); -// } -// return map; -// } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineYamlServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineYamlServiceImpl.java deleted file mode 100644 index b4ef221d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/definition/impl/PipelineYamlServiceImpl.java +++ /dev/null @@ -1,650 +0,0 @@ -package cd.casic.module.process.pipeline.definition.impl; - - -import cd.casic.ci.commons.bean.engine.job.Tasks; -import cd.casic.ci.commons.bean.process.stage.Stage; -import cd.casic.ci.commons.bean.support.deploy.TaskDeploy; -import cd.casic.module.process.engine.task.TasksService; -import cd.casic.module.process.pipeline.definition.PipelineYamlService; -import cd.casic.module.process.pipeline.definition.entity.PipelineEntity; -import cd.casic.module.process.process.definition.dao.PipelineDao; -import cd.casic.module.process.setting.service.AuthHostService; -import cd.casic.module.process.setting.service.AuthService; -import cd.casic.module.process.setting.service.AuthThirdService; -import cd.casic.module.process.stages.service.StageService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.task.artifact.model.TaskArtifact; -import cd.casic.module.process.task.artifact.service.TaskArtifactXpackService; -import cd.casic.module.process.task.build.model.TaskBuild; -import cd.casic.module.process.task.code.model.TaskCode; -import cd.casic.module.process.task.code.service.TaskCodeGittokService; -import cd.casic.module.process.task.codescan.model.TaskCodeScan; -import cd.casic.module.process.task.test.model.TaskTest; -import cd.casic.module.process.task.test.service.TaskTestOnService; -import com.alibaba.fastjson.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; - -import java.util.*; - -@Service -public class PipelineYamlServiceImpl implements PipelineYamlService { - - @Autowired - PipelineDao pipelineDao; - - @Autowired - AuthHostService authHostService; - - @Autowired - AuthThirdService authThirdService; - - @Autowired - TaskTestOnService taskTestOnService; - - @Autowired - TaskCodeGittokService taskCodeGittokService; - - @Autowired - TaskArtifactXpackService taskArtifactXpackService; - - @Autowired - AuthService authService; - - @Autowired - PipelineYamlService pipelineYamlService; - - @Autowired - TasksService tasksService; - - @Autowired - StageService stageService; - - private static final Logger logger = LoggerFactory.getLogger(PipelineYamlService.class); - - - @Override - public String importPipelineYaml(String pipelineId){ - - PipelineEntity pipeline = pipelineDao.findPipelineById(pipelineId); - - Map properties = new HashMap<>(); - properties.put("pipeline", Map.of("name", pipeline.getName())); - - DumperOptions options = new DumperOptions(); - options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - - Yaml yaml = new Yaml(options); - - // 将Java对象转换为YAML字符串 - String yamlString = yaml.dump(properties); - - return importStageYaml(yamlString,pipelineId); - - // int type = pipeline.getType(); - // - // if (type == 1){ - // return importTaskYaml(yamlString,pipelineId); - // }else { - // return importStageYaml(yamlString,pipelineId); - // } - } - - // /** - // * 导出多任务配置为Yaml格式 - // * @param yamlString yaml - // * @param pipelineId 流水线 - // * @return Yaml格式支付串 - // */ - // private String importTaskYaml(String yamlString,String pipelineId){ - // - // DumperOptions options = new DumperOptions(); - // options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - // - // Yaml yaml = new Yaml(options); - // Map data = yaml.load(yamlString); - // - // List> taskList = new ArrayList<>(); - // - // List tasksList = tasksService.finAllPipelineTaskOrTask(pipelineId); - // for (Tasks tasks : tasksList) { - // LinkedHashMap tasksMap = new LinkedHashMap<>(); - // - // LinkedHashMap taskDetails = new LinkedHashMap<>(); - // - // taskDetails.put("taskId",tasks.getTaskId()); - // taskDetails.put("taskName",tasks.getTaskName()); - // findTaskDetails(tasks.getTaskType(), tasks.getTask(), taskDetails); - // - // tasksMap.put("task",taskDetails); - // taskList.add(tasksMap); - // } - // - // Map pipelineMap = (Map) data.get("pipeline"); - // pipelineMap.put("tasks",taskList); - // return yaml.dump(data); - // } - - /** - * 导出多阶段配置为Yaml格式 - * @param yamlString yaml - * @param pipelineId 流水线 - * @return Yaml格式支付串 - */ - private String importStageYaml(String yamlString,String pipelineId){ - - DumperOptions options = new DumperOptions(); - options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - - Yaml yaml = new Yaml(options); - Map data = yaml.load(yamlString); - - List> stageMapList = new ArrayList<>(); - - List stageList = stageService.findAllStagesOrTask(pipelineId); - - for (Stage stage : stageList) { - LinkedHashMap stageMap = new LinkedHashMap<>(); - - List parallelStageList = stage.getStageList(); - - List> parallelMapList = new ArrayList<>(); - LinkedHashMap parallelsMap = new LinkedHashMap<>(); - for (Stage parallelStage : parallelStageList) { - - LinkedHashMap parallelMap = new LinkedHashMap<>(); - - List> taskMapList = new ArrayList<>(); - List taskList = parallelStage.getTaskValues(); - LinkedHashMap tasksMap = new LinkedHashMap<>(); - for (Tasks tasks : taskList) { - - LinkedHashMap taskMap = new LinkedHashMap<>(); - LinkedHashMap taskDetails = new LinkedHashMap<>(); - - taskDetails.put("taskId",tasks.getTaskId()); - taskDetails.put("taskName",tasks.getTaskName()); - findTaskDetails(tasks.getTaskType(), tasks.getTask(), taskDetails); - - taskMap.put("task",taskDetails); - taskMapList.add(taskMap); - - tasksMap.put("parallelId",parallelStage.getStageId()); - tasksMap.put("parallelName",parallelStage.getStageName()); - tasksMap.put("tasks",taskMapList); - } - - parallelMap.put("parallel",tasksMap); - parallelMapList.add(parallelMap); - } - parallelsMap.put("stageId",stage.getStageId()); - parallelsMap.put("stageName",stage.getStageName()); - parallelsMap.put("parallels",parallelMapList); - - stageMap.put("stage",parallelsMap); - stageMapList.add(stageMap); - } - Map pipelineMap = (Map) data.get("pipeline"); - pipelineMap.put("stages",stageMapList); - - return yaml.dump(data); - } - - - private LinkedHashMap findTaskDetails(String taskType,Object object,LinkedHashMap taskDetails){ - if (Objects.isNull(object)){ - return null; - } - switch (taskType){ - case PipelineFinal.TASK_CODE_GIT , PipelineFinal.TASK_CODE_GITEE , PipelineFinal.TASK_CODE_GITHUB , - PipelineFinal.TASK_CODE_GITLAB, PipelineFinal.TASK_CODE_XCODE, PipelineFinal.TASK_CODE_SVN ->{ - return taskCodeDetails(taskType,object,taskDetails); - } - case PipelineFinal.TASK_BUILD_MAVEN, PipelineFinal.TASK_BUILD_NODEJS ->{ - return taskBuildDetails(taskType,object,taskDetails); - } - case PipelineFinal.TASK_TEST_MAVENTEST, PipelineFinal.TASK_TEST_TESTON ->{ - return taskTestDetails(taskType,object,taskDetails); - } - case PipelineFinal.TASK_DEPLOY_LINUX , PipelineFinal.TASK_DEPLOY_DOCKER ->{ - return taskDeployDetails(taskType,object,taskDetails); - } - case PipelineFinal.TASK_ARTIFACT_NEXUS , PipelineFinal.TASK_ARTIFACT_SSH , PipelineFinal.TASK_ARTIFACT_XPACK ->{ - return taskArtifactDetails(taskType,object,taskDetails); - } - case PipelineFinal.TASK_CODESCAN_SONAR ->{ - return taskCodeScanDetails(taskType,object,taskDetails); - } - } - return null; - } - - - private LinkedHashMap taskCodeDetails(String taskType,Object object,LinkedHashMap taskDetailsMap){ - String string = JSONObject.toJSONString(object); - - TaskCode taskCode = JSONObject.parseObject(string, TaskCode.class); - if (!Objects.isNull(taskCode.getAuthId())){ - taskDetailsMap.put("authId",taskCode.getAuthId()); - } - if (!taskType.equals(PipelineFinal.TASK_CODE_SVN)){ - if (!Objects.isNull(taskCode.getCodeName())){ - taskDetailsMap.put("url",taskCode.getCodeName()); - } - if (!Objects.isNull(taskCode.getCodeBranch())){ - taskDetailsMap.put("branch",taskCode.getCodeBranch()); - }else { - taskDetailsMap.put("branch", PipelineFinal.TASK_CODE_DEFAULT_BRANCH); - } - }else { - if (!Objects.isNull(taskCode.getCodeName())){ - taskDetailsMap.put("detection_url",taskCode.getCodeName()); - } - - if (!Objects.isNull(taskCode.getSvnFile())){ - taskDetailsMap.put("detection_file",taskCode.getSvnFile()); - } - } - - // switch (taskType){ - // case PipelineFinal.TASK_CODE_GIT, PipelineFinal.TASK_CODE_GITLAB ->{ - // if (!Objects.isNull(taskCode.getAuthId())){ - // taskDetailsMap.put("authId",taskCode.getAuthId()); - // } - // if (!Objects.isNull(taskCode.getCodeName())){ - // taskDetailsMap.put("url",taskCode.getCodeName()); - // } - // - // if (!Objects.isNull(taskCode.getCodeBranch())){ - // taskDetailsMap.put("branch",taskCode.getCodeBranch()); - // }else { - // taskDetailsMap.put("branch", PipelineFinal.TASK_CODE_DEFAULT_BRANCH); - // } - // } - // case PipelineFinal.TASK_CODE_GITEE, PipelineFinal.TASK_CODE_GITHUB ->{ - // if (!Objects.isNull(taskCode.getAuthId())){ - // taskDetailsMap.put("authId",taskCode.getAuthId()); - // } - // if (!Objects.isNull(taskCode.getCodeName())){ - // taskDetailsMap.put("repository_name",taskCode.getCodeName()); - // } - // if (!Objects.isNull(taskCode.getCodeAddress())){ - // taskDetailsMap.put("repository_url",taskCode.getCodeAddress()); - // } - // - // if (!Objects.isNull(taskDetailsMap.get("authId"))){ - // String authId = (String) taskDetailsMap.get("authId"); - // String repositoryName = (String) taskDetailsMap.get("repository_name"); - // String houseUrl = codeThirdService.getHouseUrl(authId, repositoryName, taskType); - // taskCode.setCodeAddress(houseUrl); - // taskDetailsMap.put("repository_url",houseUrl); - // } - // - // if (!Objects.isNull(taskCode.getCodeBranch())){ - // taskDetailsMap.put("branch",taskCode.getCodeBranch()); - // }else { - // taskDetailsMap.put("branch", PipelineFinal.TASK_CODE_DEFAULT_BRANCH); - // } - // } - // case PipelineFinal.TASK_CODE_XCODE ->{ - // String authId = taskCode.getAuthId(); - // if (!Objects.isNull(authId)){ - // taskDetailsMap.put("authId",taskCode.getAuthId()); - // } - // if (!Objects.isNull(taskCode.getRepository())){ - // String rpyId = taskCode.getRepository().getRpyId(); - // taskDetailsMap.put("repository_id",rpyId); - // ThirdHouse thirdHouse = taskCodeGittokService. - // findStoreHouse((String) taskDetailsMap.get("authId"), rpyId); - // if (!Objects.isNull(thirdHouse)) { - // // taskCode.setRepository(thirdHouse); - // taskDetailsMap.put("repository_url",thirdHouse.getHouseWebUrl()); - // taskDetailsMap.put("repository_name",thirdHouse.getName()); - // } - // } - // taskDetailsMap.put("branch", PipelineFinal.TASK_CODE_DEFAULT_BRANCH); - // if (!Objects.isNull(taskCode.getBranch())){ - // String branchId = taskCode.getBranch().getBranchId(); - // String authId1 = (String) taskDetailsMap.get("authId"); - // String rpyId1 = (String) taskDetailsMap.get("repository_id"); - // XcodeBranch xcodeBranch = taskCodeGittokService.findOneBranch(authId1, rpyId1,branchId); - // if (!Objects.isNull(xcodeBranch)){ - // taskCode.setBranch(xcodeBranch); - // taskDetailsMap.put("branch_name",xcodeBranch.getBranchName()); - // } - // }else { - // taskDetailsMap.put("branch", PipelineFinal.TASK_CODE_DEFAULT_BRANCH); - // } - // } - // case PipelineFinal.TASK_CODE_SVN ->{ - // if (!Objects.isNull(taskCode.getAuthId())){ - // taskDetailsMap.put("authId",taskCode.getAuthId()); - // } - // if (!Objects.isNull(taskCode.getCodeName())){ - // taskDetailsMap.put("detection_url",taskCode.getCodeName()); - // } - // - // if (!Objects.isNull(taskCode.getSvnFile())){ - // taskDetailsMap.put("detection_file",taskCode.getSvnFile()); - // } - // } - // } - return taskDetailsMap; - } - - - private LinkedHashMap taskCodeScanDetails(String taskType,Object object,LinkedHashMap taskDetailsMap){ - String string = JSONObject.toJSONString(object); - - TaskCodeScan taskCodeScan = JSONObject.parseObject(string, TaskCodeScan.class); - - switch (taskType){ - case PipelineFinal.TASK_CODESCAN_SONAR ->{ - if (!Objects.isNull(taskCodeScan.getAuthId())){ - taskDetailsMap.put("authId",taskCodeScan.getAuthId()); - } - if (!Objects.isNull(taskCodeScan.getProjectName())){ - taskDetailsMap.put("project_name",taskCodeScan.getProjectName()); - } - } - } - return taskDetailsMap; - } - - - private LinkedHashMap taskTestDetails(String taskType,Object object,LinkedHashMap taskDetailsMap){ - String string = JSONObject.toJSONString(object); - - TaskTest taskTest = JSONObject.parseObject(string, TaskTest.class); - - switch (taskType){ - case PipelineFinal.TASK_TEST_MAVENTEST ->{ - if (!Objects.isNull(taskTest.getTestOrder())){ - taskDetailsMap.put("test_order",taskTest.getTestOrder()); - } - if (!Objects.isNull(taskTest.getAddress())){ - taskDetailsMap.put("pom_address",taskTest.getAddress()); - } - } - case PipelineFinal.TASK_TEST_TESTON ->{ - - if (!Objects.isNull(taskTest.getAuthId())){ - taskDetailsMap.put("authId",taskTest.getAuthId()); - } - - if (!Objects.isNull(taskTest.getWebEnv())){ - taskDetailsMap.put("webEnv",taskTest.getWebEnv().getId()); - } - - if (!Objects.isNull(taskTest.getApiEnv())){ - taskDetailsMap.put("apiEnv",taskTest.getApiEnv().getId()); - } - if (!Objects.isNull(taskTest.getAppEnv())){ - taskDetailsMap.put("appEnv",taskTest.getAppEnv().getId()); - } - if (!Objects.isNull(taskTest.getTestPlan())){ - taskDetailsMap.put("testPlan",taskTest.getTestPlan().getId()); - } - if (!Objects.isNull(taskTest.getTestSpace())){ - taskDetailsMap.put("testSpace",taskTest.getTestSpace().getId()); - } - } - } - return taskDetailsMap; - } - - - private LinkedHashMap taskBuildDetails(String taskType,Object object,LinkedHashMap taskDetailsMap){ - String string = JSONObject.toJSONString(object); - - TaskBuild taskBuilder = JSONObject.parseObject(string, TaskBuild.class); - - switch (taskType){ - case PipelineFinal.TASK_BUILD_MAVEN ->{ - if (!Objects.isNull(taskBuilder.getBuildOrder())){ - taskDetailsMap.put("mvn_order",taskBuilder.getBuildOrder()); - } - if (!Objects.isNull(taskBuilder.getBuildAddress())){ - taskDetailsMap.put("pom_address",taskBuilder.getBuildAddress()); - } - if (!Objects.isNull(taskBuilder.getProductRule())){ - taskDetailsMap.put("artifact_role",taskBuilder.getProductRule()); - } - } - case PipelineFinal.TASK_BUILD_NODEJS ->{ - if (!Objects.isNull(taskBuilder.getBuildOrder())){ - taskDetailsMap.put("npm_order",taskBuilder.getBuildOrder()); - } - if (!Objects.isNull(taskBuilder.getBuildAddress())){ - taskDetailsMap.put("model_address",taskBuilder.getBuildAddress()); - } - if (!Objects.isNull(taskBuilder.getProductRule())){ - taskDetailsMap.put("artifact_role",taskBuilder.getProductRule()); - } - } - } - return taskDetailsMap; - } - - - private LinkedHashMap taskDeployDetails(String taskType,Object object,LinkedHashMap taskDetailsMap){ - String string = JSONObject.toJSONString(object); - - TaskDeploy taskDeploy = JSONObject.parseObject(string, TaskDeploy.class); - - switch (taskType){ - case PipelineFinal.TASK_DEPLOY_LINUX ->{ - if (taskDeploy.getAuthType() != 0){ - taskDetailsMap.put("deploy_type",taskDeploy.getAuthType()); - } - - if (taskDeploy.getAuthType() == 1){ - if (!Objects.isNull(taskDeploy.getAuthId())){ - taskDetailsMap.put("authId",taskDeploy.getAuthId()); - } - if (!Objects.isNull(taskDeploy.getDeployAddress())){ - taskDetailsMap.put("deploy_address",taskDeploy.getDeployAddress()); - } - } - if (!Objects.isNull(taskDeploy.getDeployOrder())){ - taskDetailsMap.put("deploy_order",taskDeploy.getDeployOrder()); - } - } - case PipelineFinal.TASK_DEPLOY_DOCKER->{ - if (!Objects.isNull(taskDeploy.getAuthId())){ - taskDetailsMap.put("authId",taskDeploy.getAuthId()); - } - if (!Objects.isNull(taskDeploy.getDockerImage())){ - taskDetailsMap.put("image",taskDeploy.getDockerImage()); - } - if (!Objects.isNull(taskDeploy.getDeployAddress())){ - taskDetailsMap.put("deploy_address",taskDeploy.getDeployAddress()); - } - if (!Objects.isNull(taskDeploy.getDeployOrder())){ - taskDetailsMap.put("deploy_order",taskDeploy.getDeployOrder()); - } - } - } - return taskDetailsMap; - } - - - private LinkedHashMap taskArtifactDetails(String taskType,Object object,LinkedHashMap taskDetailsMap){ - String string = JSONObject.toJSONString(object); - - TaskArtifact taskArtifact = JSONObject.parseObject(string, TaskArtifact.class); - - String artifactType = taskArtifact.getArtifactType(); - taskDetailsMap.put("artifact_type",artifactType); - switch (taskType){ - case PipelineFinal.TASK_ARTIFACT_MAVEN ->{ - switch (artifactType){ - case PipelineFinal.TASK_ARTIFACT_NEXUS ->{ - if (!Objects.isNull(taskArtifact.getArtifactId())){ - taskDetailsMap.put("artifact_id",taskArtifact.getArtifactId()); - } - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("auth_id",taskArtifact.getAuthId()); - } - if (!Objects.isNull(taskArtifact.getGroupId())){ - taskDetailsMap.put("group_id",taskArtifact.getGroupId()); - } - if (!Objects.isNull(taskArtifact.getVersion())){ - taskDetailsMap.put("version",taskArtifact.getVersion()); - } - if (!Objects.isNull(taskArtifact.getFileAddress())){ - taskDetailsMap.put("file_address",taskArtifact.getFileAddress()); - } - if (!Objects.isNull(taskArtifact.getRule())){ - taskDetailsMap.put("rule",taskArtifact.getRule()); - } - } - case PipelineFinal.TASK_ARTIFACT_SSH ->{ - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("auth_id",taskArtifact.getAuthId()); - } - if (!Objects.isNull(taskArtifact.getPutAddress())){ - taskDetailsMap.put("remote_address",taskArtifact.getPutAddress()); - } - if (!Objects.isNull(taskArtifact.getFileAddress())){ - taskDetailsMap.put("fileAddress",taskArtifact.getFileAddress()); - } - if (!Objects.isNull(taskArtifact.getFileAddress())){ - taskDetailsMap.put("put_address",taskArtifact.getPutAddress()); - } - if (!Objects.isNull(taskArtifact.getRule())){ - taskDetailsMap.put("rule",taskArtifact.getRule()); - } - } - case PipelineFinal.TASK_ARTIFACT_XPACK ->{ - if (!Objects.isNull(taskArtifact.getArtifactId())){ - taskDetailsMap.put("artifactId",taskArtifact.getArtifactId()); - } - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("authId",taskArtifact.getAuthId()); - } - if (!Objects.isNull(taskArtifact.getGroupId())){ - taskDetailsMap.put("groupId",taskArtifact.getGroupId()); - } - if (!Objects.isNull(taskArtifact.getVersion())){ - taskDetailsMap.put("version",taskArtifact.getVersion()); - } - if (!Objects.isNull(taskArtifact.getRepository())){ - taskDetailsMap.put("repository_id",taskArtifact.getRepository().getId()); - } - } - } - } - case PipelineFinal.TASK_ARTIFACT_NODEJS ->{ - - } - case PipelineFinal.TASK_ARTIFACT_DOCKER ->{ - switch (artifactType){ - case PipelineFinal.TASK_ARTIFACT_NEXUS ->{ - if (!Objects.isNull(taskArtifact.getDockerImage())){ - taskDetailsMap.put("image",taskArtifact.getDockerImage()); - } - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("authId",taskArtifact.getAuthId()); - } - } - } - } - } - return taskDetailsMap; - } - - private LinkedHashMap taskPullArtifactDetails(String taskType,Object object,LinkedHashMap taskDetailsMap){ - String string = JSONObject.toJSONString(object); - - TaskArtifact taskArtifact = JSONObject.parseObject(string, TaskArtifact.class); - - String artifactType = taskArtifact.getArtifactType(); - taskDetailsMap.put("artifact_type",artifactType); - switch (taskType){ - case PipelineFinal.TASK_PULL_MAVEN ->{ - switch (artifactType){ - case PipelineFinal.TASK_ARTIFACT_NEXUS ->{ - if (!Objects.isNull(taskArtifact.getArtifactId())){ - taskDetailsMap.put("artifact_id",taskArtifact.getArtifactId()); - } - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("auth_id",taskArtifact.getAuthId()); - } - if (!Objects.isNull(taskArtifact.getGroupId())){ - taskDetailsMap.put("group_id",taskArtifact.getGroupId()); - } - if (!Objects.isNull(taskArtifact.getVersion())){ - taskDetailsMap.put("version",taskArtifact.getVersion()); - } - if (!Objects.isNull(taskArtifact.getFileAddress())){ - taskDetailsMap.put("file_address",taskArtifact.getFileAddress()); - } - if (!Objects.isNull(taskArtifact.getRule())){ - taskDetailsMap.put("rule",taskArtifact.getRule()); - } - } - case PipelineFinal.TASK_ARTIFACT_SSH ->{ - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("auth_id",taskArtifact.getAuthId()); - } - if (!Objects.isNull(taskArtifact.getPutAddress())){ - taskDetailsMap.put("remote_address",taskArtifact.getPutAddress()); - } - if (!Objects.isNull(taskArtifact.getFileAddress())){ - taskDetailsMap.put("fileAddress",taskArtifact.getFileAddress()); - } - if (!Objects.isNull(taskArtifact.getFileAddress())){ - taskDetailsMap.put("put_address",taskArtifact.getPutAddress()); - } - if (!Objects.isNull(taskArtifact.getRule())){ - taskDetailsMap.put("rule",taskArtifact.getRule()); - } - } - case PipelineFinal.TASK_ARTIFACT_XPACK ->{ - if (!Objects.isNull(taskArtifact.getArtifactId())){ - taskDetailsMap.put("artifactId",taskArtifact.getArtifactId()); - } - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("authId",taskArtifact.getAuthId()); - } - if (!Objects.isNull(taskArtifact.getGroupId())){ - taskDetailsMap.put("groupId",taskArtifact.getGroupId()); - } - if (!Objects.isNull(taskArtifact.getVersion())){ - taskDetailsMap.put("version",taskArtifact.getVersion()); - } - if (!Objects.isNull(taskArtifact.getRepository())){ - taskDetailsMap.put("repository_id",taskArtifact.getRepository().getId()); - } - } - } - } - case PipelineFinal.TASK_PULL_NODEJS ->{ - - } - case PipelineFinal.TASK_PULL_DOCKER ->{ - switch (artifactType){ - case PipelineFinal.TASK_ARTIFACT_NEXUS ->{ - if (!Objects.isNull(taskArtifact.getDockerImage())){ - taskDetailsMap.put("image",taskArtifact.getDockerImage()); - } - if (!Objects.isNull(taskArtifact.getAuthId())){ - taskDetailsMap.put("authId",taskArtifact.getAuthId()); - } - } - } - } - } - return taskDetailsMap; - } - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/PipelineExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/PipelineExecService.java deleted file mode 100644 index 8c57c495..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/PipelineExecService.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.pipeline.execute.service; - - -import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; - -/** - * 流水线运行服务接口 - */ -public interface PipelineExecService { - - /** - * 开始构建 - * - * @param runMsg 流水线id - // * @param startWAy 执行方式（1.手动执行 2.定时器触发） - * @return 开始构建（true:开始运行 false:正在运行） - */ - PipelineInstance start(PipelineRunMsg runMsg); - - /** - * 停止流水线运行 - * @param pipelineId 流水线id - */ - void stop(String pipelineId); - - /** - * 保持运行 - * @param pipelineId 流水线id - */ - void keepOn(String pipelineId); - - - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java deleted file mode 100644 index bff3eb43..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java +++ /dev/null @@ -1,372 +0,0 @@ -package cd.casic.module.process.pipeline.execute.service.impl; - - -import cd.casic.ci.commons.bean.engine.execute.PipelineDetails; -import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg; -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.definition.Variable; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; -import cd.casic.ci.commons.bean.process.instance.PipelineInstanceQuery; -import cd.casic.ci.commons.bean.process.setting.Scm; -import cd.casic.ci.commons.bean.process.stage.Stage; -import cd.casic.ci.commons.bean.work.agent.AgentMessage; -import cd.casic.ci.commons.bean.work.agent.model.Agent; -import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; -import cd.casic.module.process.engine.task.TasksExecService; -import cd.casic.module.process.pipeline.definition.PipelineService; -import cd.casic.module.process.pipeline.execute.service.PipelineExecService; -import cd.casic.module.process.pipeline.instance.service.PipelineInstanceServiceImpl; -import cd.casic.module.process.support.variable.service.VariableService; -import cd.casic.module.process.process.instance.PipelineInstanceService; -import cd.casic.module.process.setting.service.ResourcesService; -import cd.casic.module.process.setting.service.ScmService; -import cd.casic.module.process.stages.service.StageExecService; -import cd.casic.module.process.stages.service.StageService; -import cd.casic.module.process.support.agent.service.AgentService; -import cd.casic.module.process.support.disk.service.DiskService; -import cd.casic.module.process.support.version.service.PipelineVersionService; -import cd.casic.module.process.support.postprocess.service.PostprocessExecService; -import cd.casic.module.process.support.util.PipelineUtilService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.toolkit.join.JoinTemplate; -import cd.casic.module.process.ws.server.SocketServerHandler; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.socket.WebSocketSession; -//import org.springframework.web.socket.WebSocketSession; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 流水线运行服务 - */ -@Service -//@Exporter -public class PipelineExecServiceImpl implements PipelineExecService { - - @Autowired - PipelineService pipelineService; - - @Autowired - PostprocessExecService postExecService; - - @Autowired - PipelineInstanceService pipelineInstanceService; - - @Autowired - TasksExecService tasksExecService; - - @Autowired - StageExecService stageExecService; - - @Autowired - ResourcesService resourcesService; - - @Autowired - PipelineVersionService versionService; - - @Autowired - PipelineUtilService utilService; - - @Autowired - DiskService diskService; - - @Autowired - StageService stageService; - - @Autowired - JoinTemplate joinTemplate; - - @Autowired - ScmService scmService; - - @Autowired - VariableService variableService; - - @Autowired - AgentService agentService; - - public final Logger logger = LoggerFactory.getLogger(PipelineExecServiceImpl.class); - - //流水线id:流水线实例id - public static final Map pipelineIdOrInstanceId = new HashMap<>(); - - //流水线id:agent - public static final Map pipelineIdOrAgentId = new HashMap<>(); - - - /** - * 流水线开始运行 - * - * @param runMsg 流水线id - * @return 是否正在运行 - */ - @Override - public PipelineInstance start(PipelineRunMsg runMsg) { - Agent agent; - if (StringUtils.isEmpty(runMsg.getAgentId())) { - agent = agentService.findDefaultAgent(); - } else { - agent = agentService.findAgent(runMsg.getAgentId()); - } - if (Objects.isNull(agent)) { - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(), "无法获取到流水线执行Agent！"); - } - - WebSocketSession session = SocketServerHandler.sessionMap.get(agent.getAddress()); - if (Objects.isNull(session)) { - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(), "流水线Agent断开连接，无法执行。"); - } - - // 判断同一任务是否在运行 - Pipeline pipeline = validExecPipeline(runMsg); - String pipelineId = pipeline.getId(); - pipelineIdOrAgentId.put(pipelineId, agent); - - // 判断磁盘空间是否足够 - diskService.validationStorageSpace(); - - // 资源限制 - resourcesService.judgeResources(); - - // 进入执行 - runMsg.setPipeline(pipeline); - runMsg.setAgent(agent); - return beginExecPipeline(runMsg); - } - - /** - * 放入正在执行的流水线缓存中 - * - * @param runMsg 流水线id - * @return 流水线信息 - */ - public Pipeline validExecPipeline(PipelineRunMsg runMsg) { - String pipelineId = runMsg.getPipelineId(); - - List allMainStage = stageService.findAllMainStage(pipelineId); - if (allMainStage.isEmpty()) { - throw new ServiceException(2000, "当前流水线不存在可构建任务！"); - } - - Boolean isVip = versionService.isVip(); - - Pipeline pipeline = pipelineService.findPipelineById(pipelineId); - - int size = pipelineIdOrInstanceId.size(); - - // 资源限制放入缓存中等待执行 - if ((!isVip && size >= 2) || (isVip && size >= 4)) { - throw new ServiceException(2000, "并行任务已满，等待执行！"); - } - return pipeline; - } - - /** - * 执行流水线 - * - * @param runMsg 流水线信息 - * @return 流水线实例 - */ - public PipelineInstance beginExecPipeline(PipelineRunMsg runMsg) { - String pipelineId = runMsg.getPipelineId(); - Pipeline pipeline = pipelineService.findPipelineById(pipelineId); - pipeline.setState(2); - pipelineService.updatePipeline(pipeline); - runMsg.setPipeline(pipeline); - - logger.info("流水线{}开始运行", pipeline.getName()); - PipelineInstance pipelineInstance = pipelineInstanceService.initializeInstance(runMsg); - // 添加到缓存 - String instanceId = pipelineInstance.getInstanceId(); - pipelineInstanceService.instanceRuntime(pipelineInstance.getInstanceId()); - joinTemplate.joinQuery(pipelineInstance); - - // 运行实例放入内存中 - pipelineIdOrInstanceId.put(pipelineId, instanceId); - - try { - // 创建多阶段运行实例 - List stageList = stageExecService.createStageExecInstance(pipelineId, instanceId); - - List postprocessList = postExecService.createPipelinePostInstance(pipelineId, instanceId); - - PipelineDetails pipelineDetails = new PipelineDetails(); - - // 流水线基本运行信息 - pipelineDetails.setPipelineId(pipelineId); - pipelineDetails.setInstanceId(instanceId); - pipelineDetails.setRunWay(runMsg.getRunWay()); - pipelineDetails.setAgent(runMsg.getAgent()); - - // 流水线运行任务 - pipelineDetails.setStageList(stageList); - - // 流水线后置处理 - pipelineDetails.setPostprocessList(postprocessList); - - // 数据路径，源码，日志保存 - String sourceDir = utilService.findPipelineDefaultAddress(pipelineId, 1); - String logDir = utilService.findPipelineDefaultAddress(pipelineId, 2); - pipelineDetails.setSourceDir(sourceDir); - pipelineDetails.setLogDir(logDir); - - // 环境 - List scmList = scmService.findAllPipelineScm(); - pipelineDetails.setScmList(scmList); - - // 变量 - List variableList = variableService.findAllVariable(pipelineId); - pipelineDetails.setVariableList(variableList); - - AgentMessage agentMessage = new AgentMessage(); - agentMessage.setType("exec"); - agentMessage.setMessage(pipelineDetails); - agentMessage.setPipelineId(pipelineId); - - Agent agent = pipelineDetails.getAgent(); - - String id = agent.getAddress(); - - WebSocketSession session = SocketServerHandler.sessionMap.get(id); - if (Objects.isNull(session)) { - throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息：" + id); - } - - try { - SocketServerHandler.instance().sendHandleMessage(id, agentMessage); - } catch (Exception e) { - throw new SystemException("客户端推送消息失败,错误信息：" + e.getMessage()); - } - } catch (Exception e) { - logger.error("流水线执行出错了：{}", e.getMessage()); - stop(pipelineId); - } - return pipelineInstance; - } - - @Override - public void stop(String pipelineId) { - Pipeline pipeline = pipelineService.findPipelineById(pipelineId); - - Agent agent = pipelineIdOrAgentId.get(pipelineId); - if (Objects.isNull(agent)) { - pipeline.setState(1); - pipelineService.updatePipeline(pipeline); - - PipelineInstanceQuery pipelineInstanceQuery = new PipelineInstanceQuery(); - pipelineInstanceQuery.setState(PipelineFinal.RUN_RUN); - pipelineInstanceQuery.setPipelineId(pipelineId); - List pipelineInstanceList = pipelineInstanceService.findPipelineInstanceList(pipelineInstanceQuery); - for (PipelineInstance pipelineInstance : pipelineInstanceList) { - String instanceId = pipelineInstance.getInstanceId(); - pipelineInstance.setRunStatus(PipelineFinal.RUN_HALT); - int runtime = pipelineInstanceService.findInstanceRuntime(instanceId); - pipelineInstance.setRunTime(runtime); - pipelineInstanceService.updateInstance(pipelineInstance); - } - removeExecCache(pipelineId); - return; - } - - try { - AgentMessage agentMessage = new AgentMessage(); - agentMessage.setType("stop"); - agentMessage.setMessage(pipelineId); - agentMessage.setPipelineId(pipelineId); - SocketServerHandler.instance().sendHandleMessage(agent.getAddress(), agentMessage); - } catch (Exception e) { - logger.error(e.getMessage()); - } - - // 添加资源配置 - // resourcesService.instanceResources(integer); - - // 更新流水线状态 - pipeline.setState(1); - pipelineService.updatePipeline(pipeline); - - PipelineInstanceQuery pipelineInstanceQuery = new PipelineInstanceQuery(); - pipelineInstanceQuery.setState(PipelineFinal.RUN_RUN); - pipelineInstanceQuery.setPipelineId(pipelineId); - List pipelineInstanceList = pipelineInstanceService.findPipelineInstanceList(pipelineInstanceQuery); - for (PipelineInstance pipelineInstance : pipelineInstanceList) { - pipelineInstance.setRunStatus(PipelineFinal.RUN_HALT); - int runtime = pipelineInstanceService.findInstanceRuntime(pipelineInstance.getInstanceId()); - pipelineInstance.setRunTime(runtime); - pipelineInstanceService.updateInstance(pipelineInstance); - } - removeExecCache(pipelineId); - } - - public void removeExecCache(String pipelineId) { - String instanceId = pipelineIdOrInstanceId.get(pipelineId); - PipelineInstanceServiceImpl.runTimeMap.remove(instanceId); - pipelineInstanceService.stopThread(instanceId); - pipelineIdOrInstanceId.remove(pipelineId); - } - - @Override - public void keepOn(String pipelineId) { - Agent agent = pipelineIdOrAgentId.get(pipelineId); - String id = agent.getAddress(); - AgentMessage agentMessage = new AgentMessage(); - agentMessage.setType("keepOn"); - agentMessage.setMessage(pipelineId); - agentMessage.setPipelineId(pipelineId); - WebSocketSession session = SocketServerHandler.sessionMap.get(id); - if (Objects.isNull(session)) { - throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息：" + id); - } - - try { - SocketServerHandler.instance().sendHandleMessage(id, agentMessage); - } catch (Exception e) { - throw new SystemException("客户端推送消息失败,错误信息：" + e.getMessage()); - } - } - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/instance/service/PipelineInstanceServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/instance/service/PipelineInstanceServiceImpl.java deleted file mode 100644 index fac83c31..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/instance/service/PipelineInstanceServiceImpl.java +++ /dev/null @@ -1,158 +0,0 @@ -package cd.casic.module.process.pipeline.instance.service; - -import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg; -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; -import cd.casic.ci.commons.bean.process.instance.PipelineInstanceQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.engine.task.TasksInstanceService; -import cd.casic.module.process.process.instance.PipelineInstanceService; -import cd.casic.module.process.process.instance.dao.PipelineInstanceDao; -import cd.casic.module.process.process.stage.StageInstanceServer; -import cd.casic.module.process.support.util.PipelineUtilService; -import cd.casic.module.process.task.build.service.TaskBuildProductService; -import cd.casic.module.process.toolkit.join.JoinTemplate; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.io.File; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -/** - * 流水线实例服务 - */ -@Service -//@Exporter TODO -public class PipelineInstanceServiceImpl implements PipelineInstanceService { - public static final Map runTimeMap = new HashMap<>(); - - - @Override - public String createInstance(PipelineInstance pipelineInstance) { - return null; - } - - @Override - public void deleteAllInstance(String pipelineId) { - - } - - @Override - public PipelineInstance initializeInstance(PipelineRunMsg runMsg) { - return null; - } - - @Override - public void deleteInstance(String instanceId) { - - } - - @Override - public void updateInstance(PipelineInstance pipelineInstance) { - - } - - @Override - public PipelineInstance findOneInstance(String instanceId) { - return null; - } - - @Override - public PipelineInstance findLatelyInstance(String pipelineId) { - return null; - } - - @Override - public List findAllInstance() { - return null; - } - - @Override - public List findPipelineAllInstance(String pipelineId) { - return null; - } - - @Override - public List findUserPipelineInstance(String userId, Integer limit) { - return null; - } - - @Override - public String findRunInstanceId(String pipelineId) { - return null; - } - - @Override - public List findInstanceList(List idList) { - return null; - } - - @Override - public List findPipelineInstanceList(PipelineInstanceQuery pipelineInstanceQuery) { - return null; - } - - @Override - public PageResult findUserInstance(PipelineInstanceQuery pipelineInstanceQuery) { - return null; - } - - @Override - public PageResult findPipelineInstance(PipelineInstanceQuery query) { - return null; - } - - @Override - public List findInstanceByTime(String pipelineId, String[] queryTime) { - return null; - } - - @Override - public List findInstanceByTime(String[] queryTime) { - return null; - } - - @Override - public int findInstanceRuntime(String instanceId) { - return 0; - } - - @Override - public void instanceRuntime(String instanceId) { - - } - - @Override - public void stopThread(String threadName) { - - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/overview/service/PipelineOverviewService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/overview/service/PipelineOverviewService.java deleted file mode 100644 index d6003877..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/overview/service/PipelineOverviewService.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.pipeline.overview.service; - - -import cd.casic.ci.commons.bean.support.count.PipelineOverview; - -/** - * 流水线统计服务接口 - */ - -public interface PipelineOverviewService { - - - /** - * 流水线执行信息统计 - * @param pipelineId 流水线id - * @return 统计信息 - */ - PipelineOverview pipelineOverview(String pipelineId); - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/role/model/PatchUser.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/role/model/PatchUser.java deleted file mode 100644 index 17647a3a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/role/model/PatchUser.java +++ /dev/null @@ -1,9 +0,0 @@ -package cd.casic.module.process.privilege.role.model; - -import lombok.Data; - -@Data -public class PatchUser { - private String userId; - private Integer roleType = 0; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/vRole/model/VRole.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/vRole/model/VRole.java deleted file mode 100644 index bbdc0735..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/vRole/model/VRole.java +++ /dev/null @@ -1,11 +0,0 @@ -package cd.casic.module.process.privilege.vRole.model; - -import lombok.Data; - -@Data -public class VRole { - private String id; - private String name; - private String des; - private Integer type; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/vRole/model/VRoleDomain.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/vRole/model/VRoleDomain.java deleted file mode 100644 index a0336e99..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/privilege/vRole/model/VRoleDomain.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.privilege.vRole.model; - -import lombok.Data; - -import java.util.List; -@Data -public class VRoleDomain { - private List vRoleList; - private String domainId; - private String type; - private String modelId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/ConditionService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/ConditionService.java deleted file mode 100644 index bf8b5835..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/ConditionService.java +++ /dev/null @@ -1,91 +0,0 @@ -package cd.casic.module.process.process.definition; - -import cd.casic.ci.commons.bean.process.definition.Condition; - -import java.util.List; - -/** - * 流水线变量服务接口 - */ -public interface ConditionService { - - /** - * 创建条件 - * @param condition 条件 - * @return 条件id - */ - String createCond(Condition condition); - - - /** - * 效验条件 - * @param pipelineId 流水线id - * @param taskId 配置id - * @return 状态 true:条件满足 false:条件不满足 - */ - Boolean variableCondition(String pipelineId,String taskId); - - /** - * 删除条件 - * @param condId 条件id - */ - void deleteCond(String condId); - - /** - * 更新条件 - * @param condition 条件信息 - */ - void updateCond(Condition condition); - - /** - * 查询单个条件 - * @param condId 条件id - * @return 条件信息 - */ - Condition findOneCond(String condId); - - /** - * 查询任务条件 - * @param taskId 任务id - * @return 条件集合 - */ - List findAllTaskCond(String taskId); - - - // 克隆条件 - void cloneCond(String id ,String cloneId); - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineFollowService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineFollowService.java deleted file mode 100644 index a89bb274..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineFollowService.java +++ /dev/null @@ -1,65 +0,0 @@ -package cd.casic.module.process.process.definition; - -import cd.casic.ci.commons.bean.process.definition.PipelineFollow; -import cd.casic.ci.commons.bean.process.definition.PipelineFollowQuery; - -import java.util.List; - -/** - * 流水线收藏服务接口 - */ -public interface PipelineFollowService { - - /** - * 创建收藏 - * @param pipelineFollow 收藏模型 - */ - void updateFollow(PipelineFollow pipelineFollow); - - /** - * 获取用户收藏的流水线 - * @param userId 用户id - * @return 收藏的流水线 - */ - List findUserFollowPipeline(String userId); - - /** - * 条件查询 - * @param followQuery 条件 - * @return 查询结果 - */ - List findFollowQueryList(PipelineFollowQuery followQuery); - - /** - * 删除收藏 - * @param followId 收藏id - */ - void deleteFollow(String followId); - - /** - * 删除流水线相关的所有收藏 - * @param pipelineId 流水线id - */ - void deletePipelineFollow(String pipelineId); - - /** - * 查询单个信息 - * @param followId 收藏id - * @return 收藏信息 - */ - PipelineFollow findOneFollow(String followId); - - /** - * 查询所有收藏 - * @return 收藏集合 - */ - List findAllFollow(); - - /** - * 根据ID列表批量查询收藏信息 - * @param idList 收藏ID列表 - * @return 收藏信息列表 - */ - List findAllFollowList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineOpenService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineOpenService.java deleted file mode 100644 index 95c94b6b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineOpenService.java +++ /dev/null @@ -1,65 +0,0 @@ -package cd.casic.module.process.process.definition; - -import cd.casic.ci.commons.bean.process.definition.PipelineOpen; - -import java.util.List; - -/** - * 流水线最近打开服务接口 - */ -public interface PipelineOpenService { - - /** - * 查询用户最近打开流水线(详细信息) - * - * @param number 查询数量 - * @return 最近打开的流水线 - */ - List findUserAllOpen(int number); - - /** - * 查询用户最近打开流水线 - * - * @param number 查询数量 - * @return 最近打开的流水线 - */ - List findUserOpen(int number); - - /** - * 删除流水线收藏 - * - * @param pipelineId 流水线id - */ - void deleteAllOpen(String pipelineId); - - /** - * 获取打开的流水线 - * - * @param pipelineId 流水线id - */ - void updatePipelineOpen(String pipelineId); - - /** - * 查询单个次数信息 - * - * @param openId 次数id - * @return 次数信息 - */ - PipelineOpen findOneOpen(String openId); - - /** - * 查询所有次数 - * - * @return 次数集合 - */ - List findAllOpen(); - - /** - * 根据ID列表批量查询流水线打开信息 - * - * @param idList 流水线ID列表 - * @return 流水线打开信息列表 - */ - List findAllOpenList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineService.java deleted file mode 100644 index 00fc9341..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineService.java +++ /dev/null @@ -1,199 +0,0 @@ -package cd.casic.module.process.process.definition; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.definition.PipelineQuery; -import cd.casic.ci.commons.bean.process.definition.PipelineRecently; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.system.api.user.dto.AdminUserRespDTO; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -import java.util.List; - -/** - * 流水线服务接口 - */ -public interface PipelineService { - - /** - * 创建流水线 - * - * @param pipeline 流水线信息 - * @return 流水线id - */ - String createPipeline(@NotNull @Valid Pipeline pipeline); - - /** - * 删除流水线 - * - * @param pipelineId 流水线id - */ - void deletePipeline(@NotNull String pipelineId); - - /** - * 更新流水线 - * - * @param pipeline 更新后流水线信息 - */ - void updatePipeline(@NotNull @Valid Pipeline pipeline); - - /** - * 查询单个流水线 - * - * @param pipelineId 流水线id - * @return 流水线信息 - */ - Pipeline findPipelineById(@NotNull String pipelineId); - - - /** - * 查询单个流水线(不进行关联查询) - * - * @param pipelineId 流水线id - * @return 流水线信息 - */ - Pipeline findPipelineByIdNoQuery(String pipelineId); - - /** - * 该接口返回用户流水线 - * - * @param pipelineId 流水线Id - * @return 流水线 - */ - Pipeline findOnePipeline(String pipelineId); - - /** - * 该接口返回用户流水线 - * - * @param pipelineId 流水线Id - * @return 流水线 - */ - Pipeline findPipelineNoQuery(String pipelineId); - - - /** - * 更新流水线负责人 - * - * @param userId 负责人信息 - */ - void updatePipelineRootUser(String userId); - - /** - * 查询所有流水线 - * - * @return 流水线列表 - */ - List findAllPipeline(); - - - /** - * 查询所有流水线(不进行关联查询) - * - * @return 流水线列表 - */ - List findAllPipelineNoQuery(); - - List findAllPipelineList(List idList); - - /** - * 获取用户流水线 - * - * @return 流水线信息 - */ - List findUserPipeline(PipelineQuery query); - - /** - * 分页查询流水线信息 - * - * @param query 查询条件 - * @return 流水线信息 - */ - PageResult findUserPipelinePage(PipelineQuery query); - - - /** - * 根据查询条件获取流水线列表 - * - * @param query 查询条件 - * @return 流水线列表 - */ - List findPipelineList(PipelineQuery query); - - - /** - * 查询拥有此流水线的用户 - * - * @param pipelineId 流水线id - * @return 用户信息 - */ - List findPipelineUser(String pipelineId); - - - /** - * 查询当前用户最近构建的流水线 - * - * @return 流水线信息 - */ - List findPipelineRecently(String userId, int number); - - - /** - * 获取clone的流水线名称 - * - * @param pipelineId 流水线ID - * @return 流水线民初 - */ - String findPipelineCloneName(String pipelineId); - - - /** - * 流水线克隆 - * - * @param pipelineId 流水线id - */ - void pipelineClone(String pipelineId, String pipelineName); - - - /** - * 获取最近打开的流水线 - * - * @param number 数量 - * @return 流水线 - */ - List findRecentlyPipeline(Integer number, String pipelineId); - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineYamlService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineYamlService.java deleted file mode 100644 index b315d11c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/PipelineYamlService.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.process.definition; - -public interface PipelineYamlService { - - /** - * 导入流水线YAML配置 - * @param pipelineId 流水线id - * @return YAML配置内容 - */ - String importPipelineYaml(String pipelineId); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/ConditionDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/ConditionDao.java deleted file mode 100644 index 2ee9974e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/ConditionDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.definition.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.definition.dataobject.ConditionDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname ConditionDao - * @Description TODO - * @Date 2025/4/23 20:37 - */ -@Mapper -public interface ConditionDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineDao.java deleted file mode 100644 index cfefa127..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineDao.java +++ /dev/null @@ -1,110 +0,0 @@ -package cd.casic.module.process.process.definition.dao; - -import cd.casic.ci.commons.bean.process.definition.PipelineQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.pipeline.definition.entity.PipelineEntity; -import cd.casic.module.process.process.definition.dataobject.PipelineDo; -import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.jdbc.core.BeanPropertyRowMapper; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @author by mianbin - * @Classname Pipeline - * @Description TODO - * @Date 2025/4/23 14:13 - */ -@Mapper -public interface PipelineDao extends BaseMapperX { - /** - * 创建流水线 - * @param pipelineEntity 流水线实体 - * @return 流水线id - */ - public String createPipeline(PipelineEntity pipelineEntity); - - /** - * 删除流水线 - * @param id 流水线id - */ - public void deletePipeline(String id); - - /** - * 更新流水线 - * @param pipelineEntity 流水线实体 - */ - public void updatePipeline(PipelineEntity pipelineEntity); - - /** - * 查询单个流水线 - * @param id 流水线id - * @return 流水线信息 - */ - public PipelineEntity findPipelineById(String id); - - /** - * 查询所有流水线 - * @return 流水线列表 - */ - public List findAllPipeline(); - - - public List findAllPipelineList(List idList); - - // 关联查询，查询出收藏的 - public PageResult findPipelineListQuery(PipelineQuery query); - - - // 第一个方法：将字符串中的所有字母都转换为小写 -// public static String toLowerCase(String input) { -// if (input == null) { -// return null; -// } -// StringBuilder result = new StringBuilder(); -// for (char c : input.toCharArray()) { -// // 如果是大写字母，转换为小写 -// if (Character.isUpperCase(c)) { -// result.append(Character.toLowerCase(c)); -// } else { -// result.append(c); -// } -// } -// return result.toString(); -// } - - // 第二个方法：将字符串中的所有字母都转换为大写 -// public static String toUpperCase(String input) { -// if (input == null) { -// return null; -// } -// StringBuilder result = new StringBuilder(); -// for (char c : input.toCharArray()) { -// // 如果是小写字母，转换为大写 -// if (Character.isLowerCase(c)) { -// result.append(Character.toUpperCase(c)); -// } else { -// result.append(c); -// } -// } -// return result.toString(); -// } - - - public List findPipelineList(PipelineQuery query); - - public PageResult findPipelinePage(PipelineQuery query); - -// default String getLowerCase(String pipelineName) { -// return toLowerCase(pipelineName); -// } - - public List findRecentlyPipeline(Object[] pipelineIds, Integer number); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineFollowDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineFollowDao.java deleted file mode 100644 index aef549e9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineFollowDao.java +++ /dev/null @@ -1,74 +0,0 @@ -package cd.casic.module.process.process.definition.dao; - -import cd.casic.ci.commons.bean.process.definition.PipelineFollowQuery; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.pipeline.definition.entity.PipelineFollowEntity; -import cd.casic.module.process.process.definition.dataobject.PipelineFollowDo; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; - -import java.util.List; - -/** - * @author by mianbin - * @Classname PipelineFollowDao - * @Description TODO - * @Date 2025/4/23 14:23 - */ -@Mapper -public interface PipelineFollowDao extends BaseMapperX { - - /** - * 创建收藏 - * @param pipelineFollowEntity 收藏 - * @return 收藏id - */ - public String createFollow(PipelineFollowEntity pipelineFollowEntity); - - /** - * 删除收藏 - * @param followId 收藏id - */ - public void deleteFollow(String followId); - - /** - * 更新收藏 - * @param pipelineFollowEntity 更新信息 - */ - public void updateFollow(PipelineFollowEntity pipelineFollowEntity); - - /** - * 查询单个收藏信息 - * @param followId 收藏id - * @return 收藏信息 - */ - public PipelineFollowEntity findOneFollow(String followId); - - /** - * 查询所有收藏 - * @return 收藏集合 - */ - public List findAllFollow(); - - - public List findAllFollowList(List idList); - - /** - * 查询用户是否收藏该流水线 - * @param userId 用户id - * @param pipelineId 流水线id - * @return 收藏信息 - */ - public List findOneUserFollowPipeline(String userId, String pipelineId); - - /** - * 查询用户是藏的流水线 - * @param userId 用户id - * @return 收藏信息 - */ - public List findUserFollowPipeline(String userId); - - - public List findFollowQueryList(PipelineFollowQuery followQuery); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineOpenDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineOpenDao.java deleted file mode 100644 index e5159dc7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dao/PipelineOpenDao.java +++ /dev/null @@ -1,87 +0,0 @@ -package cd.casic.module.process.process.definition.dao; - -import cd.casic.ci.commons.bean.process.definition.PipelineOpenQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.pipeline.definition.entity.PipelineOpenEntity; -import cd.casic.module.process.process.definition.dataobject.PipelineOpenDo; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.jdbc.core.BeanPropertyRowMapper; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -/** - * @author by mianbin - * @Classname PipelineOpenDao - * @Description TODO - * @Date 2025/4/23 14:25 - */ -@Mapper -public interface PipelineOpenDao extends BaseMapperX { - /** - * 创建次数 - * @param pipelineOpenEntity 次数 - * @return 次数id - */ - public String createOpen(PipelineOpenEntity pipelineOpenEntity); - - /** - * 删除次数 - * @param openId 次数id - */ - public void deleteOpen(String openId); - - /** - * 更新次数 - * @param pipelineOpenEntity 更新信息 - */ - public void updateOpen(PipelineOpenEntity pipelineOpenEntity); - - /** - * 查询单个次数信息 - * @param openId 次数id - * @return 次数信息 - */ - public PipelineOpenEntity findOneOpen(String openId); - - /** - * 查询用户最近打开的流水线 - * @param userId 用户id - * @return 最近打开信息 - */ - public List findUserAllOpen(String userId); - - public Integer findUserOpenNumberByTime(String userId,String pipelineId,String time); - - - public Integer findUserOpenNumber(String userId,String pipelineId); - - public List findUserPipelineOpen(String userId,Integer number); - - public List findUserOpen(String userId,Integer number,String pipelineIds); - - - public List findExpirePipelineOpen(String time); - - - - public String findUserLastOpenPipeline(String userId,String pipelineId); - - - public List findPipelineOpenList(PipelineOpenQuery query); - - - public PageResult findPipelineOpenPage(PipelineOpenQuery query); - - - /** - * 查询所有次数 - * @return 次数集合 - */ - public List findAllOpen(); - - public List findAllOpenList(List idList); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/ConditionDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/ConditionDo.java deleted file mode 100644 index ce0260e3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/ConditionDo.java +++ /dev/null @@ -1,38 +0,0 @@ -package cd.casic.module.process.process.definition.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * @author by mianbin - * @Classname ConditionDo - * @Description TODO - * @Date 2025/4/23 20:36 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_condition", autoResultMap = true) -public class ConditionDo extends BaseDO { - - @TableId - private String condId; - - private String condName; - - private String taskId; -// todo -// private String createTime; - - private int condType; - - private String condKey; - - private String condValue; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineDo.java deleted file mode 100644 index b7155afb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineDo.java +++ /dev/null @@ -1,40 +0,0 @@ -package cd.casic.module.process.process.definition.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 流水线实体 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_pipeline", autoResultMap = true) -public class PipelineDo extends BaseDO { - - //流水线id - @TableId - private String id; - - //流水线名称 - private String name; - - //流水线类型 1.多任务 2.多阶段 - private int type; - - //运行状态 1.运行中 2.停止中 - private int state; - - //项目作用域 1.全局 2.项目 - private int power; - - private String envId; - - private String groupId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineFollowDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineFollowDo.java deleted file mode 100644 index b93dd479..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineFollowDo.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.process.definition.dataobject; - - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 流水线收藏实体 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_other_follow", autoResultMap = true) -public class PipelineFollowDo extends BaseDO { - - @TableId - private String id; - - private String pipelineId; - - private String userId ; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineOpenDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineOpenDo.java deleted file mode 100644 index 01954205..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/definition/dataobject/PipelineOpenDo.java +++ /dev/null @@ -1,31 +0,0 @@ -package cd.casic.module.process.process.definition.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - - -/** - * 流水线最近打开实体 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_other_open", autoResultMap = true) -public class PipelineOpenDo extends BaseDO { - - @TableId - private String openId; - - private String pipelineId; - - //打开次数 - private int number; - - private String userId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/PipelineInstanceService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/PipelineInstanceService.java deleted file mode 100644 index 26ebbaf8..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/PipelineInstanceService.java +++ /dev/null @@ -1,204 +0,0 @@ -package cd.casic.module.process.process.instance; - -import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; -import cd.casic.ci.commons.bean.process.instance.PipelineInstanceQuery; -import cd.casic.framework.commons.pojo.PageResult; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -import java.util.List; - -/** - * 流水线实例服务接口 - */ -public interface PipelineInstanceService { - - /** - * 创建流水线实例 - * - * @param pipelineInstance 流水线实例信息 - * @return 流水线id - */ - String createInstance(@NotNull @Valid PipelineInstance pipelineInstance); - - /** - * 删除流水线实例 - * - * @param pipelineId 流水线id - */ - void deleteAllInstance(@NotNull String pipelineId); - - /** - * 初始化实例信息 - * - * @param runMsg 流水线 - * @return 实例 - */ - PipelineInstance initializeInstance(PipelineRunMsg runMsg); - - - /** - * 删除单个实例 - * - * @param instanceId 实例id - */ - void deleteInstance(@NotNull String instanceId); - - /** - * 更新流水线实例 - * - * @param pipelineInstance 更新后流水线实例信息 - */ - void updateInstance(@NotNull @Valid PipelineInstance pipelineInstance); - - /** - * 查询单个流水线实例 - * - * @param instanceId 流水线实例id - * @return 流水线实例信息 - */ - PipelineInstance findOneInstance(String instanceId); - - /** - * 查询流水线最近一次实例 - * - * @param pipelineId 流水线id - * @return 实例信息 - */ - PipelineInstance findLatelyInstance(String pipelineId); - - /** - * 查询所有流水线实例 - * - * @return 流水线列表实例 - */ - List findAllInstance(); - - /** - * 根据流水线id查询所有实例信息 - * - * @param pipelineId 流水线id - * @return 实例信息 - */ - List findPipelineAllInstance(String pipelineId); - - /** - * 查询用户所有运行实例 - * - * @param userId 用户id - * @param limit 查询数量 - * @return 实例 - */ - List findUserPipelineInstance(String userId, Integer limit); - - - /** - * 查询流水线正在运行的实例ID - * - * @param pipelineId 流水线id - * @return 实例id - */ - String findRunInstanceId(String pipelineId); - - - /** - * 查询流水线实例 - * - * @param idList 实例id - * @return 实例 - */ - List findInstanceList(List idList); - - - /** - * 查询流水线实例 - * - * @param pipelineInstanceQuery 查询条件 - * @return 实例 - */ - List findPipelineInstanceList(PipelineInstanceQuery pipelineInstanceQuery); - - - /** - * 查询用户所有实例分页 - * - * @param pipelineInstanceQuery 实例 - * @return 实例 - */ - PageResult findUserInstance(PipelineInstanceQuery pipelineInstanceQuery); - - - /** - * 查询单个流水线历史 - * - * @param query 条件 - * @return 实例 - */ - PageResult findPipelineInstance(PipelineInstanceQuery query); - - - /** - * 查询流水线实例 - * - * @param pipelineId 流水线id - * @param queryTime 查询时间 [开始时间,结束时间] - * @return 实例 - */ - List findInstanceByTime(String pipelineId, String[] queryTime); - - - /** - * 查询流水线实例 - * - * @param queryTime 查询时间 [开始时间,结束时间] - * @return 实例 - */ - List findInstanceByTime(String[] queryTime); - - /** - * 获取实例运行时间 - * - * @param instanceId 实例id - * @return 运行时间 - */ - int findInstanceRuntime(String instanceId); - - /** - * 更新实例运行时间 - * - * @param instanceId 实例id - */ - void instanceRuntime(String instanceId); - - - /** - * 停止线程执行 - * - * @param threadName 线程名称 - */ - void stopThread(String threadName); - -} - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/dao/PipelineInstanceDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/dao/PipelineInstanceDao.java deleted file mode 100644 index e641d7f4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/dao/PipelineInstanceDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.instance.dao; - -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname PipelineInstanceDao - * @Description TODO - * @Date 2025/4/23 14:34 - */ -@Mapper -public interface PipelineInstanceDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/dataobject/PipelineInstanceDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/dataobject/PipelineInstanceDo.java deleted file mode 100644 index 7408c9b3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/instance/dataobject/PipelineInstanceDo.java +++ /dev/null @@ -1,50 +0,0 @@ -package cd.casic.module.process.process.instance.dataobject; - - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 流水线实例实体 - */ - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_pipeline_instance", autoResultMap = true) -public class PipelineInstanceDo extends BaseDO { - - //id - @TableId - private String instanceId; - - //创建构建时间 - // todo - -// private String createTime; - - //构建方式 - private int runWay; - - //执行人 - private String userId; - - //状态 1.失败 10.成功 20:停止 - private String runStatus; - - //执行时间 - private int runTime; - - //流水线 - private String pipelineId; - - //构建次数 - private int findNumber; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostGroupDetailsService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostGroupDetailsService.java deleted file mode 100644 index 28c475fa..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostGroupDetailsService.java +++ /dev/null @@ -1,60 +0,0 @@ -package cd.casic.module.process.process.setting; - - -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupDetails; - -import java.util.List; - -/** - * @author zcamy - */ -public interface AuthHostGroupDetailsService { - - - /** - * 创建主机组详情 - * - * @param hostGroupDetails 主机组详情 - * @return 主机组详情ID - */ - Integer creatHostGroupDetails(AuthHostGroupDetails hostGroupDetails); - - /** - * 更新主机组详情 - * - * @param hostGroupDetails 主机组详情 - */ - void updateHostGroupDetails(AuthHostGroupDetails hostGroupDetails); - - /** - * 删除主机组详情 - * - * @param groupDetailsId 主机组详情ID - */ - void deleteHostGroupDetails(String groupDetailsId); - - /** - * 查询单个主机组详情 - * - * @param groupDetailsId 主机组详情ID - * @return 主机组详情 - */ - AuthHostGroupDetails findOneHostGroupDetails(String groupDetailsId); - - /** - * 查询所有主机组详情 - * - * @return 主机组详情列表 - */ - List findAllHostGroupDetails(); - - /** - * 查询主机组详情列表 - * - * @param groupId 主机组ID - * @return 主机组详情列表 - */ - List findHostGroupDetailsList(String groupId); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostGroupService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostGroupService.java deleted file mode 100644 index 15df602c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostGroupService.java +++ /dev/null @@ -1,78 +0,0 @@ -package cd.casic.module.process.process.setting; - - -import cd.casic.ci.commons.bean.process.setting.AuthHostGroup; -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupQuery; -import cd.casic.ci.commons.bean.process.setting.HostGroup; - -import java.util.List; - -/** - * @author zcamy - */ -public interface AuthHostGroupService { - - /** - * 创建主机组 - * - * @param hostGroup hostGroup - * @return id - */ - String creatHostGroup(AuthHostGroup hostGroup); - - /** - * 更新主机组 - * - * @param hostGroup hostGroup - */ - void updateHostGroup(AuthHostGroup hostGroup); - - /** - * 删除主机组 - * - * @param groupId groupId - */ - void deleteHostGroup(String groupId); - - /** - * 查找主机组 - * - * @param groupId groupId - * @return hostGroup - */ - AuthHostGroup findOneHostGroup(String groupId); - - /** - * 查找主机组 - * - * @param groupId groupId - * @param strategyNumber strategyNumber - * @param strategyType strategyType - * @return hostGroup - */ - List findOneHostGroupByGroup(String groupId, Integer strategyNumber, String strategyType); - - /** - * 查找主机组 - * - * @return hostGroup - */ - List findAllHostGroup(); - - /** - * 查找主机组 - * - * @param groupQuery groupQuery - * @return hostGroup - */ - List findHostGroupList(AuthHostGroupQuery groupQuery); - - /** - * 查找主机组数量 - * - * @return count - */ - Long findHostGroupNumber(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostK8sService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostK8sService.java deleted file mode 100644 index 574948ac..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostK8sService.java +++ /dev/null @@ -1,83 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.AuthHostK8s; -import cd.casic.ci.commons.bean.process.setting.AuthHostK8sQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 流水线主机认证服务接口 - */ -public interface AuthHostK8sService { - - /** - * 创建流水线主机授权 - * - * @param authHostK8s 流水线主机授权 - * @return 流水线主机授权id - */ - String createAuthHostK8s(AuthHostK8s authHostK8s); - - /** - * 删除流水线主机授权 - * - * @param authHostK8sId 流水线主机授权id - */ - void deleteAuthHostK8s(String authHostK8sId); - - /** - * 更新主机授权信息 - * - * @param authHostK8s 信息 - */ - void updateAuthHostK8s(AuthHostK8s authHostK8s); - - /** - * 查询主机授权信息 - * - * @param authHostK8sId id - * @return 信息 - */ - AuthHostK8s findOneAuthHostK8s(String authHostK8sId); - - /** - * 查询配置 - * - * @param hostQuery 类型 - * @return 配置 - */ - List findAuthHostK8sList(AuthHostK8sQuery hostQuery); - - /** - * 查询所有流水线主机授权 - * - * @return 流水线主机授权列表 - */ - List findAllAuthHostK8s(); - - - /** - * 根据ID列表批量查询流水线主机授权 - * - * @param idList 流水线主机授权ID列表 - * @return 流水线主机授权列表 - */ - List findAllAuthHostK8sList(List idList); - - /** - * 分页查询流水线主机授权 - * - * @param hostQuery 查询条件 - * @return 流水线主机授权分页结果 - */ - PageResult findAuthHostK8sPage(AuthHostK8sQuery hostQuery); - - /** - * 查询流水线主机授权数量 - * - * @return 流水线主机授权数量 - */ - Long findHostNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostService.java deleted file mode 100644 index f62babdb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthHostService.java +++ /dev/null @@ -1,78 +0,0 @@ -package cd.casic.module.process.process.setting; - - - -import cd.casic.ci.commons.bean.process.setting.AuthHost; -import cd.casic.ci.commons.bean.process.setting.AuthHostQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 流水线主机认证服务接口 - */ -public interface AuthHostService { - - /** - * 创建流水线主机授权 - * - * @param authHost 流水线主机授权 - * @return 流水线主机授权id - */ - int createAuthHost(AuthHost authHost); - - /** - * 删除流水线主机授权 - * @param authHostId 流水线主机授权id - */ - void deleteAuthHost(String authHostId); - - /** - * 更新主机授权信息 - * @param authHost 信息 - */ - void updateAuthHost(AuthHost authHost); - - /** - * 查询主机授权信息 - * @param authHostId id - * @return 信息 - */ - AuthHost findOneAuthHost(String authHostId); - - - /** - * 查询流水线主机授权 - * @param hostQuery 查询条件 - * @return 流水线主机授权列表 - */ - List findAuthHostList(AuthHostQuery hostQuery); - - /** - * 查询所有流水线主机授权 - * @return 流水线主机授权列表 - */ - List findAllAuthHost(); - - /** - * 根据ID列表批量查询流水线主机授权 - * @param idList 流水线主机授权ID列表 - * @return 流水线主机授权列表 - */ - List findAllAuthHostList(List idList); - - /** - * 分页查询流水线主机授权 - * @param hostQuery 查询条件 - * @return 流水线主机授权分页结果 - */ - PageResult findAuthHostPage(AuthHostQuery hostQuery); - - /** - * 查询流水线主机授权数量 - * - * @return 流水线主机授权数量 - */ - Long findHostNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthService.java deleted file mode 100644 index 6bc944d4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthService.java +++ /dev/null @@ -1,65 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.Auth; - -import java.util.List; - -/** - * 流水线基本认证服务接口 - */ -public interface AuthService { - - /** - * 创建流水线基本认证 - * - * @param auth 流水线基本认证 - * @return 流水线基本认证id - */ - int createAuth(Auth auth); - - /** - * 删除流水线基本认证 - * - * @param authId 流水线基本认证id - */ - void deleteAuth(String authId); - - /** - * 更新基本认证信息 - * - * @param auth 信息 - */ - void updateAuth(Auth auth); - - /** - * 查询基本认证信息 - * - * @param authId id - * @return 信息 - */ - Auth findOneAuth(String authId); - - - /** - * 查询所有流水线基本认证 - * - * @return 流水线基本认证列表 - */ - List findAllAuth(); - - /** - * 根据ID列表批量查询流水线基本认证 - * - * @param idList 流水线基本认证ID列表 - * @return 流水线基本认证列表 - */ - List findAllAuthList(List idList); - - /** - * 查询流水线基本认证数量 - * - * @return 流水线基本认证数量 - */ - Long findAuthNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthThirdService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthThirdService.java deleted file mode 100644 index 5014772f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/AuthThirdService.java +++ /dev/null @@ -1,77 +0,0 @@ -package cd.casic.module.process.process.setting; - - -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.ci.commons.bean.process.setting.AuthThirdQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 流水线第三方认证服务接口 - */ -public interface AuthThirdService { - - /** - * 创建流水线第三方授权 - * - * @param authThird 流水线第三方授权 - * @return 流水线第三方授权id - */ - int createAuthServer(AuthThird authThird); - - /** - * 删除流水线第三方授权 - * @param authServerId 流水线第三方授权id - */ - void deleteAuthServer(String authServerId); - - /** - * 更新第三方授权信息 - * @param authThird 信息 - */ - void updateAuthServer(AuthThird authThird); - - /** - * 查询第三方授权信息 - * @param authServerId id - * @return 信息 - */ - AuthThird findOneAuthServer(String authServerId); - - /** - * 查询流水线第三方授权 - * @param thirdQuery 查询条件 - * @return 流水线第三方授权列表 - */ - List findAuthServerList(AuthThirdQuery thirdQuery); - - /** - * 分页查询流水线第三方授权 - * @param thirdQuery 查询条件 - * @return 分页流水线第三方授权 - */ - PageResult findAuthServerPage(AuthThirdQuery thirdQuery); - - /** - * 查询所有流水线第三方授权 - * @return 流水线第三方授权列表 - */ - List findAllAuthServer(); - - - /** - * 根据ID列表批量查询流水线第三方授权 - * @param idList 流水线第三方授权ID列表 - * @return 流水线第三方授权列表 - */ - List findAllAuthServerList(List idList); - - /** - * 查询流水线第三方授权数量 - * @return 流水线第三方授权数量 - */ - Integer findAuthServerNumber(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/CacheService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/CacheService.java deleted file mode 100644 index 00ef60fe..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/CacheService.java +++ /dev/null @@ -1,50 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.Cache; - -import java.util.List; - -/** - * 缓存服务接口 - */ -public interface CacheService { - - /** - * 创建缓存 - * - * @param cache 缓存对象 - * @return 缓存ID - */ - String createCathe(Cache cache); - - /** - * 更新缓存 - * - * @param cache 缓存对象 - */ - void updateCathe(Cache cache); - - /** - * 删除缓存 - * - * @param cacheId 缓存ID - */ - void deleteCathe(String cacheId); - - /** - * 查询缓存 - * - * @param cacheId 缓存ID - * @return 缓存对象 - */ - Cache findCathe(String cacheId); - - /** - * 查询所有缓存 - * - * @return 缓存列表 - */ - List findAllCathe(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/EnvService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/EnvService.java deleted file mode 100644 index 40f74196..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/EnvService.java +++ /dev/null @@ -1,85 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.Env; -import cd.casic.ci.commons.bean.process.setting.EnvQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 环境服务接口 - */ -public interface EnvService { - - /** - * 创建环境 - * - * @param env 环境对象 - * @return 环境ID - */ - String createEnv(Env env); - - /** - * 更新环境 - * - * @param env 环境对象 - */ - void updateEnv(Env env); - - /** - * 删除环境 - * - * @param envId 环境ID - */ - void deleteEnv(String envId); - - /** - * 查询环境 - * - * @param envId 环境ID - * @return 环境对象 - */ - Env findOneEnv(String envId); - - /** - * 查询所有环境 - * - * @return 环境列表 - */ - List findAllEnv(); - - - /** - * 查询环境列表 - * - * @param envQuery 查询条件 - * @return 环境列表 - */ - List findEnvList(EnvQuery envQuery); - - /** - * 分页查询环境 - * - * @param envQuery 查询条件 - * @return 环境分页结果 - */ - PageResult findEnvPage(EnvQuery envQuery); - - - /** - * 根据ID列表批量查询环境 - * - * @param idList 环境ID列表 - * @return 环境列表 - */ - List findAllEnvList(List idList); - - /** - * 查询环境数量 - * - * @return 环境数量 - */ - Integer findEnvNumber(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/GroupService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/GroupService.java deleted file mode 100644 index 9f325794..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/GroupService.java +++ /dev/null @@ -1,74 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.Group; -import cd.casic.ci.commons.bean.process.setting.GroupQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 主机组服务接口 - */ -public interface GroupService { - - /** - * 创建主机组 - * @param group 主机组对象 - * @return 主机组ID - */ - String createGroup(Group group); - - /** - * 更新主机组 - * @param group 主机组对象 - */ - void updateGroup(Group group); - - /** - * 删除主机组 - * @param groupId 主机组ID - */ - void deleteGroup(String groupId); - - /** - * 查询主机组 - * @param groupId 主机组ID - * @return 主机组对象 - */ - Group findOneGroup(String groupId); - - /** - * 查询所有主机组 - * @return 主机组列表 - */ - List findAllGroup(); - - /** - * 查询主机组列表 - * @param groupQuery 查询条件 - * @return 主机组列表 - */ - List findGroupList(GroupQuery groupQuery); - - /** - * 分页查询主机组 - * @param groupQuery 查询条件 - * @return 主机组分页结果 - */ - PageResult findGroupPage(GroupQuery groupQuery); - - /** - * 根据ID列表批量查询主机组 - * @param idList 主机组ID列表 - * @return 主机组列表 - */ - List findAllGroupList(List idList); - - /** - * 查询主机组数量 - * @return 主机组数量 - */ - Integer findGroupNumber(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/ResourcesService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/ResourcesService.java deleted file mode 100644 index 0588aaf9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/ResourcesService.java +++ /dev/null @@ -1,77 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.Resources; -import cd.casic.ci.commons.bean.process.setting.ResourcesDetails; - -import java.util.List; - -/** - * 资源服务接口 - */ -public interface ResourcesService { - - - /** - * 更新资源使用情况 - */ - void instanceResources(int time); - - /** - * 判断资源情况 - */ - void judgeResources(); - - /** - * 创建资源 - * - * @param resources 资源对象 - * @return 资源ID - */ - String createResources(Resources resources); - - /** - * 更新资源 - * - * @param resources 资源对象 - */ - void updateResources(Resources resources); - - /** - * 删除资源 - * - * @param resourcesId 资源ID - */ - void deleteResources(String resourcesId); - - /** - * 查询资源 - * - * @param resourcesId 资源ID - * @return 资源对象 - */ - Resources findOneResources(String resourcesId); - - /** - * 查询所有资源 - * - * @return 资源列表 - */ - List findAllResources(); - - /** - * 查询资源使用情况 - * - * @return 使用情况 - */ - Resources findResourcesList(); - - /** - * 查询资源详情 - * - * @param type 资源类型 - * @return 资源详情 - */ - ResourcesDetails findResourcesDetails(String type); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/ScmService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/ScmService.java deleted file mode 100644 index 9ab6e396..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/ScmService.java +++ /dev/null @@ -1,68 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.Scm; -import cd.casic.ci.commons.bean.process.setting.ScmQuery; - -import java.util.List; - -/** - * 流水线环境配置服务接口 - */ -public interface ScmService { - - /** - * 创建环境配置 - * - * @param scm 环境配置模型 - * @return 环境配置id - */ - String createPipelineScm(Scm scm); - - /** - * 删除环境配置 - * - * @param scmId 配置id - */ - void deletePipelineScm(String scmId); - - /** - * 更新环境配置 - * - * @param scm 配置模型 - */ - void updatePipelineScm(Scm scm); - - /** - * 查询单个环境配置 - * - * @param scmId 环境配置id - * @return 环境配置模型 - */ - Scm findOnePipelineScm(String scmId); - - /** - * 查询所有环境配置 - * - * @return 环境配置模型列表 - */ - List findAllPipelineScm(); - - /** - * 根据ID列表批量查询环境配置 - * - * @param idList 环境配置ID列表 - * @return 环境配置列表 - */ - List findPipelineScmList(List idList); - - - List findPipelineScmList(ScmQuery scmQuery); - - /** - * 查询环境配置数量 - * - * @return 环境配置数量 - */ - Integer findScmNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/SystemMassageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/SystemMassageService.java deleted file mode 100644 index 4f013961..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/SystemMassageService.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.process.process.setting; - -import cd.casic.ci.commons.bean.process.setting.SystemMassage; - -/** - * 流水线系统信息服务接口 - */ -public interface SystemMassageService { - - /** - * 系统信息 - * @return 系统信息 - */ - SystemMassage getSystemMassage(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthDao.java deleted file mode 100644 index 824afbcb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.AuthDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname AuthDao - * @Description TODO - * @Date 2025/4/23 15:07 - */ -@Mapper -public interface AuthDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostDao.java deleted file mode 100644 index 2516f534..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.AuthHostDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname AuthHostDao - * @Description TODO - * @Date 2025/4/23 15:48 - */ -@Mapper -public interface AuthHostDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostGroupDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostGroupDao.java deleted file mode 100644 index 03f9ebfe..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostGroupDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.AuthHostGroupDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname AuthHostGroupDao - * @Description TODO - * @Date 2025/4/23 15:50 - */ -@Mapper -public interface AuthHostGroupDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostGroupDetailsDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostGroupDetailsDao.java deleted file mode 100644 index 67b364d2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostGroupDetailsDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.AuthHostGroupDetailsDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname AuthHostGroupDetailsDo - * @Description TODO - * @Date 2025/4/23 15:49 - */ -@Mapper -public interface AuthHostGroupDetailsDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostK8sDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostK8sDao.java deleted file mode 100644 index 9ba6a3c6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthHostK8sDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.AuthHostK8sDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname AuthHostK8sDao - * @Description TODO - * @Date 2025/4/23 15:51 - */ -@Mapper -public interface AuthHostK8sDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthThirdDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthThirdDao.java deleted file mode 100644 index 0e5d3dce..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/AuthThirdDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.AuthThirdDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname AuthThirdDao - * @Description TODO - * @Date 2025/4/23 15:51 - */ -@Mapper -public interface AuthThirdDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/CacheDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/CacheDao.java deleted file mode 100644 index f524ee89..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/CacheDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.CacheDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname CacheDao - * @Description TODO - * @Date 2025/4/23 15:54 - */ -@Mapper -public interface CacheDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/EnvDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/EnvDao.java deleted file mode 100644 index 51f22817..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/EnvDao.java +++ /dev/null @@ -1,47 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.ci.commons.bean.process.setting.Env; -import cd.casic.ci.commons.bean.process.setting.EnvQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.EnvDo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author by mianbin - * @Classname EnvDao - * @Description TODO - * @Date 2025/4/23 15:54 - */ -@Mapper -public interface EnvDao extends BaseMapperX { - public String creatEnv(Env env); - - public void updateEnv(Env env); - - - public void deleteEnv(String groupId); - - - public Env findOneEnv(String groupId); - - - public List findAllEnv(); - - - public List findEnvList(EnvQuery envQuery); - - - public PageResult findEnvPage(EnvQuery envQuery); - - - public List findAllEnvList(List idList); - - - public Integer findEnvNumber(); -} \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/GroupDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/GroupDao.java deleted file mode 100644 index 7ac0e8bd..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/GroupDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.GroupDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname GroupDao - * @Description TODO - * @Date 2025/4/23 16:00 - */ -@Mapper -public interface GroupDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/ResourcesDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/ResourcesDao.java deleted file mode 100644 index d945b396..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/ResourcesDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.ResourcesDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname ResourcesDao - * @Description TODO - * @Date 2025/4/23 16:00 - */ -@Mapper -public interface ResourcesDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/ScmDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/ScmDao.java deleted file mode 100644 index e6317c89..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dao/ScmDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.setting.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.setting.dataobject.ScmDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname ScmDao - * @Description TODO - * @Date 2025/4/23 16:01 - */ -@Mapper -public interface ScmDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthDo.java deleted file mode 100644 index 896dfdaa..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthDo.java +++ /dev/null @@ -1,42 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * @author by mianbin - * @Classname AuthDo - * @Description 流水线基本认证实体 - * @Date 2025/4/23 14:43 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_auth", autoResultMap = true) -public class AuthDo extends BaseDO { - @TableId - private String authId; - - private String name; - - //认证类型（1.用户名密码 2.私钥） - private int authType; - - private String username; - - private String password; - - private String privateKey; - - //创建人 - private String userId ; - - //是否公开 1：公开， 2：不公开 - private int authPublic; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostDo.java deleted file mode 100644 index af929c81..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostDo.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_auth_host", autoResultMap = true) -public class AuthHostDo extends BaseDO { - - @TableId - private String hostId; - - private String name; - - private String type; - - private int authType; - - private String ip; - - private int port; - - private Long userId; - - private String password; - - private String privateKey; - - //是否公开 1：公开， 2：不公开 - private int authPublic; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostGroupDetailsDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostGroupDetailsDo.java deleted file mode 100644 index 44e10626..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostGroupDetailsDo.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 主机组与主机管理关系实体 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_auth_host_group_details", autoResultMap = true) -public class AuthHostGroupDetailsDo extends BaseDO { - - @TableId - private String id; - - // 主机组ID - private String groupId; - - // 主机ID - private String hostId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostGroupDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostGroupDo.java deleted file mode 100644 index 33cd83a7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostGroupDo.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_auth_host_group", autoResultMap = true) -public class AuthHostGroupDo extends BaseDO { - - @TableId - private String groupId; - - private String groupName; - - //是否公开 1：公开， 2：不公开 - private int authPublic; - - private String details; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostK8sDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostK8sDo.java deleted file mode 100644 index 8d1655b6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthHostK8sDo.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_auth_host_k8s", autoResultMap = true) -public class AuthHostK8sDo extends BaseDO { - - @TableId - private String hostId; - - private String name; - - private String type; - - private int authType; - - private String ip; - - private int port; - - private Long userId; - - private String password; - - private String privateKey; - - //是否公开 1：公开， 2：不公开 - private int authPublic; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthThirdDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthThirdDo.java deleted file mode 100644 index 8de85656..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/AuthThirdDo.java +++ /dev/null @@ -1,82 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_auth_server", autoResultMap = true) -public class AuthThirdDo extends BaseDO { - - @TableId - private String serverId; - - private String type; - - private String name; - - private int authType; - - private String username; - - private String password; - - private String serverAddress; - - private String privateKey; - - private String accessToken; - - private String refreshToken; - - //是否公开 true：公开， false：不公开 - private int authPublic; - - private String message; - - private String clientId; - - private String clientSecret; - - private String callbackUrl; - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/CacheDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/CacheDo.java deleted file mode 100644 index 545f9212..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/CacheDo.java +++ /dev/null @@ -1,25 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_setting_cache", autoResultMap = true) -public class CacheDo extends BaseDO { - - @TableId - private String id; - - private int logCache; - - private int artifactCache; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/EnvDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/EnvDo.java deleted file mode 100644 index 6dea67ef..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/EnvDo.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_setting_env", autoResultMap = true) -public class EnvDo extends BaseDO { - @TableId - private String id; - - // 环境名称 - private String envName; - - // 用户ID - private String userId; - - // 说明 - private String detail; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/GroupDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/GroupDo.java deleted file mode 100644 index cd6975cc..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/GroupDo.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_setting_group", autoResultMap = true) -public class GroupDo extends BaseDO { - - @TableId - private String id; - - // 环境名称 - private String groupName; - - // 用户ID - private String userId; - - // 说明 - private String detail; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/ResourcesDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/ResourcesDo.java deleted file mode 100644 index 3ef6b7f1..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/ResourcesDo.java +++ /dev/null @@ -1,32 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_setting_resources", autoResultMap = true) -public class ResourcesDo extends BaseDO { - - @TableId - private String id; - - private int useCcyNumber; - - private int useSceNumber; - - private int useCacheNumber; - - private String month; - - private String beginTime; - - private String endTime; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/ScmDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/ScmDo.java deleted file mode 100644 index 4813e996..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/dataobject/ScmDo.java +++ /dev/null @@ -1,32 +0,0 @@ -package cd.casic.module.process.process.setting.dataobject; - - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_setting_scm", autoResultMap = true) -public class ScmDo extends BaseDO { - - //凭证id - @TableId - private String scmId; - - //1.git 2.svn 21.node 22.maven - private String scmType; - - //名称 - private String scmName; - - //地址 - private String scmAddress; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupDetailsServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupDetailsServiceImpl.java deleted file mode 100644 index 4be0aff9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupDetailsServiceImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupDetails; -import cd.casic.module.process.convert.setting.AuthHostGroupDetailsConvert; -import cd.casic.module.process.process.setting.AuthHostGroupDetailsService; -import cd.casic.module.process.process.setting.dao.AuthHostGroupDetailsDao; -import cd.casic.module.process.process.setting.dataobject.AuthHostGroupDetailsDo; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class AuthHostGroupDetailsServiceImpl implements AuthHostGroupDetailsService { - - @Resource - AuthHostGroupDetailsDao authHostGroupDetailsDao; - - @Override - public Integer creatHostGroupDetails(AuthHostGroupDetails hostGroupDetails) { - return authHostGroupDetailsDao.insert(AuthHostGroupDetailsConvert.INSTANCE.convertDo(hostGroupDetails)); - } - - @Override - public void updateHostGroupDetails(AuthHostGroupDetails hostGroupDetails) { - authHostGroupDetailsDao.updateById(AuthHostGroupDetailsConvert.INSTANCE.convertDo(hostGroupDetails)); - } - - @Override - public void deleteHostGroupDetails(String groupDetailsId) { - authHostGroupDetailsDao.deleteById(groupDetailsId); - } - - @Override - public AuthHostGroupDetails findOneHostGroupDetails(String groupDetailsId) { - return AuthHostGroupDetailsConvert.INSTANCE.convert(authHostGroupDetailsDao.selectById(groupDetailsId)); - } - - @Override - public List findAllHostGroupDetails() { - return AuthHostGroupDetailsConvert.INSTANCE.convertList(authHostGroupDetailsDao.selectList()); - } - - @Override - public List findHostGroupDetailsList(String groupId) { - return AuthHostGroupDetailsConvert.INSTANCE.convertList( - authHostGroupDetailsDao.selectList(AuthHostGroupDetailsDo::getGroupId, groupId)); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupServiceImpl.java deleted file mode 100644 index fb4cd6df..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostGroupServiceImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - -import cd.casic.ci.commons.commons.PipelineConstants; -import cd.casic.ci.commons.bean.process.setting.AuthHostGroup; -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupDetails; -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupQuery; -import cd.casic.ci.commons.bean.process.setting.HostGroup; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.module.process.convert.setting.AuthHostGroupConvert; -import cd.casic.module.process.process.setting.AuthHostGroupDetailsService; -import cd.casic.module.process.process.setting.AuthHostGroupService; -import cd.casic.module.process.process.setting.dao.AuthHostGroupDao; -import cd.casic.module.process.process.setting.dataobject.AuthHostGroupDo; -import cn.hutool.core.util.IdUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -@Service -public class AuthHostGroupServiceImpl implements AuthHostGroupService { - - - @Autowired - AuthHostGroupDao authHostGroupDao; - - @Autowired - AuthHostGroupDetailsService groupDetailsService; - - @Override - public String creatHostGroup(AuthHostGroup hostGroup) { - String date = PipelineUtil.date(1); - hostGroup.setCreateTime(date); - authHostGroupDao.insert(AuthHostGroupConvert.INSTANCE.convertDo(hostGroup)); - - List detailsList = hostGroup.getDetailsList(); - if (Objects.isNull(detailsList) || detailsList.isEmpty()) { - return hostGroup.getGroupId(); - } - - // 创建关联关系 - for (AuthHostGroupDetails hostGroupDetails : detailsList) { - hostGroupDetails.setGroupId(hostGroup.getGroupId()); - groupDetailsService.creatHostGroupDetails(hostGroupDetails); - } - - return hostGroup.getGroupId(); - } - - @Override - public void updateHostGroup(AuthHostGroup hostGroup) { - String groupId = hostGroup.getGroupId(); - // 删除旧的关联关系 - List hostGroupDetailsList = groupDetailsService.findHostGroupDetailsList(groupId); - for (AuthHostGroupDetails authHostGroupDetails : hostGroupDetailsList) { - String id = authHostGroupDetails.getId(); - groupDetailsService.deleteHostGroupDetails(id); - } - - // 创建新的关联关系 - List detailsList = hostGroup.getDetailsList(); - for (AuthHostGroupDetails hostGroupDetails : detailsList) { - hostGroupDetails.setGroupId(groupId); - groupDetailsService.creatHostGroupDetails(hostGroupDetails); - } - authHostGroupDao.updateById(AuthHostGroupConvert.INSTANCE.convertDo(hostGroup)); - } - - @Override - public void deleteHostGroup(String groupId) { - List hostGroupDetailsList = groupDetailsService.findHostGroupDetailsList(groupId); - for (AuthHostGroupDetails authHostGroupDetails : hostGroupDetailsList) { - String id = authHostGroupDetails.getId(); - groupDetailsService.deleteHostGroupDetails(id); - } - authHostGroupDao.deleteById(groupId); - } - - @Override - public AuthHostGroup findOneHostGroup(String groupId) { - AuthHostGroup oneHostGroup = AuthHostGroupConvert.INSTANCE.convert(authHostGroupDao.selectById(groupId)); - if (Objects.isNull(oneHostGroup)) { - return null; - } - List hostGroupDetailsList = groupDetailsService.findHostGroupDetailsList(groupId); - oneHostGroup.setDetailsList(hostGroupDetailsList); - return oneHostGroup; - } - - @Override - public List findOneHostGroupByGroup(String groupId, Integer strategyNumber, String strategyType) { - List detailsList = groupDetailsService.findHostGroupDetailsList(groupId); - - if (strategyType.equals(PipelineConstants.DEFAULT)) { - return null; - } - - int size = detailsList.size(); - if (size <= strategyNumber) { - return null; - } - - List resultList = new ArrayList<>(); - - for (int i = 0; i < detailsList.size(); i += strategyNumber) { - List sublist = detailsList.subList(i, Math.min(i + strategyNumber, detailsList.size())); - String uuid = IdUtil.fastUUID(); - resultList.add(new HostGroup(uuid, sublist)); - } - return resultList; - } - - - @Override - public List findAllHostGroup() { - List authHostGroupDos = authHostGroupDao.selectList(); - return AuthHostGroupConvert.INSTANCE.convertList(authHostGroupDos); - - } - - @Override - public List findHostGroupList(AuthHostGroupQuery groupQuery) { - List authHostGroupDos = authHostGroupDao.selectList(AuthHostGroupDo::getCreator, groupQuery.getUserId()); - List authHostGroups = AuthHostGroupConvert.INSTANCE.convertList(authHostGroupDos); - for (AuthHostGroup authHostGroup : authHostGroups) { - String groupId = authHostGroup.getGroupId(); - List hostGroupDetailsList = groupDetailsService.findHostGroupDetailsList(groupId); - authHostGroup.setDetailsList(hostGroupDetailsList); - } - return authHostGroups; - } - - @Override - public Long findHostGroupNumber() { - return authHostGroupDao.selectCount(); - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostK8sServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostK8sServiceImpl.java deleted file mode 100644 index 74d3cffd..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostK8sServiceImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - -import cd.casic.ci.commons.bean.process.setting.AuthHostK8s; -import cd.casic.ci.commons.bean.process.setting.AuthHostK8sQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.security.core.util.SecurityFrameworkUtils; -import cd.casic.module.process.convert.setting.AuthHostK8sConvert; -import cd.casic.module.process.process.setting.AuthHostK8sService; -import cd.casic.module.process.process.setting.dao.AuthHostK8sDao; -import cd.casic.module.process.process.setting.dataobject.AuthHostK8sDo; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -@Service -public class AuthHostK8sServiceImpl implements AuthHostK8sService { - - @Autowired - AuthHostK8sDao authHostK8sDao; - - /** - * 创建流水线授权 - * - * @param authHostK8s 流水线授权 - * @return 流水线授权id - */ - @Override - public String createAuthHostK8s(AuthHostK8s authHostK8s) { - AuthHostK8sDo authHostK8sDo = AuthHostK8sConvert.INSTANCE.convertDo(authHostK8s); - authHostK8sDo.setUserId(SecurityFrameworkUtils.getLoginUser().getId()); - authHostK8sDao.updateById(authHostK8sDo); - return authHostK8sDo.getHostId(); - } - - /** - * 删除流水线授权 - * - * @param authHostK8sId 流水线授权id - */ - @Override - public void deleteAuthHostK8s(String authHostK8sId) { - authHostK8sDao.deleteById(authHostK8sId); - } - - /** - * 更新授权信息 - * - * @param authHostK8s 信息 - */ - @Override - public void updateAuthHostK8s(AuthHostK8s authHostK8s) { - int authPublic = authHostK8s.getAuthPublic(); - String authId = authHostK8s.getHostId(); - AuthHostK8s oneAuth = findOneAuthHostK8s(authId); - int hostType = oneAuth.getAuthPublic(); - if (authPublic == 1 && hostType == 2) { - authHostK8s.setPrivateKey(""); - } - if (authPublic == 2 && hostType == 1) { - authHostK8s.setUsername(""); - authHostK8s.setPassword(""); - } - authHostK8sDao.updateById(AuthHostK8sConvert.INSTANCE.convertDo(authHostK8s)); - } - - /** - * 查询授权信息 - * - * @param authHostK8sId id - * @return 信息集合 - */ - @Override - public AuthHostK8s findOneAuthHostK8s(String authHostK8sId) { - AuthHostK8sDo authHostK8sDo = authHostK8sDao.selectOne(new QueryWrapper().eq("host_id", authHostK8sId)); - return AuthHostK8sConvert.INSTANCE.convert(authHostK8sDo); - } - - /** - * 查询所有流水线授权 - * - * @return 流水线授权列表 - */ - @Override - public List findAllAuthHostK8s() { - - List authHostK8sDos = authHostK8sDao.selectList(); - if (Objects.isNull(authHostK8sDos)) { - return Collections.emptyList(); - } - List authHostK8ss = AuthHostK8sConvert.INSTANCE.convertList(authHostK8sDos); - return authHostK8ss; - } - - @Override - public List findAllAuthHostK8sList(List idList) { - List authHostK8sDos = authHostK8sDao.selectList(new QueryWrapper().in("host_id", idList)); - return AuthHostK8sConvert.INSTANCE.convertList(authHostK8sDos); - } - - @Override - public List findAuthHostK8sList(AuthHostK8sQuery hostQuery) { - PageResult authHostK8sDoPageResult = authHostK8sDao.selectPage(hostQuery.getPageParam(), - new QueryWrapper().eq("user_id", hostQuery.getUserId())); - if (Objects.isNull(authHostK8sDoPageResult) || CollectionUtil.isEmpty(authHostK8sDoPageResult.getList())) { - return Collections.emptyList(); - } - return AuthHostK8sConvert.INSTANCE.convertList(authHostK8sDoPageResult.getList()); - } - - @Override - public PageResult findAuthHostK8sPage(AuthHostK8sQuery hostQuery) { - PageResult authHostK8sDoPageResult = authHostK8sDao.selectPage(hostQuery.getPageParam(), - new QueryWrapper().eq("user_id", hostQuery.getUserId())); - return new PageResult( - AuthHostK8sConvert.INSTANCE.convertList(authHostK8sDoPageResult.getList()), - authHostK8sDoPageResult.getTotal()); - } - - - @Override - public Long findHostNumber() { - return authHostK8sDao.selectCount(); - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostServiceImpl.java deleted file mode 100644 index 982241fd..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthHostServiceImpl.java +++ /dev/null @@ -1,131 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - -import cd.casic.ci.commons.bean.process.setting.AuthHost; -import cd.casic.ci.commons.bean.process.setting.AuthHostQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.mybatis.core.query.LambdaQueryWrapperX; -import cd.casic.framework.security.core.util.SecurityFrameworkUtils; -import cd.casic.module.process.convert.setting.AuthHostConvert; -import cd.casic.module.process.process.setting.AuthHostService; -import cd.casic.module.process.process.setting.dao.AuthHostDao; -import cd.casic.module.process.process.setting.dataobject.AuthHostDo; -import cn.hutool.core.collection.CollectionUtil; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -@Service -public class AuthHostServiceImpl implements AuthHostService { - - @Resource - AuthHostDao authHostDao; - - /** - * 创建流水线授权 - * - * @param authHost 流水线授权 - * @return 流水线授权id - */ - @Override - public int createAuthHost(AuthHost authHost) { - AuthHostDo authHostDo = AuthHostConvert.INSTANCE.convertDo(authHost); - authHostDo.setUserId(SecurityFrameworkUtils.getLoginUserId()); - return authHostDao.insert(authHostDo); - } - - /** - * 删除流水线授权 - * - * @param authHostId 流水线授权id - */ - @Override - public void deleteAuthHost(String authHostId) { - authHostDao.deleteById(authHostId); - } - - /** - * 更新授权信息 - * - * @param authHost 信息 - */ - @Override - public void updateAuthHost(AuthHost authHost) { - int authPublic = authHost.getAuthPublic(); - String authId = authHost.getHostId(); - AuthHost oneAuth = findOneAuthHost(authId); - int hostType = oneAuth.getAuthPublic(); - if (authPublic == 1 && hostType == 2) { - authHost.setPrivateKey(""); - } - if (authPublic == 2 && hostType == 1) { - authHost.setUsername(""); - authHost.setPassword(""); - } - AuthHostDo authHostDo = AuthHostConvert.INSTANCE.convertDo(authHost); - authHostDao.updateById(authHostDo); - } - - /** - * 查询授权信息 - * - * @param authHostId id - * @return 信息集合 - */ - @Override - public AuthHost findOneAuthHost(String authHostId) { - AuthHostDo authHostDo = authHostDao.selectById(authHostId); - return AuthHostConvert.INSTANCE.convert(authHostDo); - } - - /** - * 查询所有流水线授权 - * - * @return 流水线授权列表 - */ - @Override - public List findAllAuthHost() { - List authHostDos = authHostDao.selectList(); - if (Objects.isNull(authHostDos)) { - return Collections.emptyList(); - } - return AuthHostConvert.INSTANCE.convertList(authHostDos); - } - - @Override - public List findAllAuthHostList(List idList) { - List authHostDos = authHostDao.selectByIds(idList); - return AuthHostConvert.INSTANCE.convertList(authHostDos); - } - - - @Override - public List findAuthHostList(AuthHostQuery hostQuery) { - PageResult authHostDoPageResult = authHostDao.selectPage(hostQuery.getPageParam(), new LambdaQueryWrapperX().eq(AuthHostDo::getUserId, hostQuery.getUserId())); - if (CollectionUtil.isEmpty(authHostDoPageResult.getList())) { - return Collections.emptyList(); - } - return AuthHostConvert.INSTANCE.convertList(authHostDoPageResult.getList()); - } - - - @Override - public PageResult findAuthHostPage(AuthHostQuery hostQuery) { - PageResult authHostDoPageResult = authHostDao.selectPage(hostQuery.getPageParam(), - new LambdaQueryWrapperX().eq(AuthHostDo::getUserId, hostQuery.getUserId())); - List dataList = authHostDoPageResult.getList(); - if (Objects.isNull(dataList) || dataList.isEmpty()) { - return PageResult.empty(); - } - AuthHostConvert.INSTANCE.convertList(dataList); - return new PageResult<>(AuthHostConvert.INSTANCE.convertList(dataList), authHostDoPageResult.getTotal()); - } - - - @Override - public Long findHostNumber() { - return authHostDao.selectCount(); - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthServiceImpl.java deleted file mode 100644 index c810f366..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - - -import cd.casic.ci.commons.bean.process.setting.Auth; -import cd.casic.module.process.convert.setting.AuthConvert; -import cd.casic.module.process.process.setting.AuthService; -import cd.casic.module.process.process.setting.dao.AuthDao; -import cd.casic.module.process.process.setting.dataobject.AuthDo; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 流水线基本认证服务 - */ -@Service -public class AuthServiceImpl implements AuthService { - - @Resource - AuthDao authDao; - - public int createAuth(Auth auth) { - return authDao.updateById(AuthConvert.INSTANCE.convertDo(auth)); - } - - - @Override - public void deleteAuth(String authId) { - authDao.deleteById(authId); - } - - @Override - public void updateAuth(Auth auth) { - String authId = auth.getAuthId(); - Auth oneAuth = findOneAuth(authId); - int authPublic = auth.getAuthPublic(); - int oneAuthAuth = oneAuth.getAuthPublic(); - //判断是否切换类型 - if (authPublic == 2 && oneAuthAuth == 1) { - auth.setUsername(""); - auth.setPassword(""); - } - if (authPublic == 1 && oneAuthAuth == 2) { - auth.setPrivateKey(""); - } - authDao.updateById(AuthConvert.INSTANCE.convertDo(auth)); - } - - @Override - public Auth findOneAuth(String authId) { - AuthDo authDo = authDao.selectById(authId); - return AuthConvert.INSTANCE.convert(authDo); - } - - @Override - public List findAllAuth() { - List authDos = authDao.selectList(); - if (authDos == null) { - return null; - } - return AuthConvert.INSTANCE.convertList(authDos); - } - - @Override - public List findAllAuthList(List idList) { - List authDos = authDao.selectByIds(idList); - return AuthConvert.INSTANCE.convertList(authDos); - } - - - @Override - public Long findAuthNumber() { - return authDao.selectCount(); - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthThirdServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthThirdServiceImpl.java deleted file mode 100644 index 2879b256..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/AuthThirdServiceImpl.java +++ /dev/null @@ -1,147 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.ci.commons.bean.process.setting.AuthThirdQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.convert.setting.AuthThirdConvert; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.process.setting.dao.AuthThirdDao; -import cd.casic.module.process.process.setting.dataobject.AuthThirdDo; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -@Service -public class AuthThirdServiceImpl implements AuthThirdService { - - @Resource - AuthThirdDao authServerDao; - - /** - * 创建流水线授权 - * - * @param authThird 流水线授权 - * @return 流水线授权id - */ - public int createAuthServer(AuthThird authThird) { - return authServerDao.updateById(AuthThirdConvert.INSTANCE.convertDo(authThird)); - } - - /** - * 删除流水线授权 - * - * @param authServerId 流水线授权id - */ - @Override - public void deleteAuthServer(String authServerId) { - authServerDao.deleteById(authServerId); - } - - /** - * 更新授权信息 - * - * @param authThird 信息 - */ - @Override - public void updateAuthServer(AuthThird authThird) { - int authPublic = authThird.getAuthPublic(); - String serverId = authThird.getServerId(); - AuthThird oneAuthServer = findOneAuthServer(serverId); - int aPublic = oneAuthServer.getAuthPublic(); - if (authPublic == 1 && aPublic == 2) { - authThird.setPrivateKey(""); - } - if (aPublic == 2 && authPublic == 1) { - authThird.setUsername(""); - authThird.setPassword(""); - } - authServerDao.updateById(AuthThirdConvert.INSTANCE.convertDo(authThird)); - } - - /** - * 查询授权信息 - * - * @param authServerId id - * @return 信息集合 - */ - @Override - public AuthThird findOneAuthServer(String authServerId) { - AuthThirdDo authThirdDo = authServerDao.selectById(authServerId); - return AuthThirdConvert.INSTANCE.convert(authThirdDo); - } - - @Override - public List findAuthServerList(AuthThirdQuery thirdQuery) { - return null; - } - - @Override - public PageResult findAuthServerPage(AuthThirdQuery thirdQuery) { - return null; - } - - @Override - public List findAllAuthServer() { - return null; - } - - @Override - public List findAllAuthServerList(List idList) { - return null; - } - - @Override - public Integer findAuthServerNumber() { - return null; - } -//TODO 暂时简单处理 -// @Override -// public List findAuthServerList(AuthThirdQuery thirdQuery) { -// List authThirdEntityList = authServerDao.findAuthServerList(thirdQuery); -// List authThirds = BeanMapper.mapList(authThirdEntityList, AuthThird.class); -// return authThirds; -// } -// -// @Override -// public PageResult findAuthServerPage(AuthThirdQuery thirdQuery) { -// Pagination authThirdEntityPage = authServerDao.findAuthServerPage(thirdQuery); -// -// List dataList = authThirdEntityPage.getDataList(); -// if (Objects.isNull(dataList)) { -// return PaginationBuilder.build(authThirdEntityPage, Collections.emptyList()); -// } -// List authThirds = BeanMapper.mapList(dataList, AuthThird.class); -// return PaginationBuilder.build(authThirdEntityPage, authThirds); -// } -// -// /** -// * 查询所有流水线授权 -// * -// * @return 流水线授权列表 -// */ -// @Override -// public List findAllAuthServer() { -// List allAuthServer = authServerDao.findAllAuthServer(); -// if (Objects.isNull(allAuthServer)) { -// return Collections.emptyList(); -// } -// List authThirds = BeanMapper.mapList(allAuthServer, AuthThird.class); -// return authThirds; -// } -// -// @Override -// public List findAllAuthServerList(List idList) { -// List allAuthServerList = authServerDao.findAllAuthServerList(idList); -// return BeanMapper.mapList(allAuthServerList, AuthThird.class); -// } -// -// @Override -// public Integer findAuthServerNumber() { -// return authServerDao.findAuthServerNumber(); -// } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/CacheServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/CacheServiceImpl.java deleted file mode 100644 index e1f73111..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/CacheServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - - -import cd.casic.ci.commons.bean.process.setting.Cache; -import cd.casic.module.process.process.setting.CacheService; -import cd.casic.module.process.process.setting.dao.CacheDao; -import cd.casic.module.process.support.version.service.PipelineVersionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - - -@Service -public class CacheServiceImpl implements CacheService { - - - @Autowired - CacheDao cacheDao; - - @Autowired - PipelineVersionService versionService; - - - @Override - public String createCathe(Cache cache){ -// TODO 待迁移 -// CacheEntity cacheEntity = BeanMapper.map(cache, CacheEntity.class); -// return cacheDao.createCathe(cacheEntity); - return null; - } - - @Override - public void updateCathe(Cache cache){ - - String id = cache.getId(); - Cache oneCathe = findCathe(id); - if (cache.getArtifactCache() == 0){ - cache.setArtifactCache(oneCathe.getArtifactCache()); - } - if (cache.getLogCache() == 0){ - cache.setLogCache(oneCathe.getLogCache()); - } - // TODO 同上 -// CacheEntity cacheEntity = BeanMapper.map(cache, CacheEntity.class); -// cacheDao.updateCathe(cacheEntity); - } - - @Override - public void deleteCathe(String cacheId){ - // TODO -// cacheDao.deleteCathe(cacheId); - } - - @Override - public Cache findCathe(String cacheId){ - // TODO 待迁移 -// CacheEntity cacheEntity = cacheDao.findCathe(cacheId); -// return BeanMapper.map(cacheEntity, Cache.class); - return null; - } - - @Override - public List findAllCathe(){ - // TODO -// List cacheEntityList = cacheDao.findAllCathe(); -// if (Objects.isNull(cacheEntityList)){ -// return Collections.emptyList(); -// } -// List caches = BeanMapper.mapList(cacheEntityList, Cache.class); -// Cache cache = caches.get(0); -// if (versionService.isVip()){ -// return caches; -// }else { -// cache.setArtifactCache(DEFAULT_CLEAN_CACHE_DAY); -// cache.setLogCache(DEFAULT_CLEAN_CACHE_DAY); -// updateCathe(cache); -// } - - List cacheList = new ArrayList<>(); -// cacheList.add(cache); - return cacheList; - } - - - -} - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/EnvServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/EnvServiceImpl.java deleted file mode 100644 index de0c8b75..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/EnvServiceImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - - -import cd.casic.ci.commons.bean.process.setting.Env; -import cd.casic.ci.commons.bean.process.setting.EnvQuery; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.process.setting.EnvService; -import cd.casic.module.process.process.setting.dao.EnvDao; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class EnvServiceImpl implements EnvService { - - @Autowired - EnvDao envDao; - - @Override - public String createEnv(Env env) { - env.setCreateTime(PipelineUtil.date(1)); - return envDao.creatEnv(env); - } - - @Override - public void updateEnv(Env env) { - envDao.updateEnv(env); - } - - @Override - public void deleteEnv(String envId) { - envDao.deleteEnv(envId); - } - - @Override - public Env findOneEnv(String envId) { - Env env = envDao.findOneEnv(envId); - return env; - } - - @Override - public List findAllEnv() { - return envDao.findAllEnv(); - } - - @Override - public List findEnvList(EnvQuery envQuery) { - List envList = envDao.findEnvList(envQuery); - return envList; - } - - @Override - public PageResult findEnvPage(EnvQuery envQuery) { -// Pagination envPage = envDao.findEnvPage(envQuery); -// List dataList = envPage.getDataList(); -// return PaginationBuilder.build(envPage,dataList); - return null; - } - - @Override - public List findAllEnvList(List idList) { - return envDao.findAllEnvList(idList); - } - - - @Override - public Integer findEnvNumber() { - return envDao.findEnvNumber(); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/GroupServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/GroupServiceImpl.java deleted file mode 100644 index 605ae1d9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/GroupServiceImpl.java +++ /dev/null @@ -1,107 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - -import cd.casic.ci.commons.bean.process.setting.Group; -import cd.casic.ci.commons.bean.process.setting.GroupQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.process.setting.GroupService; -import cd.casic.module.process.process.setting.dao.GroupDao; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class GroupServiceImpl implements GroupService { - - - @Autowired - GroupDao groupDao; -// TODO 暂时简单处理 -// @Override -// public String createGroup(Group group) { -// group.setCreateTime(PipelineUtil.date(1)); -// return groupDao.creatGroup(group); -// } -// -// @Override -// public void updateGroup(Group group) { -// groupDao.updateGroup(group); -// } -// -// @Override -// public void deleteGroup(String groupId) { -// groupDao.deleteGroup(groupId); -// } -// -// @Override -// public Group findOneGroup(String groupId) { -// Group group = groupDao.findOneGroup(groupId); -// return group; -// } -// -// @Override -// public List findAllGroup() { -// return groupDao.findAllGroup(); -// } -// -// @Override -// public List findGroupList(GroupQuery groupQuery) { -// List groupList = groupDao.findGroupList(groupQuery); -// return groupList; -// } - - @Override - public String createGroup(Group group) { - return null; - } - - @Override - public void updateGroup(Group group) { - - } - - @Override - public void deleteGroup(String groupId) { - - } - - @Override - public Group findOneGroup(String groupId) { - return null; - } - - @Override - public List findAllGroup() { - return null; - } - - @Override - public List findGroupList(GroupQuery groupQuery) { - return null; - } - - @Override - public PageResult findGroupPage(GroupQuery groupQuery) { -// PageResult groupPage = groupDao.findGroupPage(groupQuery); -// List dataList = groupPage.getDataList(); -// return PaginationBuilder.build(groupPage,dataList); - //TODO - return null; - } - - @Override - public List findAllGroupList(List idList) { -// List groupList = groupDao.findAllGroupList(idList); -// return groupList; - return null; - } - - - @Override - public Integer findGroupNumber() { -// return groupDao.findGroupNumber(); - return null; - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ResourcesServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ResourcesServiceImpl.java deleted file mode 100644 index 369e7962..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ResourcesServiceImpl.java +++ /dev/null @@ -1,272 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.bean.process.setting.Resources; -import cd.casic.ci.commons.bean.process.setting.ResourcesDetails; -import cd.casic.ci.commons.utils.PipelineFileUtil; -import cd.casic.module.process.process.definition.dao.PipelineDao; -import cd.casic.module.process.process.setting.ResourcesService; -import cd.casic.module.process.process.setting.dao.ResourcesDao; -import cd.casic.module.process.support.util.PipelineUtilService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class ResourcesServiceImpl implements ResourcesService { - - @Autowired - ResourcesDao resourcesDao; - - @Autowired - PipelineUtilService utilService; - - @Autowired - PipelineDao pipelineDao; - - @Override - public void instanceResources(int time){ -//TODO -// if (time == 0){ -// time = 1; -// } -// String date = PipelineUtil.date(2); -// Time dataTime = TimeConfig.findDataTime(date); -// String beginTime = dataTime.getMonthBeginTime(); -// String endTime = dataTime.getMonthEndTime(); -// Resources resources = resourcesDao.findResources(beginTime,endTime); -// if (Objects.nonNull(resources)){ -// int structureNumber = resources.getUseSceNumber(); -// resources.setUseSceNumber(structureNumber+time); -// resources.setMonth(dataTime.getMonth()); -// updateResources(resources); -// }else { -// resources = new Resources(); -// resources.setUseSceNumber(time); -// resources.setMonth(dataTime.getMonth()); -// resources.setBeginTime(beginTime); -// resources.setEndTime(endTime); -// String resourcesId = createResources(resources); -// if (Objects.isNull(resourcesId)){ -// throw new ApplicationException("创建资源信息失败！"); -// } -// } - } - - @Override - public void judgeResources(){ - Resources resources = findResourcesList(); - - int residueCcyNumber = resources.getResidueCcyNumber(); - if (residueCcyNumber == 0 ){ - throw new ApplicationException("并行任务已达上限，无法执行！"); - } - - double cacheNumber = resources.getResidueCacheNumber(); - if (cacheNumber == 0 ){ - throw new ApplicationException("可使用的缓存已用完，无法执行！"); - } - - int sceNumber = resources.getResidueSceNumber(); - if (sceNumber == 0 ){ - throw new ApplicationException("可使用的构建时长已用完，无法执行！"); - } - } - - @Override - public String createResources(Resources resources){ -// return resourcesDao.createResources(resources); - return null; - } - - @Override - public void updateResources(Resources resources){ -// resourcesDao.updateResources(resources); - } - - @Override - public void deleteResources(String resourcesId){ -// resourcesDao.deleteResources(resourcesId); - } - - @Override - public Resources findOneResources(String resourcesId){ -// return resourcesDao.findOneResources(resourcesId); - return null; - - } - - @Override - public List findAllResources(){ -// List allResources = resourcesDao.findAllResources(); -// if (allResources == null || allResources.isEmpty()){ -// return Collections.emptyList(); -// } -// return resourcesDao.findAllResources(); - return null; - - } - - @Override - public Resources findResourcesList(){ -// PipelineQuery pipelineQuery = new PipelineQuery(); -// pipelineQuery.setPipelineState(2); -// List pipelineList = pipelineDao.findPipelineList(pipelineQuery); -// int number = pipelineList.size(); -// -// Resources resources = notVipResources(number); -// resources.setVersion(1); -// return resources; - return null; - - } - - private static final int notVipExecNumber = 2; - - private static final int notVipExecTime = 1500; - - private static final int notVipCacheNTime = -1; - - - public Resources vipResources(int execNumber){ - return null; - } - - public Resources notVipResources(int execNumber){ - Resources resources = new Resources(); - // 可用资源总数 - resources.setCcyNumber(notVipExecNumber); - resources.setSceNumber(notVipExecTime); - - String codeAddress = utilService.instanceAddress(1); - float dirSize = PipelineFileUtil.findDiskSize(codeAddress); - double diskSize = Double.parseDouble(String.format("%.2f",dirSize)); - resources.setCacheNumber(diskSize); - - // 并发数 - resources.setUseCcyNumber(execNumber); - int i = notVipExecNumber - execNumber; - resources.setResidueCcyNumber(Math.max(i, 0)); - - // 磁盘数（社区版不限制磁盘大小） - double size = Double.parseDouble(String.format("%.2f",notVipCacheNTime - getSize())); - resources.setResidueCacheNumber(size); - double parsed = Double.parseDouble(String.format("%.2f", getSize())); - resources.setUseCacheNumber(parsed); - - resources.setResidueSceNumber(-1); - // 构建时长 - List allResources = findAllResources(); - if (allResources.isEmpty()){ - resources.setUseSceNumber(0); - }else { - Resources resources1 = allResources.get(0); - int sceNumber = resources1.getUseSceNumber(); - resources.setUseSceNumber(sceNumber/60); - } - return resources; - } - - @Override - public ResourcesDetails findResourcesDetails(String type){ -// ResourcesDetails resourcesDetails = new ResourcesDetails(); -// -// switch(type) { -// case "disk" ->{ -// String codeAddress = utilService.instanceAddress(1); -// String logAddress = utilService.instanceAddress(2); -// resourcesDetails.setArtifactCache(findDirSize(logAddress)+""); -// resourcesDetails.setSourceCache(findDirSize(codeAddress)+""); -// } -// case "run" ->{ -// PipelineQuery pipelineQuery = new PipelineQuery(); -// pipelineQuery.setPipelineState(2); -// List list = new ArrayList<>(); -// List pipelineList = pipelineDao.findPipelineList(pipelineQuery); -// if (pipelineList.isEmpty()){ -// resourcesDetails.setList(list); -// break; -// } -// for (PipelineEntity pipelineEntity : pipelineList) { -// list.add(pipelineEntity.getName()); -// } -// resourcesDetails.setList(list); -// } -// } -// return resourcesDetails; - return null; - } - - public Double findDirSize(String dir){ -// File file = new File(dir); -// if (!file.exists()){ -// return 0; -// } -// long bytes = FileUtils.sizeOfDirectory(file); -// return Math.round((float) (((bytes / 1024) / 1024) * 100) /1024)/100.0 ; - return null; - } - - /** - * 获取文件大小 - * @return 文件大小，保留两位小数点 - */ - public Double getSize() { -// String codeAddress = utilService.instanceAddress(1); -// String logAddress = utilService.instanceAddress(2); -// File codeFile = new File(codeAddress); -// -// if (!codeFile.exists()){ -// return 0; -// } -// -// -// -// long codeBytes = FileUtils.sizeOfDirectory(codeFile); -// -// double codeSize = Math.round((float) (((codeBytes / 1024) / 1024) * 100) /1024)/100.0 ; -// -// File logFile = new File(logAddress); -// if (!logFile.exists()){ -// return codeSize; -// } -// -// long logBytes = FileUtils.sizeOfDirectory(logFile); -// double logSize = Math.round((float) (((logBytes / 1024) / 1024) * 100) /1024)/100.0 ; -// return codeSize + logSize; - return null; - - } - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ScmServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ScmServiceImpl.java deleted file mode 100644 index c44c1e25..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/ScmServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - - -import cd.casic.ci.commons.bean.process.setting.Scm; -import cd.casic.ci.commons.bean.process.setting.ScmQuery; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.process.setting.ScmService; -import cd.casic.module.process.process.setting.dao.ScmDao; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Objects; - -@Service -public class ScmServiceImpl implements ScmService { - - - @Autowired - ScmDao scmDao; - - @Override - public String createPipelineScm(Scm scm) { - -// String scmType = scm.getScmType(); -// String scmAddress = scm.getScmAddress(); -// String jdkAddress = PipelineUtil.validFile(scmAddress, scmType); -// -// ScmEntity scmEntity = BeanMapper.map(scm, ScmEntity.class); -// return scmDao.createPipelineScm(scmEntity); - return null; - } - - //删除 - @Override - public void deletePipelineScm(String pathId) { -// scmDao.deletePipelineScm(pathId); - } - - //更新 - @Override - public void updatePipelineScm(Scm scm) { - -// String scmType = scm.getScmType(); -// String scmAddress = scm.getScmAddress(); -// PipelineUtil.validFile(scmAddress, scmType); -// if (scmType.equals(TASK_TOOL_TYPE_NODEJS)) { -// PipelineUtil.validFile(scmAddress, TASK_TOOL_TYPE_NPM); -// } -// -// if (scm.getScmId()==null || findOnePipelineScm(scm.getScmId())==null){ -// createPipelineScm(scm); -// return; -// } -// scmDao.updatePipelineScm(BeanMapper.map(scm, ScmEntity.class)); - } - - //查询 - @Override - public Scm findOnePipelineScm(String pathId) { -// ScmEntity scmEntity = scmDao.findOnePipelineScm(pathId); -// return BeanMapper.map(scmEntity, Scm.class); - return null; - } - - //查询所有 - @Override - public List findAllPipelineScm() { -// List scmEntityList = scmDao.findAllPipelineScm(); -// // scmEntityList.sort(Comparator.comparing(ScmEntity::getCreateTime)); -// scmEntityList.sort(Comparator.comparing(ScmEntity::getScmType)); -// return BeanMapper.mapList(scmEntityList, Scm.class); - return null; - } - - @Override - public List findPipelineScmList(List idList) { -// List scmEntityList = scmDao.findPipelineScmList(idList); -// return BeanMapper.mapList(scmEntityList, Scm.class); - return null; - } - - @Override - public List findPipelineScmList(ScmQuery scmQuery) { -// List scmEntityList = scmDao.findPipelineScmList(scmQuery); -// if (Objects.isNull(scmEntityList) || scmEntityList.isEmpty()) { -// return Collections.emptyList(); -// } -// return BeanMapper.mapList(scmEntityList, Scm.class); - return null; - } - - -// @Override - public PageResult findPipelineScmPage(ScmQuery scmQuery) { -// Pagination scmEntityPage = scmDao.findPipelineScmPage(scmQuery); -// List scmEntityList = scmEntityPage.getDataList(); -// if (Objects.isNull(scmEntityList) || scmEntityList.isEmpty()) { -// return PaginationBuilder.build(scmEntityPage, Collections.emptyList()); -// } -// List scmList = BeanMapper.mapList(scmEntityList, Scm.class); -// return PaginationBuilder.build(scmEntityPage, scmList); - return null; - } - - @Override - public Integer findScmNumber() { -// return scmDao.findScmNumber(); - return null; - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/SystemMassageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/SystemMassageServiceImpl.java deleted file mode 100644 index 0dd3afef..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/setting/impl/SystemMassageServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package cd.casic.module.process.process.setting.impl; - -import cd.casic.ci.commons.bean.process.setting.SystemMassage; -import cd.casic.module.process.process.setting.SystemMassageService; -import cd.casic.module.process.support.util.PipelineUtilService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -@Service -public class SystemMassageServiceImpl implements SystemMassageService { - - @Value("${matflow.cloud:true}") - boolean idCe; - - @Autowired - PipelineUtilService utilService; - - - @Override - public SystemMassage getSystemMassage(){ - SystemMassage systemMassage = new SystemMassage(); - String s = utilService.instanceAddress(1); - systemMassage.setWorkspace(s); - return systemMassage; - } - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageExecService.java deleted file mode 100644 index 4b5b5496..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageExecService.java +++ /dev/null @@ -1,43 +0,0 @@ -package cd.casic.module.process.process.stage; - - -import cd.casic.ci.commons.bean.engine.execute.PipelineDetails; -import cd.casic.ci.commons.bean.process.stage.Stage; - -import java.util.List; - -/** - * 阶段执行服务接口 - */ -public interface StageExecService { - - - /** - * 创建阶段运行实例 - * @param pipelineId 流水线id - * @param instanceId 流水线实例id - */ - List createStageExecInstance(String pipelineId , String instanceId); - - - /** - * 创建回滚运行实例 - * @param pipelineId 流水线id - * @param instanceId 流水线实例id - */ - List createRollBackStageExecInstance(String pipelineId,String instanceId); - - - /** - * 运行流水线阶段 - * @param pipelineDetails 流水线执行详情 - * @return 阶段运行状态 - */ - boolean execStageTask(PipelineDetails pipelineDetails); - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageInstanceServer.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageInstanceServer.java deleted file mode 100644 index 1a574b31..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageInstanceServer.java +++ /dev/null @@ -1,109 +0,0 @@ -package cd.casic.module.process.process.stage; - -import cd.casic.ci.commons.bean.process.stage.StageInstance; -import cd.casic.ci.commons.bean.process.stage.StageInstanceQuery; - -import java.util.List; - -/** - * 阶段运行实例服务接口 - */ -public interface StageInstanceServer { - - /** - * 创建阶段运行实例 - * @param stageInstance 实例模型 - * @return 运行实例模型 - */ - String createStageInstance(StageInstance stageInstance); - - /** - * 删除所有流水线实例下的阶段运行实例 - * @param instanceId 流水线实例id - */ - void deleteAllMainStageInstance(String instanceId); - - /** - * 查看完整日志 - * @param instanceId 示例ID - * @return 日志 - */ - List findAllStageInstanceLogs(String instanceId); - - /** - * 更新阶段实例内容 - * @param stageInstance 实例模型 - */ - void updateStageInstance(StageInstance stageInstance); - - /** - * 查询单个阶段运行实例 - * @param stageInstanceId 阶段运行实例id - * @return 阶段运行实例模型 - */ - StageInstance findOneStageInstance(String stageInstanceId); - - /** - * 查询流水线运行实例下的所有阶段运行实例 - * @param instanceId 流水线运行实例id - * @return 阶段运行实例 - */ - List findMainStageInstance(String instanceId); - - /** - * 查询主阶段实例下的所有运行实例 - * @param mainStageId 主阶段id - * @return 运行实例 - */ - List findOtherStageInstance(String mainStageId); - - /** - * 查询阶段运行实例 - * @param instanceId 流水线实例id - * @return 阶段运行实例 - */ - List findStageExecInstance(String instanceId); - - - /** - * 查询阶段运行实例列表 - * @param query 查询条件 - * @return 阶段运行实例列表 - */ - List findStageInstanceList(StageInstanceQuery query); - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageService.java deleted file mode 100644 index fcf1eb14..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/StageService.java +++ /dev/null @@ -1,166 +0,0 @@ -package cd.casic.module.process.process.stage; - - -import cd.casic.ci.commons.bean.process.stage.Stage; - -import java.util.List; - -/** - * 流水线阶段服务接口 - */ -public interface StageService { - - /** - * 创建阶段及关联任务 - * @param stage 阶段信息 - * @return 阶段id - */ - String createStagesOrTask(Stage stage); - - - /** - * 创建阶段模板 - * @param pipelineId 流水线id - * @param template 模板 - */ - void createStageTemplate(String pipelineId,String[] template); - - - /** - * 克隆阶段任务 - * @param pipelineId 流水线id - */ - void cloneStage(String pipelineId,String clonePipelineId); - - /** - * 查询所有阶段任务以及任务详情 - * @param pipelineId 流水线id - * @return 任务 - */ - List findAllStagesOrTask(String pipelineId); - - /** - * 查询所有阶段任务 - * @param pipelineId 流水线id - * @return 任务 - */ - List findAllStagesTask(String pipelineId); - - /** - * 删除阶段及任务 - * @param taskId 配置id - */ - void deleteStagesOrTask(String taskId); - - /** - * 删除流水线所有阶段 - * @param pipelineId 流水线id - */ - void deleteAllStagesOrTask(String pipelineId); - - /** - * 更新阶段名称 - * @param stage 阶段 - */ - void updateStageName(Stage stage); - - /** - * 获取所有阶段的根节点 - * @param pipelineId 流水线id - * @return 主分支 - */ - List findAllMainStage(String pipelineId); - - /** - * 根据根节点查询从节点 - * @param stagesId 根节点id - * @return 从节点列表 - */ - List findOtherStage(String stagesId); - - /** - * 更新阶段任务 - * @param stage 更新内容 - */ - void updateStagesTask(Stage stage); - - - /** - * 效验阶段配置必填字段 - * @param pipelineId 流水线id - * @return 配置id集合 - */ - List validStagesMustField(String pipelineId); - - /** - * 创建阶段 - * @param stage 阶段信息 - * @return 阶段id - */ - String createStages(Stage stage); - - /** - * 更新阶段 - * @param stage 阶段信息 - */ - void updateStages(Stage stage); - - /** - * 删除阶段 - * @param stageId 阶段id - */ - void deleteStages(String stageId); - - /** - * 查询单个阶段 - * @param stageId 阶段id - * @return 阶段信息 - */ - Stage findOneStages(String stageId); - - /** - * 查询所有阶段 - * @return 阶段信息集合 - */ - List findAllStages(); - - - - /** - * 根据ID列表批量查询阶段 - * @param idList 阶段ID列表 - * @return 阶段列表 - */ - List findAllStagesList(List idList); - - - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dao/StageDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dao/StageDao.java deleted file mode 100644 index a855f445..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dao/StageDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.stage.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.stage.dataobject.StageDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname StageDao - * @Description TODO - * @Date 2025/4/23 16:46 - */ -@Mapper -public interface StageDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dao/StageInstanceDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dao/StageInstanceDao.java deleted file mode 100644 index 023e575c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dao/StageInstanceDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.process.stage.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.process.stage.dataobject.StageDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname StageInstanceDao - * @Description TODO - * @Date 2025/4/23 16:47 - */ -@Mapper -public interface StageInstanceDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dataobject/StageDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dataobject/StageDo.java deleted file mode 100644 index 9b8824cc..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dataobject/StageDo.java +++ /dev/null @@ -1,44 +0,0 @@ -package cd.casic.module.process.process.stage.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * 流水线阶段实体 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_stage", autoResultMap = true) -public class StageDo extends BaseDO { - - @TableId - private String stageId; - - //阶段名称 - private String stageName; - - //创建配置时间 TODO 和超类冲突 -// private String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - - //流水线 - private String pipelineId; - - //主节点 - private String parentId; - - //阶段顺序 - private int stageSort; - - //是否为源码 - private String code; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dataobject/StageInstanceDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dataobject/StageInstanceDo.java deleted file mode 100644 index 57e2b0a1..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/process/stage/dataobject/StageInstanceDo.java +++ /dev/null @@ -1,43 +0,0 @@ -package cd.casic.module.process.process.stage.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_stage_instance", autoResultMap = true) -public class StageInstanceDo extends BaseDO { - - //日志id - @TableId - private String id; - - //任务名称 - private String stageName; - - //实例id - private String instanceId; - - //顺序 - private int stageSort; - - //运行日志 - private String stageAddress; - - //运行时间 - private int stageTime; - - //运行状态 - private String stageState; - - //阶段id - private String parentId; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/backups/model/Backups.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/backups/model/Backups.java deleted file mode 100644 index e31de302..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/backups/model/Backups.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.process.security.backups.model; - -import lombok.Data; - -@Data -public class Backups { - private String id; - private String type; - private String runState; - private String createTime; - private String dir; - private String log; - private Boolean scheduled; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/backups/service/BackupsDbService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/backups/service/BackupsDbService.java deleted file mode 100644 index 1064cbc4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/backups/service/BackupsDbService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cd.casic.module.process.security.backups.service; - -import cd.casic.module.process.security.backups.model.Backups; - -public interface BackupsDbService { - void backups(); - - Backups findBackupsResult(); - - String findLastBackupsTime(); - - void updateBackups(Boolean var1); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/model/Logging.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/model/Logging.java deleted file mode 100644 index bc5a092e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/model/Logging.java +++ /dev/null @@ -1,45 +0,0 @@ -package cd.casic.module.process.security.logging.logging.model; - -import cd.casic.module.process.user.user.User; -import com.fasterxml.jackson.annotation.JsonFormat; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -import java.sql.Timestamp; -@Data -public class Logging { - private String id; - @NotNull -// @Mappings({@Mapping( -// source = "user.id", -// target = "userId" -// )}) -// @JoinQuery( -// key = "id" -// ) - private User user; - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss", - timezone = "GMT+8" - ) - private Timestamp createTime = new Timestamp(System.currentTimeMillis()); - private String module; - @NotNull -// @Mappings({@Mapping( -// source = "actionType.id", -// target = "actionType" -// )}) -// @JoinQuery( -// key = "id" -// ) - private LoggingType actionType; - @NotNull - private String baseUrl; - private String content; - private String bgroup; - private String data; - @NotNull - private String link; - @NotNull - private String action; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/model/LoggingType.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/model/LoggingType.java deleted file mode 100644 index bca127fa..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/model/LoggingType.java +++ /dev/null @@ -1,13 +0,0 @@ -package cd.casic.module.process.security.logging.logging.model; - -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class LoggingType { - private String id; - @NotNull - private String name; - @NotNull - private String bgroup; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/service/LoggingByTempService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/service/LoggingByTempService.java deleted file mode 100644 index e83033d2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/security/logging/logging/service/LoggingByTempService.java +++ /dev/null @@ -1,9 +0,0 @@ -package cd.casic.module.process.security.logging.logging.service; - -import cd.casic.module.process.security.logging.logging.model.Logging; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; - -public interface LoggingByTempService { - String createLog(@NotNull @Valid Logging var1); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostGroupDetailsService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostGroupDetailsService.java deleted file mode 100644 index 3b90e62a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostGroupDetailsService.java +++ /dev/null @@ -1,35 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupDetails; - -import java.util.List; - -/** - * @author zcamy - */ -//TODO -//@JoinProvider(model = AuthHostGroupDetails.class) -public interface AuthHostGroupDetailsService { - - - String creatHostGroupDetails(AuthHostGroupDetails hostGroupDetails) ; - - - void updateHostGroupDetails(AuthHostGroupDetails hostGroupDetails) ; - - - void deleteHostGroupDetails(String groupDetailsId) ; - -// @FindOne - AuthHostGroupDetails findOneHostGroupDetails(String groupDetailsId) ; - -// @FindAll - List findAllHostGroupDetails() ; - - - List findHostGroupDetailsList(String groupId) ; - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostGroupService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostGroupService.java deleted file mode 100644 index f76377c7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostGroupService.java +++ /dev/null @@ -1,72 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.AuthHostGroup; -import cd.casic.ci.commons.bean.process.setting.AuthHostGroupQuery; -import cd.casic.ci.commons.bean.process.setting.HostGroup; - -import java.util.List; - -/** - * @author zcamy - */ - -public interface AuthHostGroupService { - - /** - * 创建主机组 - * @param hostGroup hostGroup - * @return id - */ - String creatHostGroup(AuthHostGroup hostGroup) ; - - /** - * 更新主机组 - * @param hostGroup hostGroup - */ - void updateHostGroup(AuthHostGroup hostGroup) ; - - /** - * 删除主机组 - * @param groupId groupId - */ - void deleteHostGroup(String groupId) ; - - /** - * 查找主机组 - * @param groupId groupId - * @return hostGroup - */ - AuthHostGroup findOneHostGroup(String groupId) ; - - /** - * 查找主机组 - * @param groupId groupId - * @param strategyNumber strategyNumber - * @param strategyType strategyType - * @return hostGroup - */ - List findOneHostGroupByGroup(String groupId, Integer strategyNumber, String strategyType); - - /** - * 查找主机组 - * @return hostGroup - */ - List findAllHostGroup() ; - - /** - * 查找主机组 - * @param groupQuery groupQuery - * @return hostGroup - */ - List findHostGroupList(AuthHostGroupQuery groupQuery) ; - - /** - * 查找主机组数量 - * @return count - */ - Integer findHostGroupNumber(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostK8sService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostK8sService.java deleted file mode 100644 index fa49769e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostK8sService.java +++ /dev/null @@ -1,68 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.AuthHostK8s; -import cd.casic.ci.commons.bean.process.setting.AuthHostK8sQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 流水线主机认证服务接口 - */ -//@JoinProvider(model = AuthHostK8s.class) -public interface AuthHostK8sService { - - /** - * 创建流水线主机授权 - * @param authHostK8s 流水线主机授权 - * @return 流水线主机授权id - */ - String createAuthHostK8s(AuthHostK8s authHostK8s); - - /** - * 删除流水线主机授权 - * @param authHostK8sId 流水线主机授权id - */ - void deleteAuthHostK8s(String authHostK8sId); - - /** - * 更新主机授权信息 - * @param authHostK8s 信息 - */ -// @FindOne - void updateAuthHostK8s(AuthHostK8s authHostK8s); - - /** - * 查询主机授权信息 - * @param authHostK8sId id - * @return 信息 - */ - AuthHostK8s findOneAuthHostK8s(String authHostK8sId); - - /** - * 查询配置 - * @param hostQuery 类型 - * @return 配置 - */ - List findAuthHostK8sList(AuthHostK8sQuery hostQuery); - - /** - * 查询所有流水线主机授权 - * @return 流水线主机授权列表 - */ -// @FindAll - List findAllAuthHostK8s(); - - -// @FindList - List findAllAuthHostK8sList(List idList); - - - PageResult findAuthHostK8sPage(AuthHostK8sQuery hostQuery); - - - Integer findHostNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostService.java deleted file mode 100644 index 7a2082e6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthHostService.java +++ /dev/null @@ -1,68 +0,0 @@ -package cd.casic.module.process.setting.service; - - -import cd.casic.ci.commons.bean.process.setting.AuthHost; -import cd.casic.ci.commons.bean.process.setting.AuthHostQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 流水线主机认证服务接口 - */ -//@JoinProvider(model = AuthHost.class) -public interface AuthHostService { - - /** - * 创建流水线主机授权 - * @param authHost 流水线主机授权 - * @return 流水线主机授权id - */ - String createAuthHost(AuthHost authHost); - - /** - * 删除流水线主机授权 - * @param authHostId 流水线主机授权id - */ - void deleteAuthHost(String authHostId); - - /** - * 更新主机授权信息 - * @param authHost 信息 - */ -// @FindOne - void updateAuthHost(AuthHost authHost); - - /** - * 查询主机授权信息 - * @param authHostId id - * @return 信息 - */ - AuthHost findOneAuthHost(String authHostId); - - - /** - * 查询流水线主机授权 - * @param hostQuery 查询条件 - * @return 流水线主机授权列表 - */ - List findAuthHostList(AuthHostQuery hostQuery); - - /** - * 查询所有流水线主机授权 - * @return 流水线主机授权列表 - */ -// @FindAll - List findAllAuthHost(); - - -// @FindList - List findAllAuthHostList(List idList); - - - PageResult findAuthHostPage(AuthHostQuery hostQuery); - - - Integer findHostNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthService.java deleted file mode 100644 index a2c13a50..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthService.java +++ /dev/null @@ -1,58 +0,0 @@ -package cd.casic.module.process.setting.service; - - - - -import cd.casic.ci.commons.bean.process.setting.Auth; - -import java.util.List; - -/** - * 流水线基本认证服务接口 - */ -//@JoinProvider(model = Auth.class) -public interface AuthService { - - /** - * 创建流水线基本认证 - * @param auth 流水线基本认证 - * @return 流水线基本认证id - */ - String createAuth(Auth auth); - - /** - * 删除流水线基本认证 - * @param authId 流水线基本认证id - */ - void deleteAuth(String authId); - - /** - * 更新基本认证信息 - * @param auth 信息 - */ - void updateAuth(Auth auth); - - /** - * 查询基本认证信息 - * @param authId id - * @return 信息 - */ -// @FindOne - Auth findOneAuth(String authId); - - - /** - * 查询所有流水线基本认证 - * @return 流水线基本认证列表 - */ -// @FindAll - List findAllAuth(); - - -// @FindList - List findAllAuthList(List idList); - - - Integer findAuthNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthThirdService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthThirdService.java deleted file mode 100644 index 1f7ddd40..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/AuthThirdService.java +++ /dev/null @@ -1,73 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.ci.commons.bean.process.setting.AuthThirdQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -/** - * 流水线第三方认证服务接口 - */ -//@JoinProvider(model = AuthThird.class) -public interface AuthThirdService { - - /** - * 创建流水线第三方授权 - * @param authThird 流水线第三方授权 - * @return 流水线第三方授权id - */ - String createAuthServer(AuthThird authThird); - - /** - * 删除流水线第三方授权 - * @param authServerId 流水线第三方授权id - */ - void deleteAuthServer(String authServerId); - - /** - * 更新第三方授权信息 - * @param authThird 信息 - */ - void updateAuthServer(AuthThird authThird); - - /** - * 查询第三方授权信息 - * @param authServerId id - * @return 信息 - */ -// @FindOne - AuthThird findOneAuthServer(String authServerId); - - /** - * 查询流水线第三方授权 - * @param thirdQuery 查询条件 - * @return 流水线第三方授权列表 - */ - List findAuthServerList(AuthThirdQuery thirdQuery); - - /** - * 分页查询流水线第三方授权 - * @param thirdQuery 查询条件 - * @return 分页流水线第三方授权 - */ - PageResult findAuthServerPage(AuthThirdQuery thirdQuery); - - /** - * 查询所有流水线第三方授权 - * @return 流水线第三方授权列表 - */ -// @FindAll - List findAllAuthServer(); - - -// @FindList - List findAllAuthServerList(List idList); - - - Integer findAuthServerNumber(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/CacheService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/CacheService.java deleted file mode 100644 index 6b88f02b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/CacheService.java +++ /dev/null @@ -1,24 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.Cache; - -import java.util.List; - -public interface CacheService { - - - String createCathe(Cache cache); - - void updateCathe(Cache cache); - - void deleteCathe(String cacheId); - - Cache findCathe(String cacheId); - - - List findAllCathe(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/EnvService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/EnvService.java deleted file mode 100644 index a05c5f3c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/EnvService.java +++ /dev/null @@ -1,42 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.Env; -import cd.casic.ci.commons.bean.process.setting.EnvQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -//@JoinProvider(model = Env.class) -public interface EnvService { - - String createEnv(Env env); - - void updateEnv(Env env); - - - void deleteEnv(String envId); - -// @FindOne - Env findOneEnv(String envId); - -// @FindAll - List findAllEnv(); - - - List findEnvList(EnvQuery envQuery); - - - PageResult findEnvPage(EnvQuery envQuery); - - -// @FindList - List findAllEnvList(List idList); - - - Integer findEnvNumber(); - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/GroupService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/GroupService.java deleted file mode 100644 index 06d50501..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/GroupService.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.Group; -import cd.casic.ci.commons.bean.process.setting.GroupQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -//@JoinProvider(model = Group.class) -public interface GroupService { - - String createGroup(Group group); - - void updateGroup(Group group); - - void deleteGroup(String groupId); - -// @FindOne - Group findOneGroup(String groupId); - -// @FindAll - List findAllGroup(); - - List findGroupList(GroupQuery groupQuery); - - - PageResult findGroupPage(GroupQuery groupQuery); - - -// @FindList - List findAllGroupList(List idList); - - - Integer findGroupNumber(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/ResourcesService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/ResourcesService.java deleted file mode 100644 index 7f383376..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/ResourcesService.java +++ /dev/null @@ -1,46 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.Resources; -import cd.casic.ci.commons.bean.process.setting.ResourcesDetails; - -import java.util.List; - -public interface ResourcesService { - - - /** - * 更新资源使用情况 - */ - void instanceResources(int time); - - /** - * 判断资源情况 - */ - void judgeResources(); - - - String createResources(Resources resources); - - void updateResources(Resources resources); - - - void deleteResources(String resourcesId); - - Resources findOneResources(String resourcesId); - - List findAllResources(); - - /** - * 查询资源使用情况 - * @return 使用情况 - */ - Resources findResourcesList(); - - - ResourcesDetails findResourcesDetails(String type); - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/ScmService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/ScmService.java deleted file mode 100644 index 945f724a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/ScmService.java +++ /dev/null @@ -1,57 +0,0 @@ -package cd.casic.module.process.setting.service; - - - -import cd.casic.ci.commons.bean.process.setting.Scm; - -import java.util.List; -/** - * 流水线环境配置服务接口 - */ -public interface ScmService { - - /** - * 创建环境配置 - * @param scm 环境配置模型 - * @return 环境配置id - */ - String createPipelineScm(Scm scm); - - /** - * 删除环境配置 - * @param scmId 配置id - */ - void deletePipelineScm(String scmId); - - /** - * 更新环境配置 - * @param scm 配置模型 - */ - void updatePipelineScm(Scm scm); - - /** - * 查询单个环境配置 - * @param scmId 环境配置id - * @return 环境配置模型 - */ - Scm findOnePipelineScm(String scmId); - - /** - * 查询所有环境配置 - * @return 环境配置模型列表 - */ - List findAllPipelineScm(); - - /** - * 根据获取配置 - * @param type 类型 - * @return 配置信息 - */ - Scm findOnePipelineScm(int type); - - List selectPipelineScmList(List idList); - - - Integer findScmNumber(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/SystemMassageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/SystemMassageService.java deleted file mode 100644 index 092a7862..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/setting/service/SystemMassageService.java +++ /dev/null @@ -1,17 +0,0 @@ -package cd.casic.module.process.setting.service; - - -import cd.casic.ci.commons.bean.process.setting.SystemMassage; - -/** - * 流水线系统信息服务接口 - */ -public interface SystemMassageService { - - /** - * 系统信息 - * @return 系统信息 - */ - SystemMassage getSystemMassage(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageExecService.java deleted file mode 100644 index 16a4274b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageExecService.java +++ /dev/null @@ -1,36 +0,0 @@ -package cd.casic.module.process.stages.service; - - - -import cd.casic.ci.commons.bean.engine.execute.PipelineDetails; -import cd.casic.ci.commons.bean.process.stage.Stage; - -import java.util.List; - -/** - * 阶段执行服务接口 - */ -public interface StageExecService { - - - /** - * 创建阶段运行实例 - * @param pipelineId 流水线id - * @param instanceId 流水线实例id - */ - List createStageExecInstance(String pipelineId , String instanceId); - - - /** - * 运行流水线阶段 - * @param pipelineDetails 流水线执行详情 - * @return 阶段运行状态 - */ - boolean execStageTask(PipelineDetails pipelineDetails); - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageInstanceServer.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageInstanceServer.java deleted file mode 100644 index 8f644d66..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageInstanceServer.java +++ /dev/null @@ -1,107 +0,0 @@ -package cd.casic.module.process.stages.service; - - - -import cd.casic.ci.commons.bean.process.stage.StageInstance; -import cd.casic.ci.commons.bean.process.stage.StageInstanceQuery; - -import java.util.List; - -/** - * 阶段运行实例服务接口 - */ -public interface StageInstanceServer { - - /** - * 创建阶段运行实例 - * @param stageInstance 实例模型 - * @return 运行实例模型 - */ - String createStageInstance(StageInstance stageInstance); - - /** - * 删除所有流水线实例下的阶段运行实例 - * @param instanceId 流水线实例id - */ - void deleteAllMainStageInstance(String instanceId); - - /** - * 查看完整日志 - * @param instanceId 示例ID - * @return 日志 - */ - List findAllStageInstanceLogs(String instanceId); - - /** - * 更新阶段实例内容 - * @param stageInstance 实例模型 - */ - void updateStageInstance(StageInstance stageInstance); - - /** - * 查询单个阶段运行实例 - * @param stageInstanceId 阶段运行实例id - * @return 阶段运行实例模型 - */ - StageInstance findOneStageInstance(String stageInstanceId); - - /** - * 查询流水线运行实例下的所有阶段运行实例 - * @param instanceId 流水线运行实例id - * @return 阶段运行实例 - */ - List findMainStageInstance(String instanceId); - - /** - * 查询主阶段实例下的所有运行实例 - * @param mainStageId 主阶段id - * @return 运行实例 - */ - List findOtherStageInstance(String mainStageId); - - /** - * 查询阶段运行实例 - * @param instanceId 流水线实例id - * @return 阶段运行实例 - */ - List findStageExecInstance(String instanceId); - - - - List findStageInstanceList(StageInstanceQuery query); - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageService.java deleted file mode 100644 index 0743c9f9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/stages/service/StageService.java +++ /dev/null @@ -1,165 +0,0 @@ -package cd.casic.module.process.stages.service; - - - - -import cd.casic.ci.commons.bean.process.stage.Stage; - -import java.util.List; - -/** - * 流水线阶段服务接口 - */ -//@JoinProvider(model = Stage.class) -public interface StageService { - - /** - * 创建阶段及关联任务 - * @param stage 阶段信息 - * @return 阶段id - */ - String createStagesOrTask(Stage stage); - - - /** - * 创建阶段模板 - * @param pipelineId 流水线id - * @param template 模板 - */ - void createStageTemplate(String pipelineId,String[] template); - - - /** - * 克隆阶段任务 - * @param pipelineId 流水线id - */ - void cloneStage(String pipelineId,String clonePipelineId); - - /** - * 查询所有阶段任务以及任务详情 - * @param pipelineId 流水线id - * @return 任务 - */ - List findAllStagesOrTask(String pipelineId); - - /** - * 查询所有阶段任务 - * @param pipelineId 流水线id - * @return 任务 - */ - List findAllStagesTask(String pipelineId); - - /** - * 删除阶段及任务 - * @param taskId 配置id - */ - void deleteStagesOrTask(String taskId); - - /** - * 删除流水线所有阶段 - * @param pipelineId 流水线id - */ - void deleteAllStagesOrTask(String pipelineId); - - /** - * 更新阶段名称 - * @param stage 阶段 - */ - void updateStageName(Stage stage); - - /** - * 获取所有阶段的根节点 - * @param pipelineId 流水线id - * @return 主分支 - */ - List findAllMainStage(String pipelineId); - - /** - * 根据根节点查询从节点 - * @param stagesId 根节点id - * @return 从节点列表 - */ - List findOtherStage(String stagesId); - - /** - * 更新阶段任务 - * @param stage 更新内容 - */ - void updateStagesTask(Stage stage); - - - /** - * 效验阶段配置必填字段 - * @param pipelineId 流水线id - * @return 配置id集合 - */ - List validStagesMustField(String pipelineId); - - /** - * 创建阶段 - * @param stage 阶段信息 - * @return 阶段id - */ - String createStages(Stage stage); - - /** - * 更新阶段 - * @param stage 阶段信息 - */ - void updateStages(Stage stage); - - /** - * 删除阶段 - * @param stageId 阶段id - */ - void deleteStages(String stageId); - - /** - * 查询单个阶段 - * @param stageId 阶段id - * @return 阶段信息 - */ -// @FindOne - Stage findOneStages(String stageId); - - /** - * 查询所有阶段 - * @return 阶段信息集合 - */ -// @FindAll - List findAllStages(); - -// @FindList - List findAllStagesList(List idList); - - - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/agent/service/AgentService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/agent/service/AgentService.java deleted file mode 100644 index 20f54d47..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/agent/service/AgentService.java +++ /dev/null @@ -1,76 +0,0 @@ -package cd.casic.module.process.support.agent.service; - - - - - -import cd.casic.ci.commons.bean.work.agent.model.Agent; -import cd.casic.ci.commons.bean.work.agent.AgentQuery; -import cd.casic.framework.commons.pojo.PageResult; - -import java.util.List; - -public interface AgentService { - - /** - * 初始化默认环境 - * @param agent 环境 - */ - void initAgent(Agent agent) ; - - /** - * 创建环境 - * @param agent 环境信息 - * @return ID - */ - String createAgent(Agent agent) ; - - /** - * 更新环境 - * @param agent 环境信息 - */ - void updateAgent(Agent agent); - - /** - * 获取默认执行环境 - * @return 执行环境 - */ - Agent findDefaultAgent(); - - /** - * 更新默认的执行环境 - * @param id 更新ID - */ - void updateDefaultAgent(String id); - - /** - * 删除环境 - * @param id 环境ID - */ - void deleteAgent(String id); - - /** - * 查询流水线执行环境 - * @param id 环境ID - * @return 环境 - */ - Agent findAgent(String id); - - /** - * 条件查询环流水线执行环境 - * @param agentQuery 条件 - * @return 执行环境列表 - */ - List findAgentList(AgentQuery agentQuery) ; - - /** - * 分页条件查询环流水线执行环境 - * @param agentQuery 条件 - * @return 执行环境列表 - */ - PageResult findAgentPage(AgentQuery agentQuery); - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/authority/service/PipelineAuthorityService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/authority/service/PipelineAuthorityService.java deleted file mode 100644 index 5da4f04a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/authority/service/PipelineAuthorityService.java +++ /dev/null @@ -1,58 +0,0 @@ -package cd.casic.module.process.support.authority.service; - -//import io.tiklab.arbess.pipeline.definition.model.Pipeline; -//import io.tiklab.privilege.role.model.PatchUser; -//import io.tiklab.user.user.model.User; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; - -import java.util.List; - -/** - * 流水线项目权限服务接口 - */ -public interface PipelineAuthorityService { - - - /** - * 获取用户拥有的流水线 - * @param userId 用户id - * @return 流水线支付串集合 - */ - String[] findUserPipelineIdString(String userId); - - /** - * 获取拥有此流水线的用户 - * @param pipelineId 流水线id - * @return 用户信息 - */ -// List findPipelineUser(String pipelineId); - - /** - * 获取用户拥有的流水线 - * @param userId 用户id - * @return 流水线 - */ - List findUserPipeline(String userId); - - /** - * 更新项目域权限 - * @param pipelineId 流水线id - */ - void deleteDmUser(String pipelineId); - - /** - * 创建流水线关联用户 - * @param pipelineId 流水线id - */ - //TODO 不知道用户需不需要 -// void createDmUser(String pipelineId,String createUserId, List userList); - - /** - * 克隆项目角色 - * @param sourceDomainId 原来的流水线ID - * @param cloneDomainId 克隆的流水线ID - */ - void cloneDomainRole(String sourceDomainId,String cloneDomainId); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/condition/service/ConditionService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/condition/service/ConditionService.java deleted file mode 100644 index 4ae8d8c8..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/condition/service/ConditionService.java +++ /dev/null @@ -1,91 +0,0 @@ -package cd.casic.module.process.support.condition.service; - - -import cd.casic.ci.commons.bean.process.definition.Condition; - -import java.util.List; -/** - * 流水线变量服务接口 - */ -public interface ConditionService { - - /** - * 创建条件 - * @param condition 条件 - * @return 条件id - */ - String createCond(Condition condition); - - - /** - * 效验条件 - * @param pipelineId 流水线id - * @param taskId 配置id - * @return 状态 true:条件满足 false:条件不满足 - */ - Boolean variableCondition(String pipelineId,String taskId); - - /** - * 删除条件 - * @param condId 条件id - */ - void deleteCond(String condId); - - /** - * 更新条件 - * @param condition 条件信息 - */ - void updateCond(Condition condition); - - /** - * 查询单个条件 - * @param condId 条件id - * @return 条件信息 - */ - Condition findOneCond(String condId); - - /** - * 查询任务条件 - * @param taskId 任务id - * @return 条件集合 - */ - List findAllTaskCond(String taskId); - - - // 克隆条件 - void cloneCond(String id ,String cloneId); - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/count/PipelineCountService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/count/PipelineCountService.java deleted file mode 100644 index d1040ef2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/count/PipelineCountService.java +++ /dev/null @@ -1,93 +0,0 @@ -package cd.casic.module.process.service.support.count; - -import cd.casic.ci.commons.bean.support.count.*; - -import java.util.List; - -/** - * 流水线统计服务接口 - */ -public interface PipelineCountService { - - /** - * 统计流水线最近的运行时间分布 - * @param countQuery 条件 - * @return 运行时间分布 - */ - List findPipelineRunTimeSpan(PipelineRunCountQuery countQuery); - - - /** - * 统计流水线最近运行时间分布 - * @param countQuery 条件 - * @return 运行时间分布 - */ - List findRunTimeSpan(PipelineRunCountQuery countQuery); - - /** - * 统计流水线最近运行信息 - * @param countQuery 条件 - * @return 运行信息 - */ - List findPipelineRunCount(PipelineRunCountQuery countQuery); - - - /** - * 流水线运行结果统计 - * @param countQuery 条件 - * @return 运行结果 - */ - List findPipelineRunResultCount(PipelineRunCountQuery countQuery); - - - /** - * 统计流水线最近运行结果 - * @param countQuery 条件 - * @return 运行结果 - */ - PipelineRunResultCount findRunResultCount(PipelineRunCountQuery countQuery); - - - /** - * 统计流水线最近运行结果 (全部，成功，失败，成功率) - * @param countQuery 条件 - * @return 运行结果 - */ - List findDayRateCount(PipelineRunCountQuery countQuery); - - /** - * 统计流水线概况 - * @param pipelineId 流水线id - * @return 概况 - */ - PipelineSurveyCount findPipelineSurveyCount(String pipelineId); - - /** - * 统计流水线运行结果 - * @param pipelineId 流水线id - * @return 运行结果 - */ - PipelineSurveyResultCount findPipelineSurveyResultCount(String pipelineId); - - /** - * 统计流水线概况 - * @return 概况 - */ - PipelineSurveyCount findSurveyCount(); - - - /** - * 统计流水线运行结果 - * @return 运行结果 - */ - PipelineSurveyResultCount findSurveyResultCount(); - - - /** - * 获取最近的天数(yyyy-MM-dd 23:59:59) - * @param days 最近几天 - * @return 天数 - */ - List findDaysFormatted(int days); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dao/TaskDeployDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dao/TaskDeployDao.java deleted file mode 100644 index d9a182ba..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dao/TaskDeployDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.service.support.deploy.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.service.support.deploy.dataobject.TaskDeployDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname TaskDeployDao - * @Description TODO - * @Date 2025/4/23 17:16 - */ -@Mapper -public interface TaskDeployDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dao/TaskDeployInstanceDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dao/TaskDeployInstanceDao.java deleted file mode 100644 index 652b5d56..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dao/TaskDeployInstanceDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.service.support.deploy.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.service.support.deploy.dataobject.TaskDeployInstanceDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname TaskDeployInstanceDao - * @Description TODO - * @Date 2025/4/23 17:15 - */ -@Mapper -public interface TaskDeployInstanceDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dataobject/TaskDeployDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dataobject/TaskDeployDo.java deleted file mode 100644 index 69a0195c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dataobject/TaskDeployDo.java +++ /dev/null @@ -1,57 +0,0 @@ -package cd.casic.module.process.service.support.deploy.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_deploy", autoResultMap = true) -public class TaskDeployDo extends BaseDO { - - @TableId - private String taskId; - - //认证类型 - private int authType; - - //文件地址 - private String localAddress; - - //部署地址 - private String deployAddress; - - //认证id - private String authId; - - //部署命令 - private String deployOrder; - - //启动文件地址 - private String startAddress; - - //启动命令 - private String startOrder; - - private String dockerImage; - - private String rule; - - // 命名空间 - private String k8sNamespace; - - // 配置文件 - private String k8sJson; - - // 策略类型 - private String strategyType; - - // 策略数量 - private Integer strategyNumber; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dataobject/TaskDeployInstanceDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dataobject/TaskDeployInstanceDo.java deleted file mode 100644 index 8f6ac1b3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/deploy/dataobject/TaskDeployInstanceDo.java +++ /dev/null @@ -1,37 +0,0 @@ -package cd.casic.module.process.service.support.deploy.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_deploy_instance", autoResultMap = true) -public class TaskDeployInstanceDo extends BaseDO { - - @TableId - private String id; - - private String taskInstanceId; - - // 名称 - private String name; - - // 时间 - private String runTime; - - // 状态 - private String runStatus; - - // 运行日志 - private String runLog; - - private Integer sort; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/disk/model/Disk.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/disk/model/Disk.java deleted file mode 100644 index 3ce7f9c3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/disk/model/Disk.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.support.disk.model; - -public class Disk { - - private String name; - - private String dirSize; - - private String diskSize; - - private String userSize; - - private String path; - - private String filePath; - - public String getFilePath() { - return filePath; - } - - public Disk setFilePath(String filePath) { - this.filePath = filePath; - return this; - } - - public String getPath() { - return path; - } - - public Disk setPath(String path) { - this.path = path; - return this; - } - - public String getName() { - return name; - } - - public Disk setName(String name) { - this.name = name; - return this; - } - - public String getDirSize() { - return dirSize; - } - - public Disk setDirSize(String dirSize) { - this.dirSize = dirSize; - return this; - } - - public String getDiskSize() { - return diskSize; - } - - public Disk setDiskSize(String diskSize) { - this.diskSize = diskSize; - return this; - } - - public String getUserSize() { - return userSize; - } - - public Disk setUserSize(String userSize) { - this.userSize = userSize; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/disk/service/DiskService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/disk/service/DiskService.java deleted file mode 100644 index 7b812a43..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/disk/service/DiskService.java +++ /dev/null @@ -1,24 +0,0 @@ -package cd.casic.module.process.support.disk.service; - - - -import cd.casic.module.process.support.disk.model.Disk; - -import java.util.List; - -public interface DiskService { - - - Boolean deleteDisk(String pipelineId); - - - void validationStorageSpace(); - - - List findDiskList(); - - - void cleanDisk(String fileList); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dao/TaskMessageTypeDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dao/TaskMessageTypeDao.java deleted file mode 100644 index 7894c127..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dao/TaskMessageTypeDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.service.support.message.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.service.support.message.dataobject.TaskMessageTypeDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname TaskMessageTypeDao - * @Description TODO - * @Date 2025/4/23 17:10 - */ -@Mapper -public interface TaskMessageTypeDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dao/TaskMessageUserDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dao/TaskMessageUserDao.java deleted file mode 100644 index f3295ec3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dao/TaskMessageUserDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.service.support.message.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.service.support.message.dataobject.TaskMessageUserDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname TaskMessageUserDao - * @Description TODO - * @Date 2025/4/23 17:11 - */ -@Mapper -public interface TaskMessageUserDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dataobject/TaskMessageTypeDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dataobject/TaskMessageTypeDo.java deleted file mode 100644 index 7221a8af..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dataobject/TaskMessageTypeDo.java +++ /dev/null @@ -1,26 +0,0 @@ -package cd.casic.module.process.service.support.message.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_message_type", autoResultMap = true) -public class TaskMessageTypeDo extends BaseDO { - - @TableId - private String id; - - //任务id - private String taskId; - - //消息类型 - private String taskType; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dataobject/TaskMessageUserDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dataobject/TaskMessageUserDo.java deleted file mode 100644 index b327156a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/dataobject/TaskMessageUserDo.java +++ /dev/null @@ -1,31 +0,0 @@ -package cd.casic.module.process.service.support.message.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_message_user", autoResultMap = true) -public class TaskMessageUserDo extends BaseDO { - - //id - @TableId - private String messageId; - - //类型 - private String taskId; - - //接收人 - private String userId; - - //接收类型 1.全部 2.仅成功 3.仅失败 - private String receiveType; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/package-info.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/package-info.java deleted file mode 100644 index 3ddbd47d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/message/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @Classname package-info - * @Description TODO - * @Date 2025/4/23 17:07 - * @author by mianbin - */ -package cd.casic.module.process.service.support.message; \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java deleted file mode 100644 index 8e87fb17..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/controller/PostprocessController.java +++ /dev/null @@ -1,99 +0,0 @@ -package cd.casic.module.process.support.postprocess.controller; - -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.ci.commons.utils.Result; -import cd.casic.module.process.support.postprocess.service.PostprocessService; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @ClassName PostprocessController - * @Author hopeli - * @Date 2025/4/28 10:43 - * @Version 1.0 - */ -@RestController -@RequestMapping("/postprocess") -public class PostprocessController { - - @Resource - PostprocessService postServer; - - - /** - * 创建流水线后置配置 - * @param postprocess - * @return - */ - @RequestMapping(path="/createPost",method = RequestMethod.POST) - public Result createPost(@RequestBody @NotNull @Valid Postprocess postprocess){ - String postId = postServer.createPostTask(postprocess); - return Result.ok(postId); - } - - /** - * 更新流水线后置配置 - * @param postprocess - * @return - */ - @RequestMapping(path="/updatePost",method = RequestMethod.POST) - public Result updatePost(@RequestBody @NotNull @Valid Postprocess postprocess){ - postServer.updatePostTask(postprocess); - return Result.ok(); - } - - - /** - * 查询流水线后置配置信息 - * @param pipelineId - * @return - */ - @RequestMapping(path="/findPipelinePost",method = RequestMethod.POST) - public Result> findAllPipelinePostTask(@NotNull String pipelineId) { - List list = postServer.findAllPipelinePostTask(pipelineId); - return Result.ok(list); - } - - - /** - * 查询流水线任务后置配置信息 - * @param taskId - * @return - */ - @RequestMapping(path="/findTaskPost",method = RequestMethod.POST) - public Result< List> findAllTaskPostTask(@NotNull String taskId) { - List list = postServer.findAllTaskPostTask(taskId); - return Result.ok(list); - } - - - /** - * 删除流水线任务后置配置信息 - * @param postId - * @return - */ - @RequestMapping(path="/deletePost",method = RequestMethod.POST) - public Result deletePost(@NotNull String postId) { - postServer.deletePostTask(postId); - return Result.ok(); - } - - - /** - * 查询后置配置信息 - * @param postId - * @return - */ - @RequestMapping(path="/findOnePost",method = RequestMethod.POST) - public Result findOnePostOrTask(@NotNull String postId) { - Postprocess postOrTask = postServer.findOnePostOrTask(postId); - return Result.ok(postOrTask); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessDao.java deleted file mode 100644 index eccb85c7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessDao.java +++ /dev/null @@ -1,33 +0,0 @@ -package cd.casic.module.process.support.postprocess.dao; - -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.support.postprocess.entity.PostprocessDo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author by mianbin - * @Classname PostprocessDao - * @Description TODO - * @Date 2025/4/23 16:52 - */ -@Mapper -public interface PostprocessDao extends BaseMapperX { - List findTaskPost(String taskId); - - List findPipelinePost(String pipelineId); - - String createPost(PostprocessDo postprocessEntity); - - void deletePost(String postprocessId); - - PostprocessDo findOnePost(String postprocessId); - - List findAllPost(); - - List findAllPostList(List idList); - - void updatePost(PostprocessDo map); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessInstanceDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessInstanceDao.java deleted file mode 100644 index d5177b46..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/dao/PostprocessInstanceDao.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.support.postprocess.dao; - -import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance; -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.support.postprocess.entity.PostprocessInstanceDo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author by mianbin - * @Classname PostprocessInstanceDao - * @Description TODO - * @Date 2025/4/23 16:54 - */ -@Mapper -public interface PostprocessInstanceDao extends BaseMapperX { - String createPostInstance(PostprocessInstance instance); - - PostprocessInstance findOnePostInstance(String postInstanceId); - - void updatePostInstance(PostprocessInstance instance); - - List findPipelinePostInstance(String instanceId); - - List findAllPostInstance(); - - List findTaskPostInstance(String taskInstanceId); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessDo.java deleted file mode 100644 index 98988e4d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessDo.java +++ /dev/null @@ -1,31 +0,0 @@ -package cd.casic.module.process.support.postprocess.entity; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_postprocess", autoResultMap = true) -public class PostprocessDo extends BaseDO { - - @TableId - private String postId; - - private String postName; - - private int taskSort; - - private String taskType; - - private String taskId; - - private String pipelineId; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessInstanceDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessInstanceDo.java deleted file mode 100644 index d733976f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/entity/PostprocessInstanceDo.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.process.support.postprocess.entity; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -/** - * 任务实例实体 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_postprocess_instance", autoResultMap = true) -public class PostprocessInstanceDo extends BaseDO { - - @TableId - private String id; - - //实例id - private String instanceId; - - //任务实例id - private String taskInstanceId; - - //日志地址 - private String postAddress; - - //运行时间 - private Integer postTime; - - //运行状态 - private String postState; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessExecService.java deleted file mode 100644 index 2bb569b1..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessExecService.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.support.postprocess.service; - - -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; - -import java.util.List; - -/** - * 流水线后置处理服务接口 - */ -public interface PostprocessExecService { - - - /** - * 创建流水线后置任务实例 - * - * @param pipelineId 流水线id - * @param instanceId 流水线实例id - */ - List createPipelinePostInstance(String pipelineId, String instanceId); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessInstanceService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessInstanceService.java deleted file mode 100644 index cb70adb2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessInstanceService.java +++ /dev/null @@ -1,112 +0,0 @@ -package cd.casic.module.process.support.postprocess.service; - -import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance; - -import java.util.List; - -/** - * 流水线后置处理实例服务接口 - */ -public interface PostprocessInstanceService { - - - /** - * 创建后置任务执行实例 - * - * @param instance 实例模型 - * @return 实例id - */ - String createPostInstance(PostprocessInstance instance); - - - /** - * 查询后置任务执行实例 - * - * @param postInstanceId 实例id - * @return 后置任务实例 - */ - PostprocessInstance findPostInstance(String postInstanceId); - - - /** - * 删除实例下的所有后置处理 - * - * @param instanceId 实例id - */ - void deletePipelinePostInstance(String instanceId); - - /** - * 删除实例下的所有后置处理 - * - * @param taskInstanceId 任务实例id - */ - void deleteTaskPostInstance(String taskInstanceId); - - /** - * 更新后置任务实例信息 - * - * @param instance 后置任务实例模型 - */ - void updatePostInstance(PostprocessInstance instance); - - /** - * 查询任务后置处理实例 - * - * @param taskInstanceId 任务执行实例 - * @return 后置处理集合实例 - */ - List findTaskPostInstance(String taskInstanceId); - - - /** - * 查询流水线后置处理实例 - * - * @param instanceId 流水线执行实例 - * @return 后置处理集合实例 - */ - List findPipelinePostInstance(String instanceId); - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java deleted file mode 100644 index d2cd2112..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java +++ /dev/null @@ -1,94 +0,0 @@ -package cd.casic.module.process.support.postprocess.service; - -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.ci.commons.annotation.join.JoinProvider; - -import java.util.List; - -/** - * 流水线后置处理服务接口 - */ -@JoinProvider(model = Postprocess.class) -public interface PostprocessService { - - /** - * 创建 - * - * @param postprocess message信息 - * @return messageId - */ - String createPostTask(Postprocess postprocess); - - - /** - * 查询流水线后置任务 - * - * @param pipelineId 流水线id - * @return 任务 - */ - List findAllPipelinePostTask(String pipelineId); - - - void clonePostTask(String pipelineId, String clonePipelineId); - - /** - * 查询任务后置处理 - * - * @param taskId 任务id - * @return 任务列表 - */ - List findAllTaskPostTask(String taskId); - - - /** - * 删除 - * - * @param postprocessId 后置任务id - */ - void deletePostTask(String postprocessId); - - - /** - * 更新信息 - * - * @param postprocess 信息 - */ - void updatePostTask(Postprocess postprocess); - - - void updatePost(Postprocess postprocess); - - /** - * 查询单个后置任务及详情 - * - * @param postprocessId 后置任务id - * @return 后置任务及详情 - */ - Postprocess findOnePostOrTask(String postprocessId); - - /** - * 查询单个信息 - * - * @param postprocessId 后置任务id - * @return message信息 - */ - Postprocess findOnePost(String postprocessId); - - /** - * 根据流水线id查询后置配置 - * - * @param taskId 流水线id - * @return 配置 - */ - List findAllPost(String taskId); - - /** - * 查询所有信息 - * - * @return message信息集合 - */ - List findAllPost(); - - List findAllPostList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessExecServiceImpl.java deleted file mode 100644 index ed032b11..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessExecServiceImpl.java +++ /dev/null @@ -1,107 +0,0 @@ -package cd.casic.module.process.support.postprocess.service.impl; - -import cd.casic.ci.commons.bean.engine.job.Tasks; -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance; -import cd.casic.module.process.engine.task.TasksExecService; -import cd.casic.module.process.engine.task.TasksService; -import cd.casic.module.process.support.postprocess.service.PostprocessExecService; -import cd.casic.module.process.support.postprocess.service.PostprocessInstanceService; -import cd.casic.module.process.support.postprocess.service.PostprocessService; -import cd.casic.module.process.support.util.PipelineUtilService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * @ClassName PostprocessExecServiceImpl - * @Author hopeli - * @Date 2025/4/28 15:39 - * @Version 1.0 - */ - -@Service -public class PostprocessExecServiceImpl implements PostprocessExecService { - @Resource - PostprocessService postprocessService; - - @Resource - TasksExecService tasksExecService; - - @Resource - PostprocessInstanceService postInstanceService; - - @Resource - PipelineUtilService utilService; - - @Resource - TasksService tasksService; - - private static final Logger logger = LoggerFactory.getLogger(PostprocessExecServiceImpl.class); - - - //后置任务id与后置任务实例id之间的关系 - public static Map postIdOrPostInstanceId = new HashMap<>(); - - //后置实例id与后置任务实例之间的关系 - public static Map postInstanceIdOrPostInstance = new HashMap<>(); - - - private final static Map> pipelineIdOrPostInstanceId = new HashMap<>(); - - @Override - public List createPipelinePostInstance(String pipelineId, String instanceId){ - String fileAddress = utilService.findPipelineDefaultAddress(pipelineId,2) + instanceId; - List postprocessList = postprocessService.findAllPipelinePostTask(pipelineId); - if (postprocessList.isEmpty()){ - return Collections.emptyList(); - } - for (Postprocess postprocess : postprocessList) { - - PostprocessInstance postInstance = new PostprocessInstance(); - postInstance.setInstanceId(instanceId); - postInstance.setPostState(PipelineFinal.RUN_HALT); - String postInstanceId = postInstanceService.createPostInstance(postInstance); - - Tasks task = tasksService.findOnePostTaskOrTask(postprocess.getPostId()); - task.setTaskSort(postprocess.getTaskSort()); - fileAddress = fileAddress + "/" + postInstanceId; - String taskInstanceId = tasksExecService.createTaskExecInstance(task, postInstanceId, 3, fileAddress); - task.setInstanceId(taskInstanceId); - - postInstance.setTaskInstanceId(taskInstanceId); - task.setTaskSort(postprocess.getTaskSort()); - postprocess.setTask(task); - postprocess.setValues(task); - postprocess.setInstanceId(postInstanceId); - } - return postprocessList; - } - - - public String findPostInstanceId(String postId){ - return postIdOrPostInstanceId.get(postId); - } - - public PostprocessInstance findPostInstance(String postInstanceId){ - return postInstanceIdOrPostInstance.get(postInstanceId); - } - - - private List findPipelineOrPostInstanceCache(String pipelineId){ - List list = pipelineIdOrPostInstanceId.get(pipelineId); - if (Objects.isNull(list)){ - return new ArrayList<>(); - } - return list; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessInstanceServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessInstanceServiceImpl.java deleted file mode 100644 index 14f59ec9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessInstanceServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package cd.casic.module.process.support.postprocess.service.impl; - -import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance; -import cd.casic.module.process.support.postprocess.dao.PostprocessInstanceDao; -import cd.casic.module.process.support.postprocess.entity.PostprocessInstanceDo; -import cd.casic.module.process.support.postprocess.service.PostprocessInstanceService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Collections; -import java.util.List; - -/** - * @ClassName PostprocessInstanceServiceImpl - * @Author hopeli - * @Date 2025/4/28 15:42 - * @Version 1.0 - */ -@Service -public class PostprocessInstanceServiceImpl implements PostprocessInstanceService { - - @Resource - private PostprocessInstanceDao postInstanceDao; - - @Override - public String createPostInstance(PostprocessInstance instance) { - return postInstanceDao.createPostInstance(instance); - } - - @Override - public PostprocessInstance findPostInstance(String postInstanceId) { - PostprocessInstance postprocessInstance = postInstanceDao.findOnePostInstance(postInstanceId); - return BeanMapper.map(postprocessInstance,PostprocessInstance.class); - } - - /** - * 删除执行实例 - * @param postInstanceId 实例id - */ - public void deletePostInstance(String postInstanceId) { - postInstanceDao.findOnePostInstance(postInstanceId); - } - - @Override - public void deletePipelinePostInstance(String instanceId) { - List postInstanceList = findPipelinePostInstance(instanceId); - if (postInstanceList.isEmpty()){ - return; - } - for (PostprocessInstance instance : postInstanceList) { - deletePostInstance(instance.getId()); - } - } - - @Override - public void deleteTaskPostInstance(String taskInstanceId) { - List postInstanceList = findPipelinePostInstance(taskInstanceId); - if (postInstanceList.isEmpty()){ - return; - } - for (PostprocessInstance instance : postInstanceList) { - deletePostInstance(instance.getId()); - } - } - - @Override - public void updatePostInstance(PostprocessInstance instance) { - postInstanceDao.updatePostInstance(instance); - } - - @Override - public List findTaskPostInstance(String taskInstanceId) { - List allPostInstanceEntity = postInstanceDao.findTaskPostInstance(taskInstanceId); - if (allPostInstanceEntity.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(allPostInstanceEntity,PostprocessInstance.class); - } - - @Override - public List findPipelinePostInstance(String instanceId) { - List allPostInstanceEntity = postInstanceDao.findPipelinePostInstance(instanceId); - if (allPostInstanceEntity.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(allPostInstanceEntity,PostprocessInstance.class); - } - - /** - * 查询所有后置处理实例 - * @return 后置处理实例集合 - */ - private List findAllPostInstance(){ - List allPostInstance = postInstanceDao.findAllPostInstance(); - if (allPostInstance == null || allPostInstance.isEmpty()){ - return Collections.emptyList(); - } - return allPostInstance; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessServiceImpl.java deleted file mode 100644 index a6a5e1c0..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/impl/PostprocessServiceImpl.java +++ /dev/null @@ -1,198 +0,0 @@ -package cd.casic.module.process.support.postprocess.service.impl; - -import cd.casic.ci.commons.bean.engine.job.Tasks; -import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.module.process.engine.task.TasksCloneService; -import cd.casic.module.process.engine.task.TasksService; -import cd.casic.module.process.support.postprocess.dao.PostprocessDao; -import cd.casic.module.process.support.postprocess.entity.PostprocessDo; -import cd.casic.module.process.support.postprocess.service.PostprocessService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Objects; - -/** - * @ClassName PostprocessServiceImpl - * @Author hopeli - * @Date 2025/4/28 16:26 - * @Version 1.0 - */ -@Service -public class PostprocessServiceImpl implements PostprocessService { - - @Resource - PostprocessDao postprocessDao; - - @Resource - TasksService tasksService; - - @Resource - TasksCloneService tasksCloneService; - - @Override - public String createPostTask(Postprocess postprocess) { - if (Objects.isNull(postprocess.getTaskType())){ - throw new ApplicationException("taskType不能为空！"); - } - - String pipelineId = postprocess.getPipelineId(); - if (Objects.isNull(pipelineId)){ - List taskPost = postprocessDao.findTaskPost(postprocess.getTaskId()); - int size = taskPost.size(); - postprocess.setTaskSort(size); - }else { - List taskPost = postprocessDao.findPipelinePost(pipelineId); - int size = taskPost.size(); - postprocess.setTaskSort(size); - } - - // 设置默认名称 - if (Objects.isNull(postprocess.getPostName())){ - String name = tasksService.initDifferentTaskName(postprocess.getTaskType()); - postprocess.setPostName(name); - } - - PostprocessDo postprocessEntity = BeanMapper.map(postprocess, PostprocessDo.class); - postprocessEntity.setCreateTime(LocalDateTime.now()); - String postId = postprocessDao.createPost(postprocessEntity); - Tasks tasks = new Tasks(); - tasks.setTaskSort(postprocess.getTaskSort()); - tasks.setTaskName(postprocess.getPostName()); - tasks.setTaskType(postprocess.getTaskType()); - tasks.setPostprocessId(postId); - tasks.setValues(postprocess.getValues()); - tasksService.createTasksOrTask(tasks); - return postId; - } - - @Override - public List findAllPipelinePostTask(String pipelineId){ - List allPostEntity = postprocessDao.findPipelinePost(pipelineId); - List postprocessList = BeanMapper.mapList(allPostEntity, Postprocess.class); - if (postprocessList.isEmpty()){ - return Collections.emptyList(); - } - List list = new ArrayList<>(); - for (Postprocess postprocess : postprocessList) { - String postprocessId = postprocess.getPostId(); - Tasks tasks = tasksService.findOnePostTaskOrTask(postprocessId); - postprocess.setTask(tasks); - String taskType = tasks.getTaskType(); - postprocess.setTaskType(taskType); - list.add(postprocess); - } - list.sort(Comparator.comparing(Postprocess::getTaskSort)); - return list; - } - - @Override - public void clonePostTask(String pipelineId,String clonePipelineId){ - List allPostEntity = postprocessDao.findPipelinePost(pipelineId); - List postprocessList = BeanMapper.mapList(allPostEntity, Postprocess.class); - for (Postprocess postprocess : postprocessList) { - postprocess.setPipelineId(clonePipelineId); - PostprocessDo postprocessEntity = BeanMapper.map(postprocess, PostprocessDo.class); - String clonePostId = postprocessDao.createPost(postprocessEntity); - tasksCloneService.clonePostTasks(postprocess.getPostId(),clonePostId); - } - } - - @Override - public List findAllTaskPostTask(String taskId) { - List allPostEntity = postprocessDao.findTaskPost(taskId); - List postprocessList = BeanMapper.mapList(allPostEntity, Postprocess.class); - if (postprocessList.isEmpty()){ - return Collections.emptyList(); - } - List list = new ArrayList<>(); - for (Postprocess postprocess : postprocessList) { - String id = postprocess.getPostId(); - Tasks tasks = tasksService.findOnePostTaskOrTask(id); - String taskType = tasks.getTaskType(); - postprocess.setTaskType(taskType); - postprocess.setTask(tasks); - list.add(postprocess); - } - postprocessList.sort(Comparator.comparing(Postprocess::getCreateTime).reversed()); - return list; - } - - @Override - public void deletePostTask(String postprocessId) { - Tasks postTask = tasksService.findOnePostTask(postprocessId); - String taskId = postTask.getTaskId(); - tasksService.deleteTasksOrTask(taskId); - postprocessDao.deletePost(postprocessId); - } - - @Override - public List findAllPost(String taskId) { - List allPostprocess = findAllPost(); - if (allPostprocess == null){ - return Collections.emptyList(); - } - List list = new ArrayList<>(); - for (Postprocess postprocess : allPostprocess) { - String postTaskId = postprocess.getTaskId(); - if (!postTaskId.equals(taskId)){ - continue; - } - list.add(postprocess); - } - list.sort(Comparator.comparing(Postprocess::getCreateTime).reversed()); - return list; - } - - @Override - public void updatePostTask(Postprocess postprocess) { - String postprocessId = postprocess.getPostId(); - Postprocess onePost = findOnePost(postprocessId); - onePost.setPostName(postprocess.getPostName()); - postprocessDao.updatePost(BeanMapper.map(onePost,PostprocessDo.class)); - - Tasks task = tasksService.findOnePostTask(postprocessId); - Object values = postprocess.getValues(); - task.setTask(values); - task.setValues(values); - task.setTaskType(postprocess.getTaskType()); - tasksService.updateTasksTask(task); - } - - public void updatePost(Postprocess postprocess){ - postprocessDao.updatePost(BeanMapper.map(postprocess,PostprocessDo.class)); - } - - @Override - public Postprocess findOnePostOrTask(String postprocessId) { - Postprocess postprocess = findOnePost(postprocessId); - String id = postprocess.getPostId(); - Tasks taskOrTask = tasksService.findOnePostTaskOrTask(id); - postprocess.setTask(taskOrTask); - postprocess.setTaskType(taskOrTask.getTaskType()); - return postprocess; - } - - @Override - public Postprocess findOnePost(String postprocessId) { - PostprocessDo postprocessEntity = postprocessDao.findOnePost(postprocessId); - return BeanMapper.map(postprocessEntity, Postprocess.class); - } - - @Override - public List findAllPost() { - return BeanMapper.mapList(postprocessDao.findAllPost(), Postprocess.class); - } - - @Override - public List findAllPostList(List idList) { - return BeanMapper.mapList(postprocessDao.findAllPostList(idList), Postprocess.class); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/script/dao/TaskScriptDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/script/dao/TaskScriptDao.java deleted file mode 100644 index 102f1277..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/script/dao/TaskScriptDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.service.support.script.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.service.support.script.dataobject.TaskScriptDo; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author by mianbin - * @Classname TaskScriptDao - * @Description TODO - * @Date 2025/4/23 17:04 - */ -@Mapper -public interface TaskScriptDao extends BaseMapperX { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/script/dataobject/TaskScriptDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/script/dataobject/TaskScriptDo.java deleted file mode 100644 index 902fc88f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/script/dataobject/TaskScriptDo.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.service.support.script.dataobject; - - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_script", autoResultMap = true) -public class TaskScriptDo extends BaseDO { - - //id - @TableId - private String taskId; - - private String name; - - private String type; - - private String scriptOrder; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dao/TriggerDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dao/TriggerDao.java deleted file mode 100644 index 54cd9b93..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dao/TriggerDao.java +++ /dev/null @@ -1,32 +0,0 @@ -package cd.casic.module.process.support.trigger.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.support.trigger.dateObject.Trigger; -import cd.casic.module.process.support.trigger.dateObject.TriggerQuery; -import cd.casic.module.process.support.trigger.entity.TriggerDo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author by mianbin - * @Classname TriggerDao - * @Description TODO - * @Date 2025/4/23 20:03 - */ -@Mapper -public interface TriggerDao extends BaseMapperX { - String createTrigger(TriggerDo triggerEntity); - - void updateTrigger(TriggerDo triggerEntity); - - List findTriggerList(TriggerQuery triggerQuery); - - TriggerDo findOneTrigger(String triggerId); - - void deleteTrigger(String triggerId); - - List findAllTrigger(); - - List findAllTriggerList(List idList); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dao/TriggerTimeDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dao/TriggerTimeDao.java deleted file mode 100644 index b794910d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dao/TriggerTimeDao.java +++ /dev/null @@ -1,29 +0,0 @@ -package cd.casic.module.process.support.trigger.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.support.trigger.dateObject.TriggerTime; -import cd.casic.module.process.support.trigger.entity.TriggerTimeDo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author by mianbin - * @Classname TriggerTimeDao - * @Description TODO - * @Date 2025/4/23 20:04 - */ -@Mapper -public interface TriggerTimeDao extends BaseMapperX { - String createTime(TriggerTimeDo triggerTimeEntity); - - void deleteTime(String timeId); - - void updateTime(TriggerTimeDo triggerTimeEntity); - - TriggerTimeDo findOneTime(String timeId); - - List findAllTime(); - - List findAllTimeList(List idList); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/Trigger.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/Trigger.java deleted file mode 100644 index d35c7095..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/Trigger.java +++ /dev/null @@ -1,49 +0,0 @@ -package cd.casic.module.process.support.trigger.dateObject; - - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author by mianbin - * @Classname Test - * @Description 流水线触发器模型 - * @Date 2025/4/22 8:45 - */ -@Data -@Builder -@Accessors(chain = true) -@AllArgsConstructor -public class Trigger { - - private String triggerId; - - @Schema(description = "名称") - private String name; - - @Schema(description = "类型 任务类型") - private int jobType; - - @Schema(description = "创建时间") - private String createTime; - - @Schema(description = "流水线id") - private Pipeline pipeline; - - @Schema(description = "顺序") - private int jobSort; - - @Schema(description = "更改的数据") - private Object values; - - // 状态 1--未执行 2--已执行,后面枚举 - private String state; - - @Schema(description = "任务类型") - private int taskType; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/TriggerQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/TriggerQuery.java deleted file mode 100644 index 20871abf..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/TriggerQuery.java +++ /dev/null @@ -1,35 +0,0 @@ -package cd.casic.module.process.support.trigger.dateObject; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author by mianbin - * @Classname Test - * @Description 流水线触发器模型 - * @Date 2025/4/22 8:45 - */ -@Data -@Builder -@Accessors(chain = true) -@AllArgsConstructor -public class TriggerQuery { - - //名称 - private String name; - - //定时任务 - private int taskType; - /** - * 流水线ID - */ - private String pipelineId; - - /** - * 状态 1--未执行 2--已执行 - */ - private String state; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/TriggerTime.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/TriggerTime.java deleted file mode 100644 index 0486e5ed..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/dateObject/TriggerTime.java +++ /dev/null @@ -1,62 +0,0 @@ -package cd.casic.module.process.support.trigger.dateObject; - - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @author by mianbin - * @Classname Test - * @Description 流水线触发器时间模型 - * @Date 2025/4/22 8:45 - */ -@Data -@Builder -@Accessors(chain = true) -@AllArgsConstructor -public class TriggerTime { - - private String timeId; - - private int jobType; - - private int date; - - //具体时间 - private String time; - - //配置id - private String triggerId; - - //配置id - private String cron; - - //具体执行时间 - private String weekTime; - - //执行时间 - private String execTime; - - //天数,周几 or 这里使用cron 表达式存储？ - private List timeList; - - private Integer dayTime; - - //类型 - private int type; - - //名称 - private String name; - - /** - * 状态 - */ - private String state; - - private int taskType; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/entity/TriggerDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/entity/TriggerDo.java deleted file mode 100644 index 177ef5c2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/entity/TriggerDo.java +++ /dev/null @@ -1,32 +0,0 @@ -package cd.casic.module.process.support.trigger.entity; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_trigger", autoResultMap = true) -public class TriggerDo extends BaseDO { - - @TableId - private String id; - private String triggerId; - - private String name; - - private int taskSort; - - private int taskType; - - private String pipelineId; - - private String state; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/entity/TriggerTimeDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/entity/TriggerTimeDo.java deleted file mode 100644 index 24d426f1..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/entity/TriggerTimeDo.java +++ /dev/null @@ -1,31 +0,0 @@ -package cd.casic.module.process.support.trigger.entity; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_trigger_time", autoResultMap = true) -public class TriggerTimeDo extends BaseDO { - - @TableId - private String timeId; - - // 1:单次 2:周期 - private String taskType; - - //时间 - private int date; - - private String cron; - - //配置id - private String triggerId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/Job.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/Job.java deleted file mode 100644 index cb46c78d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/Job.java +++ /dev/null @@ -1,289 +0,0 @@ -package cd.casic.module.process.support.trigger.quartz; - -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.module.process.support.trigger.service.CronUtils; -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.JobBuilder; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; -import org.quartz.JobExecutionContext; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.SchedulerFactory; -import org.quartz.Trigger; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; -import org.quartz.impl.StdSchedulerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.batch.BatchProperties; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * @ClassName job - * @Author hopeli - * @Date 2025/4/29 09:36 - * @Version 1.0 - */ - - -@Component -@Scope("singleton") -public class Job { - - private static final Logger logger = LoggerFactory.getLogger(BatchProperties.Job.class); - - private static final SchedulerFactory schedulerFactory = new StdSchedulerFactory(); - - private Scheduler scheduler = null; - - /** - * @param jobClass 执行不同的任务 - * @param cron 时间设置，参考quartz说明文档 - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void addJob(String group, String pipelineId, Class jobClass, String cron,String triggerId) throws SchedulerException { - Map map = CronUtils.cronWeek(cron); - String weekTime = map.get("weekTime"); - Date date = PipelineUtil.StringChengeDate(weekTime); - if (date.getTime() <= new Date().getTime()){ - logger.warn("定时任务时间已过，跳过添加：{}，执行流水线id：{}，执行时间：{}，cron：{}",group,pipelineId, weekTime,cron); - return; - } - - logger.warn("添加定时任务，定时任务组：{}，执行流水线id：{}，执行时间：{}，cron：{}",group,pipelineId, weekTime,cron); - - // 任务名，任务组，任务执行类 - Scheduler scheduler = schedulerFactory.getScheduler(); - - boolean isNewTrigger = false; - - JobKey jobKey = JobKey.jobKey(group); - JobDetail jobDetail = scheduler.getJobDetail(jobKey); - - if (Objects.isNull(jobDetail)){ - JobBuilder jobBuilder = JobBuilder.newJob(jobClass); - //添加pipelineId执行信息 - JobDataMap jobDataMap = new JobDataMap(); - jobDataMap.put("group",group); - jobDataMap.put("triggerId",triggerId); - jobDataMap.put("pipelineId",pipelineId); - jobDataMap.put("cron",cron); - jobDataMap.put("weekTime",map.get("weekTime")); - jobBuilder.setJobData(jobDataMap); - - jobDetail = jobBuilder.withIdentity(group).build(); - - isNewTrigger = true; - - } - - String triggerName = pipelineId + "_" + cron + "_" + triggerId; - - // 添加触发器 - addTrigger(scheduler,jobDetail,group,triggerName,cron,isNewTrigger); - - } - - /** - * 添加触发器 - * @param scheduler 定时器 - * @param jobDetail JobDetail - * @param state 是否为新建trigger - * @param triggerName 流水线ID - * @param cron 时间 - * @throws SchedulerException 添加失败 - */ - private void addTrigger( Scheduler scheduler,JobDetail jobDetail,String group,String triggerName,String cron,Boolean state) throws SchedulerException { - - //触发器名 - // String triggerName = pipelineId + "_" + cron; - - // 触发器 - TriggerBuilder triggerBuilder = TriggerBuilder.newTrigger() - .withIdentity(triggerName, group) // 触发器名,触发器组 - .withSchedule(CronScheduleBuilder.cronSchedule(cron));// 触发器时间设定 - - // Job存在则指定job - if (!state){ - triggerBuilder.forJob(jobDetail); - } - - CronTrigger trigger = (CronTrigger) triggerBuilder.build(); - - // 调度容器设置JobDetail和Trigger - if (state){ - scheduler.scheduleJob(jobDetail, (Trigger) trigger); - }else { - scheduler.scheduleJob((Trigger) trigger); - } - - // 启动 - if (!scheduler.isShutdown()) { - scheduler.start(); - } - - } - - public boolean findTask(String triggerName ,String triggerGroupName){ - try { - Scheduler scheduler = schedulerFactory.getScheduler(); - TriggerKey triggerKey = TriggerKey.triggerKey(triggerName, triggerGroupName); - JobKey jobKey = JobKey.jobKey(" ", " "); - CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey); - if (trigger == null) { - return true; - } - } catch (SchedulerException e) { - throw new RuntimeException(e); - } - return false; - } - - /** - * @Description: 修改一个任务的触发时间 - * @param jobName - * @param jobGroupName - * @param triggerName 触发器名 - * @param triggerGroupName 触发器组名 - * @param cron 时间设置，参考quartz说明文档 - */ - public void modifyJobTime(String jobName,String jobGroupName, String triggerName, String triggerGroupName, String cron) { - try { - Scheduler scheduler = schedulerFactory.getScheduler(); - TriggerKey triggerKey = TriggerKey.triggerKey(triggerName, triggerGroupName); - CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey); - if (trigger == null) { - return; - } - - String oldTime = trigger.getCronExpression(); - if (!oldTime.equalsIgnoreCase(cron)) { - logger.warn("任务："+jobName+"被修改"); - /** 方式一 ：调用 rescheduleJob 开始 */ - /* // 触发器 - TriggerBuilder triggerBuilder = TriggerBuilder.newTrigger(); - // 触发器名,触发器组 - triggerBuilder.withIdentity(triggerName, triggerGroupName); - triggerBuilder.startNow(); - // 触发器时间设定 - triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron)); - // 创建Trigger对象 - trigger = (CronTrigger) triggerBuilder.build(); - // 方式一 ：修改一个任务的触发时间 - scheduler.rescheduleJob(triggerKey, trigger);*/ - /** 方式一 ：调用 rescheduleJob 结束 */ - - /** 方式二：先删除，然后在创建一个新的Job */ - JobDetail jobDetail = scheduler.getJobDetail(JobKey.jobKey(jobName, jobGroupName)); - Class jobClass = jobDetail.getJobClass(); - removeJob(jobName, jobGroupName, triggerName, triggerGroupName); - // addJob(jobName, jobGroupName, triggerName, triggerGroupName, jobClass,cron); - /** 方式二 ：先删除，然后在创建一个新的Job */ - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - - public void removeJob(String group,String triggerName){ - // String triggerName = pipelineId + "_" + cron; - try { - Scheduler scheduler = schedulerFactory.getScheduler(); - // JobKey jobKey = JobKey.jobKey(group); - - TriggerKey triggerKey = TriggerKey.triggerKey(triggerName,group); - scheduler.pauseTrigger(triggerKey);// 停止触发器 - scheduler.unscheduleJob(triggerKey);// 移除触发器 - - logger.warn("移除触发器，定时任务组：{}，triggerName：{}",group , triggerName ); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - - /** - * @Description: 移除一个任务 - * - * @param jobName - * @param jobGroupName - * @param triggerName - * @param triggerGroupName - */ - public void removeJob(String jobName, String jobGroupName,String triggerName, String triggerGroupName) { - try { - Scheduler scheduler = schedulerFactory.getScheduler(); - - TriggerKey triggerKey = TriggerKey.triggerKey(triggerName, triggerGroupName); - - scheduler.pauseTrigger(triggerKey);// 停止触发器 - scheduler.unscheduleJob(triggerKey);// 移除触发器 - scheduler.deleteJob(JobKey.jobKey(jobName, jobGroupName));// 删除任务 - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * @Description:启动所有定时任务 - */ - public void startJobs() { - try { - Scheduler scheduler = schedulerFactory.getScheduler(); - scheduler.start(); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * @Description:关闭所有定时任务 - */ - public void shutdownJobs() { - try { - Scheduler scheduler = schedulerFactory.getScheduler(); - if (!scheduler.isShutdown()) { - scheduler.shutdown(); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * 获取当前正在执行的任务 - * @return - */ - public boolean getCurrentJobs(String name){ - try { - Scheduler scheduler = schedulerFactory.getScheduler(); - List jobContexts = scheduler.getCurrentlyExecutingJobs(); - for (JobExecutionContext context : jobContexts) { - if (name.equals(context.getTrigger().getJobKey().getName())) { - return true; - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } - return false; - } - - public Scheduler getScheduler() { - return scheduler; - } - - public void setScheduler(Scheduler scheduler) { - this.scheduler = scheduler; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/RunJob.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/RunJob.java deleted file mode 100644 index e36e1ba2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/quartz/RunJob.java +++ /dev/null @@ -1,87 +0,0 @@ -package cd.casic.module.process.support.trigger.quartz; - -import cd.casic.ci.commons.bean.engine.execute.PipelineRunMsg; -import cd.casic.module.process.core.context.LoginContext; -import cd.casic.module.process.engine.execute.PipelineExecService; -import cd.casic.module.process.support.trigger.service.TriggerService; -import org.quartz.JobDataMap; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class RunJob implements org.quartz.Job { - - public static PipelineExecService execService; - - public static Job job; - - public static TriggerService triggerService; - - private static final Logger logger = LoggerFactory.getLogger(RunJob.class); - - @Autowired - public void setExecService(PipelineExecService execService) { - RunJob.execService = execService; - } - - @Autowired - public void setQuartzManager(Job job) { - RunJob.job = job; - } - - @Autowired - public void setTriggerConfigServer(TriggerService triggerService) { - RunJob.triggerService = triggerService; - } - - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - JobDataMap map = jobExecutionContext.getMergedJobDataMap(); - String pipelineId = (String)map.get("pipelineId"); - String group = (String)map.get("group"); - String weekTime = (String)map.get("weekTime"); - String cron = (String)map.get("cron"); - - String triggerName = jobExecutionContext.getTrigger().getKey().getName(); - - logger.warn("定时任务触发，组：{}，流水线：{} 时间：{}，",group,pipelineId,weekTime); - String loginId = LoginContext.getLoginId(); - PipelineRunMsg pipelineRunMsg = new PipelineRunMsg(pipelineId,loginId,2); - execService.start(pipelineRunMsg); - triggerService.updateTrigger(triggerName.split("_")[2]); - logger.warn("组：{}，流水线：{},定时任务触发完成",group,pipelineId); - job.removeJob(group,triggerName); - } - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/CronUtils.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/CronUtils.java deleted file mode 100644 index 8fda028d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/CronUtils.java +++ /dev/null @@ -1,181 +0,0 @@ -package cd.casic.module.process.support.trigger.service; - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.utils.PipelineUtil; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.DayOfWeek; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.temporal.TemporalAdjusters; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName CronUtils - * @Author hopeli - * @Date 2025/4/28 14:49 - * @Version 1.0 - */ -public class CronUtils { - - /** - * cron 表达式转换成日期 - * @param cron 表达式 - * @return 日期 - */ - public static Map cronWeek(String cron) { - String[] s = cron.split(" "); - String date = s[2]+":"+s[1]; - - LocalDate localDate = LocalDate.of(Integer.parseInt(s[6]), Integer.parseInt(s[4]), Integer.parseInt(s[3])); - int value = localDate.getDayOfWeek().getValue(); - String[] weekDays = {"今天","周一", "周二", "周三", "周四", "周五", "周六","周日"}; - - String weekTime = weekTime(cron); - - Date chengeDate = PipelineUtil.StringChengeDate(weekTime); - - // 获取当前日期 - LocalDate today = LocalDate.now(); - LocalDate tomorrow = today.plusDays(1); - LocalDateTime tomorrowMidnight = LocalDateTime.of(tomorrow, LocalTime.MIDNIGHT); - Date dates = Date.from(tomorrowMidnight.atZone(ZoneId.systemDefault()).toInstant()); - if (new Date().getTime() < chengeDate.getTime() && chengeDate.getTime()< dates.getTime()){ - value = 0; - } - - String time = weekDays[value]; - - Map map = new HashMap<>(); - map.put("cron",time); - map.put("time",date); - map.put("weekTime",weekTime); - return map; - } - - /** - * 周几转换成具体日期 - * @param cron 表达式 - * @return 日期 - */ - public static String weekTime(String cron){ - String[] s = cron.split(" "); - // 0 27 16 1 4 ? 2023 - return s[6] + "-" + s[4]+ "-" + s[3] +" "+ s[2] + ":"+ s[1] +":00"; - } - - public static String weekCron(String date,int timeDay){ - - int year ; - int month ; - int day ; - String hour ; - String minute ; - - boolean isToday = false; - - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); - Date parse ; - try { - parse = simpleDateFormat.parse(date); - } catch (ParseException e) { - throw new ApplicationException("时间格式转换错误，错误时间：" + date); - } - - SimpleDateFormat dateFormat = new SimpleDateFormat("mm"); - minute = dateFormat.format(parse); - - SimpleDateFormat format = new SimpleDateFormat("HH"); - hour = format.format(parse); - - // 判断是否为今天 - int nowWeek = PipelineUtil.week(); - if( timeDay == nowWeek){ - LocalTime currentTime = LocalTime.now(); - if (currentTime.getHour() == Integer.parseInt(hour) ){ - if (currentTime.getMinute() < Integer.parseInt(minute) ){ - isToday = true; - } - } else if (currentTime.getHour() < Integer.parseInt(hour)){ - isToday = true; - } - } - - if (isToday){ - // 获取今天的日期 - LocalDate currentDate = LocalDate.now(); - // 获取年、月和日 - year = currentDate.getYear(); - month = currentDate.getMonthValue(); - day = currentDate.getDayOfMonth(); - }else { - Map weekDetails ; - if (timeDay <= nowWeek ){ - weekDetails = findNextWeekTime(timeDay); - }else { - weekDetails = findNowWeekTime(timeDay); - } - - year = weekDetails.get("year"); - month = weekDetails.get("month"); - day = weekDetails.get("day"); - } - - return "00 " + minute + " " + hour + " " + day + " " + month + " ? " + year; - } - - /** - * 获取下周的日期 - * @param week 周几 - * @return 下周的日期 - */ - public static Map findNextWeekTime(int week) { - - // 获取当前日期 - LocalDate currentDate = LocalDate.now(); - // 找到下一个周一的日期 - LocalDate nextMonday = currentDate.with(TemporalAdjusters.next(DayOfWeek.MONDAY)); - - LocalDate nextDate = nextMonday.plusDays(week-1); - - // 获取年、月、日和星期几 - int year = nextDate.getYear(); - int month = nextDate.getMonthValue(); - int day = nextDate.getDayOfMonth(); - int dayOfWeek = nextDate.getDayOfWeek().getValue(); - Map weekMap = new HashMap<>(); - weekMap.put("year", nextDate.getYear()); - weekMap.put("month", nextDate.getMonthValue()); - weekMap.put("day", nextDate.getDayOfMonth()); - return weekMap; - } - - /** - * 获取本周的日期 - * @param week 周几 - * @return 下周的日期 - */ - public static Map findNowWeekTime(int week) { - // 获取当前日期 - LocalDate currentDate = LocalDate.now(); - - // 获取传入数字对应的DayOfWeek - DayOfWeek targetDayOfWeek = DayOfWeek.of(week); - - // 如果传入的是星期六或星期天，获取当前周的相应星期的日期 - LocalDate nowDate = (week == 6 || week == 7) ? - currentDate.with(TemporalAdjusters.nextOrSame(targetDayOfWeek)) : - currentDate.with(TemporalAdjusters.next(targetDayOfWeek)); - - Map weekMap = new HashMap<>(); - weekMap.put("year", nowDate.getYear()); - weekMap.put("month", nowDate.getMonthValue()); - weekMap.put("day", nowDate.getDayOfMonth()); - return weekMap; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerService.java deleted file mode 100644 index e9167587..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerService.java +++ /dev/null @@ -1,88 +0,0 @@ -package cd.casic.module.process.support.trigger.service; - -import cd.casic.module.process.support.trigger.dateObject.Trigger; -import cd.casic.module.process.support.trigger.dateObject.TriggerQuery; - -import java.util.List; - -/** - * 流水线触发器服务接口 - *@ClassName TriggerService - *@Author hopeli - *@Date 2025/4/28 14:57 - *@Version 1.0 - */ -public interface TriggerService { - /** - * 创建配置及任务 - * @param trigger 配置 - * @return 配置id - */ - String createTrigger(Trigger trigger); - - /** - * 查询所有配置 - * @param triggerQuery 流水线id - * @return 配置列表 - */ - List findAllTrigger(TriggerQuery triggerQuery); - - - void cloneTrigger(String pipelineId,String clonePipelineId); - - /** - * 删除流水线所有定时任务 - * @param pipelineId 流水线id - */ - void deleteAllTrigger(String pipelineId); - - - /** - * 更新单个定时任务 - * @param triggerId 定时任务id - */ - void updateTrigger(String triggerId); - - /** - * 更新配置信息 - * @param trigger 配置 - */ - void updateTrigger(Trigger trigger); - - /** - * 根据流水线id查询触发器配置 - * @param triggerQuery 流水线id - * @return 配置 - */ - List findTriggerList(TriggerQuery triggerQuery) ; - - - /** - * 删除单个定时任务 - * @param triggerId 定时任务id - */ - void deleteTrigger(String triggerId) ; - - - /** - * 查询所有配置 - * @return 配置列表 - */ - List findAllTrigger(); - - /** - * 根据ID查询配置 - * @param triggerId 配置ID - * @return 配置 - */ - Trigger findOneTriggerById(String triggerId); - - - /** - * 根据ID列表查询配置 - * @param idList 配置ID列表 - * @return 配置列表 - */ - List findAllTriggerConfigList(List idList) ; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerTimeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerTimeService.java deleted file mode 100644 index 38e9c75f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerTimeService.java +++ /dev/null @@ -1,101 +0,0 @@ -package cd.casic.module.process.support.trigger.service; - -import cd.casic.ci.commons.annotation.join.FindList; -import cd.casic.ci.commons.annotation.join.FindOne; -import cd.casic.ci.commons.annotation.join.JoinProvider; -import cd.casic.module.process.support.trigger.dateObject.TriggerTime; - -import java.util.List; - -/** - * 流水线触发器时间服务接口 - * @ClassName TriggerTimeService - * @Author hopeli - * @Date 2025/4/28 15:01 - * @Version 1.0 - */ -@JoinProvider(model = TriggerTime.class) -public interface TriggerTimeService { - - /** - * 创建所有关联时间信息 - * @param triggerTime 信息 - */ - String createTriggerTime(TriggerTime triggerTime, String pipelineId); - - - /** - * 根据配置id查询消息类型 - * @param triggerId 配置id - * @return 消息 - */ - TriggerTime findTriggerTime(String triggerId); - - - /** - * 根据配置查询所有任务 - * @param triggerId 配置id - * @return 任务集合 - */ - List findAllTriggerTime(String triggerId); - - - /** - * 查询cron时间列表 - * @param cron cron表达式 - * @return 时间列表 - */ - List fondCronTimeList(String cron); - - - /** - * 根据配置获取所有时间 - * @param configId 配置id - * @return 时间集合 - */ - List findAllDataConfig(String configId); - - /** - * 删除当前配置下的的所有任务 - * @param triggerId 配置id - */ - void deleteAllTime(String triggerId,String pipelineId); - - - /** - * 周期任务更新执行时间 - * @param timeId 任务id - */ - Boolean deleteCronTime(String pipelineId,String timeId); - - /** - * 删除 - * @param timeId timeId - */ - void deleteTime(String timeId) ; - - - void updateTime(TriggerTime triggerTime); - - /** - * 查询单个信息 - * @param timeId pipelineTimeId - * @return time信息 - */ - @FindOne - TriggerTime findOneTime(String timeId) ; - - /** - * 查询所有信息 - * @return time信息集合 - */ - List findAllTime() ; - - /** - * 根据ID列表查询时间 - * @param idList 时间ID列表 - * @return 时间列表 - */ - @FindList - List findAllTimeList(List idList); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java deleted file mode 100644 index 278582b3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java +++ /dev/null @@ -1,262 +0,0 @@ -package cd.casic.module.process.support.trigger.service.impl; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.ci.commons.annotation.rpc.Exporter; -import cd.casic.module.process.support.trigger.dao.TriggerDao; -import cd.casic.module.process.support.trigger.dateObject.Trigger; -import cd.casic.module.process.support.trigger.dateObject.TriggerQuery; -import cd.casic.module.process.support.trigger.dateObject.TriggerTime; -import cd.casic.module.process.support.trigger.entity.TriggerDo; -import cd.casic.module.process.support.trigger.service.CronUtils; -import cd.casic.module.process.support.trigger.service.TriggerService; -import cd.casic.module.process.support.trigger.service.TriggerTimeService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import cd.casic.module.process.toolkit.join.JoinTemplate; -import com.alibaba.fastjson.JSON; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @ClassName TriggerServiceImpl - * @Author hopeli - * @Date 2025/4/28 16:41 - * @Version 1.0 - */ - - -@Service -@Exporter -public class TriggerServiceImpl implements TriggerService { - - @Resource - TriggerDao triggerDao; - - @Resource - JoinTemplate joinTemplate; - - @Resource - TriggerTimeService timeServer; - - - /** - * 创建配置及任务 - * @param trigger 配置 - * @return 配置id - */ - @Override - public String createTrigger(Trigger trigger) { - trigger.setCreateTime(PipelineUtil.date(1)); - String triggerId = createTriggerConfig(trigger); - int taskType = trigger.getTaskType(); - String pipelineId = trigger.getPipeline().getId(); - if (taskType == 81){ - String object = JSON.toJSONString(trigger.getValues()); - TriggerTime triggerTime = JSON.parseObject(object, TriggerTime.class); - List timeList = triggerTime.getTimeList(); - for (Integer integer : timeList) { - triggerTime.setDayTime(integer); - triggerTime.setTriggerId(triggerId); - timeServer.createTriggerTime(triggerTime,pipelineId); - } - } - return triggerId; - } - - @Override - public List findAllTrigger(TriggerQuery triggerQuery){ - List triggerList = findTriggerList(triggerQuery); - if (triggerList.isEmpty()){ - return Collections.emptyList(); - } - List triggerTimeList = new ArrayList<>(); - for (Trigger trigger : triggerList) { - String triggerId = trigger.getTriggerId(); - TriggerTime triggerTime = timeServer.findTriggerTime(triggerId); - if (triggerTime == null){ - deleteTrigger(trigger.getTriggerId()); - continue; - } - int taskType = trigger.getTaskType(); - triggerTime.setType(taskType); - triggerTime.setState(trigger.getState()); - triggerTimeList.add(triggerTime); - } - - triggerTimeList.sort(Comparator.comparing(TriggerTime::getWeekTime)); - - return new ArrayList<>(triggerTimeList); - } - - @Override - public void cloneTrigger(String pipelineId,String clonePipelineId){ - TriggerQuery triggerQuery = new TriggerQuery(null,0,null,null); - triggerQuery.setPipelineId(pipelineId); - List allTrigger = findTriggerList(triggerQuery); - if (allTrigger.isEmpty()){ - return; - } - for (Trigger trigger : allTrigger) { - String triggerId = trigger.getTriggerId(); - trigger.setPipeline(new Pipeline(clonePipelineId)); - TriggerDo triggerEntity = BeanMapper.map(trigger, TriggerDo.class); - String triggerEntityId = triggerDao.createTrigger(triggerEntity); - - TriggerTime triggerTime = timeServer.findTriggerTime(triggerId); - List timeList = triggerTime.getTimeList(); - for (Integer integer : timeList) { - triggerTime.setDayTime(integer); - triggerTime.setTriggerId(triggerEntityId); - timeServer.createTriggerTime(triggerTime,clonePipelineId); - } - } - - } - - /** - * 删除流水线所有定时任务 - * @param pipelineId 流水线id - */ - @Override - public void deleteAllTrigger(String pipelineId){ - TriggerQuery triggerQuery = new TriggerQuery(null,0,null,null); - triggerQuery.setPipelineId(pipelineId); - List allTriggerConfig = findTriggerList(triggerQuery); - if ( allTriggerConfig.isEmpty()){ - return; - } - for (Trigger trigger : allTriggerConfig) { - String triggerId = trigger.getTriggerId(); - deleteTrigger(triggerId); - timeServer.deleteAllTime(triggerId,pipelineId); - } - } - - /** - * 更新定时任务 - */ - @Override - public void updateTrigger(String triggerId){ - - // List triggerTimeList = timeServer.fondCronTimeList(cron); - // if (triggerTimeList.isEmpty()){ - // return; - // } - // List timeList = triggerTimeList.stream() - // .filter(triggerTime -> { - // String triggerId = triggerTime.getTriggerId(); - // Trigger trigger = findOneTriggerById(triggerId); - // String id = trigger.getPipeline().getId(); - // return id.equals(pipelineId); - // }).toList(); - // - // if (timeList.isEmpty()){ - // return; - // } - - // String triggerId = timeList.get(0).getTriggerId(); - - boolean b = true; - List allTriggerTime = timeServer.findAllTriggerTime(triggerId); - for (TriggerTime time : allTriggerTime) { - String weekTime = CronUtils.weekTime(time.getCron()); - Date date = PipelineUtil.StringChengeDate(weekTime); - - if (date.getTime() < new Date().getTime()){ - continue; - } - b = false; - } - if (b){ - Trigger trigger = findOneTriggerById(triggerId); - System.out.println("更新状态："+trigger.getState() + " 更新ID：" + trigger.getTriggerId()); - TriggerDo triggerEntity = BeanMapper.map(trigger.setState("2"), TriggerDo.class); - triggerDao.updateTrigger(triggerEntity); - } - } - - - @Override - public void updateTrigger(Trigger trigger){ - String triggerId = trigger.getTriggerId(); - if (triggerId == null){ - triggerId = createTrigger(trigger); - } - trigger.setTriggerId(triggerId); - - int taskType = trigger.getTaskType(); - Pipeline pipeline = trigger.getPipeline(); - String pipelineId = pipeline.getId(); - String object = JSON.toJSONString(trigger.getValues()); - if (taskType == 81){ - TriggerTime triggerTime = JSON.parseObject(object, TriggerTime.class); - if (Objects.isNull(triggerTime)){ - return; - } - triggerTime.setTriggerId(triggerId); - timeServer.deleteAllTime(triggerId,pipelineId); - - List timeList = triggerTime.getTimeList(); - for (Integer integer : timeList) { - triggerTime.setDayTime(integer); - timeServer.createTriggerTime(triggerTime,pipelineId); - } - - } - } - - /** - * 根据流水线id查询触发器配置 - * @param triggerQuery 条件 - * @return 配置 - */ - @Override - public List findTriggerList(TriggerQuery triggerQuery) { - List triggerEntityList = triggerDao.findTriggerList(triggerQuery); - - if ( triggerEntityList.isEmpty()){ - return Collections.emptyList(); - } - - return BeanMapper.mapList(triggerEntityList, Trigger.class); - } - - //创建 - public String createTriggerConfig(Trigger trigger){ - TriggerDo configEntity = BeanMapper.map(trigger, TriggerDo.class); - return triggerDao.createTrigger(configEntity); - } - - - public Trigger findOneTriggerById(String triggerId) { - TriggerDo triggerConfigEntity = triggerDao.findOneTrigger(triggerId); - Trigger trigger = BeanMapper.map(triggerConfigEntity, Trigger.class); - joinTemplate.joinQuery(trigger); - return trigger; - } - - @Override - public void deleteTrigger(String triggerId) { - Trigger trigger = findOneTriggerById(triggerId); - String pipelineId = trigger.getPipeline().getId(); - timeServer.deleteAllTime(triggerId,pipelineId); - triggerDao.deleteTrigger(triggerId); - } - - - public List findAllTrigger() { - return BeanMapper.mapList(triggerDao.findAllTrigger(), Trigger.class); - } - - @Override - public List findAllTriggerConfigList(List idList) { - return BeanMapper.mapList(triggerDao.findAllTriggerList(idList), Trigger.class); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java deleted file mode 100644 index bbd35ffe..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java +++ /dev/null @@ -1,228 +0,0 @@ -package cd.casic.module.process.support.trigger.service.impl; - - - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.annotation.rpc.Exporter; -import cd.casic.module.process.support.trigger.dao.TriggerTimeDao; -import cd.casic.module.process.support.trigger.dateObject.TriggerTime; -import cd.casic.module.process.support.trigger.entity.TriggerTimeDo; -import cd.casic.module.process.support.trigger.quartz.Job; -import cd.casic.module.process.support.trigger.quartz.RunJob; -import cd.casic.module.process.support.trigger.service.CronUtils; -import cd.casic.module.process.support.trigger.service.TriggerTimeService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.quartz.SchedulerException; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import static cd.casic.module.process.support.util.util.PipelineFinal.DEFAULT; - -/** - * @ClassName TriggerTimeServiceImpl - * @Author hopeli - * @Date 2025/4/28 17:24 - * @Version 1.0 - */ - -@Service -@Exporter -public class TriggerTimeServiceImpl implements TriggerTimeService { - - @Resource - TriggerTimeDao triggerTimeDao; - - @Resource - Job manager; - - @Override - public String createTriggerTime(TriggerTime triggerTime, String pipelineId){ - List timeList = triggerTime.getTimeList(); - if (timeList == null || timeList.isEmpty()){ - throw new ApplicationException(50001,"无法获取到执行时间"); - } - String time = triggerTime.getTime(); - triggerTime.setDate(triggerTime.getDayTime()); - String cron = CronUtils.weekCron(time, triggerTime.getDayTime()); - triggerTime.setCron(cron); - - String triggerId = triggerTime.getTriggerId(); - - TriggerTimeDo triggerTimeEntity = BeanMapper.map(triggerTime, TriggerTimeDo.class); - String timeId = triggerTimeDao.createTime(triggerTimeEntity); - - try { - manager.addJob(DEFAULT,pipelineId, RunJob.class,cron,triggerId); - } catch (SchedulerException e) { - e.printStackTrace(); - throw new ApplicationException(50001,"当前时间已经添加过，无需重复添加。"); - } - return timeId; - } - - @Override - public TriggerTime findTriggerTime(String configId){ - List allTriggerTime = findAllTriggerTime(configId); - if (allTriggerTime == null || allTriggerTime.isEmpty()){ - return null; - } - - //获取时间 - List allDataConfig = findAllDataConfig(configId); - - StringBuilder execTime = new StringBuilder(); - for (Integer integer : allDataConfig) { - TriggerTime triggerTime = findOneConfig(configId, integer); - triggerTime.setTimeList(allDataConfig); - Map map = CronUtils.cronWeek(triggerTime.getCron()); - execTime.append(map.get("cron")).append(" | "); - } - - Integer integer = allDataConfig.get(0); - TriggerTime triggerTime = findOneConfig(configId, integer); - triggerTime.setTimeList(allDataConfig); - //获取具体时间 - Map map = CronUtils.cronWeek(triggerTime.getCron()); - - triggerTime.setExecTime(execTime + map.get("time")); - triggerTime.setTime(map.get("time")); - triggerTime.setWeekTime(map.get("weekTime")); - - return triggerTime; - } - - @Override - public List findAllTriggerTime(String configId){ - List allTriggerTime = findAllTime(); - if (allTriggerTime == null){ - return null; - } - List list = new ArrayList<>(); - for (TriggerTime triggerTime : allTriggerTime) { - if (triggerTime.getTriggerId().equals(configId)){ - list.add(triggerTime); - } - } - return list; - } - - public TriggerTime findOneConfig(String configId, int day){ - List allTriggerTime = findAllTime(); - if (allTriggerTime == null){ - return null; - } - for (TriggerTime triggerTime : allTriggerTime) { - String timeConfigId = triggerTime.getTriggerId(); - int date = triggerTime.getDate(); - if (timeConfigId.equals(configId) && date == day){ - return triggerTime; - } - } - return null; - } - - - public List fondCronTimeList(String cron){ - List allTriggerTime = findAllTime(); - if (allTriggerTime == null){ - return null; - } - - List triggerTimeList = new ArrayList<>(); - - for (TriggerTime triggerTime : allTriggerTime) { - if (!triggerTime.getCron().equals(cron)){ - continue; - } - triggerTimeList.add(triggerTime); - } - return triggerTimeList; - } - - @Override - public List findAllDataConfig(String configId){ - List allTriggerTime = findAllTriggerTime(configId); - if (allTriggerTime == null){ - return null; - } - List list = new ArrayList<>(); - for (TriggerTime triggerTime : allTriggerTime) { - String s = CronUtils.weekTime(triggerTime.getCron()); - triggerTime.setTime(s); - } - allTriggerTime.sort(Comparator.comparing(TriggerTime::getTime)); - - for (TriggerTime triggerTime : allTriggerTime) { - list.add(triggerTime.getDate()); - } - return list; - } - - @Override - public void deleteAllTime(String triggerId,String pipelineId){ - List triggerTimeConfig = findAllTriggerTime(triggerId); - if (triggerTimeConfig == null){ - return; - } - for (TriggerTime triggerTime : triggerTimeConfig) { - String cron = triggerTime.getCron(); - String triggerName = pipelineId + "_" + cron + "_" + triggerId; - manager.removeJob(DEFAULT,triggerName); - deleteTime(triggerTime.getTimeId()); - } - } - - @Override - public Boolean deleteCronTime(String pipelineId,String timeId){ - TriggerTime oneTriggerTime = findOneTime(timeId); - if (oneTriggerTime.getTaskType() == 1){ - return true; - } - String cron = oneTriggerTime.getCron(); - String triggerId = oneTriggerTime.getTriggerId(); - String[] s = cron.split(" "); - String time = s[2] + ":" + s[1]; - int date = oneTriggerTime.getDate(); - String weekCron = CronUtils.weekCron(time, date); - oneTriggerTime.setCron(weekCron); - try { - manager.addJob(DEFAULT,pipelineId, RunJob.class,weekCron,triggerId); - } catch (SchedulerException e) { - throw new ApplicationException(50001,"当前时间已经添加过，无需重复添加。"); - } - updateTime(oneTriggerTime); - return false; - } - - @Override - public void deleteTime(String timeId) { - triggerTimeDao.deleteTime(timeId); - } - - public void updateTime(TriggerTime triggerTime) { - TriggerTimeDo triggerTimeEntity = BeanMapper.map(triggerTime, TriggerTimeDo.class); - triggerTimeDao.updateTime(triggerTimeEntity); - } - - @Override - public TriggerTime findOneTime(String timeId) { - TriggerTimeDo timeEntity = triggerTimeDao.findOneTime(timeId); - return BeanMapper.map(timeEntity, TriggerTime.class); - - } - - @Override - public List findAllTime() { - return BeanMapper.mapList(triggerTimeDao.findAllTime(), TriggerTime.class); - } - - @Override - public List findAllTimeList(List idList) { - return BeanMapper.mapList(triggerTimeDao.findAllTimeList(idList), TriggerTime.class); - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/PipelineDataService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/PipelineDataService.java deleted file mode 100644 index 09f710f5..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/PipelineDataService.java +++ /dev/null @@ -1,15 +0,0 @@ -package cd.casic.module.process.support.util; - -/** - * @ClassName PipelineDataService - * @Author hopeli - * @Date 2025/5/2 18:27 - * @Version 1.0 - */ -public interface PipelineDataService { - - /** - * 清理消息数据 - */ - void cleanMessageData(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/PipelineUtilService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/PipelineUtilService.java deleted file mode 100644 index 8211ad12..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/PipelineUtilService.java +++ /dev/null @@ -1,43 +0,0 @@ -package cd.casic.module.process.support.util; - -import cd.casic.framework.commons.exception.ServiceException; - - -public interface PipelineUtilService { - - /** - * 获取当前用户存储空间地址 - * @param type 获取类型 1.源文件 2.日志文件 - * @return 地址 - */ - String instanceAddress(int type); - - - /** - * 获取流水线默认位置 - * @param pipelineId 流水线id - * @param type 获取类型 1.源文件 2.日志文件 - * @return 地址 - */ - String findPipelineDefaultAddress(String pipelineId,int type); - - /** - * 配置指定位置文件 - * @param pipelineId 流水线id - * @param regex 匹配规则 - * @return 文件地址 - */ - String findFile(String pipelineId,String fileDir, String regex) throws ServiceException; - - - /** - * 获取Java安装位置 - * @return Java安装位置 - */ - String findJavaPath(); - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineDataServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineDataServiceImpl.java deleted file mode 100644 index 42dabdbe..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineDataServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package cd.casic.module.process.support.util.impl; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.module.process.message.message.MessageDmNoticeService; -import cd.casic.module.process.message.message.model.MessageDmNotice; -import cd.casic.module.process.message.message.model.MessageDmNoticeQuery; -import cd.casic.module.process.message.message.model.MessageNoticePatch; -import cd.casic.module.process.pipeline.definition.PipelineService; -import cd.casic.module.process.support.util.PipelineDataService; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @ClassName PipelineDataServiceImpl - * @Author hopeli - * @Date 2025/5/2 18:27 - * @Version 1.0 - */ -@Service -public class PipelineDataServiceImpl implements PipelineDataService { - - @Resource - PipelineService pipelineService; - - @Resource - MessageDmNoticeService messageDmNoticeService; - - - @Override - public void cleanMessageData(){ - - List allPipeline = pipelineService.findAllPipelineNoQuery(); - - for (Pipeline pipeline : allPipeline) { - String domainId = pipeline.getId(); - - MessageDmNoticeQuery messageDmNoticeQuery = new MessageDmNoticeQuery(); - messageDmNoticeQuery.setDomainId(domainId); - List messageDmNoticeList = - messageDmNoticeService.findMessageDmNoticeList(messageDmNoticeQuery); - - if (!messageDmNoticeList.isEmpty()){ - continue; - } - - // 克隆消息模版 - MessageNoticePatch messageNoticePatch = new MessageNoticePatch(); - messageNoticePatch.setDomainId(domainId); - messageNoticePatch.setUserList(List.of(String.valueOf(pipeline.getAdminUserRespDTO().getId()))); - messageDmNoticeService.initMessageDmNotice(messageNoticePatch); - } - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineUtilServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineUtilServiceImpl.java deleted file mode 100644 index 13f83b92..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/impl/PipelineUtilServiceImpl.java +++ /dev/null @@ -1,126 +0,0 @@ -package cd.casic.module.process.support.util.impl; - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.utils.PipelineFileUtil; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.module.process.core.context.AppHomeContext; -import cd.casic.module.process.support.util.PipelineUtilService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * @ClassName PipelineUtilServiceImpl - * @Author hopeli - * @Date 2025/5/2 18:22 - * @Version 1.0 - */ -@Service -public class PipelineUtilServiceImpl implements PipelineUtilService{ - @Value("${DATA_HOME:null}") - String dataHome; - - @Value("${jdk.address:null}") - String jdkPath; - - @Override - public String instanceAddress(int type) { - if (Objects.isNull(dataHome) || "null".equals(dataHome)){ - dataHome = "/opt/tiklab/tiklab-arbess"; - } - - return switch (type) { - case 0 -> dataHome + PipelineFinal.MATFLOW_INSTABCE; - case 1 -> dataHome + PipelineFinal.MATFLOW_WORKSPACE; - default -> dataHome + PipelineFinal.MATFLOW_LOGS; - }; - } - - @Override - public String findPipelineDefaultAddress(String pipelineId, int type) { - String path = instanceAddress(type); - int systemType = PipelineUtil.findSystemType(); - if (systemType == 1){ - if (!PipelineUtil.isNoNull(pipelineId)){ - return path + "\\"; - }else { - return path + "\\" + pipelineId + "\\"; - } - }else { - if (!PipelineUtil.isNoNull(pipelineId)){ - return path + "/"; - }else { - return path + "/" + pipelineId + "/" ; - } - } - } - - - @Override - public String findFile(String pipelineId,String fileDir, String regex) { - List list = new ArrayList<>(); - - File file3 = new File(fileDir); - if (file3.exists() && file3.isFile()){ - return fileDir; - } - - File file2 = new File(fileDir + "/" + regex); - if (file2.exists() && file2.isFile()){ - return file2.getAbsolutePath(); - } - - List filePath = PipelineFileUtil.getFilePath(new File(fileDir),new ArrayList<>()); - for (String s : filePath) { - File file = new File(s); - - //拼装正则匹配 - boolean matches = file.getName().matches("^(.*" + regex + ".*)"); - - //正则匹配 - boolean matches1 = file.getName().matches(regex); - - File file1 = new File(s + "/" + regex); - if (file1.exists()){ - return file1.getAbsolutePath(); - } - - if (matches || matches1){ - list.add(s); - } - } - - if (list.size() > 1){ - StringBuilder s = new StringBuilder("匹配到多个文件，请重新输入文件信息。"); - for (String s1 : list) { - s.append("\n").append(s1); - } - throw new ApplicationException(s.toString()); - } - - if (list.size()== 1){ - return list.get(0); - } - throw new ApplicationException("没有匹配到文件。"); - } - - - @Override - public String findJavaPath(){ - - if (!"null".equals(jdkPath)){ - return jdkPath; - } - - String appHome = AppHomeContext.getAppHome(); - String applyRootDir = new File(appHome).getParentFile().getParent(); - - return appHome+"/embbed/jdk-16.0.2"; - - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineFinal.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineFinal.java deleted file mode 100644 index 4efa1d53..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineFinal.java +++ /dev/null @@ -1,229 +0,0 @@ -package cd.casic.module.process.support.util.util; - -public class PipelineFinal { - - /** - * 项目名称 - */ - public static final String appName = "arbess"; - - /** - * DEFAULT - */ - public static final String DEFAULT = "default"; - - /** - * 流水线文件系统 - */ - public static final String MATFLOW_WORKSPACE = "/source"; - - public static final String MATFLOW_LOGS = "/artifact"; - - public static final String MATFLOW_INSTABCE = "/instance"; - - - /** - * 流水线运行状态 - */ - //流水线运行状态 - public static final String RUN_SUCCESS = "success"; - - public static final String RUN_ERROR = "error"; - - public static final String RUN_WAIT = "wait"; - - public static final String RUN_HALT = "halt"; - - public static final String RUN_RUN = "run"; - - public static final String RUN_SUSPEND = "suspend"; - - - /** - * 系统编码 - */ - //字节编码 - public static final String UTF_8 = "UTF-8"; - - public static final String GBK = "GBK"; - - - /** - * 消息 - */ - //消息发送类型 - public static final String MES_PIPELINE_RUN = "PIPELINE_RUN"; - - //消息发送方式 - public static final String MES_SEND_SITE = "site"; - public static final String MES_SEND_EMAIL = "email"; - public static final String MES_SEND_DINGDING = "dingding"; - public static final String MES_SEND_WECHAT = "qywechat"; - public static final String MES_SEND_SMS = "sms"; - - //消息通知方案 - public static final String MES_UPDATE = "MF_MES_TYPE_UPDATE"; - public static final String MES_DELETE = "MF_MES_TYPE_DELETE"; - public static final String MES_CREATE = "MF_MES_TYPE_CREATE"; - public static final String MES_RUN = "MF_MES_TYPE_RUN"; - - - // 日志类型 - public static final String LOG_TYPE_CREATE = "MF_LOG_TYPE_CREATE"; - - public static final String LOG_TYPE_DELETE = "MF_LOG_TYPE_DELETE"; - - public static final String LOG_TYPE_UPDATE = "MF_LOG_TYPE_UPDATE"; - - public static final String LOG_TYPE_RUN = "MF_LOG_TYPE_RUN"; - - - public static final String CREATE_LINK = "/pipeline/${pipelineId}/config"; - - public static final String DELETE_LINK = "/pipeline/${pipelineId}/delete"; - - public static final String UPDATE_LINK = "/pipeline/${pipelineId}/set/info"; - - public static final String RUN_LINK = "/pipeline/${pipelineId}/history/${instanceId}"; - - - /** - * 构建产物信息 - */ - // 默认制品地址 - public static final String PROJECT_DEFAULT_ADDRESS = "${PROJECT_DEFAULT_ADDRESS}"; - - public static final String DEFAULT_ARTIFACT_ADDRESS = "DEFAULT_ARTIFACT_ADDRESS"; - - // 默认制品 - public static final String DEFAULT_ARTIFACT_NAME = "DEFAULT_ARTIFACT_NAME"; - - // Docker制品 - public static final String DEFAULT_ARTIFACT_DOCKER = "DEFAULT_ARTIFACT_DOCKER"; - - // Docker名称 - public static final String DEFAULT_ARTIFACT_DOCKER_NAME = "DEFAULT_ARTIFACT_DOCKER_NAME"; - - - // 默认源码位置 - public static final String DEFAULT_CODE_ADDRESS = "${DEFAULT_CODE_ADDRESS}"; - - public static final String DEFAULT_TYPE = "string"; - - /** - * 默认命令 - */ - public static final String TEST_DEFAULT_ORDER = "mvn test"; - public static final String MAVEN_DEFAULT_ORDER = "mvn clean package"; - public static final String NODE_DEFAULT_ORDER = "npm install"; - public static final String DOCKER_DEFAULT_ORDER = "docker image build -t default ."; - - /** - * 文件信息 - */ - public static final String FILE_TEMP_PREFIX = "temp"; - public static final String FILE_TYPE_TXT = ".txt"; - public static final String FILE_TYPE_SH = ".sh"; - public static final String FILE_TYPE_BAT = ".bat"; - - /** - * 系统任务类型 - */ - - // 源码应用类型 - public static final String TASK_TYPE_CODE = "code"; - public static final String TASK_CODE_GIT = "git"; - public static final String TASK_CODE_GITLAB = "gitlab"; - public static final String TASK_CODE_GITHUB = "github"; - public static final String TASK_CODE_GITEE = "gitee"; - public static final String TASK_CODE_SVN = "svn"; - public static final String TASK_CODE_XCODE = "gitpuk"; - public static final String TASK_CODE_DEFAULT_BRANCH = "master"; - - - // 构建应用类型 - public static final String TASK_TYPE_BUILD = "build"; - public static final String TASK_BUILD_MAVEN = "maven"; - public static final String TASK_BUILD_NODEJS = "nodejs"; - - public static final String TASK_BUILD_DOCKER = "build_docker"; - - - // 测试应用类型 - public static final String TASK_TYPE_TEST = "test"; - public static final String TASK_TEST_MAVENTEST = "maventest"; - public static final String TASK_TEST_TESTON = "testhubo"; - - - // 部署应用类型 - public static final String TASK_TYPE_DEPLOY = "deploy"; - public static final String TASK_DEPLOY_LINUX = "liunx"; - public static final String TASK_DEPLOY_DOCKER = "docker"; - public static final String TASK_DEPLOY_K8S = "k8s"; - - - // 推送制品应用类型 - public static final String TASK_TYPE_ARTIFACT = "artifact"; - public static final String TASK_ARTIFACT_MAVEN = "artifact_maven"; - public static final String TASK_ARTIFACT_NODEJS = "artifact_nodejs"; - public static final String TASK_ARTIFACT_DOCKER = "artifact_docker"; - - - // 制品拉取应用类型 - public static final String TASK_TYPE_PULL = "pull"; - public static final String TASK_PULL_MAVEN = "pull_maven"; - public static final String TASK_PULL_NODEJS = "pull_nodejs"; - public static final String TASK_PULL_DOCKER = "pull_docker"; - - // 制品推送应用方式 - public static final String TASK_ARTIFACT_XPACK = "hadess"; - public static final String TASK_ARTIFACT_SSH = "ssh"; - public static final String TASK_ARTIFACT_NEXUS = "nexus"; - - // 代码扫描应用类型 - public static final String TASK_TYPE_CODESCAN = "codescan"; - public static final String TASK_CODESCAN_SONAR = "sonar"; - public static final String TASK_CODESCAN_SPOTBUGS = "spotbugs"; - - // 消息应用类型 - public static final String TASK_TYPE_MESSAGE = "message"; - public static final String TASK_MESSAGE_MSG = "message"; - - // 脚本应用类型 - public static final String TASK_TYPE_SCRIPT = "script"; - public static final String TASK_SCRIPT_SHELL = "shell"; - public static final String TASK_SCRIPT_BAT = "bat"; - - - //触发器 - public static final String TRIGGER_SCHEDULED = "scheduled"; - - - public static final String SIZE_TYPE_MB = "MB"; - - public static final int DEFAULT_SIZE = 2; - - - public static final String SIZE_TYPE_GB = "GB"; - - - public static final Integer DEFAULT_CLEAN_CACHE_DAY = 7; - - - // 上传类型 - public static final String TASK_TYPE_UPLOAD = "upload"; - public static final String TASK_UPLOAD_HADESS = "upload_hadess"; - public static final String TASK_UPLOAD_SSH = "upload_ssh"; - public static final String TASK_UPLOAD_NEXUS = "upload_nexus"; - public static final String TASK_UPLOAD_DOCKER = "upload_docker"; - - - - - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineRequestUtil.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineRequestUtil.java deleted file mode 100644 index 190ac9a0..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/util/util/PipelineRequestUtil.java +++ /dev/null @@ -1,222 +0,0 @@ -package cd.casic.module.process.support.util.util; - -/** - * @ClassName TaskArtifactServiceImpl - * @Author hopeli - * @Date 2025/5/5 06:04 - * @Version 1.0 - */ - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.exception.SystemException; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Component; -import org.springframework.web.client.ResourceAccessException; -import org.springframework.web.client.RestTemplate; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -@Component -public class PipelineRequestUtil { - - @Autowired - RestTemplate restTemplate; - - @Autowired - PipelineRequestUtil requestUtil; - - - /** - * 发起Post请求 - * @param headers 请求头 - * @param requestUrl 请求地址 - * @param param 请求参数 - * @param tClass 返回类型 - * @return 请求结果 - * @throws ApplicationException 请求失败 - */ - public T requestPost(HttpHeaders headers, String requestUrl, Object param, Class tClass){ - - // 创建带有头部和请求体的 HttpEntity - HttpEntity requestEntity = new HttpEntity<>(param, headers); - ResponseEntity response; - try { - response = restTemplate.exchange(requestUrl, HttpMethod.POST, requestEntity, JSONObject.class); - }catch (ResourceAccessException e){ - boolean timedOut = Objects.requireNonNull(e.getMessage()).contains("Read timed out"); - boolean connectOut = Objects.requireNonNull(e.getMessage()).contains("Connect timed out"); - if (timedOut || connectOut){ - throw new ApplicationException(50001,"请求超时！"); - } - throw new SystemException(String.valueOf(e)); - } - - JSONObject jsonObject = response.getBody(); - return findBody(jsonObject,tClass); - } - - public List requestPostList(HttpHeaders headers, String requestUrl, Object param, Class tClass){ - - // 创建带有头部和请求体的 HttpEntity - HttpEntity requestEntity = new HttpEntity<>(param, headers); - - ResponseEntity response; - try { - response = restTemplate.exchange(requestUrl, HttpMethod.POST, requestEntity, JSONObject.class); - }catch (ResourceAccessException e){ - boolean timedOut = Objects.requireNonNull(e.getMessage()).contains("Read timed out"); - boolean connectOut = Objects.requireNonNull(e.getMessage()).contains("Connect timed out"); - if (timedOut || connectOut){ - throw new ApplicationException(50001,"请求超时！"); - } - throw new RuntimeException(e); - } - - JSONObject jsonObject = response.getBody(); - return findBodyList(jsonObject,tClass); - } - - - /** - * 发起Get请求 - * @param headers 请求头 - * @param requestUrl 请求地址 - * @param tClass 返回类型 - * @return 请求结果 - * @throws ApplicationException 请求失败 - */ - public T requestGet(HttpHeaders headers, String requestUrl, Object param, Class tClass){ - - // 创建带有头部和请求体的 HttpEntity - HttpEntity requestEntity = new HttpEntity<>(param, headers); - - ResponseEntity response; - try { - response = restTemplate.exchange(requestUrl, HttpMethod.GET, requestEntity, JSONObject.class); - }catch (ResourceAccessException e){ - boolean timedOut = Objects.requireNonNull(e.getMessage()).contains("Read timed out"); - boolean connectOut = Objects.requireNonNull(e.getMessage()).contains("Connect timed out"); - if (timedOut || connectOut){ - throw new ApplicationException(50001,"请求超时！"); - } - throw new RuntimeException(); - } - JSONObject jsonObject = response.getBody(); - - return findBody(jsonObject,tClass); - } - - public List requestGetList(HttpHeaders headers, String requestUrl, Object param, Class tClass){ - - // 创建带有头部和请求体的 HttpEntity - HttpEntity requestEntity = new HttpEntity<>(param, headers); - - ResponseEntity response; - try { - response = restTemplate.exchange(requestUrl, HttpMethod.GET, requestEntity, JSONObject.class); - }catch (ResourceAccessException e){ - boolean timedOut = Objects.requireNonNull(e.getMessage()).contains("Read timed out"); - boolean connectOut = Objects.requireNonNull(e.getMessage()).contains("Connect timed out"); - if (timedOut || connectOut){ - throw new ApplicationException(50001,"请求超时！"); - } - throw new SystemException(String.valueOf(e)); - } - JSONObject jsonObject = response.getBody(); - return findBodyList(jsonObject,tClass); - } - - - /** - * 转换接口请求内容 - * @param jsonObject 接口返回数据 - * @param tClass 转换模型 - * @return 转换后对象 - * @param 对象类型 - */ - public T findBody(JSONObject jsonObject,Class tClass){ - if (Objects.isNull(jsonObject)){ - throw new ApplicationException(50001,"获取接口返回数据为空！"); - } - Integer code = jsonObject.getInteger("code"); - if (code != 0){ - String msg = jsonObject.getString("msg"); - throw new SystemException("错误！,Message：" + msg); - } - - if (tClass.isAssignableFrom(String.class)){ - String data = jsonObject.getString("data"); - return (T)data; - } - - JSONObject data = jsonObject.getJSONObject("data"); - if (Objects.isNull(data)){ - return null; - } - - return JSONObject.parseObject(data.toJSONString(), tClass); - } - - /** - * 转换接口请求内容 - * @param jsonObject 接口返回数据 - * @param tClass 转换模型 - * @return 转换后对象 - * @param 对象类型 - */ - public List findBodyList(JSONObject jsonObject,Class tClass){ - - if (Objects.isNull( jsonObject)){ - throw new SystemException("获取返回值为空！"); - } - Integer code = jsonObject.getInteger("code"); - if (code != 0){ - String msg = jsonObject.getString("msg"); - throw new ApplicationException("错误！,Message："+msg); - } - if(Objects.isNull(tClass)){ - return null; - } - - JSONArray data = jsonObject.getJSONArray("data"); - if (Objects.isNull(data)){ - return null; - } - return data.toJavaList(tClass); - } - - /** - * - * @param mediaType 请求类型 MediaType.MULTIPART_FORM_DATA --formdata MediaType.APPLICATION_JSON --json - * @param headerMap 其他请求头 - * @return 请求头 - */ - public HttpHeaders initHeaders(MediaType mediaType, Map headerMap){ - HttpHeaders headers = new HttpHeaders(); - headers.setAccept(Collections.singletonList(mediaType)); - if (Objects.isNull(headerMap)){ - return headers; - } - for (Map.Entry header : headerMap.entrySet()) { - String key = header.getKey(); - String value = header.getValue(); - headers.set(key,value); - } - return headers; - } - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/dao/VariableDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/dao/VariableDao.java deleted file mode 100644 index 331b6b83..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/dao/VariableDao.java +++ /dev/null @@ -1,30 +0,0 @@ -package cd.casic.module.process.support.variable.dao; - -import cd.casic.framework.mybatis.core.mapper.BaseMapperX; -import cd.casic.module.process.support.variable.dataobject.VariableDo; -import cd.casic.ci.commons.bean.process.definition.Variable; -import cd.casic.module.process.support.variable.model.VariableQuery; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author by mianbin - * @Classname VariableDao - * @Description TODO - * @Date 2025/4/23 20:07 - */ -@Mapper -public interface VariableDao extends BaseMapperX { - String createVariable(Variable variable); - - void deleteVariable(String varId); - - void updateVariable(Variable variable); - - Variable findOneVariable(String varId); - - List findAllVariable(); - - List findVariableList(VariableQuery query); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/dataobject/VariableDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/dataobject/VariableDo.java deleted file mode 100644 index 8017952e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/dataobject/VariableDo.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.process.support.variable.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; -import lombok.experimental.Accessors; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_pipeline_variable", autoResultMap = true) -public class VariableDo extends BaseDO { - - //流水线配置id - @TableId - private String varId; - - //名称 - private String varKey; - - //值 - private String varValue; - - //类型 - private String varType; - - private int type; - - //任务id - private String taskId; - - private String pipelineId; - - private String varValues; -} \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/model/ExecVariable.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/model/ExecVariable.java deleted file mode 100644 index c3f379c6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/model/ExecVariable.java +++ /dev/null @@ -1,34 +0,0 @@ -package cd.casic.module.process.support.variable.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author by mianbin - * @Classname Test - * @Description 流水线条件模型 - * @Date 2025/4/22 8:45 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -public class ExecVariable { - - //类型 str.字符串 single.单选 - private String varType; - - //名称 - private String varKey; - - //默认值 - private Object varValue; - - //默认值 - private String pipelineId; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/model/VariableQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/model/VariableQuery.java deleted file mode 100644 index c8045fab..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/model/VariableQuery.java +++ /dev/null @@ -1,50 +0,0 @@ -package cd.casic.module.process.support.variable.model; - -import cd.casic.framework.commons.pojo.PageParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author by mianbin - * @Classname Test - * @Description 流水线条件模型 - * @Date 2025/4/22 8:45 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -public class VariableQuery { - - //类型 1.字符串 2.单选 - private int taskType; - - //类型 1.全局 2.项目 - private int type; - - //任务id - private String taskId; - - //名称 - private String varKey; - - //默认值 - private String varValue; - - //值 - private String varValues; - - //流水线id - private String pipelineId; - - //分页参数 - private PageParam pageParam = new PageParam(); - - //排序参数 - private Object orderParams; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/ExecVariableService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/ExecVariableService.java deleted file mode 100644 index 5fe31395..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/ExecVariableService.java +++ /dev/null @@ -1,24 +0,0 @@ -package cd.casic.module.process.support.variable.service; - - -import cd.casic.module.process.support.variable.model.ExecVariable; - -/** - * 执行变量服务接口 - */ -public interface ExecVariableService { - - /** - * 初始化流水线变量 - * @param pipelineId 流水线ID - * @param taskId 任务ID - */ - void initPipelineVariable(String pipelineId,String taskId); - - /** - * 添加执行变量 - * @param variable 执行变量 - */ - void addExecVariable(ExecVariable variable); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/VariableService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/VariableService.java deleted file mode 100644 index 1faac048..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/VariableService.java +++ /dev/null @@ -1,80 +0,0 @@ -package cd.casic.module.process.support.variable.service; - -import cd.casic.ci.commons.bean.process.definition.Variable; -import cd.casic.module.process.support.variable.model.VariableQuery; - -import java.util.List; - -/** - * 流水线条件服务接口 - */ -public interface VariableService { - - /** - * 创建变量 - * - * @param variable 变量信息 - * @return 变量id - */ - String createVariable(Variable variable); - - /** - * 删除变量 - * - * @param varId 变量id - */ - void deleteVariable(String varId); - - /** - * 更新变量 - * - * @param variable 变量信息 - */ - void updateVariable(Variable variable); - - - /** - * 替换变量 - * - * @param pipelineId 流水线id - * @param taskId 任务id - * @param order 需要替换的内容 - * @return 替换后的内容 - */ - String replaceVariable(String pipelineId, String taskId, String order); - - /** - * 查询单个变量 - * - * @param varId 变量id - * @return 变量信息 - */ - Variable findOneVariable(String varId); - - /** - * 获取所以变量 - * - * @return 变量 - */ - List findAllVariable(); - - /** - * 查询流水线所有变量 - * - * @param taskId 任务id - * @return 变量 - */ - List findAllVariable(String taskId); - - /** - * 条件查询变量 - * - * @param query 条件 - * @return 变量列表 - */ - List findVariableList(VariableQuery query); - - // 克隆变量 - void cloneVariable(String id, String cloneId); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/ExecVariableServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/ExecVariableServiceImpl.java deleted file mode 100644 index 6484fbbb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/ExecVariableServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.support.variable.service.impl; - -import cd.casic.module.process.support.variable.model.ExecVariable; -import cd.casic.module.process.support.variable.service.ExecVariableService; - -/** - * @ClassName ExecVariableServiceImpl - * @Author hopeli - * @Date 2025/5/2 18:47 - * @Version 1.0 - */ -public class ExecVariableServiceImpl implements ExecVariableService { - @Override - public void initPipelineVariable(String pipelineId, String taskId) { - - } - - @Override - public void addExecVariable(ExecVariable variable) { - - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/VariableServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/VariableServiceImpl.java deleted file mode 100644 index b0d0939a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/variable/service/impl/VariableServiceImpl.java +++ /dev/null @@ -1,173 +0,0 @@ -package cd.casic.module.process.support.variable.service.impl; - -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.module.process.support.variable.dao.VariableDao; -import cd.casic.module.process.support.variable.dataobject.VariableDo; -import cd.casic.ci.commons.bean.process.definition.Variable; -import cd.casic.module.process.support.variable.model.VariableQuery; -import cd.casic.module.process.support.variable.service.VariableService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.text.StrSubstitutor; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @ClassName VariableServiceImpl - * @Author hopeli - * @Date 2025/5/2 18:49 - * @Version 1.0 - */ -public class VariableServiceImpl implements VariableService { - - @Resource - private VariableDao variableDao; - - - public String replaceVariable(String pipelineId,String taskId,String order){ - Map map = new HashMap<>(); - //替换全局变量 - List allVariable = findAllVariable(pipelineId); - if (!allVariable.isEmpty()){ - for (Variable variable : allVariable) { - String varKey = variable.getVarKey(); - String varValue = variable.getVarValue(); - map.put(varKey,varValue); - } - } - //替换局部变量 - List variableList = findAllVariable(taskId); - if (!variableList.isEmpty()){ - for (Variable variable : variableList) { - String varValue = variable.getVarValue(); - String varKey = variable.getVarKey(); - map.put(varKey,varValue); - } - } - - StrSubstitutor substitutor = new StrSubstitutor(map); - return substitutor.replace(order); - } - - @Override - public String createVariable(Variable variable) { - String taskType = variable.getVarType(); - variable.setCreateTime(PipelineUtil.date(1)); - if (taskType.equals("single")){ - String values = updateValues(variable.getValueList()); - variable.setVarValues(values); - } - return variableDao.createVariable(variable); - } - - private String updateValues(List list ){ - StringBuilder values = new StringBuilder(); - for (String s : list) { - if (!PipelineUtil.isNoNull(values.toString())){ - values = new StringBuilder(s); - }else { - values.append(",").append(s); - } - } - return values.toString(); - } - - /** - * 删除变量 - * @param varId 变量id - */ - @Override - public void deleteVariable(String varId) { - variableDao.deleteVariable(varId); - } - - /** - * 更新变量 - * @param variable 变量信息 - */ - @Override - public void updateVariable(Variable variable) { - String taskType = variable.getVarType(); - if (taskType.equals("single")){ - String values = updateValues(variable.getValueList()); - variable.setVarValues(values); - } - variableDao.updateVariable(variable); - } - - /** - * 查询单个变量 - * @param varId 变量id - * @return 变量信息 - */ - @Override - public Variable findOneVariable(String varId) { - return variableDao.findOneVariable(varId); - } - - /** - * 查询所有变量 - * @return 变量集合 - */ - public List findAllVariable() { - List allVariable = variableDao.findAllVariable(); - if (allVariable == null || allVariable.isEmpty()){ - return Collections.emptyList(); - } - return allVariable; - } - - /** - * 查询流水线所有变量 - * @param taskId 流水线id - * @return 变量 - */ - @Override - public List findAllVariable(String taskId) { - List allVariable = findAllVariable(); - if (allVariable.isEmpty()){ - return Collections.emptyList(); - } - List list = new ArrayList<>(); - for (Variable variable : allVariable) { - String id = variable.getTaskId(); - if (id == null ||!id.equals(taskId)){ - continue; - } - if (variable.getVarType().equals("single")){ - String values = variable.getVarValues(); - String[] split = values.split(","); - List stringList = new ArrayList<>(List.of(split)); - variable.setValueList(stringList); - } - list.add(variable); - } - list.sort(Comparator.comparing(Variable::getCreateTime).reversed()); - return list; - } - - @Override - public List findVariableList(VariableQuery query){ - List variableList = variableDao.findVariableList(query); - if (variableList == null || variableList.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(variableList, Variable.class); - } - - @Override - public void cloneVariable(String id,String cloneId){ - VariableQuery variableQuery = new VariableQuery(); - variableQuery.setTaskId(id); - List variableList = findVariableList(variableQuery); - for (Variable variable : variableList) { - variable.setTaskId(cloneId); - createVariable(variable); - } - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/version/service/PipelineVersionService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/version/service/PipelineVersionService.java deleted file mode 100644 index b08a68e8..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/version/service/PipelineVersionService.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.support.version.service; - -public interface PipelineVersionService { - - /** - * 获取当前系统版本 - * @return 系统版本 false.免费 true.付费 - */ - Boolean isVip(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/version/service/impl/PipelineVersionServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/version/service/impl/PipelineVersionServiceImpl.java deleted file mode 100644 index 6147e75f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/version/service/impl/PipelineVersionServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package cd.casic.module.process.support.version.service.impl; - -import cd.casic.module.process.licence.licence.model.Version; -import cd.casic.module.process.licence.licence.service.VersionService; -import cd.casic.module.process.support.version.service.PipelineVersionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @ClassName PipelineVersionServiceImpl - * @Author hopeli - * @Date 2025/5/2 18:58 - * @Version 1.0 - */ -@Service -public class PipelineVersionServiceImpl implements PipelineVersionService { - - @Autowired - VersionService versionServer; - - - @Override - public Boolean isVip() { - Version version = versionServer.getVersion(); - - Boolean expired = version.getExpired(); - // Integer release = version.getRelease(); - return !expired; - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/webHook/model/WebHook.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/webHook/model/WebHook.java deleted file mode 100644 index d98a2b4f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/webHook/model/WebHook.java +++ /dev/null @@ -1,51 +0,0 @@ -package cd.casic.module.process.support.webHook.model; - - -/** - * @ClassName PipelineVersionServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:00 - * @Version 1.0 - */ - -/** - * 流水线webhook模型 - */ -public class WebHook { - - /** - * ID - */ - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 类型 - */ - private String type; - - /** - * 流水线ID - */ - private String pipelineId; - - /** - * 参数 - */ - private String parameters; - - /** - * 地址 - */ - private String url; - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/dao/TaskArtifactDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/dao/TaskArtifactDao.java deleted file mode 100644 index f5019bac..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/dao/TaskArtifactDao.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.process.task.artifact.dao; - -import cd.casic.module.process.task.artifact.dataobject.TaskArtifactDo; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @ClassName TaskArtifactDao - * @Author hopeli - * @Date 2025/5/2 19:08 - * @Version 1.0 - */ - -@Repository -public class TaskArtifactDao { - public String createProduct(TaskArtifactDo taskArtifactEntity) { - return null; - } - - public void deleteProduct(String productId) { - } - - public void updateProduct(TaskArtifactDo productEntity) { - - } - - public TaskArtifactDo findOneProduct(String artifactId) { - return null; - } - - public List findAllProduct() { - return null; - } - - public List findAllProductList(List idList) { - return null; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/dataobject/TaskArtifactDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/dataobject/TaskArtifactDo.java deleted file mode 100644 index 8887eb23..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/dataobject/TaskArtifactDo.java +++ /dev/null @@ -1,51 +0,0 @@ -package cd.casic.module.process.task.artifact.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; -import org.springframework.data.annotation.Id; - -import java.io.Serial; - -/** - * @ClassName TaskArtifactDo - * @Author hopeli - * @Date 2025/5/2 19:10 - * @Version 1.0 - */ - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_artifact", autoResultMap = true) -public class TaskArtifactDo extends BaseDO { - - @Serial - private static final long serialVersionUID = -5333368911605592175L; - - @TableId - private String taskId; - - private String artifactType; - - private String version; - - private String fileAddress; - - private String putAddress; - - private String authId; - - private String rule; - - private String dockerImage; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/TaskArtifact.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/TaskArtifact.java deleted file mode 100644 index f9a71f48..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/TaskArtifact.java +++ /dev/null @@ -1,64 +0,0 @@ -package cd.casic.module.process.task.artifact.model; - - -import lombok.Data; - - -/** - * 任务推送制品模型 - */ -//@ApiModel -//@Join -//@Mapper -@Data -public class TaskArtifact { - - //@ApiProperty(name = "taskId",desc = "id") - private String taskId; - - //@ApiProperty(name = "groupId",desc = "groupId") - private String groupId; - - //@ApiProperty(name = "artifactId",desc = "artifactId") - private String artifactId; - - //@ApiProperty(name = "artifactType",desc = "推送类型") - private String artifactType; - - //@ApiProperty(name = "version",desc = "version") - private String version; - - //@ApiProperty(name = "fileType",desc = "文件类型") - private String fileType; - - //@ApiProperty(name = "fileAddress",desc = "文件地址") - private String fileAddress; - - //@ApiProperty(name = "putAddress",desc = "发送地址") - private String putAddress; - - //@ApiProperty(name = "dockerImage",desc = "docker镜像") - private String dockerImage; - - //授权id - //@ApiProperty(name="authId",desc="授权id") - private String authId; - - //@ApiProperty(name="authId",desc="rule") - private String rule; - -// @Mappings({ -// @Mapping(source = "repository.id",target = "xpackId") -// }) -// @JoinQuery(key = "xpackId") - private XpackRepository repository; - - //授权信息 - private Object auth; - - private String type; - - private int sort; - - private String instanceId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepository.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepository.java deleted file mode 100644 index b9a66372..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.process.task.artifact.model; - -import lombok.Data; - -@Data -public class XpackRepository { - - private String id; - - - private String name; - - - private String repositoryUrl; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepositoryQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepositoryQuery.java deleted file mode 100644 index 48e3849b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/model/XpackRepositoryQuery.java +++ /dev/null @@ -1,27 +0,0 @@ -package cd.casic.module.process.task.artifact.model; - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class XpackRepositoryQuery { - - // @ApiProperty(name = "orderParams", desc = "排序参数") - private List orderParams = OrderBuilders.instance().asc("id").get(); - - // @ApiProperty(name = "pageParam", desc = "分页参数") - private PageParam pageParam = new PageParam(); - - // @ApiProperty(name = "name", desc = "制品库名字") - private String name; - - // @ApiProperty(name = "repositoryType", desc = "制品库类型 maven、npm") - private String repositoryType; - - // @ApiProperty(name = "type", desc = "类型 local、remote、group") - private String type; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactService.java deleted file mode 100644 index 3780195c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactService.java +++ /dev/null @@ -1,76 +0,0 @@ -package cd.casic.module.process.task.artifact.service; - -/** - * @ClassName TaskArtifactService - * @Author hopeli - * @Date 2025/5/2 19:02 - * @Version 1.0 - */ - -import cd.casic.ci.commons.annotation.join.FindAll; -import cd.casic.ci.commons.annotation.join.FindList; -import cd.casic.ci.commons.annotation.join.FindOne; -import cd.casic.ci.commons.annotation.join.JoinProvider; -import cd.casic.module.process.task.artifact.model.TaskArtifact; - -import java.util.List; - -/** - * 任务推送制品服务接口 - */ -@JoinProvider(model = TaskArtifact.class) -public interface TaskArtifactService { - - /** - * 创建流水线推送制品 - * @param taskArtifact 流水线推送制品 - * @return 流水线推送制品id - */ - String createProduct(TaskArtifact taskArtifact); - - /** - * 删除流水线推送制品 - * @param productId 流水线推送制品id - */ - void deleteProduct(String productId); - - - /** - * 根据配置id查询任务 - * @param taskId 配置id - * @return 任务 - */ - TaskArtifact findOneArtifactByAuth(String taskId); - - - /** - * 更新推送制品信息 - * @param taskArtifact 信息 - */ - void updateProduct(TaskArtifact taskArtifact); - - /** - * 查询推送制品信息 - * @param artifactId id - * @return 信息 - */ - @FindOne - TaskArtifact findOneProduct(String artifactId); - - /** - * 查询所有流水线推送制品 - * @return 流水线推送制品列表 - */ - @FindAll - List findAllProduct(); - - - /** - * 根据ID列表查询流水线推送制品 - * @param idList ID列表 - * @return 流水线推送制品列表 - */ - @FindList - List findAllProductList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactXpackService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactXpackService.java deleted file mode 100644 index 129bebc0..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactXpackService.java +++ /dev/null @@ -1,28 +0,0 @@ -package cd.casic.module.process.task.artifact.service; - -import cd.casic.module.process.task.artifact.model.XpackRepository; - - -import java.util.List; - -public interface TaskArtifactXpackService { - - /** - * 获取xpack仓库 - * @param authId 认证id - * @return 仓库 - */ - List findAllRepository(String authId); - - - /** - * - * @param authId 认证id - * @param rpyId 仓库id - * @return 仓库地址 - */ - XpackRepository findRepository(String authId,String rpyId); - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactServiceImpl.java deleted file mode 100644 index f2a693a4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package cd.casic.module.process.task.artifact.service.impl; - -import cd.casic.ci.commons.bean.process.setting.AuthHost; -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.ci.commons.annotation.rpc.Exporter; -import cd.casic.module.process.process.setting.AuthHostService; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.task.artifact.dao.TaskArtifactDao; -import cd.casic.module.process.task.artifact.dataobject.TaskArtifactDo; -import cd.casic.module.process.task.artifact.model.TaskArtifact; -import cd.casic.module.process.task.artifact.service.TaskArtifactService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Objects; - -/** - * @ClassName TaskArtifactServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:34 - * @Version 1.0 - */ - - -@Service -@Exporter -public class TaskArtifactServiceImpl implements TaskArtifactService { - - @Resource - private TaskArtifactDao productDao; - - @Resource - private AuthThirdService thirdServer; - - @Resource - private AuthHostService hostServer; - - /** - * 创建流水线推送制品 - * @param taskArtifact 流水线推送制品 - * @return 流水线推送制品id - */ - @Override - public String createProduct(TaskArtifact taskArtifact) { - TaskArtifactDo taskArtifactEntity = BeanMapper.map(taskArtifact, TaskArtifactDo.class); - return productDao.createProduct(taskArtifactEntity); - } - - /** - * 根据配置id查询任务 - * @return 任务 - */ - @Override - public TaskArtifact findOneArtifactByAuth(String taskId){ - - TaskArtifact artifact = findOneProduct(taskId); - if (Objects.isNull(artifact)){ - return null; - } - String authId = artifact.getAuthId(); - if (Objects.isNull(authId)){ - return artifact; - } - String artifactType = artifact.getArtifactType(); - AuthThird authServer = thirdServer.findOneAuthServer(authId); - artifact.setAuth(authServer); - - if (artifactType.equals(PipelineFinal.TASK_UPLOAD_SSH)){ - AuthHost oneAuthHost = hostServer.findOneAuthHost(authId); - artifact.setAuth(oneAuthHost); - } - return artifact; - } - - /** - * 删除流水线推送制品 - * @param ProductId 流水线推送制品id - */ - @Override - public void deleteProduct(String ProductId) { - productDao.deleteProduct(ProductId); - } - - /** - * 更新推送制品信息 - * @param taskArtifact 信息 - */ - @Override - public void updateProduct(TaskArtifact taskArtifact) { - TaskArtifactDo productEntity = BeanMapper.map(taskArtifact, TaskArtifactDo.class); - productDao.updateProduct(productEntity); - } - - /** - * 查询推送制品信息 - * @param artifactId id - * @return 信息集合 - */ - @Override - public TaskArtifact findOneProduct(String artifactId) { - TaskArtifactDo oneProduct = productDao.findOneProduct(artifactId); - return BeanMapper.map(oneProduct, TaskArtifact.class); - } - - /** - * 查询所有流水线推送制品 - * @return 流水线推送制品列表 - */ - @Override - public List findAllProduct() { - List allProduct = productDao.findAllProduct(); - return BeanMapper.mapList(allProduct, TaskArtifact.class); - } - - @Override - public List findAllProductList(List idList) { - List allProductList = productDao.findAllProductList(idList); - return BeanMapper.mapList(allProductList, TaskArtifact.class); - } - - private Object findAuth(String id){ - AuthThird oneAuthServer = thirdServer.findOneAuthServer(id); - if (oneAuthServer != null){ - return oneAuthServer; - } - return hostServer.findOneAuthHost(id); - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactXpackServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactXpackServiceImpl.java deleted file mode 100644 index 84368856..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactXpackServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package cd.casic.module.process.task.artifact.service.impl; - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.support.util.util.PipelineRequestUtil; -import cd.casic.module.process.task.artifact.model.XpackRepository; -import cd.casic.module.process.task.artifact.model.XpackRepositoryQuery; -import cd.casic.module.process.task.artifact.service.TaskArtifactXpackService; -import cd.casic.module.process.task.code.service.impl.TaskCodeGittokServiceImpl; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; - -import java.util.HashMap; -import java.util.List; -import java.util.Objects; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:19 - * @Version 1.0 - */ -@Service -public class TaskArtifactXpackServiceImpl implements TaskArtifactXpackService { - - private static final Logger logger = LoggerFactory.getLogger(TaskCodeGittokServiceImpl.class); - - @Resource - AuthThirdService authThirdService; - - @Resource - PipelineRequestUtil requestUtil; - - - @Override - public List findAllRepository(String authId){ - AuthThird authServer = authThirdService.findOneAuthServer(authId); - - if (Objects.isNull(authServer)){ - return null; - } - - String serverAddress = authServer.getServerAddress(); - XpackRepositoryQuery repositoryQuery = new XpackRepositoryQuery(); - repositoryQuery.setRepositoryType("local"); - try { - HttpHeaders headers = requestUtil.initHeaders(MediaType.APPLICATION_JSON, new HashMap<>()); - String requestUrl = serverAddress+"/api/xpackRepository/findRepositoryList"; - return requestUtil.requestPostList(headers, requestUrl, repositoryQuery, XpackRepository.class); - - } catch (Throwable throwable){ - String message = throwable.getMessage(); - logger.error(message); - if (message.contains("未订阅")){ - throw new ApplicationException("当前企业未订阅GitPuk!"); - } - if (throwable instanceof ApplicationException){ - throw new ApplicationException(message); - } - throw new ApplicationException("无法连接到："+serverAddress); - } - } - - public XpackRepository findRepository(String authId,String rpyId){ - AuthThird authServer = authThirdService.findOneAuthServer(authId); - if (Objects.isNull(authServer) || Objects.isNull(rpyId)){ - return null; - } - String serverAddress = authServer.getServerAddress(); - - try { - HttpHeaders headers = requestUtil.initHeaders(MediaType.APPLICATION_JSON, new HashMap<>()); - String requestUrl = serverAddress+"/api/xpackRepository/findRepository"; - MultiValueMap multiValueMap = new LinkedMultiValueMap<>(); - multiValueMap.add("id",rpyId); - return requestUtil.requestPost(headers, requestUrl, multiValueMap, XpackRepository.class); - - } catch (Throwable throwable){ - String message = throwable.getMessage(); - logger.error(message); - if (throwable instanceof ApplicationException){ - throw new ApplicationException(message); - } - if (message.contains("未订阅")){ - throw new ApplicationException("当前企业未订阅GitPuk!"); - } - throw new ApplicationException("无法连接到："+serverAddress); - } - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dao/TaskBuildDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dao/TaskBuildDao.java deleted file mode 100644 index 7b5d7cdd..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dao/TaskBuildDao.java +++ /dev/null @@ -1,69 +0,0 @@ -package cd.casic.module.process.task.build.dao; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:26 - * @Version 1.0 - */ - -import cd.casic.module.process.task.code.jpa.JpaTemplate; -import cd.casic.module.process.task.build.dataobject.TaskBuildDo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public class TaskBuildDao { - - @Autowired - JpaTemplate jpaTemplate; - - /** - * 创建 - * @param taskBuildDo build信息 - * @return buildId - */ - public String createBuild(TaskBuildDo taskBuildDo){ - return jpaTemplate.save(taskBuildDo,String.class); - } - - /** - * 删除 - * @param buildId buildId - */ - public void deleteBuild(String buildId){ - jpaTemplate.delete(TaskBuildDo.class,buildId); - } - - /** - * 更新build - * @param taskBuildDo 更新信息 - */ - public void updateBuild(TaskBuildDo taskBuildDo){ - jpaTemplate.update(taskBuildDo); - } - - /** - * 查询单个build信息 - * @param buildId buildId - * @return build信息 - */ - public TaskBuildDo findOneBuild(String buildId){ - return jpaTemplate.findOne(TaskBuildDo.class,buildId); - } - - /** - * 查询所有build信息 - * @return build信息集合 - */ - public List findAllBuild(){ - return jpaTemplate.findAll(TaskBuildDo.class); - } - - - public List findAllCodeList(List idList){ - return jpaTemplate.findList(TaskBuildDo.class,idList); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dao/TaskBuildProductDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dao/TaskBuildProductDao.java deleted file mode 100644 index 25ce2b88..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dao/TaskBuildProductDao.java +++ /dev/null @@ -1,84 +0,0 @@ -package cd.casic.module.process.task.build.dao; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:46 - * @Version 1.0 - */ - - -import cd.casic.module.process.task.build.dataobject.TaskBuildProductDo; -import cd.casic.module.process.task.build.model.TaskBuildProductQuery; -import cd.casic.module.process.task.code.jpa.JpaTemplate; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public class TaskBuildProductDao { - - @Autowired - JpaTemplate jpaTemplate; - - /** - * 创建 - * @param taskBuildProductEntity build信息 - * @return buildId - */ - public String createBuildProduct(TaskBuildProductDo taskBuildProductEntity){ - return jpaTemplate.save(taskBuildProductEntity,String.class); - } - - /** - * 删除 - * @param buildId buildId - */ - public void deleteBuildProduct(String buildId){ - jpaTemplate.delete(TaskBuildProductDo.class,buildId); - } - - /** - * 更新build - * @param taskBuildProductDo 更新信息 - */ - public void updateBuildProduct(TaskBuildProductDo taskBuildProductDo){ - jpaTemplate.update(taskBuildProductDo); - } - - /** - * 查询单个build信息 - * @param buildId buildId - * @return build信息 - */ - public TaskBuildProductDo findOneBuildProduct(String buildId){ - return jpaTemplate.findOne(TaskBuildProductDo.class,buildId); - } - - /** - * 查询所有build信息 - * @return build信息集合 - */ - public List findAllBuildProduct(){ - return jpaTemplate.findAll(TaskBuildProductDo.class); - } - - public List findBuildProductList(TaskBuildProductQuery taskBuildProductQuery){ -// QueryCondition queryCondition = QueryWrapper.createQuery(TaskBuildProductDo.class) -// .eq("instanceId", taskBuildProductQuery.getInstanceId()) -// .eq("type", taskBuildProductQuery.getType()) -// .eq("key", taskBuildProductQuery.getKey()) -// .get(); - return jpaTemplate.findList(null, TaskBuildProductDo.class); - } - - public List findAllBuildProductList(List idList){ - return jpaTemplate.findList(TaskBuildProductDo.class,idList); - } - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dataobject/TaskBuildDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dataobject/TaskBuildDo.java deleted file mode 100644 index d7153351..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dataobject/TaskBuildDo.java +++ /dev/null @@ -1,60 +0,0 @@ -package cd.casic.module.process.task.build.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:23 - * @Version 1.0 - */ - - - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_build", autoResultMap = true) -public class TaskBuildDo extends BaseDO { - - @TableId - private String taskId; - - //地址 - private String buildAddress; - - //分支 - private String buildOrder; - - private String productRule; - - private String dockerName; - - private String dockerVersion; - - private String dockerFile; - - private String dockerOrder; - - // jdk版本 - private String toolJdk; - - // maven版本 - private String toolMaven; - - // npm版本 - private String toolNodejs; - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dataobject/TaskBuildProductDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dataobject/TaskBuildProductDo.java deleted file mode 100644 index 3b5b6ef1..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/dataobject/TaskBuildProductDo.java +++ /dev/null @@ -1,43 +0,0 @@ -package cd.casic.module.process.task.build.dataobject; - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:24 - * @Version 1.0 - */ - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_build_product", autoResultMap = true) -public class TaskBuildProductDo extends BaseDO { - - @TableId - private String id; - - - private String instanceId; - - //地址 - private String type; - - - private String key; - - private String value; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuild.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuild.java deleted file mode 100644 index 37d826b6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuild.java +++ /dev/null @@ -1,51 +0,0 @@ -package cd.casic.module.process.task.build.model; - - - -import lombok.Data; - - -/** - * 任务构建模型 - */ -//@ApiModel -//@Join -//@Mapper -@Data -public class TaskBuild { - - //@ApiProperty(name = "taskId",desc = "id") - private String taskId; - - //构建文件地址 - //@ApiProperty(name="buildAddress",desc="构建文件地址") - private String buildAddress; - - //构建命令 - //@ApiProperty(name="buildOrder",desc="构建命令") - private String buildOrder; - - //@ApiProperty(name="productRule",desc="制品规则") - private String productRule; - - - //@ApiProperty(name = "dockerName",desc="镜像名称") - private String dockerName; - - //@ApiProperty(name = "dockerVersion",desc="镜像版本") - private String dockerVersion; - - //@ApiProperty(name = "dockerFile",desc="DockerFile文件地址") - private String dockerFile; - - //@ApiProperty(name = "dockerOrder",desc="Docker部署命令") - private String dockerOrder; - - //顺序 - private int sort; - - //构建类型 - private String type; - - private String instanceId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuildProduct.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuildProduct.java deleted file mode 100644 index 40b50c3b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuildProduct.java +++ /dev/null @@ -1,75 +0,0 @@ -package cd.casic.module.process.task.build.model; - - - -// TODO -//@ApiModel -//@Join -//@Mapper -public class TaskBuildProduct { - - - //@ApiProperty(name = "taskId",desc = "id") - private String id; - - //地址 - //@ApiProperty(name = "type",desc = "类型") - private String type; - - //@ApiProperty(name = "key",desc = "key") - private String key; - - //@ApiProperty(name = "value",desc = "值") - private String value; - - //分支 - //@ApiProperty(name = "instanceId",desc = "实例id") - private String instanceId; - - public TaskBuildProduct() { - } - - public TaskBuildProduct(String instanceId) { - this.instanceId = instanceId; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getInstanceId() { - return instanceId; - } - - public void setInstanceId(String instanceId) { - this.instanceId = instanceId; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuildProductQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuildProductQuery.java deleted file mode 100644 index f57e52e0..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/model/TaskBuildProductQuery.java +++ /dev/null @@ -1,56 +0,0 @@ -package cd.casic.module.process.task.build.model; - - - -public class TaskBuildProductQuery { - - //地址 - //@ApiProperty(name = "type",desc = "类型") - private String type; - - //@ApiProperty(name = "key",desc = "key") - private String key; - - //@ApiProperty(name = "value",desc = "值") - private String value; - - //分支 - //@ApiProperty(name = "instanceId",desc = "实例id") - private String instanceId; - - public String getType() { - return type; - } - - public TaskBuildProductQuery setType(String type) { - this.type = type; - return this; - } - - public String getKey() { - return key; - } - - public TaskBuildProductQuery setKey(String key) { - this.key = key; - return this; - } - - public String getValue() { - return value; - } - - public TaskBuildProductQuery setValue(String value) { - this.value = value; - return this; - } - - public String getInstanceId() { - return instanceId; - } - - public TaskBuildProductQuery setInstanceId(String instanceId) { - this.instanceId = instanceId; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildProductService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildProductService.java deleted file mode 100644 index 73f104e0..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildProductService.java +++ /dev/null @@ -1,36 +0,0 @@ -package cd.casic.module.process.task.build.service; - - - -import cd.casic.module.process.task.build.model.TaskBuildProduct; -import cd.casic.module.process.task.build.model.TaskBuildProductQuery; - -import java.util.List; - -public interface TaskBuildProductService { - - - String createBuildProduct(TaskBuildProduct taskBuildProduct); - - - void updateBuildProduct(TaskBuildProduct taskBuildProduct); - - - void deleteBuildProduct(String id); - - - TaskBuildProduct findOneBuildProduct(String id); - - - List findAllBuildProduct(); - - List findBuildProductList(TaskBuildProductQuery taskBuildProductQuery); - - - String replace(String instanceId,String strings); - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildService.java deleted file mode 100644 index cae1189e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildService.java +++ /dev/null @@ -1,85 +0,0 @@ -package cd.casic.module.process.task.build.service; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:30 - * @Version 1.0 - */ - - - -import cd.casic.ci.commons.annotation.join.FindAll; -import cd.casic.ci.commons.annotation.join.FindList; -import cd.casic.ci.commons.annotation.join.FindOne; -import cd.casic.ci.commons.annotation.join.JoinProvider; -import cd.casic.module.process.task.build.model.TaskBuild; - -import java.util.List; - -/** - * 任务构建服务接口 - */ -@JoinProvider(model = TaskBuild.class) -public interface TaskBuildService { - - /** - * 创建 - * @param TaskBuild build信息 - * @return buildId - */ - String createBuild(TaskBuild TaskBuild); - - /** - * 删除 - * @param buildId buildId - */ - void deleteBuild(String buildId); - - /** - * 更新 - * @param TaskBuild 更新信息 - */ - void updateBuild(TaskBuild TaskBuild); - - /** - * 验证 - * @param taskType taskType - * @param taskBuild object - * @return Boolean - */ - Boolean buildValid(String taskType,TaskBuild taskBuild); - - - /** - * 根据配置id查询任务 - * @param configId 配置id - * @return 任务 - */ - TaskBuild findBuildByAuth(String configId); - - - /** - * 查询单个信息 - * @param buildId buildId - * @return build信息 - */ - @FindOne - TaskBuild findOneBuild(String buildId); - - /** - * 查询所有信息 - * @return build信息集合 - */ - @FindAll - List findAllBuild(); - - /** - * 根据ID列表查询构建 - * @param idList ID列表 - * @return 构建列表 - */ - @FindList - List findAllBuildList(List idList); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildProductServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildProductServiceImpl.java deleted file mode 100644 index 3027999b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildProductServiceImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package cd.casic.module.process.task.build.service.impl; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:35 - * @Version 1.0 - */ - -import cd.casic.ci.commons.annotation.rpc.Exporter; -import cd.casic.module.process.task.build.dao.TaskBuildProductDao; -import cd.casic.module.process.task.build.dataobject.TaskBuildProductDo; -import cd.casic.module.process.task.build.model.TaskBuildProduct; -import cd.casic.module.process.task.build.model.TaskBuildProductQuery; -import cd.casic.module.process.task.build.service.TaskBuildProductService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import com.alibaba.fastjson.JSONObject; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Service -@Exporter -public class TaskBuildProductServiceImpl implements TaskBuildProductService { - - @Resource - TaskBuildProductDao taskBuildProductDao; - - - @Override - public String createBuildProduct(TaskBuildProduct taskBuildProduct) { - TaskBuildProductDo taskBuildProductDo = BeanMapper.map(taskBuildProduct, TaskBuildProductDo.class); - return taskBuildProductDao.createBuildProduct(taskBuildProductDo); - } - - @Override - public void updateBuildProduct(TaskBuildProduct taskBuildProduct) { - TaskBuildProductDo taskBuildProductDo = BeanMapper.map(taskBuildProduct, TaskBuildProductDo.class); - taskBuildProductDao.updateBuildProduct(taskBuildProductDo); - } - - @Override - public void deleteBuildProduct(String id) { - taskBuildProductDao.deleteBuildProduct(id); - } - - @Override - public TaskBuildProduct findOneBuildProduct(String id) { - TaskBuildProductDo buildProductEntity = taskBuildProductDao.findOneBuildProduct(id); - return BeanMapper.map(buildProductEntity, TaskBuildProduct.class); - } - - @Override - public List findAllBuildProduct() { - List allBuildProduct = taskBuildProductDao.findAllBuildProduct(); - if (allBuildProduct == null || allBuildProduct.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(allBuildProduct, TaskBuildProduct.class); - } - - @Override - public List findBuildProductList(TaskBuildProductQuery taskBuildProductQuery) { - List allBuildProduct = taskBuildProductDao.findBuildProductList(taskBuildProductQuery); - if (allBuildProduct == null || allBuildProduct.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(allBuildProduct, TaskBuildProduct.class); - } - - - @Override - public String replace(String instanceId,String strings){ - TaskBuildProductQuery taskBuildProductQuery = new TaskBuildProductQuery(); - taskBuildProductQuery.setInstanceId(instanceId); - List buildProductList = findBuildProductList(taskBuildProductQuery); - - if (buildProductList.isEmpty()){ - return strings; - } - - for (TaskBuildProduct taskBuildProduct : buildProductList) { - - LinkedHashMap linkedHashMap = JSONObject.parseObject(taskBuildProduct.getValue(), LinkedHashMap.class); - for (Map.Entry entry : linkedHashMap.entrySet()) { - String value = (String)entry.getValue(); - String key = entry.getKey(); - strings = strings.replaceAll("\\$\\{" + key + "}",value); - strings = strings.replaceAll(key,value); - } - } - return strings; - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildServiceImpl.java deleted file mode 100644 index 222eeb5a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package cd.casic.module.process.task.build.service.impl; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:40 - * @Version 1.0 - */ - -import cd.casic.ci.commons.annotation.rpc.Exporter; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.task.build.dao.TaskBuildDao; -import cd.casic.module.process.task.build.dataobject.TaskBuildDo; -import cd.casic.module.process.task.build.model.TaskBuild; -import cd.casic.module.process.task.build.service.TaskBuildService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Objects; - - -@Service -@Exporter -public class TaskBuildServiceImpl implements TaskBuildService { - - @Resource - TaskBuildDao taskBuildDao; - - //创建 - @Override - public String createBuild(TaskBuild taskBuild) { - return taskBuildDao.createBuild(BeanMapper.map(taskBuild, TaskBuildDo.class)); - } - - @Override - public Boolean buildValid(String taskType,TaskBuild build){ - if (taskType.equals(PipelineFinal.TASK_BUILD_DOCKER)){ - return !StringUtils.isEmpty(build.getDockerFile()); - } - return true; - } - - /** - * 根据配置id查询任务 - * @param authId 配置id - * @return 任务 - */ - @Override - public TaskBuild findBuildByAuth(String authId){ - - TaskBuild build = findOneBuild(authId); - if (Objects.isNull(build.getDockerVersion())){ - build.setDockerVersion("latest"); - } - return build; - } - - //删除 - @Override - public void deleteBuild(String buildId) { - taskBuildDao.deleteBuild(buildId); - } - - //修改 - @Override - public void updateBuild(TaskBuild taskBuild) { - taskBuildDao.updateBuild(BeanMapper.map(taskBuild, TaskBuildDo.class)); - } - - //查询单个 - @Override - public TaskBuild findOneBuild(String buildId) { - return BeanMapper.map(taskBuildDao.findOneBuild(buildId), TaskBuild.class); - } - - //查询所有 - @Override - public List findAllBuild() { - return BeanMapper.mapList(taskBuildDao.findAllBuild(), TaskBuild.class); - } - - @Override - public List findAllBuildList(List idList) { - return BeanMapper.mapList(taskBuildDao.findAllCodeList(idList), TaskBuild.class); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitHubController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitHubController.java deleted file mode 100644 index 97f6c80f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitHubController.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.task.code.controller; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:25 - * @Version 1.0 - */ -import cd.casic.ci.commons.utils.Result; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.service.TaskCodeGitHubService; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.jetbrains.annotations.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @pi.protocol: http - * @pi.groupName: 流水线集成github控制器 - */ -@RestController -@RequestMapping("/code/third/github") -public class PipelineCodeGitHubController { - - @Resource - TaskCodeGitHubService gitHubService; - - /** - * @pi.name:获取xcode所有仓库 - * @pi.url:/code/third/github/findStoreHouseList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - */ - @RequestMapping(path="/findStoreHouseList",method = RequestMethod.POST) - public Result< List> findAllRepository(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = gitHubService.findStoreHouseList(thirdQuery); - - return Result.ok(allRepository); - } - - - /** - * @pi.name:获取仓库分支信息 - * @pi.url:/code/third/github/findHouseBranchList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - * @pi.param: name=rpyId;dataType=string;value=rpyId; - */ - @RequestMapping(path="/findHouseBranchList",method = RequestMethod.POST) - public Result> findHouseBranchList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = gitHubService.findStoreBranchList(thirdQuery); - - return Result.ok(allRepository); - } - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitLabController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitLabController.java deleted file mode 100644 index 3968ed14..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGitLabController.java +++ /dev/null @@ -1,71 +0,0 @@ -package cd.casic.module.process.task.code.controller; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:25 - * @Version 1.0 - */ - -import cd.casic.ci.commons.utils.Result; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.service.TaskCodeGitLabService; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.jetbrains.annotations.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @pi.protocol: http - * @pi.groupName: 流水线集成gitlab控制器 - */ -@RestController -@RequestMapping("/code/third/gitlab") -public class PipelineCodeGitLabController { - - @Resource - TaskCodeGitLabService gitLabService; - - /** - * @pi.name:获取xcode所有仓库 - * @pi.url:/code/third/gitlab/findStoreHouseList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - */ - @RequestMapping(path="/findStoreHouseList",method = RequestMethod.POST) - public Result> findStoreHouseList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = gitLabService.findStoreHouseList(thirdQuery); - - return Result.ok(allRepository); - } - - - /** - * @pi.name:获取仓库分支信息 - * @pi.url:/code/third/gitlab/findHouseBranchList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - * @pi.param: name=rpyId;dataType=string;value=rpyId; - */ - @RequestMapping(path="/findHouseBranchList",method = RequestMethod.POST) - public Result> findHouseBranchList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = gitLabService.findStoreBranchList(thirdQuery); - - return Result.ok(allRepository); - } - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGiteeController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGiteeController.java deleted file mode 100644 index 5a84f358..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGiteeController.java +++ /dev/null @@ -1,71 +0,0 @@ -package cd.casic.module.process.task.code.controller; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:25 - * @Version 1.0 - */ - -import cd.casic.ci.commons.utils.Result; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.service.TaskCodeGiteeService; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.jetbrains.annotations.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @pi.protocol: http - * @pi.groupName: 流水线集成gitee控制器 - */ -@RestController -@RequestMapping("/code/third/gitee") -public class PipelineCodeGiteeController { - - @Resource - TaskCodeGiteeService giteeService; - - /** - * @pi.name:获取xcode所有仓库 - * @pi.url:/code/third/gitee/findStoreHouseList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - */ - @RequestMapping(path="/findStoreHouseList",method = RequestMethod.POST) - public Result> findAllRepository(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = giteeService.findStoreHouseList(thirdQuery); - - return Result.ok(allRepository); - } - - - /** - * @pi.name:获取仓库分支信息 - * @pi.url:/code/third/gitee/findHouseBranchList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - * @pi.param: name=rpyId;dataType=string;value=rpyId; - */ - @RequestMapping(path="/findHouseBranchList",method = RequestMethod.POST) - public Result> findHouseBranchList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = giteeService.findStoreBranchList(thirdQuery); - - return Result.ok(allRepository); - } - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGittokController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGittokController.java deleted file mode 100644 index d733bc2b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodeGittokController.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.task.code.controller; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:25 - * @Version 1.0 - */ - -import cd.casic.ci.commons.utils.Result; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.service.TaskCodeGittokService; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.jetbrains.annotations.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @pi.protocol: http - * @pi.groupName: 流水线集成Xcode控制器 - */ -@RestController -@RequestMapping("/code/third/gittok") -public class PipelineCodeGittokController { - - @Resource - TaskCodeGittokService gittokService; - - /** - * @pi.name:获取xcode所有仓库 - * @pi.url:/xcodeAuthorize/findAllRepository - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - */ - @RequestMapping(path="/findStoreHouseList",method = RequestMethod.POST) - public Result> findStoreHouseList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = gittokService.findStoreHouseList(thirdQuery); - - return Result.ok(allRepository); - } - - - /** - * @pi.name:获取仓库分支信息 - * @pi.url:/xcodeAuthorize/findAllBranch - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - * @pi.param: name=rpyId;dataType=string;value=rpyId; - */ - @RequestMapping(path="/findHouseBranchList",method = RequestMethod.POST) - public Result> findHouseBranchList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = gittokService.findHouseBranchList(thirdQuery); - - return Result.ok(allRepository); - } - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodePriGitLabController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodePriGitLabController.java deleted file mode 100644 index 0007f1a5..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/controller/PipelineCodePriGitLabController.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.task.code.controller; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:25 - * @Version 1.0 - */ - -import cd.casic.ci.commons.utils.Result; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.service.TaskCodePriGitLabService; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.jetbrains.annotations.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @pi.protocol: http - * @pi.groupName: 流水线集成gitlab控制器 - */ -@RestController -@RequestMapping("/code/third/pri/v4/gitlab") -public class PipelineCodePriGitLabController { - - @Resource - TaskCodePriGitLabService priGitLabService; - - /** - * @pi.name:获取自建GitLab所有仓库 - * @pi.url:/code/third/gitlab/findStoreHouseList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - */ - @RequestMapping(path="/findStoreHouseList",method = RequestMethod.POST) - public Result> findStoreHouseList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = priGitLabService.findStoreHouseList(thirdQuery); - - return Result.ok(allRepository); - } - - - /** - * @pi.name:获取仓库分支信息 - * @pi.url:/code/third/gitlab/findHouseBranchList - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=authId;dataType=string;value=authId; - * @pi.param: name=rpyId;dataType=string;value=rpyId; - */ - @RequestMapping(path="/findHouseBranchList",method = RequestMethod.POST) - public Result> findHouseBranchList(@RequestBody @Valid @NotNull ThirdQuery thirdQuery){ - - List allRepository = priGitLabService.findStoreBranchList(thirdQuery); - - return Result.ok(allRepository); - } - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/dao/TaskCodeDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/dao/TaskCodeDao.java deleted file mode 100644 index 77a91fbb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/dao/TaskCodeDao.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.task.code.dao; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:25 - * @Version 1.0 - */ - -import cd.casic.module.process.task.code.jpa.JpaTemplate; -import cd.casic.module.process.task.code.dataobject.TaskCodeDo; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public class TaskCodeDao { - - @Resource - JpaTemplate jpaTemplate; - - /** - * 创建 - * @param taskCodeDo code信息 - * @return codeId - */ - public String createCode(TaskCodeDo taskCodeDo){ - return jpaTemplate.save(taskCodeDo,String.class); - } - - /** - * 删除code - * @param codeId codeId - */ - public void deleteCode(String codeId){ - jpaTemplate.delete(TaskCodeDo.class,codeId); - } - - /** - * 更新code - * @param taskCodeDo 更新信息 - */ - public void updateCode(TaskCodeDo taskCodeDo){ - jpaTemplate.update(taskCodeDo); - } - - /** - * 查询单个code信息 - * @param codeId codeId - * @return code信息 - */ - public TaskCodeDo findOneCode(String codeId){ - return jpaTemplate.findOne(TaskCodeDo.class,codeId); - } - - /** - * 查询所有code信息 - * @return code信息集合 - */ - public List findAllCode(){ - return jpaTemplate.findAll(TaskCodeDo.class); - } - - public List findAllCodeList(List idList){ - return jpaTemplate.findList(TaskCodeDo.class,idList); - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/dataobject/TaskCodeDo.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/dataobject/TaskCodeDo.java deleted file mode 100644 index 0a51cdd6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/dataobject/TaskCodeDo.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.task.code.dataobject; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:25 - * @Version 1.0 - */ - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_code", autoResultMap = true) -public class TaskCodeDo extends BaseDO { - - @TableId - private String taskId; - - //地址名 - private String codeName; - - //地址 - private String codeAddress; - - //分支 - private String codeBranch; - - //凭证信息 - private String authId; - - private String svnFile; - - private String xcodeId; - - private String branchId; - - private String houseId; - - private String toolGit; - - private String toolSvn; - - // 认证类型 - private String authType; - - // 用户名 - private String username; - - // 密码 - private String password; - - // 私钥 - private String priKey; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaOperation.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaOperation.java deleted file mode 100644 index 8e258aaf..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaOperation.java +++ /dev/null @@ -1,10 +0,0 @@ -package cd.casic.module.process.task.code.jpa; - -/** - * @ClassName JpaOperation - * @Author hopeli - * @Date 2025/5/2 21:28 - * @Version 1.0 - */ -public interface JpaOperation { -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaTemplate.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaTemplate.java deleted file mode 100644 index bfdeba00..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/jpa/JpaTemplate.java +++ /dev/null @@ -1,73 +0,0 @@ -package cd.casic.module.process.task.code.jpa; - -import cd.casic.ci.commons.commons.Pagination; -import cd.casic.ci.commons.utils.JdbcTemplate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.dao.DataAccessException; -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; - -import javax.sql.DataSource; -import java.util.List; - -/** - * @ClassName JpaTemplate - * @Author hopeli - * @Date 2025/5/2 21:27 - * @Version 1.0 - */ -public class JpaTemplate implements JpaOperation { - private static Logger logger = LoggerFactory.getLogger(JpaTemplate.class); - private DataSource dataSource; - private JdbcTemplate jdbcTemplate; - private NamedParameterJdbcTemplate namedParameterJdbcTemplate; - - public JpaTemplate() { - } - - public JpaTemplate(DataSource dataSource) { - this.dataSource = dataSource; - this.jdbcTemplate = new JdbcTemplate(dataSource); - this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource); - } - - public JdbcTemplate getJdbcTemplate() { - return this.jdbcTemplate; - } - - public NamedParameterJdbcTemplate getNamedParameterJdbcTemplate() { - return this.namedParameterJdbcTemplate; - } - - - public ID save(T entity, Class idClass) throws DataAccessException { - return null; - } - - public void update(T entity) throws DataAccessException { - } - - - public void delete(Class entityClass, ID id) throws DataAccessException { - } - - public List findAll(Class entityClass) throws DataAccessException { - return null; - } - - public T findOne(Class entityClass, ID id) throws DataAccessException { - return null; - } - - public List findList(Class entityClass, List idList) throws DataAccessException { - return null; - } - - public List findList(Object queryObject, Class resultType) throws DataAccessException { - return null; - } - - public Pagination findPage(Object queryObject, Class resultType) throws DataAccessException { - return null; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/TaskCode.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/TaskCode.java deleted file mode 100644 index ddb838f3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/TaskCode.java +++ /dev/null @@ -1,72 +0,0 @@ -package cd.casic.module.process.task.code.model; - - -import cd.casic.ci.commons.bean.process.setting.Scm; -import lombok.Data; - -/** - * 任务源码模型 - */ -//@ApiModel -//@Join -//@Mapper -@Data -public class TaskCode { - - //@ApiProperty(name = "taskId",desc = "id") - private String taskId; - - //地址名 - //@ApiProperty(name="codeName",desc="地址名") - private String codeName; - - //代码源地址 - //@ApiProperty(name="codeAddress",desc="代码地址") - private String codeAddress; - - //分支 - //@ApiProperty(name="codeBranch",desc="分支") - private String codeBranch; - - //授权id - //@ApiProperty(name="authId",desc="授权id") - private String authId; - - //@ApiProperty(name="svnFile",desc="svn检出文件夹") - private String svnFile; - - // 第三方仓库ID - private String houseId; - - - //授权信息 - private Object auth; - - //顺序 - private int sort; - - //代码类型 - private String type; - - private String instanceId; - - // Git版本 - private Scm toolGit; - - // svn版本 - private Scm toolSvn; - - - // 认证类型 - private String authType; - - // 用户名 - private String username; - - // 密码 - private String password; - - // 私钥 - private String priKey; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdBranch.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdBranch.java deleted file mode 100644 index ffbc65ef..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdBranch.java +++ /dev/null @@ -1,17 +0,0 @@ -package cd.casic.module.process.task.code.model; - -import lombok.Data; - -//import io.tiklab.core.BaseModel; -@Data -public class ThirdBranch { - - private String id; - - private String name; - - private Boolean isProtected = false ; - - private Boolean isDefault; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdHouse.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdHouse.java deleted file mode 100644 index 3a2af82a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdHouse.java +++ /dev/null @@ -1,25 +0,0 @@ -package cd.casic.module.process.task.code.model; - -import lombok.Data; - -//import io.tiklab.core.BaseModel; -@Data -public class ThirdHouse { - - private String id; - - private String path; - - private String name; - - private String pathWithSpace; - - private String nameWithSpace; - - private String houseWebUrl; - - private String houseSshUrl; - - private String defaultBranch; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdQuery.java deleted file mode 100644 index a8122eeb..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdQuery.java +++ /dev/null @@ -1,23 +0,0 @@ -package cd.casic.module.process.task.code.model; - -import lombok.Data; - -//import io.tiklab.core.BaseModel; -@Data -public class ThirdQuery { - - private String authId; - - private String houseId; - - // 查询条件 - private String query; - - // 页数 - private Integer page = 1; - - // 每页数量 - private Integer pageNumber = 50; - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdUser.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdUser.java deleted file mode 100644 index 7f3051b6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/model/ThirdUser.java +++ /dev/null @@ -1,17 +0,0 @@ -package cd.casic.module.process.task.code.model; - -//import io.tiklab.core.BaseModel; -import lombok.Data; - -@Data -public class ThirdUser { - - private String id; - - private String path; - - private String name; - - private String head; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/SpotbugsScanService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/SpotbugsScanService.java deleted file mode 100644 index c6de997b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/SpotbugsScanService.java +++ /dev/null @@ -1,44 +0,0 @@ -package cd.casic.module.process.task.code.service; - - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.task.codescan.model.SpotbugsBugQuery; -import cd.casic.module.process.task.codescan.model.SpotbugsBugSummary; - -import java.util.List; - -/** - * @author zcamy - */ -public interface SpotbugsScanService { - - - String creatSpotbugs(SpotbugsBugSummary bugSummary); - - - void updateSpotbugs(SpotbugsBugSummary bugSummary); - - - void deleteSpotbugs(String bugId); - - SpotbugsBugSummary findOneSpotbugs(String bugId); - - - List findAllSpotbugs(); - - - List findSpotbugsList(SpotbugsBugQuery bugQuery); - - - PageResult findSpotbugsPage(SpotbugsBugQuery bugQuery); - - - - - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGitHubService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGitHubService.java deleted file mode 100644 index 3a1893e7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGitHubService.java +++ /dev/null @@ -1,49 +0,0 @@ -package cd.casic.module.process.task.code.service; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:15 - * @Version 1.0 - */ - - -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; - -import java.util.List; - -public interface TaskCodeGitHubService { - - /** - * 获取AccessToken的授权用户信息 - * @param thirdQuery 凭证 - * @return 授权用户信息 - */ - ThirdUser findAuthUser(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库列表 - * @param thirdQuery 凭证 - * @return 仓库列表 - */ - List findStoreHouseList(ThirdQuery thirdQuery); - - /** - * 获取指定仓库信息 - * @param thirdQuery 仓库 - * @return 仓库信息 - */ - ThirdHouse findStoreHouse(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库分支列表 - * @param thirdQuery 凭证 - * @return 分支列表 - */ - List findStoreBranchList(ThirdQuery thirdQuery); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGitLabService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGitLabService.java deleted file mode 100644 index 00dd2c4e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGitLabService.java +++ /dev/null @@ -1,49 +0,0 @@ -package cd.casic.module.process.task.code.service; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:15 - * @Version 1.0 - */ - - -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; - -import java.util.List; - -public interface TaskCodeGitLabService { - - /** - * 获取AccessToken的授权用户信息 - * @param thirdQuery 凭证 - * @return 授权用户信息 - */ - ThirdUser findAuthUser(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库列表 - * @param thirdQuery 凭证 - * @return 仓库列表 - */ - List findStoreHouseList(ThirdQuery thirdQuery); - - /** - * 获取指定仓库信息 - * @param thirdQuery 仓库 - * @return 仓库信息 - */ - ThirdHouse findStoreHouse(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库分支列表 - * @param thirdQuery 凭证 - * @return 分支列表 - */ - List findStoreBranchList(ThirdQuery thirdQuery); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGiteeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGiteeService.java deleted file mode 100644 index 2af0f025..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGiteeService.java +++ /dev/null @@ -1,50 +0,0 @@ -package cd.casic.module.process.task.code.service; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:15 - * @Version 1.0 - */ - - -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; - -import java.util.List; - -public interface TaskCodeGiteeService { - - /** - * 获取AccessToken的授权用户信息 - * @param thirdQuery 凭证 - * @return 授权用户信息 - */ - ThirdUser findAuthUser(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库列表 - * @param thirdQuery 凭证 - * @return 仓库列表 - */ - List findStoreHouseList(ThirdQuery thirdQuery); - - - /** - * 获取指定仓库信息 - * @param thirdQuery 仓库 - * @return 仓库信息 - */ - ThirdHouse findStoreHouse(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库分支列表 - * @param thirdQuery 凭证 - * @return 分支列表 - */ - List findStoreBranchList(ThirdQuery thirdQuery); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGittokService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGittokService.java deleted file mode 100644 index 45ae3ef2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeGittokService.java +++ /dev/null @@ -1,47 +0,0 @@ -package cd.casic.module.process.task.code.service; - - - - -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; - -import java.util.List; - -public interface TaskCodeGittokService { - - /** - * 获取凭证认证的仓库列表 - * @param thirdQuery 凭证 - * @return 仓库列表 - */ - List findStoreHouseList(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库分支列表 - * @param thirdQuery 凭证 - * @return 分支列表 - */ - List findHouseBranchList(ThirdQuery thirdQuery); - - - /** - * 获取分支 - * @param authId 认证id - * @param rpyId 仓库id - * @param branchId 分支id - * @return 分支 - */ - ThirdBranch findOneBranch(String authId,String rpyId,String branchId); - - /** - * 获取凭证认证的指定的仓库 - * @param thirdQuery 凭证 - * @return 指定的仓库 - */ - ThirdHouse findStoreHouse(ThirdQuery thirdQuery); - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodePriGitLabService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodePriGitLabService.java deleted file mode 100644 index 40c496c4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodePriGitLabService.java +++ /dev/null @@ -1,48 +0,0 @@ -package cd.casic.module.process.task.code.service; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:15 - * @Version 1.0 - */ - -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; - -import java.util.List; - -public interface TaskCodePriGitLabService { - - /** - * 获取AccessToken的授权用户信息 - * @param thirdQuery 凭证 - * @return 授权用户信息 - */ - ThirdUser findAuthUser(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库列表 - * @param thirdQuery 凭证 - * @return 仓库列表 - */ - List findStoreHouseList(ThirdQuery thirdQuery); - - /** - * 获取指定仓库信息 - * @param thirdQuery 仓库 - * @return 仓库信息 - */ - ThirdHouse findStoreHouse(ThirdQuery thirdQuery); - - /** - * 获取凭证认证的仓库分支列表 - * @param thirdQuery 凭证 - * @return 分支列表 - */ - List findStoreBranchList(ThirdQuery thirdQuery); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeService.java deleted file mode 100644 index 5a1bce14..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeService.java +++ /dev/null @@ -1,81 +0,0 @@ -package cd.casic.module.process.task.code.service; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:15 - * @Version 1.0 - */ - -import cd.casic.ci.commons.annotation.join.FindAll; -import cd.casic.ci.commons.annotation.join.FindList; -import cd.casic.ci.commons.annotation.join.FindOne; -import cd.casic.ci.commons.annotation.join.JoinProvider; -import cd.casic.module.process.task.code.model.TaskCode; - -import java.util.List; - -/** - * 源码服务接口 - */ -@JoinProvider(model = TaskCode.class) -public interface TaskCodeService { - - /** - * 创建 - * @param taskCode code信息 - * @return codeId - */ - String createCode(TaskCode taskCode); - - /** - * 根据配置id查询任务 - * @param taskId 配置id - * @return 任务 - */ - TaskCode findCodeByAuth(String taskId); - - - /** - * 验证 - * @param taskType 任务类型 - * @param code object - * @return 是否验证通过 - */ - Boolean codeValid(String taskType,TaskCode code); - - /** - * 删除 - * @param codeId codeId - */ - void deleteCode(String codeId); - - /** - * 更新 - * @param taskCode 更新信息 - */ - void updateCode(TaskCode taskCode); - - - void updateOneCode(TaskCode taskCode); - - /** - * 查询单个信息 - * @param codeId codeId - * @return code信息 - */ - @FindOne - TaskCode findOneCode(String codeId); - - /** - * 查询所有信息 - * @return code信息集合 - */ - @FindAll - List findAllCode(); - - - @FindList - List findAllCodeList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitHubServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitHubServiceImpl.java deleted file mode 100644 index 23acde3c..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitHubServiceImpl.java +++ /dev/null @@ -1,257 +0,0 @@ -package cd.casic.module.process.task.code.service.impl; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:12 - * @Version 1.0 - */ - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; -import cd.casic.module.process.task.code.service.TaskCodeGitHubService; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import jakarta.annotation.Resource; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -@Service -public class TaskCodeGitHubServiceImpl implements TaskCodeGitHubService { - - - @Resource - AuthThirdService authThirdService; - - /** - * 获取accessToken - * @param authId 认证ID - * @return 凭证 - */ - private String findAccessToken(String authId){ - AuthThird authServer = authThirdService.findOneAuthServer(authId); - if (Objects.isNull(authServer)){ - throw new ApplicationException("没有查询到当前凭证授权码！"); - } - return authServer.getAccessToken(); - } - - @Override - public List findStoreHouseList(ThirdQuery thirdQuery){ - - String accessToken = findAccessToken(thirdQuery.getAuthId()); - List houseList = new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("https://api.github.com/user/repos?page=%s&per_page=%s", - thirdQuery.getPage(), thirdQuery.getPageNumber()); - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Accept", "application/vnd.github.v3+json"); - headers.set("Authorization", "token"+" "+ accessToken); - headers.set("X-GitHub-Api-Version", "2022-11-28"); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取仓库信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String id = jsonObject.getString("id"); - String name = jsonObject.getString("name"); - String nameSpace = jsonObject.getString("full_name"); - String sshUrl = jsonObject.getString("ssh_url_to_repo"); - String webUrl = jsonObject.getString("clone_url"); - String defaultBranch = jsonObject.getString("default_branch"); - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(name); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(nameSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - houseList.add(thirdHouse); - } - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - return houseList; - } - - @Override - public ThirdHouse findStoreHouse(ThirdQuery thirdQuery) { - - String accessToken = findAccessToken(thirdQuery.getAuthId()); - String[] split = thirdQuery.getHouseId().split("/"); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("https://api.github.com/repos/%s/%s", split[0],split[1]); - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Accept", "application/vnd.github.v3+json"); - headers.set("Authorization", "token"+" "+ accessToken); - headers.set("X-GitHub-Api-Version", "2022-11-28"); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取仓库信息失败，获取信息为空！"); - } - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("id"); - String name = jsonObject.getString("name"); - String nameSpace = jsonObject.getString("full_name"); - String sshUrl = jsonObject.getString("ssh_url_to_repo"); - String webUrl = jsonObject.getString("clone_url"); - String defaultBranch = jsonObject.getString("default_branch"); - - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(name); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(nameSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - - return thirdHouse; - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public ThirdUser findAuthUser(ThirdQuery thirdQuery){ - String accessToken = findAccessToken(thirdQuery.getAuthId()); - RestTemplate restTemplate = new RestTemplate(); - String url = "https://api.github.com/user"; - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Accept", "application/vnd.github.v3+json"); - headers.set("Authorization", "token"+" "+ accessToken); - headers.set("X-GitHub-Api-Version", "2022-11-28"); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("id"); - String login = jsonObject.getString("login"); - String name = jsonObject.getString("name"); - String avatar = jsonObject.getString("avatar_url"); - ThirdUser thirdUser = new ThirdUser(); - thirdUser.setId(id); - thirdUser.setName(name); - thirdUser.setPath(login); - thirdUser.setHead(avatar); - return thirdUser; - - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public List findStoreBranchList(ThirdQuery thirdQuery){ - String accessToken = findAccessToken(thirdQuery.getAuthId()); - String[] split = thirdQuery.getHouseId().split("/"); - List branchList= new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("https://api.github.com/repos/%s/%s/branches?page=%s&per_page=%s", - split[0],split[1], thirdQuery.getPage(), thirdQuery.getPageNumber()); - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Accept", "application/vnd.github.v3+json"); - headers.set("Authorization", "token"+" "+ accessToken); - headers.set("X-GitHub-Api-Version", "2022-11-28"); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取分支信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String name = jsonObject.getString("name"); - Boolean idProtected = jsonObject.getBoolean("protected"); - ThirdBranch thirdBranch = new ThirdBranch(); - thirdBranch.setId(name); - thirdBranch.setName(name); - thirdBranch.setIsProtected(idProtected); - thirdBranch.setIsProtected(false); - branchList.add(thirdBranch); - } - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - return branchList; - } - - private void findGitlabErrorRequest(int code){ - switch (code){ - case 401 -> { throw new ApplicationException("令牌无效或已过期 ！");} - case 403 -> { throw new ApplicationException("令牌权限不足！");} - case 404 -> { throw new ApplicationException("请求失败，接口不存在！");} - case 405 -> { throw new ApplicationException("不支持该请求！");} - case 429 -> { throw new ApplicationException("请求次数过多！");} - case 503 -> { throw new ApplicationException("服务器暂时超载，无法处理该请求！");} - } - } - - -} - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitLabServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitLabServiceImpl.java deleted file mode 100644 index 70ae7ee6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGitLabServiceImpl.java +++ /dev/null @@ -1,256 +0,0 @@ -package cd.casic.module.process.task.code.service.impl; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:13 - * @Version 1.0 - */ - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; -import cd.casic.module.process.task.code.service.TaskCodeGitLabService; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import jakarta.annotation.Resource; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -@Service -public class TaskCodeGitLabServiceImpl implements TaskCodeGitLabService { - - @Resource - AuthThirdService authThirdService; - - /** - * 获取accessToken - * @param authId 认证ID - * @return 凭证 - */ - private String findAccessToken(String authId){ - AuthThird authServer = authThirdService.findOneAuthServer(authId); - if (Objects.isNull(authServer)){ - throw new ApplicationException("没有查询到当前凭证授权码！"); - } - return authServer.getAccessToken(); - } - - @Override - public List findStoreHouseList(ThirdQuery thirdQuery){ - String accessToken = findAccessToken(thirdQuery.getAuthId()); - List houseList = new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("https://gitlab.com/api/v4/projects?min_access_level=10&simple=true&page=%s&per_page=%s", - thirdQuery.getPage(),thirdQuery.getPageNumber()); - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取分支信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String id = jsonObject.getString("id"); - String name = jsonObject.getString("name"); - String path = jsonObject.getString("path"); - String nameSpace = jsonObject.getString("name_with_namespace"); - String pathSpace = jsonObject.getString("path_with_namespace"); - String sshUrl = jsonObject.getString("ssh_url_to_repo"); - String webUrl = jsonObject.getString("http_url_to_repo"); - String defaultBranch = jsonObject.getString("default_branch"); - - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(name); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(nameSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - houseList.add(thirdHouse); - } - }catch (HttpClientErrorException e) { - // if (Objects.requireNonNull(e.getMessage()).contains("Token is expired")){ - // throw new SystemException("令牌已过期！"); - // } - // if (e.getMessage().contains("Unauthorized")){ - // throw new SystemException("令牌认证失败！"); - // } - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - return houseList; - } - - @Override - public ThirdHouse findStoreHouse(ThirdQuery thirdQuery) { - String accessToken = findAccessToken(thirdQuery.getAuthId()); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("https://gitlab.com/api/v4/projects/%s",thirdQuery.getHouseId()); - ResponseEntity forEntity; - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取仓库信息失败，获取信息为空！"); - } - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("id"); - String name = jsonObject.getString("name"); - String path = jsonObject.getString("path"); - String nameSpace = jsonObject.getString("name_with_namespace"); - String pathSpace = jsonObject.getString("path_with_namespace"); - String sshUrl = jsonObject.getString("ssh_url_to_repo"); - String webUrl = jsonObject.getString("http_url_to_repo"); - String defaultBranch = jsonObject.getString("default_branch"); - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(name); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(nameSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - return thirdHouse; - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public ThirdUser findAuthUser(ThirdQuery thirdQuery){ - String accessToken = findAccessToken(thirdQuery.getAuthId()); - RestTemplate restTemplate = new RestTemplate(); - String url = "https://gitlab.com/api/v4/user"; - ResponseEntity forEntity; - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("id"); - String login = jsonObject.getString("username"); - String name = jsonObject.getString("name"); - String avatar = jsonObject.getString("avatar_url"); - ThirdUser thirdUser = new ThirdUser(); - thirdUser.setId(id); - thirdUser.setName(name); - thirdUser.setPath(login); - thirdUser.setHead(avatar); - return thirdUser; - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public List findStoreBranchList(ThirdQuery thirdQuery){ - String accessToken = findAccessToken(thirdQuery.getAuthId()); - List branchList= new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("https://gitlab.com/api/v4/projects/%s/repository/branches",thirdQuery.getHouseId()); - ResponseEntity forEntity; - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取分支信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String id = jsonObject.getString("commit"); - String name = jsonObject.getString("name"); - Boolean isDefault = jsonObject.getBoolean("default"); - Boolean idProtected = jsonObject.getBoolean("protected"); - ThirdBranch thirdBranch = new ThirdBranch(); - thirdBranch.setId(name); - thirdBranch.setName(name); - thirdBranch.setIsProtected(idProtected); - thirdBranch.setIsProtected(false); - branchList.add(thirdBranch); - } - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - return branchList; - } - - private void findGitlabErrorRequest(int code){ - switch (code){ - case 401 -> { throw new ApplicationException("令牌无效或已过期 ！");} - case 403 -> { throw new ApplicationException("令牌权限不足！");} - case 404 -> { throw new ApplicationException("请求失败，接口不存在！");} - case 405 -> { throw new ApplicationException("不支持该请求！");} - case 429 -> { throw new ApplicationException("请求次数过多！");} - case 503 -> { throw new ApplicationException("服务器暂时超载，无法处理该请求！");} - } - } - - -} - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGiteeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGiteeServiceImpl.java deleted file mode 100644 index bf74820e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGiteeServiceImpl.java +++ /dev/null @@ -1,260 +0,0 @@ -package cd.casic.module.process.task.code.service.impl; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:10 - * @Version 1.0 - */ - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; -import cd.casic.module.process.task.code.service.TaskCodeGiteeService; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -@Service -public class TaskCodeGiteeServiceImpl implements TaskCodeGiteeService { - - @Resource - AuthThirdService authThirdService; - - /** - * 获取accessToken - * @param authId 认证ID - * @return 凭证 - */ - private String findAccessToken(String authId){ - AuthThird authServer = authThirdService.findOneAuthServer(authId); - if (Objects.isNull(authServer)){ - throw new ApplicationException("没有查询到当前凭证授权码！"); - } - return authServer.getAccessToken(); - } - - @Override - public List findStoreHouseList(ThirdQuery thirdQuery){ - List houseList = new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - String accessToken = findAccessToken(thirdQuery.getAuthId()); - String url; - if (StringUtils.isEmpty(thirdQuery.getQuery())){ - url = String.format("https://gitee.com/api/v5/user/repos?access_token=%s&sort=full_name&page=%s&per_page=%s", - accessToken,thirdQuery.getPage(),thirdQuery.getPageNumber()); - }else { - url = String.format("https://gitee.com/api/v5/user/repos?access_token=%s&sort=full_name&q=%s&page=%s&per_page=%s", - accessToken,thirdQuery.getQuery(),thirdQuery.getPage(),thirdQuery.getPageNumber()); - } - - try { - HttpHeaders headers = new HttpHeaders(); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取分支信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String id = jsonObject.getString("full_name"); - String name = jsonObject.getString("name"); - String path = jsonObject.getString("path"); - String nameSpace = jsonObject.getString("full_name"); - String pathSpace = jsonObject.getString("human_name"); - String sshUrl = jsonObject.getString("ssh_url"); - String webUrl = jsonObject.getString("html_url"); - String defaultBranch = jsonObject.getString("default_branch"); - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(path); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(pathSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - houseList.add(thirdHouse); - } - }catch (Exception e) { - if (e instanceof HttpClientErrorException){ - int rawStatusCode = ((HttpClientErrorException) e).getRawStatusCode(); - if (rawStatusCode == 401){ - throw new ApplicationException("授权信息认证失败！"); - } - } - throw new SystemException(String.valueOf(e)); - } - return houseList; - } - - @Override - public ThirdHouse findStoreHouse(ThirdQuery thirdQuery){ - String accessToken = findAccessToken(thirdQuery.getAuthId()); - String[] split = thirdQuery.getHouseId().split("/"); - String url = String.format("https://gitee.com/api/v5/repos/%s/%s?access_token=%s", - split[0],split[1],accessToken); - RestTemplate restTemplate = new RestTemplate(); - - try { - HttpHeaders headers = new HttpHeaders(); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取仓库信息失败，获取信息为空！"); - } - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("full_name"); - String name = jsonObject.getString("name"); - String path = jsonObject.getString("path"); - String nameSpace = jsonObject.getString("full_name"); - String pathSpace = jsonObject.getString("human_name"); - String sshUrl = jsonObject.getString("ssh_url"); - String webUrl = jsonObject.getString("html_url"); - String defaultBranch = jsonObject.getString("default_branch"); - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(path); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(pathSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - return thirdHouse; - } catch (Exception e) { - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public ThirdUser findAuthUser(ThirdQuery thirdQuery){ - RestTemplate restTemplate = new RestTemplate(); - String accessToken = findAccessToken(thirdQuery.getAuthId()); - String url = String.format("https://gitee.com/api/v5/user?access_token=%s",accessToken); - try { - HttpHeaders headers = new HttpHeaders(); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("id"); - String login = jsonObject.getString("login"); - String name = jsonObject.getString("name"); - String avatar = jsonObject.getString("avatar_url"); - - ThirdUser thirdUser = new ThirdUser(); - thirdUser.setId(id); - thirdUser.setName(name); - thirdUser.setPath(login); - thirdUser.setHead(avatar); - return thirdUser; - }catch (Exception e) { - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public List findStoreBranchList(ThirdQuery thirdQuery){ - List branchList= new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - String[] split = thirdQuery.getHouseId().split("/"); - String accessToken = findAccessToken(thirdQuery.getAuthId()); - String url = String.format("https://gitee.com/api/v5/repos/%s/%s/branches?access_token=%s&sort=name&direction=asc&page=%s&per_page=%s", - split[0],split[1],accessToken,thirdQuery.getPage(),thirdQuery.getPageNumber()); - ResponseEntity forEntity; - try { - HttpHeaders headers = new HttpHeaders(); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取分支信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - if (projectList.isEmpty()){ - throw new SystemException("获取分支信息失败，当前仓库为空仓库！"); - } - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String name = jsonObject.getString("name"); - Boolean isProtected = jsonObject.getBoolean("protected"); - ThirdBranch thirdBranch = new ThirdBranch(); - thirdBranch.setId(name); - thirdBranch.setName(name); - thirdBranch.setIsProtected(isProtected); - thirdBranch.setIsDefault(false); - branchList.add(thirdBranch); - } - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - return branchList; - } - - private void findGitlabErrorRequest(int code){ - switch (code){ - case 401 -> { throw new ApplicationException("AccessToken无效或已过期 ！");} - case 403 -> { throw new ApplicationException("AccessToken权限不足！");} - case 404 -> { throw new ApplicationException("请求失败，接口不存在！");} - case 405 -> { throw new ApplicationException("不支持该请求！");} - case 429 -> { throw new ApplicationException("请求次数过多！");} - case 503 -> { throw new ApplicationException("服务器暂时超载，无法处理该请求！");} - } - } - - -} - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGittokServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGittokServiceImpl.java deleted file mode 100644 index 38ec6e19..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeGittokServiceImpl.java +++ /dev/null @@ -1,281 +0,0 @@ -package cd.casic.module.process.task.code.service.impl; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:13 - * @Version 1.0 - */ - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.support.util.util.PipelineRequestUtil; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.service.TaskCodeGittokService; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.RestTemplate; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; - -@Service -public class TaskCodeGittokServiceImpl implements TaskCodeGittokService { - - private static final Logger logger = LoggerFactory.getLogger(TaskCodeGittokServiceImpl.class); - - @Resource - AuthThirdService serverServer; - - @Resource - PipelineRequestUtil requestUtil; - - - @Override - public List findStoreHouseList(ThirdQuery thirdQuery){ - String authId = thirdQuery.getAuthId(); - AuthThird authServer = serverServer.findOneAuthServer(authId); - - if (Objects.isNull(authServer)){ - return null; - } - - String serverAddress = authServer.getServerAddress(); - try { - - String username = authServer.getUsername(); - String password = authServer.getPassword(); - - HttpHeaders headers = requestUtil.initHeaders(MediaType.APPLICATION_JSON, new HashMap<>()); - MultiValueMap valueMap = new LinkedMultiValueMap<>(); - valueMap.add("account",username); - valueMap.add("password",password); - valueMap.add("dirId","1"); - String requestUrl = serverAddress+"/api/rpy/findRepositoryByUser"; - - HttpEntity requestEntity = new HttpEntity<>(valueMap, headers); - RestTemplate restTemplate = new RestTemplate(); - ResponseEntity response = restTemplate.exchange(requestUrl, HttpMethod.POST, requestEntity, JSONObject.class); - JSONObject jsonObject = response.getBody(); - JSONArray jsonArray = validBody(jsonObject, JSONArray.class); - - List houseList = new ArrayList<>(); - - for (Object o : jsonArray) { - JSONObject parseObject = JSONObject.parseObject(String.valueOf(o)); - ThirdHouse thirdHouse = bindHouse(parseObject); - houseList.add(thirdHouse); - } - return houseList; - }catch (Throwable throwable){ - String message = throwable.getMessage(); - logger.error(" 连接异常：{}", message); - if (message.contains("timed out") ){ - throw new ApplicationException(58001,"请求超时！"); - } - if (message.contains("未订阅")){ - throw new ApplicationException("当前企业未订阅gittok"); - } - if (throwable instanceof ApplicationException){ - throw new ApplicationException(message); - } - throw new ApplicationException("无法连接到：" + serverAddress); - } - } - - @Override - public List findHouseBranchList(ThirdQuery thirdQuery){ - String authId = thirdQuery.getAuthId(); - String houseId = thirdQuery.getHouseId(); - AuthThird authServer = serverServer.findOneAuthServer(authId); - String serverAddress = authServer.getServerAddress(); - try { - HttpHeaders headers = requestUtil.initHeaders(MediaType.APPLICATION_JSON, new HashMap<>()); - MultiValueMap valueMap = new LinkedMultiValueMap<>(); - valueMap.add("rpyId",houseId); - String requestUrl = serverAddress+"/api/branch/findAllBranch"; - - HttpEntity requestEntity = new HttpEntity<>(valueMap, headers); - RestTemplate restTemplate = new RestTemplate(); - ResponseEntity response = restTemplate.exchange(requestUrl, HttpMethod.POST, requestEntity, JSONObject.class); - JSONObject jsonObject = response.getBody(); - List branchList = new ArrayList<>(); - JSONArray jsonArray = validBody(jsonObject, JSONArray.class); - for (Object o : jsonArray) { - JSONObject parseObject = JSONObject.parseObject(String.valueOf(o)); - ThirdBranch thirdBranch = bindBranch(parseObject); - branchList.add(thirdBranch); - } - return branchList; - - // return requestUtil.requestPostList(headers, requestUrl, valueMap, XcodeBranch.class); - }catch (Throwable throwable){ - String message = throwable.getMessage(); - logger.error(message); - if (message.contains("未订阅")){ - throw new ApplicationException("当前企业未订阅Xcode"); - } - if (throwable instanceof ApplicationException){ - throw new ApplicationException(message); - } - throw new ApplicationException("无法连接到："+serverAddress); - } - } - - @Override - public ThirdBranch findOneBranch(String authId,String rpyId,String branchId){ - if (Objects.isNull(authId) || Objects.isNull(branchId)){ - return null; - } - - AuthThird authServer = serverServer.findOneAuthServer(authId); - String serverAddress = authServer.getServerAddress(); - - HttpHeaders headers = requestUtil.initHeaders(MediaType.APPLICATION_JSON, new HashMap<>()); - MultiValueMap valueMap = new LinkedMultiValueMap<>(); - valueMap.add("rpyId",rpyId); - valueMap.add("commitId",branchId); - String requestUrl = serverAddress+"/api/branch/findBranch"; - - HttpEntity requestEntity = new HttpEntity<>(valueMap, headers); - RestTemplate restTemplate = new RestTemplate(); - ResponseEntity response = restTemplate.exchange(requestUrl, HttpMethod.POST, requestEntity, JSONObject.class); - JSONObject object = validBody(response.getBody(), JSONObject.class); - ThirdBranch thirdBranch = bindBranch(object); - if (Objects.isNull(thirdBranch)){ - throw new ApplicationException("找不到"+ rpyId +"仓库！"); - } - return thirdBranch; - - // return requestUtil.requestPost(headers, requestUrl, valueMap, XcodeBranch.class); - } - - @Override - public ThirdHouse findStoreHouse(ThirdQuery thirdQuery){ - String authId = thirdQuery.getAuthId(); - String houseId = thirdQuery.getHouseId(); - if (Objects.isNull(authId) || Objects.isNull(houseId)){ - return null; - } - AuthThird authServer = serverServer.findOneAuthServer(authId); - String serverAddress = authServer.getServerAddress(); - try { - HttpHeaders headers = requestUtil.initHeaders(MediaType.APPLICATION_JSON, new HashMap<>()); - MultiValueMap valueMap = new LinkedMultiValueMap<>(); - valueMap.add("id",houseId); - String requestUrl = serverAddress+"/api/rpy/findRepository"; - - HttpEntity requestEntity = new HttpEntity<>(valueMap, headers); - RestTemplate restTemplate = new RestTemplate(); - ResponseEntity response = restTemplate.exchange(requestUrl, HttpMethod.POST, requestEntity, JSONObject.class); - JSONObject object = validBody(response.getBody(), JSONObject.class); - ThirdHouse thirdHouse = bindHouse(object); - if (Objects.isNull(thirdHouse)){ - throw new ApplicationException("找不到"+ houseId +"仓库！"); - } - return thirdHouse; - }catch (Throwable throwable){ - String message = throwable.getMessage(); - logger.error(message); - if (message.contains("未订阅")){ - throw new ApplicationException("当前企业未订阅Xcode"); - } - if (throwable instanceof ApplicationException){ - throw new ApplicationException(message); - } - throw new ApplicationException("无法连接到："+serverAddress); - } - } - - - private T validBody(JSONObject jsonObject,Class tClass){ - if (Objects.isNull( jsonObject)){ - throw new SystemException("获取返回值为空！"); - } - Integer code = jsonObject.getInteger("code"); - if (code != 0){ - String msg = jsonObject.getString("msg"); - if (code == 5000){ - throw new ApplicationException("用户效验失败！"); - } - throw new ApplicationException("获取仓库列表失败！,Message："+msg); - } - return jsonObject.getObject("data",tClass); - } - - - private ThirdHouse bindHouse(JSONObject jsonObject){ - if (Objects.isNull(jsonObject)){ - return null; - } - String id = jsonObject.getString("rpyId"); - String fullPath = jsonObject.getString("fullPath"); - String path = jsonObject.getString("address"); - String defaultBranch = jsonObject.getString("defaultBranch"); - String name = jsonObject.getString("name"); - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(path); - thirdHouse.setNameWithSpace(name); - thirdHouse.setPathWithSpace(path); - thirdHouse.setHouseSshUrl(fullPath); - thirdHouse.setDefaultBranch(defaultBranch); - return thirdHouse; - } - - private ThirdBranch bindBranch(JSONObject jsonObject){ - if (Objects.isNull(jsonObject)){ - return null; - } - String id = jsonObject.getString("branchId"); - Boolean defaultBranch = jsonObject.getBoolean("defaultBranch"); - String branchName = jsonObject.getString("branchName"); - - ThirdBranch thirdBranch = new ThirdBranch(); - thirdBranch.setId(branchName); - thirdBranch.setName(branchName); - thirdBranch.setIsDefault(defaultBranch); - return thirdBranch; - } - -} - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodePriGitLabServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodePriGitLabServiceImpl.java deleted file mode 100644 index f4e0563b..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodePriGitLabServiceImpl.java +++ /dev/null @@ -1,262 +0,0 @@ -package cd.casic.module.process.task.code.service.impl; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:13 - * @Version 1.0 - */ - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.task.code.model.ThirdBranch; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.model.ThirdUser; -import cd.casic.module.process.task.code.service.TaskCodePriGitLabService; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -@Service -public class TaskCodePriGitLabServiceImpl implements TaskCodePriGitLabService { - - @Autowired - AuthThirdService authThirdService; - - /** - * 获取accessToken - * @param authId 认证ID - * @return 凭证 - */ - private AuthThird findAccessToken(String authId){ - AuthThird authServer = authThirdService.findOneAuthServer(authId); - if (Objects.isNull(authServer)){ - throw new ApplicationException("没有查询到当前凭证授权码！"); - } - return authServer; - } - - @Override - public List findStoreHouseList(ThirdQuery thirdQuery){ - AuthThird authServer = findAccessToken(thirdQuery.getAuthId()); - String accessToken = authServer.getAccessToken(); - String serverAddress = authServer.getServerAddress(); - List houseList = new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - - String url = String.format("%s/api/v4/projects?min_access_level=10&simple=true&page=%s&per_page=%s", - serverAddress,thirdQuery.getPage(),thirdQuery.getPageNumber()); - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取分支信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String id = jsonObject.getString("id"); - String name = jsonObject.getString("name"); - String path = jsonObject.getString("path"); - String nameSpace = jsonObject.getString("name_with_namespace"); - String pathSpace = jsonObject.getString("path_with_namespace"); - String sshUrl = jsonObject.getString("ssh_url_to_repo"); - String webUrl = jsonObject.getString("http_url_to_repo"); - String defaultBranch = jsonObject.getString("default_branch"); - - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(path); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(pathSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - houseList.add(thirdHouse); - } - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - return houseList; - } - - @Override - public ThirdHouse findStoreHouse(ThirdQuery thirdQuery) { - AuthThird authServer = findAccessToken(thirdQuery.getAuthId()); - String accessToken = authServer.getAccessToken(); - String serverAddress = authServer.getServerAddress(); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("%s/api/v4/projects/%s",serverAddress,thirdQuery.getHouseId()); - ResponseEntity forEntity; - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取仓库信息失败，获取信息为空！"); - } - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("id"); - String name = jsonObject.getString("name"); - String path = jsonObject.getString("path"); - String nameSpace = jsonObject.getString("name_with_namespace"); - String pathSpace = jsonObject.getString("path_with_namespace"); - String sshUrl = jsonObject.getString("ssh_url_to_repo"); - String webUrl = jsonObject.getString("http_url_to_repo"); - String defaultBranch = jsonObject.getString("default_branch"); - ThirdHouse thirdHouse = new ThirdHouse(); - thirdHouse.setId(id); - thirdHouse.setName(name); - thirdHouse.setPath(path); - thirdHouse.setNameWithSpace(nameSpace); - thirdHouse.setPathWithSpace(pathSpace); - thirdHouse.setHouseSshUrl(sshUrl); - thirdHouse.setHouseWebUrl(webUrl); - thirdHouse.setDefaultBranch(defaultBranch); - - return thirdHouse; - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public ThirdUser findAuthUser(ThirdQuery thirdQuery){ - AuthThird authServer = findAccessToken(thirdQuery.getAuthId()); - String accessToken = authServer.getAccessToken(); - String serverAddress = authServer.getServerAddress(); - RestTemplate restTemplate = new RestTemplate(); - String url = serverAddress+ "/api/v4/user"; - ResponseEntity forEntity; - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - - JSONObject jsonObject = JSONObject.parseObject(body); - String id = jsonObject.getString("id"); - String login = jsonObject.getString("username"); - String name = jsonObject.getString("name"); - String avatar = jsonObject.getString("avatar_url"); - - ThirdUser thirdUser = new ThirdUser(); - thirdUser.setId(id); - thirdUser.setName(name); - thirdUser.setPath(login); - thirdUser.setHead(avatar); - return thirdUser; - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - } - - @Override - public List findStoreBranchList(ThirdQuery thirdQuery){ - AuthThird authServer = findAccessToken(thirdQuery.getAuthId()); - String accessToken = authServer.getAccessToken(); - String serverAddress = authServer.getServerAddress(); - List branchList= new ArrayList<>(); - RestTemplate restTemplate = new RestTemplate(); - String url = String.format("%s/api/v4/projects/%s/repository/branches",serverAddress,thirdQuery.getHouseId()); - ResponseEntity forEntity; - try { - HttpHeaders headers = new HttpHeaders(); - headers.set("Authorization", "Bearer"+" "+accessToken); - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - HttpEntity> entity = new HttpEntity<>(paramMap, headers); - forEntity = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); - String body = forEntity.getBody(); - if (Objects.isNull(body)){ - throw new SystemException("获取分支信息失败，获取信息为空！"); - } - JSONArray projectList = JSONObject.parseArray(body); - for (Object o : projectList) { - JSONObject jsonObject = JSONObject.parseObject(String.valueOf(o)); - String id = jsonObject.getString("commit"); - String name = jsonObject.getString("name"); - Boolean isDefault = jsonObject.getBoolean("default"); - Boolean idProtected = jsonObject.getBoolean("protected"); - ThirdBranch thirdBranch = new ThirdBranch(); - thirdBranch.setId(name); - thirdBranch.setName(name); - thirdBranch.setIsProtected(idProtected); - thirdBranch.setIsProtected(false); - - branchList.add(thirdBranch); - } - }catch (HttpClientErrorException e) { - findGitlabErrorRequest(e.getRawStatusCode()); - throw new SystemException(String.valueOf(e)); - } - return branchList; - } - - private void findGitlabErrorRequest(int code){ - switch (code){ - case 401 -> { throw new ApplicationException("令牌无效或已过期 ！");} - case 403 -> { throw new ApplicationException("令牌权限不足！");} - case 404 -> { throw new ApplicationException("请求失败，接口不存在！");} - case 405 -> { throw new ApplicationException("不支持该请求！");} - case 429 -> { throw new ApplicationException("请求次数过多！");} - case 503 -> { throw new ApplicationException("服务器暂时超载，无法处理该请求！");} - } - } - - -} - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java deleted file mode 100644 index ce9d9f11..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java +++ /dev/null @@ -1,220 +0,0 @@ -package cd.casic.module.process.task.code.service.impl; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 20:14 - * @Version 1.0 - */ - - -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.ci.commons.annotation.rpc.Exporter; -import cd.casic.module.process.process.setting.AuthService; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.task.code.dao.TaskCodeDao; -import cd.casic.module.process.task.code.dataobject.TaskCodeDo; -import cd.casic.module.process.task.code.model.TaskCode; -import cd.casic.module.process.task.code.model.ThirdHouse; -import cd.casic.module.process.task.code.model.ThirdQuery; -import cd.casic.module.process.task.code.service.TaskCodeGitHubService; -import cd.casic.module.process.task.code.service.TaskCodeGitLabService; -import cd.casic.module.process.task.code.service.TaskCodeGiteeService; -import cd.casic.module.process.task.code.service.TaskCodeGittokService; -import cd.casic.module.process.task.code.service.TaskCodePriGitLabService; -import cd.casic.module.process.task.code.service.TaskCodeService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Objects; - -import static cd.casic.ci.commons.commons.PipelineConstants.AUTH_NONE; -import static cd.casic.ci.commons.commons.PipelineConstants.AUTH_USER_PASS; -import static cd.casic.ci.commons.commons.PipelineConstants.TASK_CODE_PRI_GITLAB; -import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_GITEE; -import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_GITHUB; -import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_GITLAB; -import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_SVN; -import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODE_XCODE; - - -@Service -@Exporter -public class TaskCodeServiceImpl implements TaskCodeService { - - @Resource - TaskCodeDao taskCodeDao; - - @Resource - AuthService authServer; - - @Resource - AuthThirdService authServerServer; - - @Resource - TaskCodeGiteeService giteeService; - - @Resource - TaskCodeGitHubService gitHubService; - - @Resource - TaskCodeGitLabService gitLabService; - - @Resource - TaskCodePriGitLabService priGitLabService; - - @Resource - TaskCodeGittokService xcodeService; - - @Override - public String createCode(TaskCode taskCode) { - return taskCodeDao.createCode(BeanMapper.map(taskCode, TaskCodeDo.class)); - } - - @Override - public TaskCode findCodeByAuth(String taskId){ - TaskCodeDo oneCodeEntity = taskCodeDao.findOneCode(taskId); - TaskCode taskCode = BeanMapper.map(oneCodeEntity, TaskCode.class); - String authId = taskCode.getAuthId(); - - if (Objects.isNull(authId)){ - return taskCode; - } - taskCode.setAuth(findAuth(taskCode.getAuthId())); - return taskCode; - } - - @Override - public Boolean codeValid(String taskType,TaskCode code){ - switch (taskType) { - case TASK_CODE_GITEE, TASK_CODE_GITLAB, TASK_CODE_GITHUB,TASK_CODE_PRI_GITLAB -> { - if (StringUtils.isEmpty(code.getHouseId())) { - return false; - } - return !StringUtils.isEmpty(code.getAuthId()); - } - case TASK_CODE_XCODE -> { - if (StringUtils.isEmpty(code.getHouseId())) { - return false; - } - return !StringUtils.isEmpty(code.getAuthId()); - } - case TASK_CODE_SVN -> { - // String svnFile = code.getSvnFile(); - // return !StringUtils.isEmpty(svnFile); - return true; - } - default -> { - String codeAddress = code.getCodeAddress(); - return !StringUtils.isEmpty(codeAddress); - } - } - } - - @Override - public void deleteCode(String codeId) { - taskCodeDao.deleteCode(codeId); - } - - @Override - public void updateCode(TaskCode taskCode) { - TaskCodeDo oneCodeEntity = taskCodeDao.findOneCode(taskCode.getTaskId()); - TaskCode oneCode = BeanMapper.map(oneCodeEntity, TaskCode.class); - String authId = oneCode.getAuthId(); - String houseId = taskCode.getHouseId(); - - if (!StringUtils.isEmpty(houseId)){ - ThirdHouse storeHouse = null; - ThirdQuery thirdQuery = new ThirdQuery(); - thirdQuery.setHouseId(houseId); - thirdQuery.setAuthId(authId); - switch (taskCode.getType()) { - case TASK_CODE_GITEE -> { - storeHouse = giteeService.findStoreHouse(thirdQuery); - } - case TASK_CODE_GITHUB -> { - storeHouse = gitHubService.findStoreHouse(thirdQuery); - } - case TASK_CODE_GITLAB -> { - storeHouse = gitLabService.findStoreHouse(thirdQuery); - } - case TASK_CODE_PRI_GITLAB -> { - storeHouse = priGitLabService.findStoreHouse(thirdQuery); - } - case TASK_CODE_XCODE -> { - storeHouse = xcodeService.findStoreHouse(thirdQuery); - } - default -> { - } - } - if (!Objects.isNull(storeHouse)){ - taskCode.setCodeAddress(storeHouse.getHouseWebUrl()); - taskCode.setCodeName(storeHouse.getNameWithSpace()); - taskCode.setCodeBranch(storeHouse.getDefaultBranch()); - } - }else { - taskCode.setCodeAddress(taskCode.getCodeName()); - } - - String authType = taskCode.getAuthType(); - if (!StringUtils.isEmpty(authType)){ - if (authType.equals(AUTH_NONE)){ - taskCode.setUsername(""); - taskCode.setPassword(""); - taskCode.setPriKey(""); - }else if (authType.equals(AUTH_USER_PASS)){ - taskCode.setPriKey(""); - }else { - taskCode.setUsername(""); - taskCode.setPassword(""); - } - } - TaskCodeDo taskCodeDo = BeanMapper.map(taskCode, TaskCodeDo.class); - taskCodeDao.updateCode(taskCodeDo); - } - - @Override - public void updateOneCode(TaskCode taskCode){ - taskCodeDao.updateCode(BeanMapper.map(taskCode, TaskCodeDo.class)); - } - - @Override - public TaskCode findOneCode(String codeId) { - TaskCodeDo oneCodeEntity = taskCodeDao.findOneCode(codeId); - return BeanMapper.map(oneCodeEntity, TaskCode.class); - } - - @Override - public List findAllCode() { - List allCode = taskCodeDao.findAllCode(); - List taskCodes = BeanMapper.mapList(allCode, TaskCode.class); - if (taskCodes == null){ - return null; - } - for (TaskCode taskCode : taskCodes) { - taskCode.setAuth(findAuth(taskCode.getAuthId())); - } - return taskCodes; - } - - @Override - public List findAllCodeList(List idList) { - return BeanMapper.mapList(taskCodeDao.findAllCodeList(idList), TaskCode.class); - } - - //获认证信息 - private Object findAuth(String id){ - AuthThird oneAuthServer = authServerServer.findOneAuthServer(id); - if (oneAuthServer != null){ - return oneAuthServer; - } - return authServer.findOneAuth(id); - } - -} - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/controller/SpotbugsScanController.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/controller/SpotbugsScanController.java deleted file mode 100644 index 771c2978..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/controller/SpotbugsScanController.java +++ /dev/null @@ -1,110 +0,0 @@ -package cd.casic.module.process.task.codescan.controller; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/3 20:15 - * @Version 1.0 - */ - -import cd.casic.ci.commons.commons.Pagination; -import cd.casic.ci.commons.utils.Result; -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.task.code.service.SpotbugsScanService; -import cd.casic.module.process.task.codescan.model.SpotbugsBugInstance; -import cd.casic.module.process.task.codescan.model.SpotbugsBugPackageStats; -import cd.casic.module.process.task.codescan.model.SpotbugsBugQuery; -import cd.casic.module.process.task.codescan.model.SpotbugsBugSummary; -import cd.casic.module.process.task.codescan.service.impl.SpotbugsXmlConfig; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.jetbrains.annotations.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @pi.protocol: http - * @pi.groupName: 流水线代码扫描Spotbugs控制器 - */ -@RestController -@RequestMapping("/spotbugsScan") -public class SpotbugsScanController { - - @Resource - SpotbugsScanService spotbugsScanService; - - /** - * @pi.name:条件查询代码扫描结果 - * @pi.url:/spotbugsScan/findScanBugsList - * @pi.methodType:post - * @pi.request-type:json - * @pi.param: model=spotbugsBugQuery - */ - @RequestMapping(path = "/findScanBugsList", method = RequestMethod.POST) - public Result> findSpotbugsList(@RequestBody @Valid @NotNull SpotbugsBugQuery spotbugsBugQuery) { - List spotbugsList = spotbugsScanService.findSpotbugsList(spotbugsBugQuery); - - return Result.ok(spotbugsList); - } - - /** - * @pi.name:分页查询代码扫描结果 - * @pi.url:/spotbugsScan/findSpotbugsPage - * @pi.methodType:post - * @pi.request-type:json - * @pi.param: model=spotbugsBugQuery - */ - @RequestMapping(path = "/findSpotbugsPage", method = RequestMethod.POST) - public Result> findSpotbugsPage(@RequestBody @Valid @NotNull SpotbugsBugQuery spotbugsBugQuery) { - - PageResult spotbugsList = spotbugsScanService.findSpotbugsPage(spotbugsBugQuery); - - return Result.ok(spotbugsList); - } - - /** - * @pi.name:查询代码扫描详情 - * @pi.url:/spotbugsScan/findBugs - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=xmlPath;dataType=string;value=xmlPath; - */ - @RequestMapping(path = "/findBugs", method = RequestMethod.POST) - public Result> findAllRepository(@NotNull String xmlPath) { - List scanBugs = new SpotbugsXmlConfig().findScanBugs(xmlPath); - - return Result.ok(scanBugs); - } - - - /** - * @pi.name:删除代码扫描结果 - * @pi.url:/spotbugsScan/deleteSpotbugs - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=bugId;dataType=string;value=bugId; - */ - @RequestMapping(path = "/deleteSpotbugs", method = RequestMethod.POST) - public Result> deleteSpotbugs(@NotNull String bugId) { - - spotbugsScanService.deleteSpotbugs(bugId); - return Result.ok(); - } - - - - - - - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/SpotbugsScanDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/SpotbugsScanDao.java deleted file mode 100644 index 177d54a6..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/SpotbugsScanDao.java +++ /dev/null @@ -1,74 +0,0 @@ -package cd.casic.module.process.task.codescan.dao; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/3 20:15 - * @Version 1.0 - */ - - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.task.code.jpa.JpaTemplate; -import cd.casic.module.process.task.codescan.dataobject.SpotbugsScanEntity; -import cd.casic.module.process.task.codescan.model.SpotbugsBugQuery; -import cd.casic.module.process.task.codescan.model.SpotbugsBugSummary; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Repository; - -import java.util.Collections; -import java.util.List; - -/** - * Spotbugs代码扫描数据操作 - * @author zcamy - */ -@Repository -public class SpotbugsScanDao { - - - @Resource - JpaTemplate jpaTemplate; - - public String creatSpotbugs(SpotbugsBugSummary bugSummary) { - SpotbugsScanEntity scanEntity = BeanMapper.map(bugSummary, SpotbugsScanEntity.class); - return jpaTemplate.save(scanEntity,String.class); - } - - public void updateSpotbugs(SpotbugsBugSummary bugSummary) { - SpotbugsScanEntity scanEntity = BeanMapper.map(bugSummary, SpotbugsScanEntity.class); - jpaTemplate.update(scanEntity); - } - - - public void deleteSpotbugs(String bugId) { - jpaTemplate.delete(SpotbugsScanEntity.class,bugId); - } - - - public SpotbugsBugSummary findOneSpotbugs(String bugId) { - SpotbugsScanEntity scanEntity = jpaTemplate.findOne(SpotbugsScanEntity.class, bugId); - - return BeanMapper.map(scanEntity,SpotbugsBugSummary.class); - } - - - public List findAllSpotbugs() { - List scanEntityList = jpaTemplate.findAll(SpotbugsScanEntity.class); - if (scanEntityList == null || scanEntityList.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(scanEntityList,SpotbugsBugSummary.class); - } - - - public List findSpotbugsList(SpotbugsBugQuery bugQuery) { - return BeanMapper.mapList(null,SpotbugsBugSummary.class); - } - - public PageResult findSpotbugsPage(SpotbugsBugQuery bugQuery) { - return null; - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/TaskCodeScanDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/TaskCodeScanDao.java deleted file mode 100644 index 8b7fd17e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dao/TaskCodeScanDao.java +++ /dev/null @@ -1,73 +0,0 @@ -package cd.casic.module.process.task.codescan.dao; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:26 - * @Version 1.0 - */ - -import cd.casic.module.process.task.code.jpa.JpaTemplate; -import cd.casic.module.process.task.codescan.dataobject.TaskCodeScanEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public class TaskCodeScanDao { - - @Autowired - JpaTemplate jpaTemplate ; - - /** - * 创建动态 - * @param taskCodeScanEntity 代码扫描 - * @return 代码扫描id - */ - public String createCodeScan(TaskCodeScanEntity taskCodeScanEntity){ - - return jpaTemplate.save(taskCodeScanEntity, String.class); - } - - /** - * 删除代码扫描 - * @param CodeScanId 代码扫描id - */ - public void deleteCodeScan(String CodeScanId){ - jpaTemplate.delete(TaskCodeScanEntity.class, CodeScanId); - } - - /** - * 更新代码扫描 - * @param taskCodeScanEntity 更新信息 - */ - public void updateCodeScan(TaskCodeScanEntity taskCodeScanEntity){ - jpaTemplate.update(taskCodeScanEntity); - } - - /** - * 查询单个代码扫描信息 - * @param CodeScanId 代码扫描id - * @return 代码扫描信息 - */ - public TaskCodeScanEntity findOneCodeScan(String CodeScanId){ - return jpaTemplate.findOne(TaskCodeScanEntity.class,CodeScanId); - } - - /** - * 查询所有代码扫描 - * @return 代码扫描集合 - */ - public List findAllCodeScan(){ - return jpaTemplate.findAll(TaskCodeScanEntity.class); - } - - - public List findAllCodeScanList(List idList){ - return jpaTemplate.findList(TaskCodeScanEntity.class,idList); - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dataobject/SpotbugsScanEntity.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dataobject/SpotbugsScanEntity.java deleted file mode 100644 index 7489450d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dataobject/SpotbugsScanEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package cd.casic.module.process.task.codescan.dataobject; - - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:26 - * @Version 1.0 - */ - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author Spotbugs代码扫描 - */ -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_code_scan_spotbugs", autoResultMap = true) -public class SpotbugsScanEntity extends BaseDO { - - @TableId - private String id; - - // 流水线id - private String pipelineId; - - // 扫描时间 - private String scanTime; - - // 总共扫描的类的数量。 - private String totalClasses; - - // 引用的类的数量 - private String referencedClasses; - - // 检测到的问题（Bugs）的数量 - private String totalBugs; - - // 项目中的包（package）数量 - private String numPackages; - - // 优先级为 1 的问题数 - private String priorityOne; - - // 优先级为 2 的问题数 - private String priorityTwo; - - // 优先级为 3 的问题数 - private String priorityThree; - - private String xmlPath; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dataobject/TaskCodeScanEntity.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dataobject/TaskCodeScanEntity.java deleted file mode 100644 index 02376f3d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/dataobject/TaskCodeScanEntity.java +++ /dev/null @@ -1,62 +0,0 @@ -package cd.casic.module.process.task.codescan.dataobject; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/2 19:26 - * @Version 1.0 - */ - - -import cd.casic.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; -import org.springframework.data.annotation.Id; - -/** - * 代码扫描 - * @author zcamy - */ - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "pip_task_code_scan", autoResultMap = true) -public class TaskCodeScanEntity extends BaseDO { - - @TableId - private String taskId; - - private String projectName; - - private String authId; - - // 是否开启断言 - private String openAssert; - - // 是否启用调试模式 - private String openDebug; - - private String scanPath; - - // 扫描等级 min--最小，default--默认，max--最大 - private String scanGrade; - - // 扫描错误级别 default--默认 max--最大 - private String errGrade; - - // jdk版本 - private String toolJdk; - - // maven版本 - private String toolMaven; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugCategory.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugCategory.java deleted file mode 100644 index a1730360..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugCategory.java +++ /dev/null @@ -1,32 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author Spotbugs代码扫描 - */ -public class SpotbugsBugCategory { - - - // bug描述 - private String category; - - private String description; - - - public String getCategory() { - return category; - } - - public SpotbugsBugCategory setCategory(String category) { - this.category = category; - return this; - } - - public String getDescription() { - return description; - } - - public SpotbugsBugCategory setDescription(String description) { - this.description = description; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugClass.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugClass.java deleted file mode 100644 index 33087017..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugClass.java +++ /dev/null @@ -1,53 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author zcamy - */ -public class SpotbugsBugClass { - - - private String classname; - - private int startLine; - - private int endLine; - - private String message; - - - public String getClassname() { - return classname; - } - - public SpotbugsBugClass setClassname(String classname) { - this.classname = classname; - return this; - } - - public int getStartLine() { - return startLine; - } - - public SpotbugsBugClass setStartLine(int startLine) { - this.startLine = startLine; - return this; - } - - public int getEndLine() { - return endLine; - } - - public SpotbugsBugClass setEndLine(int endLine) { - this.endLine = endLine; - return this; - } - - public String getMessage() { - return message; - } - - public SpotbugsBugClass setMessage(String message) { - this.message = message; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugClassStats.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugClassStats.java deleted file mode 100644 index 07ad9149..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugClassStats.java +++ /dev/null @@ -1,64 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -import java.util.List; - -/** - * @author zcamy - */ -public class SpotbugsBugClassStats { - - private String className; - - private String classPath; - - private int bugNumber; - - private Boolean isInterface; - - private List bugInstanceList; - - public List getBugInstanceList() { - return bugInstanceList; - } - - public SpotbugsBugClassStats setBugInstanceList(List bugInstanceList) { - this.bugInstanceList = bugInstanceList; - return this; - } - - public String getClassName() { - return className; - } - - public SpotbugsBugClassStats setClassName(String className) { - this.className = className; - return this; - } - - public String getClassPath() { - return classPath; - } - - public SpotbugsBugClassStats setClassPath(String classPath) { - this.classPath = classPath; - return this; - } - - public int getBugNumber() { - return bugNumber; - } - - public SpotbugsBugClassStats setBugNumber(int bugNumber) { - this.bugNumber = bugNumber; - return this; - } - - public Boolean getInterface() { - return isInterface; - } - - public SpotbugsBugClassStats setInterface(Boolean anInterface) { - isInterface = anInterface; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugCode.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugCode.java deleted file mode 100644 index 5b3cde16..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugCode.java +++ /dev/null @@ -1,41 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author zcamy - */ -public class SpotbugsBugCode { - - private String abbrev; - - - private String cweid; - - private String description; - - public String getAbbrev() { - return abbrev; - } - - public SpotbugsBugCode setAbbrev(String abbrev) { - this.abbrev = abbrev; - return this; - } - - public String getCweid() { - return cweid; - } - - public SpotbugsBugCode setCweid(String cweid) { - this.cweid = cweid; - return this; - } - - public String getDescription() { - return description; - } - - public SpotbugsBugCode setDescription(String description) { - this.description = description; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugField.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugField.java deleted file mode 100644 index acbc6f73..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugField.java +++ /dev/null @@ -1,41 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author zcamy - */ -public class SpotbugsBugField { - - - private String fieldName; - - private String signature; - - private String message; - - public String getFieldName() { - return fieldName; - } - - public SpotbugsBugField setFieldName(String fieldName) { - this.fieldName = fieldName; - return this; - } - - public String getSignature() { - return signature; - } - - public SpotbugsBugField setSignature(String signature) { - this.signature = signature; - return this; - } - - public String getMessage() { - return message; - } - - public SpotbugsBugField setMessage(String message) { - this.message = message; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugFileStats.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugFileStats.java deleted file mode 100644 index 52d9e44a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugFileStats.java +++ /dev/null @@ -1,42 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -import java.util.List; - -/** - * @author 文件代码bug信息 - */ -public class SpotbugsBugFileStats { - - private String path; - - private String bugNumber; - - private List bugInstanceList; - - public List getBugInstanceList() { - return bugInstanceList; - } - - public SpotbugsBugFileStats setBugInstanceList(List bugInstanceList) { - this.bugInstanceList = bugInstanceList; - return this; - } - - public String getPath() { - return path; - } - - public SpotbugsBugFileStats setPath(String path) { - this.path = path; - return this; - } - - public String getBugNumber() { - return bugNumber; - } - - public SpotbugsBugFileStats setBugNumber(String bugNumber) { - this.bugNumber = bugNumber; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugInstance.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugInstance.java deleted file mode 100644 index e4474e08..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugInstance.java +++ /dev/null @@ -1,140 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author Spotbugs代码扫描，Bug实例 - */ -public class SpotbugsBugInstance { - - // bug类型 - private String bugType; - - // bug级别 - private String bugPriority; - - // 简略描述 - private String shortMessage; - - // 详细描述 - private String longMessage; - - // bug类描述 - private SpotbugsBugClass bugClass; - - // bug字段描述 - private SpotbugsBugField bugField; - - // bug方法描述 - private SpotbugsBugMethod bugMethod; - - // bug源码描述 - private SpotbugsBugSourceLine bugSourceLine; - - // 表示一个Bug的类别 - private SpotbugsBugCategory category; - - // 代码缺陷模式（BugPattern）的信息 - private SpotbugsBugPattern bugPattern; - - // 表示一个Bug的类型 - private SpotbugsBugCode bugCode; - - - public String getBugType() { - return bugType; - } - - public SpotbugsBugInstance setBugType(String bugType) { - this.bugType = bugType; - return this; - } - - public String getBugPriority() { - return bugPriority; - } - - public SpotbugsBugInstance setBugPriority(String bugPriority) { - this.bugPriority = bugPriority; - return this; - } - - public String getShortMessage() { - return shortMessage; - } - - public SpotbugsBugInstance setShortMessage(String shortMessage) { - this.shortMessage = shortMessage; - return this; - } - - public String getLongMessage() { - return longMessage; - } - - public SpotbugsBugInstance setLongMessage(String longMessage) { - this.longMessage = longMessage; - return this; - } - - public SpotbugsBugClass getBugClass() { - return bugClass; - } - - public SpotbugsBugInstance setBugClass(SpotbugsBugClass bugClass) { - this.bugClass = bugClass; - return this; - } - - public SpotbugsBugField getBugField() { - return bugField; - } - - public SpotbugsBugInstance setBugField(SpotbugsBugField bugField) { - this.bugField = bugField; - return this; - } - - public SpotbugsBugMethod getBugMethod() { - return bugMethod; - } - - public SpotbugsBugInstance setBugMethod(SpotbugsBugMethod bugMethod) { - this.bugMethod = bugMethod; - return this; - } - - public SpotbugsBugSourceLine getBugSourceLine() { - return bugSourceLine; - } - - public SpotbugsBugInstance setBugSourceLine(SpotbugsBugSourceLine bugSourceLine) { - this.bugSourceLine = bugSourceLine; - return this; - } - - public SpotbugsBugCategory getCategory() { - return category; - } - - public SpotbugsBugInstance setCategory(SpotbugsBugCategory category) { - this.category = category; - return this; - } - - public SpotbugsBugPattern getBugPattern() { - return bugPattern; - } - - public SpotbugsBugInstance setBugPattern(SpotbugsBugPattern bugPattern) { - this.bugPattern = bugPattern; - return this; - } - - public SpotbugsBugCode getBugCode() { - return bugCode; - } - - public SpotbugsBugInstance setBugCode(SpotbugsBugCode bugCode) { - this.bugCode = bugCode; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugMethod.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugMethod.java deleted file mode 100644 index ebd49e14..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugMethod.java +++ /dev/null @@ -1,62 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author zcamy - */ -public class SpotbugsBugMethod { - - private String methodName; - - private String signature; - - private int startLine; - - private int endLine; - - private String message; - - public String getMethodName() { - return methodName; - } - - public SpotbugsBugMethod setMethodName(String methodName) { - this.methodName = methodName; - return this; - } - - public String getSignature() { - return signature; - } - - public SpotbugsBugMethod setSignature(String signature) { - this.signature = signature; - return this; - } - - public int getStartLine() { - return startLine; - } - - public SpotbugsBugMethod setStartLine(int startLine) { - this.startLine = startLine; - return this; - } - - public int getEndLine() { - return endLine; - } - - public SpotbugsBugMethod setEndLine(int endLine) { - this.endLine = endLine; - return this; - } - - public String getMessage() { - return message; - } - - public SpotbugsBugMethod setMessage(String message) { - this.message = message; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugPackageStats.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugPackageStats.java deleted file mode 100644 index 3f44ddb2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugPackageStats.java +++ /dev/null @@ -1,55 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -import java.util.List; - -/** - * @author zcamy - */ -public class SpotbugsBugPackageStats { - - private String packagePath; - - private int totalBugs; - - - private int totalTypes; - - private List classStatsList; - - - public String getPackagePath() { - return packagePath; - } - - public SpotbugsBugPackageStats setPackagePath(String packagePath) { - this.packagePath = packagePath; - return this; - } - - public int getTotalBugs() { - return totalBugs; - } - - public SpotbugsBugPackageStats setTotalBugs(int totalBugs) { - this.totalBugs = totalBugs; - return this; - } - - public int getTotalTypes() { - return totalTypes; - } - - public SpotbugsBugPackageStats setTotalTypes(int totalTypes) { - this.totalTypes = totalTypes; - return this; - } - - public List getClassStatsList() { - return classStatsList; - } - - public SpotbugsBugPackageStats setClassStatsList(List classStatsList) { - this.classStatsList = classStatsList; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugPattern.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugPattern.java deleted file mode 100644 index 7c20f964..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugPattern.java +++ /dev/null @@ -1,63 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author zcamy - */ -public class SpotbugsBugPattern { - - private String type; - - private String abbrev; - - private String category; - - - private String shortDescription; - - private String details; - - public String getType() { - return type; - } - - public SpotbugsBugPattern setType(String type) { - this.type = type; - return this; - } - - public String getAbbrev() { - return abbrev; - } - - public SpotbugsBugPattern setAbbrev(String abbrev) { - this.abbrev = abbrev; - return this; - } - - public String getCategory() { - return category; - } - - public SpotbugsBugPattern setCategory(String category) { - this.category = category; - return this; - } - - public String getShortDescription() { - return shortDescription; - } - - public SpotbugsBugPattern setShortDescription(String shortDescription) { - this.shortDescription = shortDescription; - return this; - } - - public String getDetails() { - return details; - } - - public SpotbugsBugPattern setDetails(String details) { - this.details = details; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugQuery.java deleted file mode 100644 index 8cd01c5d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugQuery.java +++ /dev/null @@ -1,23 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; - -import java.util.List; - -/** - * 代码扫描查询 - * @author zcamy - */ -public class SpotbugsBugQuery { - - private String pipelineId; - - private PageParam pageParam= new PageParam(); - - private List orderParams = OrderBuilders.instance().desc("scanTime").get(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSourceLine.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSourceLine.java deleted file mode 100644 index c3eec190..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSourceLine.java +++ /dev/null @@ -1,65 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -/** - * @author zcamy - */ -public class SpotbugsBugSourceLine { - - - private String sourcePath; - - - private String sourceFile; - - private int startLine; - - private int endLine; - - private String message; - - - public String getSourcePath() { - return sourcePath; - } - - public SpotbugsBugSourceLine setSourcePath(String sourcePath) { - this.sourcePath = sourcePath; - return this; - } - - public String getSourceFile() { - return sourceFile; - } - - public SpotbugsBugSourceLine setSourceFile(String sourceFile) { - this.sourceFile = sourceFile; - return this; - } - - public int getStartLine() { - return startLine; - } - - public SpotbugsBugSourceLine setStartLine(int startLine) { - this.startLine = startLine; - return this; - } - - public int getEndLine() { - return endLine; - } - - public SpotbugsBugSourceLine setEndLine(int endLine) { - this.endLine = endLine; - return this; - } - - public String getMessage() { - return message; - } - - public SpotbugsBugSourceLine setMessage(String message) { - this.message = message; - return this; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSummary.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSummary.java deleted file mode 100644 index 84e455ad..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/SpotbugsBugSummary.java +++ /dev/null @@ -1,53 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -import lombok.Data; - -/** - * @author Spotbugs代码扫描信息 - */ -//@Join -//@Mapper(targetName = "io.tiklab.arbess.task.codescan.entity.SpotbugsScanEntity") -// @Mapper -@Data -public class SpotbugsBugSummary { - - // id - private String id; - - // 流水线id - private String pipelineId; - - // 扫描时间 - private String scanTime; - - // 总共扫描的类的数量。 - private String totalClasses; - - // 引用的类的数量 - private String referencedClasses; - - // 检测到的问题（Bugs）的数量 - private String totalBugs; - - // 项目中的包（package）数量 - private String numPackages; - - // Java 版本信息 - private String vmVersion; - - // 优先级为 1 的问题数 - private String priorityOne; - - // 优先级为 2 的问题数 - private String priorityTwo; - - // 优先级为 3 的问题数 - private String priorityThree; - - // xml文件报错地址 - private String xmlPath; - - // xml文件内容 - private String xmlFileContent; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/TaskCodeScan.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/TaskCodeScan.java deleted file mode 100644 index c41dfae7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/model/TaskCodeScan.java +++ /dev/null @@ -1,150 +0,0 @@ -package cd.casic.module.process.task.codescan.model; - -import lombok.Data; - - -/** - * 任务代码扫描模型 - */ -//@ApiModel -//@Join -//@Mapper -@Data -public class TaskCodeScan { - - //@ApiProperty(name = "taskId",desc = "id") - private String taskId; - - //@ApiProperty(name="projectName",desc="项目名称") - private String projectName; - - //授权id - //@ApiProperty(name="authName",desc="授权id") - private String authId; - - - // 是否开启断言 - private Boolean openAssert; - - // 是否启用调试模式 - private Boolean openDebug; - - // 扫描路径 - private String scanPath; - - // 扫描等级 min--最小，default--默认，max--最大 - private String scanGrade; - - // 扫描错误级别 default--默认 max--最大 - private String errGrade; - - //授权信息 - private Object auth; - - private int sort; - - private String type; - - private String instanceId; - - public String getInstanceId() { - return instanceId; - } - - public void setInstanceId(String instanceId) { - this.instanceId = instanceId; - } - - public String getScanGrade() { - return scanGrade; - } - - public TaskCodeScan setScanGrade(String scanGrade) { - this.scanGrade = scanGrade; - return this; - } - - public String getErrGrade() { - return errGrade; - } - - public TaskCodeScan setErrGrade(String errGrade) { - this.errGrade = errGrade; - return this; - } - - public String getScanPath() { - return scanPath; - } - - public TaskCodeScan setScanPath(String scanPath) { - this.scanPath = scanPath; - return this; - } - - public Boolean getOpenAssert() { - return openAssert; - } - - public TaskCodeScan setOpenAssert(Boolean openAssert) { - this.openAssert = openAssert; - return this; - } - - public Boolean getOpenDebug() { - return openDebug; - } - - public TaskCodeScan setOpenDebug(Boolean openDebug) { - this.openDebug = openDebug; - return this; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public int getSort() { - return sort; - } - - public void setSort(int sort) { - this.sort = sort; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getAuthId() { - return authId; - } - - public void setAuthId(String authId) { - this.authId = authId; - } - - public Object getAuth() { - return auth; - } - - public void setAuth(Object auth) { - this.auth = auth; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/TaskCodeScanService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/TaskCodeScanService.java deleted file mode 100644 index 5c3d1336..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/TaskCodeScanService.java +++ /dev/null @@ -1,62 +0,0 @@ -package cd.casic.module.process.task.codescan.service; - - -import cd.casic.module.process.task.codescan.model.TaskCodeScan; - -import java.util.List; -/** - * 代码扫描服务接口 - */ -//@JoinProvider(model = TaskCodeScan.class) -public interface TaskCodeScanService { - - /** - * 创建流水线代码扫描 - * @param taskCodeScan 流水线代码扫描 - * @return 流水线代码扫描id - */ - String createCodeScan(TaskCodeScan taskCodeScan); - - /** - * 删除流水线代码扫描 - * @param codeScanId 流水线代码扫描id - */ - void deleteCodeScan(String codeScanId); - - /** - * 更新代码扫描信息 - * @param taskCodeScan 信息 - */ - void updateCodeScan(TaskCodeScan taskCodeScan); - - - Boolean codeScanValid(String taskType,TaskCodeScan taskCodeScan); - - - /** - * 根据配置id查询任务 - * @param taskId 配置id - * @return 任务 - */ - TaskCodeScan findCodeScanByAuth(String taskId); - - /** - * 查询代码扫描信息 - * @param codeScanId id - * @return 信息 - */ -// @FindOne - TaskCodeScan findOneCodeScan(String codeScanId); - - /** - * 查询所有流水线代码扫描 - * @return 流水线代码扫描列表 - */ -// @FindAll - List findAllCodeScan(); - - -// @FindList - List findAllCodeScanList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsScanServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsScanServiceImpl.java deleted file mode 100644 index bd3e0e16..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsScanServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package cd.casic.module.process.task.codescan.service.impl; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/3 20:15 - * @Version 1.0 - */ - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.task.code.service.SpotbugsScanService; -import cd.casic.module.process.task.codescan.dao.SpotbugsScanDao; -import cd.casic.module.process.task.codescan.model.SpotbugsBugQuery; -import cd.casic.module.process.task.codescan.model.SpotbugsBugSummary; -import jakarta.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.io.File; -import java.util.List; -import java.util.Objects; - -/** - * @author Spotbugs代码扫描实现 - */ -@Service -public class SpotbugsScanServiceImpl implements SpotbugsScanService { - - @Resource - SpotbugsScanDao spotbugsScanDao; - - @Override - public String creatSpotbugs(SpotbugsBugSummary bugSummary) { - return spotbugsScanDao.creatSpotbugs(bugSummary); - } - - @Override - public void updateSpotbugs(SpotbugsBugSummary bugSummary) { - spotbugsScanDao.updateSpotbugs(bugSummary); - } - - @Override - public void deleteSpotbugs(String bugId) { - SpotbugsBugSummary spotbugs = findOneSpotbugs(bugId); - if (Objects.isNull(spotbugs)){ - return; - } - String xmlPath = spotbugs.getXmlPath(); - - File file = new File(xmlPath); - if (file.exists()){ - file.delete(); - } - spotbugsScanDao.deleteSpotbugs(bugId); - } - - @Override - public SpotbugsBugSummary findOneSpotbugs(String bugId) { - return spotbugsScanDao.findOneSpotbugs(bugId); - } - - @Override - public List findAllSpotbugs() { - return spotbugsScanDao.findAllSpotbugs(); - } - - @Override - public List findSpotbugsList(SpotbugsBugQuery bugQuery) { - return spotbugsScanDao.findSpotbugsList(bugQuery); - } - - @Override - public PageResult findSpotbugsPage(SpotbugsBugQuery bugQuery) { - return spotbugsScanDao.findSpotbugsPage(bugQuery); - } -} - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsXmlConfig.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsXmlConfig.java deleted file mode 100644 index a5bc9638..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/SpotbugsXmlConfig.java +++ /dev/null @@ -1,550 +0,0 @@ -package cd.casic.module.process.task.codescan.service.impl; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/3 20:15 - * @Version 1.0 - */ - -import cd.casic.ci.commons.exception.ApplicationException; -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.utils.PipelineFileUtil; -import cd.casic.module.process.task.codescan.model.SpotbugsBugCategory; -import cd.casic.module.process.task.codescan.model.SpotbugsBugClass; -import cd.casic.module.process.task.codescan.model.SpotbugsBugClassStats; -import cd.casic.module.process.task.codescan.model.SpotbugsBugCode; -import cd.casic.module.process.task.codescan.model.SpotbugsBugField; -import cd.casic.module.process.task.codescan.model.SpotbugsBugFileStats; -import cd.casic.module.process.task.codescan.model.SpotbugsBugInstance; -import cd.casic.module.process.task.codescan.model.SpotbugsBugMethod; -import cd.casic.module.process.task.codescan.model.SpotbugsBugPackageStats; -import cd.casic.module.process.task.codescan.model.SpotbugsBugPattern; -import cd.casic.module.process.task.codescan.model.SpotbugsBugSourceLine; -import cd.casic.module.process.task.codescan.model.SpotbugsBugSummary; -import org.apache.commons.lang3.StringUtils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import java.io.File; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; - -/** - * SpotbugsXml文件解析 - * @author zcamy - */ -public class SpotbugsXmlConfig { - - /** - * 解析代码扫描统计信息 - * @param xmlPath 扫描结果文件 - * @return 解析结果 - */ - public SpotbugsBugSummary findScanSummary(String xmlPath){ - try { - File xmlFile = new File(xmlPath); - DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); - Document doc = dBuilder.parse(xmlFile); - - // 可选：根据需要对Document进行额外的配置 - doc.getDocumentElement().normalize(); - - // 获取根元素 - Element rootElement = doc.getDocumentElement(); - - NodeList findBugsSummaryList = rootElement.getElementsByTagName("FindBugsSummary"); - for (int i = 0; i < findBugsSummaryList.getLength(); i++) { - Node findBugsSummaryNode = findBugsSummaryList.item(i); - if (findBugsSummaryNode.getNodeType() == Node.ELEMENT_NODE) { - Element findBugsSummaryElement = (Element) findBugsSummaryNode; - String totalClasses = findBugsSummaryElement.getAttribute("total_classes"); //总共扫描的类的数量。 - String referencedClasses = findBugsSummaryElement.getAttribute("referenced_classes");//引用的类的数量。 - String totalBugs = findBugsSummaryElement.getAttribute("total_bugs");//总共检测到的问题（Bugs）的数量。 - String numPackages = findBugsSummaryElement.getAttribute("num_packages");//项目中的包（package）数量。 - String vmVersion = findBugsSummaryElement.getAttribute("vm_version");//vm_version Java 版本信息。 - String priority2 = findBugsSummaryElement.getAttribute("priority_2");//优先级为 2 的问题数量。 - String priority1 = findBugsSummaryElement.getAttribute("priority_1");//优先级为 1 的问题数量。 - String priority3 = findBugsSummaryElement.getAttribute("priority_3");//优先级为 1 的问题数量。 - - // 转换时间 - String format; - SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH); - try { - Date date = dateFormat.parse(findBugsSummaryElement.getAttribute("timestamp")); - format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date); - } catch (ParseException e) { - format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - } - SpotbugsBugSummary summary = new SpotbugsBugSummary(); - summary.setScanTime(format); - summary.setTotalClasses(totalClasses); - summary.setReferencedClasses(referencedClasses); - summary.setTotalBugs(totalBugs); - summary.setNumPackages(numPackages); - summary.setVmVersion(vmVersion); - summary.setPriorityOne(priority1); - summary.setPriorityTwo(priority2); - summary.setPriorityThree(priority3); - - return summary; - } - } - }catch (Exception e){ - throw new SystemException("解析Xml文件失败，path:"+xmlPath+" ，message："+e.getMessage()); - } - return null; - } - - /** - * 解析所有Bug - * @param xmlPath 文件地址 - * @return Bug集合 - */ - public List findBugFileStats(String xmlPath){ - try { - File xmlFile = new File(xmlPath); - DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); - Document doc = dBuilder.parse(xmlFile); - - // 可选：根据需要对Document进行额外的配置 - doc.getDocumentElement().normalize(); - - List list = new ArrayList<>(); - - // 获取根元素 - Element rootElement = doc.getDocumentElement(); - - NodeList findBugsSummaryList = rootElement.getElementsByTagName("FindBugsSummary"); - for (int i = 0; i < findBugsSummaryList.getLength(); i++) { - Node findBugsSummaryNode = findBugsSummaryList.item(i); - if (findBugsSummaryNode.getNodeType() == Node.ELEMENT_NODE) { - Element findBugsSummaryElement = (Element) findBugsSummaryNode; - - NodeList fileStatsList = findBugsSummaryElement.getElementsByTagName("FileStats"); - for (int i1 = 0; i1 < fileStatsList.getLength(); i1++) { - Node fileStatsNide = fileStatsList.item(i); - if (fileStatsNide.getNodeType() == Node.ELEMENT_NODE) { - Element fileStatsElement = (Element) fileStatsNide; - String path = fileStatsElement.getAttribute("path"); - String bugCount = fileStatsElement.getAttribute("bugCount"); - - String replace = path.replaceAll("/", ".").replace(".java",""); - - List scanBugsList = findScanBugs(xmlPath); - List bugInstanceList = scanBugsList.stream() - .filter(a -> !Objects.equals(a.getBugClass().getClassname(), replace)).toList(); - - SpotbugsBugFileStats spotbugsBugFileStats = new SpotbugsBugFileStats() - .setPath(path) - .setBugNumber(String.valueOf(scanBugsList.size())) - .setBugInstanceList(bugInstanceList); - - list.add(spotbugsBugFileStats); - - } - } - } - } - - return list; - }catch (Exception e){ - throw new SystemException("解析Xml文件失败，path:"+xmlPath+" ，message："+e.getMessage()); - } - } - - /** - * 根据包解析Bug - * @param xmlPath xml文件地址 - * @return bug集合 - */ - public List findBugPackageStats(String xmlPath){ - try { - File xmlFile = new File(xmlPath); - DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); - Document doc = dBuilder.parse(xmlFile); - - // 可选：根据需要对Document进行额外的配置 - doc.getDocumentElement().normalize(); - - List list = new ArrayList<>(); - - // 获取根元素 - Element rootElement = doc.getDocumentElement(); - - NodeList findBugsSummaryList = rootElement.getElementsByTagName("FindBugsSummary"); - for (int i = 0; i < findBugsSummaryList.getLength(); i++) { - Node findBugsSummaryNode = findBugsSummaryList.item(i); - if (findBugsSummaryNode.getNodeType() == Node.ELEMENT_NODE) { - Element findBugsSummaryElement = (Element) findBugsSummaryNode; - - NodeList packageStatsList = findBugsSummaryElement.getElementsByTagName("PackageStats"); - for (int i1 = 0; i1 < packageStatsList.getLength(); i1++) { - Node fileStatsNide = packageStatsList.item(i); - if (fileStatsNide.getNodeType() == Node.ELEMENT_NODE) { - Element fileStatsElement = (Element) findBugsSummaryNode; - String packagePath = fileStatsElement.getAttribute("package"); - String totalBugs = fileStatsElement.getAttribute("total_bugs"); - String totalTypes = fileStatsElement.getAttribute("total_types"); - - // 文件不存在bug - if ("0".equals(totalBugs)){ - continue; - } - List classStatsArrayList = new ArrayList<>(); - - NodeList classStatsList = fileStatsElement.getElementsByTagName("ClassStats"); - for (int i2 = 0; i2 < classStatsList.getLength(); i2++) { - Element classStatsElement = (Element) classStatsList.item(i); - String aClass = classStatsElement.getAttribute("class"); - String bugs = classStatsElement.getAttribute("bugs"); - String idInterface = classStatsElement.getAttribute("interface"); - // if ("0".equals(bugs)){ - // continue; - // } - - List scanBugsList = findScanBugs(xmlPath); - List bugInstanceList = scanBugsList.stream() - .filter(a -> !Objects.equals(a.getBugClass().getClassname(), aClass)).toList(); - - SpotbugsBugClassStats spotbugsBugClassStats = new SpotbugsBugClassStats() - // .setBugNumber(scanBugsList.size()) - .setClassName(aClass) - // .setInterface(Boolean.valueOf(idInterface)) - .setBugInstanceList(bugInstanceList); - - classStatsArrayList.add(spotbugsBugClassStats); - } - SpotbugsBugPackageStats spotbugsBugPackageStats = new SpotbugsBugPackageStats() - .setTotalBugs(classStatsArrayList.size()) - .setPackagePath(packagePath) - // .setTotalTypes(Integer.parseInt(totalTypes)) - .setClassStatsList(classStatsArrayList); - list.add(spotbugsBugPackageStats); - } - } - } - } - return list; - }catch (Exception e){ - throw new SystemException("解析Xml文件失败，path:"+xmlPath+" ，message："+e.getMessage()); - } - } - - public List findScanBugs(String xmlPath){ - try { - // 读取XML文件 - File xmlFile = new File(xmlPath); - DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); - Document doc = dBuilder.parse(xmlFile); - - // 可选：根据需要对Document进行额外的配置 - doc.getDocumentElement().normalize(); - - // 获取根元素 - Element rootElement = doc.getDocumentElement(); - - List list = new ArrayList<>(); - - Map categoryMap = analysisBugCategory(rootElement); - - Map patternMap = analysisBugPattern(rootElement); - - Map bugCodeMap = analysisBugCode(rootElement); - - - // 获取BugInstance元素的列表 - NodeList bugInstanceList = rootElement.getElementsByTagName("BugInstance"); - - // 遍历BugInstance元素列表 - for (int i = 0; i < bugInstanceList.getLength(); i++) { - Node bugInstanceNode = bugInstanceList.item(i); - - if (bugInstanceNode.getNodeType() == Node.ELEMENT_NODE) { - Element bugInstanceElement = (Element) bugInstanceNode; - - // 获取Bug 级别 - String priority = bugInstanceElement.getAttribute("priority"); - - String bugDescription = bugInstanceElement.getElementsByTagName("LongMessage") - .item(0).getTextContent(); - - String shortMessage = bugInstanceElement.getElementsByTagName("ShortMessage") - .item(0).getTextContent(); - - - String abbrev = bugInstanceElement.getAttribute("abbrev"); - SpotbugsBugCode spotbugsBugCode = bugCodeMap.get(abbrev); - - String category = bugInstanceElement.getAttribute("category"); - SpotbugsBugCategory spotbugsBugCategory = categoryMap.get(category); - - String bugType = bugInstanceElement.getAttribute("type"); - SpotbugsBugPattern spotbugsBugPattern = patternMap.get(bugType); - - // 解析Class - SpotbugsBugClass spotbugsBugClass = analysisClass(bugInstanceElement); - - // 解析Method - SpotbugsBugMethod spotbugsBugMethod = analysisMethod(bugInstanceElement); - - // 解析Field - SpotbugsBugField spotbugsBugField = analysisField(bugInstanceElement); - - // 解析SourceLine - SpotbugsBugSourceLine spotbugsBugSourceLine = analysisSourceLine(bugInstanceElement); - - SpotbugsBugInstance spotbugsBugInstance = new SpotbugsBugInstance() - .setBugClass(spotbugsBugClass) - .setBugCode(spotbugsBugCode) - .setBugField(spotbugsBugField) - .setBugMethod(spotbugsBugMethod) - .setBugField(spotbugsBugField) - .setCategory(spotbugsBugCategory) - .setBugPattern(spotbugsBugPattern) - .setBugPriority(priority) - .setBugSourceLine(spotbugsBugSourceLine) - .setBugType(bugType) - .setLongMessage(bugDescription) - .setShortMessage(shortMessage); - list.add(spotbugsBugInstance); - } - } - return list.stream().sorted(Comparator.comparing(SpotbugsBugInstance::getBugPriority)).toList(); - - } catch (Exception e) { - throw new SystemException("解析Xml文件失败，path:"+xmlPath+" ，message："+e.getMessage()); - } - } - - // 解析Class - private SpotbugsBugClass analysisClass(Element element){ - Element classElement = (Element) element.getElementsByTagName("Class") - .item(0); - Element sourceLine = (Element) classElement.getElementsByTagName("SourceLine") - .item(0); - int beginLine = 0 ,endLine = 0; - String start = sourceLine.getAttribute("start"); - if (!StringUtils.isEmpty(start)){ - beginLine = Integer.parseInt(sourceLine.getAttribute("start")); - } - String end = sourceLine.getAttribute("end"); - if (!StringUtils.isEmpty(end)){ - endLine = Integer.parseInt(sourceLine.getAttribute("end")); - } - String classname = classElement.getAttribute("classname"); - String message = classElement.getElementsByTagName("Message") - .item(0).getTextContent(); - return new SpotbugsBugClass() - .setMessage(message) - .setStartLine(beginLine) - .setEndLine(endLine) - .setClassname(classname); - } - - // 解析Method - private SpotbugsBugMethod analysisMethod(Element element){ - Element methodElement = (Element) element.getElementsByTagName("Method") - .item(0); - if (Objects.isNull(methodElement)){ - return null; - } - String name = methodElement.getAttribute("name"); - String signature = methodElement.getAttribute("signature"); - Element sourceLine = (Element) methodElement.getElementsByTagName("SourceLine") - .item(0); - int beginLine = 0 ,endLine = 0; - String start = sourceLine.getAttribute("start"); - if (!StringUtils.isEmpty(start)){ - beginLine = Integer.parseInt(start); - } - String end = sourceLine.getAttribute("end"); - if (!StringUtils.isEmpty(end)){ - endLine = Integer.parseInt(end); - } - String message = methodElement.getElementsByTagName("Message") - .item(0).getTextContent(); - return new SpotbugsBugMethod() - .setMethodName(name) - .setSignature(signature) - .setStartLine(beginLine) - .setEndLine(endLine) - .setMessage(message); - } - - // 解析Field - private SpotbugsBugField analysisField(Element element){ - Element fieldElement = (Element) element.getElementsByTagName("Field") - .item(0); - if (Objects.isNull(fieldElement)){ - return null; - } - String name = fieldElement.getAttribute("name"); - String signature = fieldElement.getAttribute("signature"); - String message = fieldElement.getElementsByTagName("Message") - .item(0).getTextContent(); - return new SpotbugsBugField() - .setFieldName(name) - .setSignature(signature) - .setMessage(message); - } - - // 解析SourceLine - private SpotbugsBugSourceLine analysisSourceLine(Element element){ - Element sourceLineElement = (Element) element.getElementsByTagName("SourceLine").item(0); - if (Objects.isNull(sourceLineElement)){ - return null; - } - String sourcePath = sourceLineElement.getAttribute("sourcepath"); - String sourceFile = sourceLineElement.getAttribute("sourcefile"); - - int beginLine = 0 ,endLine = 0; - String start = sourceLineElement.getAttribute("start"); - if (!StringUtils.isEmpty(start)){ - beginLine = Integer.parseInt(start); - } - String end = sourceLineElement.getAttribute("end"); - if (!StringUtils.isEmpty(end)){ - endLine = Integer.parseInt(end); - } - String message = sourceLineElement.getElementsByTagName("Message").item(0).getTextContent(); - return new SpotbugsBugSourceLine() - .setStartLine(beginLine) - .setEndLine(endLine) - .setMessage(message) - .setSourceFile(sourceFile) - .setSourcePath(sourcePath); - } - - // 解析Category - private Map analysisBugCategory(Element element){ - NodeList bugInstanceList = element.getElementsByTagName("BugCategory"); - Map hashMap = new HashMap<>(); - for (int i = 0; i < bugInstanceList.getLength(); i++) { - Node bugInstanceNode = bugInstanceList.item(i); - - if (bugInstanceNode.getNodeType() == Node.ELEMENT_NODE) { - Element categoryElement = (Element) bugInstanceNode; - - String category = categoryElement.getAttribute("category"); - String description = categoryElement.getElementsByTagName("Description") - .item(0).getTextContent(); - SpotbugsBugCategory spotbugsBugCategory = new SpotbugsBugCategory() - .setCategory(category) - .setDescription(description); - - hashMap.put(category,spotbugsBugCategory); - } - } - return hashMap; - } - - private Map analysisBugPattern(Element element){ - NodeList bugInstanceList = element.getElementsByTagName("BugPattern"); - Map hashMap = new HashMap<>(); - for (int i = 0; i < bugInstanceList.getLength(); i++) { - Node bugInstanceNode = bugInstanceList.item(i); - - if (bugInstanceNode.getNodeType() == Node.ELEMENT_NODE) { - Element categoryElement = (Element) bugInstanceNode; - - String category = categoryElement.getAttribute("category"); - String type = categoryElement.getAttribute("type"); - String abbrev = categoryElement.getAttribute("abbrev"); - - String shortDescription = categoryElement.getElementsByTagName("ShortDescription") - .item(0).getTextContent(); - - String details = categoryElement.getElementsByTagName("Details") - .item(0).getTextContent(); - SpotbugsBugPattern spotbugsBugPattern = new SpotbugsBugPattern() - .setCategory(category) - .setType(type) - .setAbbrev(abbrev) - .setShortDescription(shortDescription) - .setDetails(details); - - hashMap.put(type, spotbugsBugPattern); - } - } - return hashMap; - } - - private Map analysisBugCode(Element element){ - NodeList bugInstanceList = element.getElementsByTagName("BugCode"); - Map hashMap = new HashMap<>(); - for (int i = 0; i < bugInstanceList.getLength(); i++) { - Node bugInstanceNode = bugInstanceList.item(i); - - if (bugInstanceNode.getNodeType() == Node.ELEMENT_NODE) { - Element categoryElement = (Element) bugInstanceNode; - - String cweid = categoryElement.getAttribute("cweid"); - String abbrev = categoryElement.getAttribute("abbrev"); - - String description = categoryElement.getElementsByTagName("Description") - .item(0).getTextContent(); - - SpotbugsBugCode spotbugsBugCode = new SpotbugsBugCode() - .setAbbrev(abbrev) - .setCweid(cweid) - .setDescription(description); - - hashMap.put(abbrev,spotbugsBugCode); - - } - } - return hashMap; - } - - private Map findJavaFilePath(String filePath){ - - File file = new File(filePath); - - if (!file.exists() || file.isFile()){ - throw new ApplicationException("文件夹不存在！" + filePath); - } - - Map map = new HashMap<>(); - - List javaPathList = PipelineFileUtil.getFilePath(file, new ArrayList<>()); - - for (String javaPath : javaPathList) { - if (!javaPath.endsWith(".java")){ - continue; - } - String name = new File(javaPath).getName(); - - if (StringUtils.isEmpty(map.get(name))){ - String parent = new File(javaPath).getParent(); - map.put( parent+"/"+name ,javaPath); - }else { - map.put(name,javaPath); - } - } - return map; - } - - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java deleted file mode 100644 index cb9577d3..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package cd.casic.module.process.task.codescan.service.impl; - -/** - * @ClassName TaskArtifactXpackServiceImpl - * @Author hopeli - * @Date 2025/5/3 20:15 - * @Version 1.0 - */ - -import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.ci.commons.annotation.rpc.Exporter; -import cd.casic.module.process.process.setting.AuthHostService; -import cd.casic.module.process.process.setting.AuthThirdService; -import cd.casic.module.process.task.codescan.dao.TaskCodeScanDao; -import cd.casic.module.process.task.codescan.dataobject.TaskCodeScanEntity; -import cd.casic.module.process.task.codescan.model.TaskCodeScan; -import cd.casic.module.process.task.codescan.service.TaskCodeScanService; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import cd.casic.module.process.toolkit.join.JoinTemplate; -import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Objects; - -import static cd.casic.module.process.support.util.util.PipelineFinal.TASK_CODESCAN_SONAR; - - -@Service -@Exporter -public class TaskCodeScanServiceImpl implements TaskCodeScanService { - - - @Resource - TaskCodeScanDao codeScanDao; - - @Resource - AuthThirdService thirdServer; - - @Resource - JoinTemplate joinTemplate; - - @Resource - AuthHostService authHostService; - - /** - * 创建流水线代码扫描 - * @param taskCodeScan 流水线代码扫描 - * @return 流水线代码扫描id - */ - @Override - public String createCodeScan(TaskCodeScan taskCodeScan) { - TaskCodeScanEntity taskCodeScanEntity = BeanMapper.map(taskCodeScan, TaskCodeScanEntity.class); - return codeScanDao.createCodeScan(taskCodeScanEntity); - } - - - @Override - public Boolean codeScanValid(String taskType,TaskCodeScan taskCodeScan){ - - if (taskType.equals(TASK_CODESCAN_SONAR)) { - if (StringUtils.isEmpty(taskCodeScan.getAuthId())){ - return false; - } - String projectName = taskCodeScan.getProjectName(); - return !StringUtils.isEmpty(projectName); - } else { - return true; - } - } - - - @Override - public TaskCodeScan findCodeScanByAuth(String taskId){ - TaskCodeScan codeScan = findOneCodeScan(taskId); - String authId = codeScan.getAuthId(); - if (!Objects.isNull(authId)){ - Object auth = authHostService.findOneAuthHost(authId); - if (Objects.isNull(auth)){ - auth = thirdServer.findOneAuthServer(authId); - codeScan.setAuth(auth); - } - codeScan.setAuth(auth); - } - return codeScan; - } - - /** - * 删除流水线代码扫描 - * @param CodeScanId 流水线代码扫描id - */ - @Override - public void deleteCodeScan(String CodeScanId) { - codeScanDao.deleteCodeScan(CodeScanId); - } - - /** - * 更新代码扫描信息 - * @param taskCodeScan 信息 - */ - @Override - public void updateCodeScan(TaskCodeScan taskCodeScan) { - TaskCodeScanEntity codeScanEntity = BeanMapper.map(taskCodeScan, TaskCodeScanEntity.class); - codeScanDao.updateCodeScan(codeScanEntity); - } - - /** - * 查询代码扫描信息 - * @param codeScanId id - * @return 信息集合 - */ - @Override - public TaskCodeScan findOneCodeScan(String codeScanId) { - TaskCodeScanEntity oneCodeScan = codeScanDao.findOneCodeScan(codeScanId); - TaskCodeScan codeScan = BeanMapper.map(oneCodeScan, TaskCodeScan.class); - if (PipelineUtil.isNoNull(codeScan.getAuthId())){ - AuthThird authServer = thirdServer.findOneAuthServer(codeScan.getAuthId()); - codeScan.setAuth(authServer); - } - joinTemplate.joinQuery(codeScan); - return codeScan; - } - - /** - * 查询所有流水线代码扫描 - * @return 流水线代码扫描列表 - */ - @Override - public List findAllCodeScan() { - List allCodeScan = codeScanDao.findAllCodeScan(); - return BeanMapper.mapList(allCodeScan, TaskCodeScan.class); - } - - @Override - public List findAllCodeScanList(List idList) { - List allCodeScanList = codeScanDao.findAllCodeScanList(idList); - List taskCodeScans = BeanMapper.mapList(allCodeScanList, TaskCodeScan.class); - joinTemplate.joinQuery(taskCodeScans); - return taskCodeScans; - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeploy.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeploy.java deleted file mode 100644 index 81442122..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeploy.java +++ /dev/null @@ -1,238 +0,0 @@ -package cd.casic.module.process.task.deploy.model; - - - -import cd.casic.ci.commons.bean.process.setting.HostGroup; - -import java.util.List; - - -/** - * 任务部署模型 - * @author zcamy - */ -//@ApiModel -//@Join -//@Mapper -public class TaskDeploy { - - //@ApiProperty(name = "taskId",desc = "id") - private String taskId; - - //@ApiProperty(name = "authType",desc = "部署方式，自定义部署，结构化部署" ) - private int authType; - - //@ApiProperty(name = "localAddress" , desc = "文件地址") - private String localAddress; - - //@ApiProperty(name="deployAddress",desc="部署地址") - private String deployAddress; - - //@ApiProperty(name = "authId" , desc = "认证id") - private String authId; - - //@ApiProperty(name = "deployOrder",desc = "部署命令" ) - private String deployOrder; - - //@ApiProperty(name = "startAddress",desc = "启动文件地址" ) - private String startAddress; - - //@ApiProperty(name="startOrder",desc="启动命令") - private String startOrder; - - //@ApiProperty(name="rule",desc="规则") - private String rule; - - //@ApiProperty(name="dockerImage",desc="规则") - private String dockerImage; - - // 主机类型 host--主机 hostGroup--主机组 - private String hostType; - - //授权信息 - private Object auth; - - private int sort; - - private String type; - - // 命名空间 - private String k8sNamespace; - - // 配置文件 - private String k8sJson; - - // 策略类型 - private String strategyType; - - // 策略数量 - private Integer strategyNumber; - - private String instanceId; - - // - private List hostGroupList; - - public List getHostGroupList() { - return hostGroupList; - } - - public void setHostGroupList(List hostGroupList) { - this.hostGroupList = hostGroupList; - } - - public String getInstanceId() { - return instanceId; - } - - public void setInstanceId(String instanceId) { - this.instanceId = instanceId; - } - - public String getStrategyType() { - return strategyType; - } - - public void setStrategyType(String strategyType) { - this.strategyType = strategyType; - } - - public Integer getStrategyNumber() { - return strategyNumber; - } - - public void setStrategyNumber(Integer strategyNumber) { - this.strategyNumber = strategyNumber; - } - - public String getK8sNamespace() { - return k8sNamespace; - } - - public void setK8sNamespace(String k8sNamespace) { - this.k8sNamespace = k8sNamespace; - } - - public String getK8sJson() { - return k8sJson; - } - - public void setK8sJson(String k8sJson) { - this.k8sJson = k8sJson; - } - - public String getHostType() { - return hostType; - } - - public TaskDeploy setHostType(String hostType) { - this.hostType = hostType; - return this; - } - - public String getDockerImage() { - return dockerImage; - } - - public TaskDeploy setDockerImage(String dockerImage) { - this.dockerImage = dockerImage; - return this; - } - - public String getRule() { - return rule; - } - - public TaskDeploy setRule(String rule) { - this.rule = rule; - return this; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public int getAuthType() { - return authType; - } - - public void setAuthType(int authType) { - this.authType = authType; - } - - public String getLocalAddress() { - return localAddress; - } - - public void setLocalAddress(String localAddress) { - this.localAddress = localAddress; - } - - public String getDeployAddress() { - return deployAddress; - } - - public void setDeployAddress(String deployAddress) { - this.deployAddress = deployAddress; - } - - public String getAuthId() { - return authId; - } - - public void setAuthId(String authId) { - this.authId = authId; - } - - public String getDeployOrder() { - return deployOrder; - } - - public void setDeployOrder(String deployOrder) { - this.deployOrder = deployOrder; - } - - public String getStartAddress() { - return startAddress; - } - - public void setStartAddress(String startAddress) { - this.startAddress = startAddress; - } - - public String getStartOrder() { - return startOrder; - } - - public void setStartOrder(String startOrder) { - this.startOrder = startOrder; - } - - public Object getAuth() { - return auth; - } - - public void setAuth(Object auth) { - this.auth = auth; - } - - public int getSort() { - return sort; - } - - public void setSort(int sort) { - this.sort = sort; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstance.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstance.java deleted file mode 100644 index 07aa9b64..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstance.java +++ /dev/null @@ -1,92 +0,0 @@ -package cd.casic.module.process.task.deploy.model; - -//import io.tiklab.toolkit.beans.annotation.Mapper; - -//@Mapper -public class TaskDeployInstance { - - // id - private String id; - - // 实例ID - private String taskInstanceId; - - // 名称 - private String name; - - // 时间 - private String runTime; - - // 状态 - private String runStatus; - - // 运行日志 - private String runLog; - - private Integer sort; - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public TaskDeployInstance() { - } - - public TaskDeployInstance(String id, String taskInstanceId) { - this.id = id; - this.taskInstanceId = taskInstanceId; - this.runStatus = "wait"; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTaskInstanceId() { - return taskInstanceId; - } - - public void setTaskInstanceId(String taskInstanceId) { - this.taskInstanceId = taskInstanceId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getRunTime() { - return runTime; - } - - public void setRunTime(String runTime) { - this.runTime = runTime; - } - - public String getRunStatus() { - return runStatus; - } - - public void setRunStatus(String runStatus) { - this.runStatus = runStatus; - } - - public String getRunLog() { - return runLog; - } - - public void setRunLog(String runLog) { - this.runLog = runLog; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstanceQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstanceQuery.java deleted file mode 100644 index 982c4f0e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployInstanceQuery.java +++ /dev/null @@ -1,18 +0,0 @@ -package cd.casic.module.process.task.deploy.model; - - -public class TaskDeployInstanceQuery { - - // 实例ID - private String taskInstanceId; - - - public String getTaskInstanceId() { - return taskInstanceId; - } - - public void setTaskInstanceId(String taskInstanceId) { - this.taskInstanceId = taskInstanceId; - } - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployStrategy.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployStrategy.java deleted file mode 100644 index d98ff1be..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/model/TaskDeployStrategy.java +++ /dev/null @@ -1,41 +0,0 @@ -package cd.casic.module.process.task.deploy.model; - - - -import cd.casic.ci.commons.bean.process.setting.AuthHost; - -import java.util.List; - -public class TaskDeployStrategy { - - private String taskInstanceId; - - private String strategyInstanceId; - - private List authHostList; - - - public String getTaskInstanceId() { - return taskInstanceId; - } - - public void setTaskInstanceId(String taskInstanceId) { - this.taskInstanceId = taskInstanceId; - } - - public String getStrategyInstanceId() { - return strategyInstanceId; - } - - public void setStrategyInstanceId(String strategyInstanceId) { - this.strategyInstanceId = strategyInstanceId; - } - - public List getAuthHostList() { - return authHostList; - } - - public void setAuthHostList(List authHostList) { - this.authHostList = authHostList; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployExecService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployExecService.java deleted file mode 100644 index e7d571bd..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployExecService.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.task.deploy.service; - - -import cd.casic.ci.commons.bean.engine.job.Tasks; - -/** - * 部署执行服务接口 - */ -public interface TaskDeployExecService { - - /** - * 部署 - * @param pipelineId 流水线id - * @param task 任务信息 - * @param taskType 任务类型 - * @return 执行状态 true:成功 false:失败 - * @throws ApplicationException 运行失败 - */ - boolean deploy(String pipelineId, Tasks task , String taskType); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployInstanceService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployInstanceService.java deleted file mode 100644 index 19ef215d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployInstanceService.java +++ /dev/null @@ -1,51 +0,0 @@ -package cd.casic.module.process.task.deploy.service; - - -import cd.casic.ci.commons.bean.support.deploy.TaskDeployInstance; -import cd.casic.module.process.task.deploy.model.TaskDeployInstanceQuery; - -import java.util.List; - -public interface TaskDeployInstanceService { - - /** - * 创建部署实例 - * @param deployInstance deployInstance - * @return id - */ - String createDeployInstance(TaskDeployInstance deployInstance); - - /** - * 更新部署实例 - * @param deployInstance deployInstance - */ - void updateDeployInstance(TaskDeployInstance deployInstance); - - /** - * 删除部署实例 - * @param id id - */ - void deleteDeployInstance(String id); - - - /** - * 查找部署实例 - * @param id id - * @return deployInstance - */ - TaskDeployInstance findDeployInstance(String id); - - /** - * 查找部署实例 - * @param deployInstanceQuery deployInstanceQuery - * @return deployInstance - */ - List findAllDeployInstanceList(TaskDeployInstanceQuery deployInstanceQuery); - - /** - * 查找部署实例 - * @return deployInstance - */ - List findAllDeployInstanceList(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployService.java deleted file mode 100644 index 30bf2ae7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/deploy/service/TaskDeployService.java +++ /dev/null @@ -1,68 +0,0 @@ -package cd.casic.module.process.task.deploy.service; - - - -import cd.casic.ci.commons.bean.support.deploy.TaskDeploy; - -import java.util.List; - -/** - * 部署服务接口 - */ -//@JoinProvider(model = TaskDeploy.class) -public interface TaskDeployService { - - /** - * 创建 - * @param taskDeploy deploy信息 - * @return deployId - */ - String createDeploy(TaskDeploy taskDeploy) ; - - /** - * 删除 - * @param deployId deployId - */ - void deleteDeploy(String deployId) ; - - /** - * 测试是否有效 - * @param taskType 任务类型 - * @param taskDeploy object - * @return 是否有效 - */ - Boolean deployValid(String taskType,TaskDeploy taskDeploy); - - - /** - * 根据配置id查询任务 - * @param authId 配置id - * @return 任务 - */ - TaskDeploy findDeployByAuth(String authId); - - /** - * 更新 - * @param taskDeploy 更新信息 - */ - void updateDeploy(TaskDeploy taskDeploy); - - /** - * 查询单个信息 - * @param deployId pipelineDeployId - * @return deploy信息 - */ -// @FindOne - TaskDeploy findOneDeploy(String deployId) ; - - /** - * 查询所有信息 - * @return deploy信息集合 - */ -// @FindAll - List findAllDeploy() ; - -// @FindList - List findAllDeployList(List idList); - -} \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessage.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessage.java deleted file mode 100644 index 55b76b98..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessage.java +++ /dev/null @@ -1,59 +0,0 @@ -package cd.casic.module.process.task.message.model; - -import java.util.List; -import java.util.Map; - -public class TaskMessage { - - /** - * 流水线id - */ - private String pipelineId; - - /** - * 接收人 - */ - private List list; - - - /** - * 消息内容 - */ - private Map map; - - public TaskMessage() { - } - - public TaskMessage(String pipelineId, List list, Map map) { - this.pipelineId = pipelineId; - this.list = list; - this.map = map; - } - - public String getPipelineId() { - return pipelineId; - } - - public void setPipelineId(String pipelineId) { - this.pipelineId = pipelineId; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } - - public Map getMap() { - return map; - } - - public void setMap(Map map) { - this.map = map; - } -} - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageType.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageType.java deleted file mode 100644 index 9648c0e5..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageType.java +++ /dev/null @@ -1,70 +0,0 @@ -package cd.casic.module.process.task.message.model; - - - -import java.util.List; -/** - * 任务消息类型模型 - */ -//@ApiModel -//@Join -//@Mapper -public class TaskMessageType { - - //@ApiProperty(name = "id",desc = "id") - private String id; - - //@ApiProperty(name = "taskId",desc = "任务id") - private String taskId; - - //@ApiProperty(name="taskType",desc="消息类型") - private String taskType; - - //@ApiProperty(name="typeList",desc="site:站内信 sms:短信发送 wechat:微信 mail:邮箱发送") - private List typeList; - - //@ApiProperty(name="userList",desc="接收人信息") - private List userList; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public List getTypeList() { - return typeList; - } - - public void setTypeList(List typeList) { - this.typeList = typeList; - } - - public List getUserList() { - return userList; - } - - public void setUserList(List userList) { - this.userList = userList; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public String getTaskType() { - return taskType; - } - - public void setTaskType(String taskType) { - this.taskType = taskType; - } - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageUser.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageUser.java deleted file mode 100644 index ed502c8a..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/model/TaskMessageUser.java +++ /dev/null @@ -1,61 +0,0 @@ -package cd.casic.module.process.task.message.model; - - -import cd.casic.module.process.user.user.User; - -/** - * 任务消息接收人模型 - */ -//@ApiModel -//@Join -//@Mapper -public class TaskMessageUser { - - //@ApiProperty(name="messageId",desc="配置id") - private String messageId; - - //@ApiProperty(name="taskId",desc="类型") - private String taskId; - - //@ApiProperty(name="user",desc="用户",required = true) -// @Mappings({ -// @Mapping(source = "user.id",target = "userId") -// }) -// @JoinQuery(key = "id") - private User user; - - //@ApiProperty(name="receiveType",desc="接收类型 1.全部 2.仅成功 3.仅失败") - private int receiveType; - - public String getMessageId() { - return messageId; - } - - public void setMessageId(String messageId) { - this.messageId = messageId; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - public int getReceiveType() { - return receiveType; - } - - public void setReceiveType(int receiveType) { - this.receiveType = receiveType; - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageTypeService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageTypeService.java deleted file mode 100644 index b63babe4..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageTypeService.java +++ /dev/null @@ -1,74 +0,0 @@ -package cd.casic.module.process.task.message.service; - - - -import cd.casic.module.process.task.message.model.TaskMessageType; - -import java.util.List; - -/** - * 任务消息类型服务接口 - */ -//@JoinProvider(model = TaskMessageType.class) -public interface TaskMessageTypeService { - - /** - * 创建 - * @param taskMessageType message信息 - */ - void createMessage(TaskMessageType taskMessageType) ; - - /** - * 删除任务 - * @param taskId 任务id - */ - void deleteAllMessage(String taskId); - - - /** - * 判断是否存在消息配置 - * @return 不存在的消息配置 - */ - List messageSendType(); - - - /** - * 根据配置id查询消息类型 - * @param taskId 配置id - * @return 消息 - */ - TaskMessageType findMessage(String taskId); - - /** - * 删除 - * @param messageId messageId - */ - void deleteMessage(String messageId) ; - - - /** - * 更新信息 - * @param taskMessageType 信息 - */ - void updateMessage(TaskMessageType taskMessageType); - - /** - * 查询单个信息 - * @param messageId pipelineMessageId - * @return message信息 - */ -// @FindOne - TaskMessageType findOneMessage(String messageId) ; - - /** - * 查询所有信息 - * @return message信息集合 - */ -// @FindAll - List findAllMessage() ; - -// @FindList - List findAllMessageList(List idList); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageUserService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageUserService.java deleted file mode 100644 index 57e93c0d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/message/service/TaskMessageUserService.java +++ /dev/null @@ -1,74 +0,0 @@ -package cd.casic.module.process.task.message.service; - -import cd.casic.module.process.task.message.model.TaskMessageUser; - -import java.util.List; - -/** - * 消息接收人服务接口 - */ -//@JoinProvider(model = TaskMessageUser.class) -public interface TaskMessageUserService { - - /** - * 创建 - * @param taskMessageUser message信息 - * @return messageId - */ - String createMessage(TaskMessageUser taskMessageUser) ; - - - /** - * 添加所有接收人 - * @param userMessages 接收人信息 - * @param taskId 任务id - */ - void createAllMessage(List userMessages, String taskId); - - - /** - * 查询所有发送人 - * @param taskId 任务id - * @return 发送人 - */ - List findAllUserMessage(String taskId); - - - /** - * 删除任务 - * @param taskId 配置id - */ - void deleteAllMessage(String taskId); - - /** - * 删除 - * @param messageId messageId - */ - void deleteMessage(String messageId) ; - - - /** - * 更新信息 - * @param taskMessageUser 信息 - */ - void updateMessage(TaskMessageUser taskMessageUser); - - /** - * 查询单个信息 - * @param messageId pipelineMessageId - * @return message信息 - */ -// @FindOne - TaskMessageUser findOneMessage(String messageId) ; - - /** - * 查询所有信息 - * @return message信息集合 - */ -// @FindAll - List findAllMessage() ; - -// @FindList - List findAllMessageList(List idList); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/entity/TaskInstanceEntity.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/entity/TaskInstanceEntity.java deleted file mode 100644 index 8a6a28b8..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/entity/TaskInstanceEntity.java +++ /dev/null @@ -1,54 +0,0 @@ -package cd.casic.module.process.task.task.entity; - - -import lombok.Data; - -/** - * 流水线日志 - */ - -//@Entity -//@Table(name="pip_task_instance") -@Data -public class TaskInstanceEntity { - - //日志id -// @Id -// @GeneratorValue(length = 12) -// @Column(name = "id") - private String id; - -// @Column(name = "instance_id") - private String instanceId; - - //运行类型 -// @Column(name = "task_type") - private String taskType ; - -// @Column(name = "task_sort") - private int taskSort ; - - //运行日志 -// @Column(name = "log_address") - private String logAddress; - - //运行时间 -// @Column(name = "run_time") - private int runTime; - - //运行状态 -// @Column(name = "run_state") - private String runState; - - //阶段id -// @Column(name = "stages_id") - private String stagesId; - - //任务名称 -// @Column(name = "task_name") - private String taskName; - -// @Column(name = "postprocess_id") - private String postprocessId; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksExecServiceImpl.java deleted file mode 100644 index afa613db..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksExecServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package cd.casic.module.process.task.task.service; - -import cd.casic.ci.commons.bean.engine.job.TaskInstance; -import cd.casic.ci.commons.bean.engine.job.Tasks; -import cd.casic.ci.commons.bean.process.setting.HostGroup; -import cd.casic.ci.commons.bean.support.deploy.TaskDeploy; -import cd.casic.ci.commons.bean.support.deploy.TaskDeployInstance; -import cd.casic.ci.commons.utils.PipelineFileUtil; -import cd.casic.module.process.engine.task.TasksExecService; -import cd.casic.module.process.engine.task.TasksInstanceService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.task.deploy.service.TaskDeployInstanceService; -import com.alibaba.fastjson.JSON; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -@Service -public class TasksExecServiceImpl implements TasksExecService { - - @Autowired - TasksInstanceService tasksInstanceService; - - @Autowired - TaskDeployInstanceService taskDeployInstanceService; - - private static final Logger logger = LoggerFactory.getLogger(TasksExecServiceImpl.class); - - //任务id与任务实例id关系 - public static Map taskIdOrTaskInstanceId = new HashMap<>(); - - //任务实例id与任务实例关系 - public static Map taskOrTaskInstance = new HashMap<>(); - - @Override - public String createTaskExecInstance(Tasks task, String instanceId, int type, String logPath){ - TaskInstance instance = new TaskInstance(); - if (type == 1){ - instance.setInstanceId(instanceId); - } - if (type == 2) { - instance.setStagesId(instanceId); - } - if (type == 3) { - instance.setPostprocessId(instanceId); - } - instance.setRunState(PipelineFinal.RUN_WAIT); - instance.setTaskName(task.getTaskName()); - instance.setTaskType(task.getTaskType()); - instance.setTaskSort(task.getTaskSort()); - - String taskInstanceId = tasksInstanceService.createTaskInstance(instance); - instance.setId(taskInstanceId); - //日志文件地址 - String fileAddress = logPath +"/"+ taskInstanceId + ".log"; - instance.setLogAddress(fileAddress); - PipelineFileUtil.createFile(fileAddress); - tasksInstanceService.updateTaskInstance(instance); - putTaskOrTaskInstance(taskInstanceId,instance); - taskIdOrTaskInstanceId.put(task.getTaskId(),taskInstanceId); - - - return taskInstanceId; - } - - @Override - public void createDeployInstance(Tasks task,String taskInstanceId){ - if (task.getTaskType().equals(PipelineFinal.TASK_DEPLOY_LINUX)){ - String object = JSON.toJSONString(task.getTask()); - TaskDeploy taskDeploy = JSON.parseObject(object, TaskDeploy.class); - if ( taskDeploy.getAuthType() == 2){ - return; - } - String hostType = taskDeploy.getHostType(); - if (!"hostGroup".equals(hostType)){ - return; - } - List hostGroupList = taskDeploy.getHostGroupList(); - if (Objects.isNull(hostGroupList)){ - return; - } - for (int i = 0; i < hostGroupList.size(); i++) { - HostGroup hostGroup = hostGroupList.get(i); - String format = String.format("第%s批次", i + 1); - TaskDeployInstance taskDeployInstance = new TaskDeployInstance(hostGroup.getTaskInstanceId(),taskInstanceId); - taskDeployInstance.setName(format); - taskDeployInstance.setSort(i+1); - taskDeployInstanceService.createDeployInstance(taskDeployInstance); - } - } - } - - public TaskInstance findTaskInstance(String taskInstanceId){ - return taskOrTaskInstance.get(taskInstanceId); - } - - public String findTaskInstanceId(String taskId){ - return taskIdOrTaskInstanceId.get(taskId); - } - - public void putTaskOrTaskInstance(String taskInstanceId ,TaskInstance taskInstance ){ - taskOrTaskInstance.put(taskInstanceId,taskInstance); - } - - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksInstanceServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksInstanceServiceImpl.java deleted file mode 100644 index 3d95ded2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/task/service/TasksInstanceServiceImpl.java +++ /dev/null @@ -1,459 +0,0 @@ -package cd.casic.module.process.task.task.service; - - -import cd.casic.ci.commons.bean.engine.job.TaskInstance; -import cd.casic.ci.commons.bean.engine.job.TaskInstanceQuery; -import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance; -import cd.casic.ci.commons.bean.support.deploy.TaskDeployInstance; -import cd.casic.ci.commons.utils.PipelineFileUtil; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.module.process.engine.task.TasksInstanceService; -import cd.casic.module.process.engine.task.dao.TaskInstanceDao; -import cd.casic.module.process.support.postprocess.service.PostprocessInstanceService; -import cd.casic.module.process.support.util.util.PipelineFinal; - -import cd.casic.module.process.task.deploy.model.TaskDeployInstanceQuery; -import cd.casic.module.process.task.deploy.service.TaskDeployInstanceService; -import cd.casic.module.process.task.task.entity.TaskInstanceEntity; -import cd.casic.module.process.toolkit.beans.BeanMapper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.*; - -/** - * 任务执行实例服务接口 - */ - -@Service -//@Exporter -public class TasksInstanceServiceImpl implements TasksInstanceService { - - @Autowired - TaskInstanceDao taskInstanceDao; - - @Autowired - PostprocessInstanceService postInstanceService; - - @Autowired - TaskDeployInstanceService taskDeployInstanceService; - - public static Map taskInstanceMap = new HashMap<>(); - - @Override - public String createTaskInstance(TaskInstance taskInstance) { - TaskInstanceEntity instanceEntity = BeanMapper.map(taskInstance, TaskInstanceEntity.class); - return taskInstanceDao.createInstance(instanceEntity); - } - - @Override - public void deleteAllInstanceInstance(String instanceId) { - List allInstanceInstance = findAllInstanceInstance(instanceId); - if (allInstanceInstance.isEmpty()){ - return; - } - for (TaskInstance instance : allInstanceInstance) { - String taskInstanceId = instance.getId(); - deleteTaskInstance(taskInstanceId); - } - } - - @Override - public List findAllInstanceLogs(String instanceId){ - List allInstanceInstance = findAllInstanceInstance(instanceId); - if (allInstanceInstance.isEmpty()){ - return Collections.emptyList(); - } - List list = new ArrayList<>(); - for (TaskInstance taskInstance : allInstanceInstance) { - String runLog = taskInstance.getLogAddress(); - String readFile = PipelineFileUtil.readFile(runLog, 0); - if (Objects.isNull(readFile)){ - continue; - } - list.add(readFile + "\n"); - } - return list; - } - - @Override - public void deleteAllStageInstance(String stageId) { - List allStageInstance = findAllStageInstance(stageId); - if (allStageInstance.isEmpty()){ - return; - } - for (TaskInstance instance : allStageInstance) { - String instanceId = instance.getId(); - deleteTaskInstance(instanceId); - } - } - - @Override - public TaskInstance findOneTaskInstance(String taskInstanceId) { - TaskInstanceEntity taskInstanceEntity = taskInstanceDao.findOne(taskInstanceId); - return BeanMapper.map(taskInstanceEntity, TaskInstance.class); - } - - @Override - public void updateTaskInstance(TaskInstance taskInstance) { - TaskInstanceEntity instance = BeanMapper.map(taskInstance, TaskInstanceEntity.class); - taskInstanceDao.updateInstance(instance); - } - - private static Integer readLogLength= 600; - - @Override - public List findAllInstanceInstance(String instanceId) { - - List pipelineInstance = taskInstanceDao.findPipelineInstance(instanceId); - List allInstance = BeanMapper.mapList(pipelineInstance, TaskInstance.class); - if (Objects.isNull(allInstance) || allInstance.isEmpty()){ - return Collections.emptyList(); - } - allInstance.sort(Comparator.comparing(TaskInstance::getTaskSort)); - - // 没有正在运行的任务时查询所有日志 - TaskInstance taskInstance1 = allInstance.get(allInstance.size() - 1); - if (!taskInstance1.getRunState().equals(PipelineFinal.RUN_RUN)){ - readLogLength = 0; - } - - List list = new ArrayList<>(); - for (TaskInstance instance : allInstance) { - String taskInstanceId = instance.getId(); - - TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); - if (!Objects.isNull(taskInstance)) { - int time = taskInstance.getRunTime(); - if (time == 0){ - time = 1; - } - instance.setRunTime(time); - // if (!StringUtils.isEmpty(instance.getRunLog())){ - // instance.setRunLog(instance.getRunLog() + taskInstance.getRunLog()); - // }else { - // instance.setRunLog(taskInstance.getRunLog()); - // } - instance.setRunState(PipelineFinal.RUN_RUN); - } - String logAddress = instance.getLogAddress(); - String readFile = PipelineFileUtil.readFile(logAddress, readLogLength); - String time = PipelineUtil.formatDateTime(instance.getRunTime()); - instance.setRunTimeDate(time); - instance.setRunLog(readFile); - list.add(instance); - } - TaskInstance taskInstance = findPostPipelineRunMessage(instanceId); - if (!Objects.isNull(taskInstance)){ - list.add(list.size(),taskInstance); - } - return list; - } - - @Override - public TaskInstance findPostPipelineRunMessage(String instanceId){ - List postInstanceList = postInstanceService.findPipelinePostInstance(instanceId);; - - if (Objects.isNull(postInstanceList) || postInstanceList.isEmpty()){ - return null; - } - - int runTime = 0; - TaskInstance taskInstances4 = new TaskInstance(); - StringBuilder runLog = new StringBuilder(); - for (PostprocessInstance postprocessInstance : postInstanceList) { - String postInstanceId = postprocessInstance.getId(); - List postInstance = taskInstanceDao.findPostInstance(postInstanceId); - if (Objects.isNull(postInstance) || Objects.equals(postInstance.size(),0)){ - return null; - } - //任务是否在运行中 - String taskInstanceId = postInstance.get(0).getId(); - TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); - - String readFile = PipelineFileUtil.readFile(taskInstance.getLogAddress(), readLogLength); - runTime = runTime + taskInstance.getRunTime(); - runLog.append(readFile).append("\n"); - taskInstances4.setRunState(taskInstance.getRunState()); - taskInstances4.setPostprocessId(postInstanceId); - taskInstances4.setLogAddress(postprocessInstance.getPostAddress()); - } - taskInstances4.setRunLog(runLog.toString()); - String runState = taskInstances4.getRunState(); - if (Objects.equals(runTime,0) && - !Objects.isNull(runState) && - !Objects.equals(runState,PipelineFinal.RUN_RUN) && - !Objects.equals(runState,PipelineFinal.RUN_HALT)){ - runTime = 1; - } - String time = PipelineUtil.formatDateTime(runTime); - taskInstances4.setRunTimeDate(time); - taskInstances4.setRunTime(runTime); - taskInstances4.setTaskType("post"); - taskInstances4.setTaskName("后置处理"); - taskInstances4.setId("post"); - return taskInstances4; - } - - @Override - public List findStagePostRunMessage(String id){ - List taskPostInstance = postInstanceService.findPipelinePostInstance(id); - List list = new ArrayList<>(); - for (PostprocessInstance postprocessInstance : taskPostInstance) { - String postInstanceId = postprocessInstance.getId(); - List postInstanceEntityList = taskInstanceDao.findPostInstance(postInstanceId); - TaskInstance instance = BeanMapper.map(postInstanceEntityList.get(0), TaskInstance.class); - String taskInstanceId = instance.getId(); - TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); - if (Objects.isNull(taskInstance)){ - String readFile = PipelineFileUtil.readFile(instance.getLogAddress(), 0); - instance.setRunLog(readFile); - }else { - instance.setRunTime(taskInstance.getRunTime()); - if (!StringUtils.isEmpty(instance.getRunLog())){ - instance.setRunLog(instance.getRunLog() + taskInstance.getRunLog()); - }else { - instance.setRunLog(taskInstance.getRunLog()); - } - } - String time = PipelineUtil.formatDateTime(instance.getRunTime()); - instance.setRunTimeDate(time); - list.add(instance); - } - list.sort(Comparator.comparing(TaskInstance::getTaskSort)); - return list; - } - - @Override - public List findAllStageInstance(String stageId) { - List pipelineInstance = taskInstanceDao.findStageInstance(stageId); - List allInstance = BeanMapper.mapList(pipelineInstance, TaskInstance.class); - if (Objects.isNull(allInstance) || allInstance.isEmpty()){ - return Collections.emptyList(); - } - - int allTaskRunTime = 0; - for (TaskInstance instance : allInstance) { - String taskInstanceId = instance.getId(); - - TaskDeployInstanceQuery deployInstanceQuery = new TaskDeployInstanceQuery(); - deployInstanceQuery.setTaskInstanceId(taskInstanceId); - List allDeployInstanceList = taskDeployInstanceService.findAllDeployInstanceList(deployInstanceQuery); - List list = allDeployInstanceList.stream().peek(deployInstance -> { - String runTime = deployInstance.getRunTime(); - if (StringUtils.isEmpty(runTime)) { - runTime = "0"; - } - String s = PipelineUtil.formatDateTime(Long.parseLong(runTime)); - deployInstance.setRunTime(s); - }).toList(); - instance.setDeployInstanceList(list); - - TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); - - if (!Objects.isNull(taskInstance)){ - int time = taskInstance.getRunTime() == 0 ? 1 : taskInstance.getRunTime(); - instance.setRunTime(time); - instance.setRunState(taskInstance.getRunState()); - } - // if (Objects.isNull(taskInstance)){ - // String logAddress = instance.getLogAddress(); - // String readFile = PipelineFileUtil.readFile(logAddress, 2000); - // instance.setRunLog(readFile); - // }else { - // int time = taskInstance.getRunTime(); - // if (time == 0){ - // time = 1; - // } - // if (StringUtils.isEmpty(taskInstance.getRunLog()) ){ - // String logAddress = instance.getLogAddress(); - // String readFile = PipelineFileUtil.readFile(logAddress, readLogLength); - // instance.setRunLog(readFile); - // }else { - // instance.setRunLog(taskInstance.getRunLog()); - // } - // instance.setRunTime(time); - // instance.setRunState(taskInstance.getRunState()); - // } - String logAddress = instance.getLogAddress(); - String readFile = PipelineFileUtil.readFile(logAddress, readLogLength); - instance.setRunLog(readFile); - - String time = PipelineUtil.formatDateTime(instance.getRunTime()); - instance.setRunTimeDate(time); - allTaskRunTime = allTaskRunTime + instance.getRunTime(); - } - return allInstance; - } - - - @Override - public boolean readCommandExecResult(Process process , String enCode, Map error,String taskId) { - boolean state = true; - //指定编码 - if (!PipelineUtil.isNoNull(enCode)){ - int systemType = PipelineUtil.findSystemType(); - if (systemType == 1){ - enCode = PipelineFinal.GBK; - }else { - enCode = PipelineFinal.UTF_8; - } - } - - //转换流 - InputStream inputStream = process.getInputStream(); - InputStream errInputStream = process.getErrorStream(); - - InputStreamReader inputStreamReader ; - BufferedReader bufferedReader ; - if (inputStream == null){ - inputStreamReader = PipelineUtil.encode(errInputStream, enCode); - }else { - inputStreamReader = PipelineUtil.encode(inputStream, enCode); - } - - String s; - bufferedReader = new BufferedReader(inputStreamReader); - - try { - - //读取执行信息 - while ((s = bufferedReader.readLine()) != null) { - String s1 = validStatus(s, error); - if (!Objects.isNull(s1)){ - state = false ; - writeExecLog(taskId, s1); - } - writeExecLog(taskId, s); - - } - - //读取err执行信息 - inputStreamReader = PipelineUtil.encode(errInputStream, enCode); - bufferedReader = new BufferedReader(inputStreamReader); - - while ((s = bufferedReader.readLine()) != null) { - String s1 = validStatus(s, error); - if (!Objects.isNull(s1)){ - state = false ; - writeExecLog(taskId, s1); - } - writeExecLog(taskId, s); - } - - // 关闭 - inputStreamReader.close(); - bufferedReader.close(); - - } catch (Exception e){ - writeExecLog(taskId, e.getMessage()); - state = false; - } - process.destroy(); - return state; - } - - /** - * 效验日志状态 - * @param s 日志 - * @param errors 错误状态 - * @return null 正确 other：错误 - */ - public String validStatus(String s,Map errors){ - - for (Map.Entry errorString : errors.entrySet()) { - String key = errorString.getKey(); - if (!s.contains(key)){ - continue; - } - return errorString.getValue(); - } - - return null; - } - - @Override - public void writeExecLog(String taskId, String execLog){ - if(!PipelineUtil.isNoNull(execLog)){ - return; - } - TasksExecServiceImpl tasksExecService = new TasksExecServiceImpl(); - String taskInstanceId = tasksExecService.findTaskInstanceId(taskId); - TaskInstance taskInstance2 = tasksExecService.findTaskInstance(taskInstanceId); - if (Objects.isNull(taskInstance2)){ - return; - } - - String execInstance = taskInstance2.getRunLog(); - - if (!PipelineUtil.isNoNull(execInstance)){ - taskInstance2.setRunLog(execLog); - }else { - taskInstance2.setRunLog(execInstance +"\n"+ execLog); - } - - //长度过长写入文件中 - String runInstance = taskInstance2.getRunLog(); - if (runInstance.length() > 9000){ - String logAddress = taskInstance2.getLogAddress(); - PipelineFileUtil.logWriteFile(runInstance,logAddress); - taskInstance2.setRunLog(null); - } - tasksExecService.putTaskOrTaskInstance(taskInstanceId, taskInstance2); - } - - @Override - public void writeAllExecLog(String taskId, String execLog){ - if(!PipelineUtil.isNoNull(execLog)){ - return; - } - TasksExecServiceImpl tasksExecService = new TasksExecServiceImpl(); - String taskInstanceId = tasksExecService.findTaskInstanceId(taskId); - TaskInstance taskInstance1 = tasksExecService.findTaskInstance(taskInstanceId); - String execInstance = taskInstance1.getRunLog(); - - if (!PipelineUtil.isNoNull(execInstance)){ - taskInstance1.setRunLog(execLog); - }else { - taskInstance1.setRunLog(execInstance +"\n"+ execLog); - } - - //长度过长写入文件中 - String runInstance = taskInstance1.getRunLog(); - String logAddress = taskInstance1.getLogAddress(); - PipelineFileUtil.logWriteFile(runInstance,logAddress); - } - - /** - * 删除任务执行实例 - * @param taskInstanceId 任务实例id - */ - private void deleteTaskInstance(String taskInstanceId){ - taskInstanceDao.deleteInstance(taskInstanceId); - } - - @Override - public List findAllTaskInstance() { - List allInstance = taskInstanceDao.findAllInstance(); - return BeanMapper.mapList(allInstance, TaskInstance.class); - } - - @Override - public List findAllInstanceList(List idList) { - List pipelineInstanceList = taskInstanceDao.findAllInstanceList(idList); - return BeanMapper.mapList(pipelineInstanceList, TaskInstance.class); - } - - @Override - public List findTaskInstanceList(TaskInstanceQuery query){ - List pipelineInstanceList = taskInstanceDao.findTaskInstanceList(query); - if (pipelineInstanceList == null || pipelineInstanceList.isEmpty()){ - return Collections.emptyList(); - } - return BeanMapper.mapList(pipelineInstanceList,TaskInstance.class); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTest.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTest.java deleted file mode 100644 index b70b310e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.Data; - -//@Join -//@Mapper -@Data -public class MavenTest { - - // id - private String id; - - // 流水线ID - private String pipelineId; - - // 创建时间 - private String createTime; - - // 名称 - private String name; - - // 包路径 - private String packagePath; - - // 执行人 - private String userId; - - // 全部测试用例 - private String allNumber; - - // 失败的用例数 - private String failNumber; - - // 错误的用例数 - private String errorNumber; - - // 跳过的用例数 - private String skipNumber; - - // 信息 - private String message; - - // 总测试实例ID - private String testId; - - // 测试状态 - private String testState; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTestQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTestQuery.java deleted file mode 100644 index c8f3e7a2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/MavenTestQuery.java +++ /dev/null @@ -1,30 +0,0 @@ -package cd.casic.module.process.task.test.model; - - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -// -//@Join -//@Mapper -@Data -public class MavenTestQuery { - - // 流水线ID - private String pipelineId; - - private String createTime; - - private String testId; - - //@ApiProperty(name ="pageParam",desc = "分页参数") - private PageParam pageParam= new PageParam(); - - //@ApiProperty(name ="orderParams",desc = "排序参数") - private List orderParams = OrderBuilders.instance().desc("createTime").get(); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOn.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOn.java deleted file mode 100644 index 5503d651..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOn.java +++ /dev/null @@ -1,36 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import lombok.Data; - - -//@ApiModel -//@Join -//@Mapper -@Data -public class RelevanceTestOn { - - - private String relevanceId; - -// @Mappings({ -// @Mapping(source = "pipeline.id",target = "pipelineId") -// }) -// @JoinQuery(key = "id") - private Pipeline pipeline; - - private String time; - - private String authId; - - private String createTime; - - private String testonId; - - private Integer status; - - private Object object; - - private String url; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOnQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOnQuery.java deleted file mode 100644 index 31804ef8..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/RelevanceTestOnQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.task.test.model; - - - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class RelevanceTestOnQuery { - - private String pipelineId; - - //@ApiProperty(name ="pageParam",desc = "分页参数") - private PageParam pageParam= new PageParam(); - - //@ApiProperty(name ="orderParams",desc = "排序参数") - private List orderParams = OrderBuilders.instance().desc("createTime").get(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TaskTest.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TaskTest.java deleted file mode 100644 index 5bb2558d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TaskTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package cd.casic.module.process.task.test.model; - - -import lombok.Data; - -/** - * 任务测试模型 - */ -//@ApiModel -//@Join -//@Mapper -@Data -public class TaskTest { - - //@ApiProperty(name = "taskId",desc = "id") - private String taskId; - - //测试内容 - //@ApiProperty(name="testOrder",desc="测试内容",required = true) - private String testOrder; - - //@ApiProperty(name="address",desc="测试地址",required = true) - private String address; - -// @Mappings({ -// @Mapping(source = "testSpace.id",target = "testSpace") -// }) -// @JoinQuery(key = "testSpace") - private TestOnRepository testSpace; - -// @Mappings({ -// @Mapping(source = "testPlan.id",target = "testPlan") -// }) -// @JoinQuery(key = "testPlan") - private TestOnTestPlan testPlan; - -// @Mappings({ -// @Mapping(source = "apiEnv.id",target = "apiEnv") -// }) -// @JoinQuery(key = "apiEnv") - private TestOnApiEnv apiEnv; - -// @Mappings({ -// @Mapping(source = "appEnv.id",target = "appEnv") -// }) -// @JoinQuery(key = "appEnv") - private TestOnAppEnv appEnv; - -// @Mappings({ -// @Mapping(source = "webEnv.id",target = "webEnv") -// }) -// @JoinQuery(key = "webEnv") - private TestOnWebEnv webEnv; - - //@ApiProperty(name = "authId",desc="认证id") - private String authId; - - private Object auth; - - //测试类型 - private String type; - - //顺序 - private int sort; - - private String instanceId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnv.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnv.java deleted file mode 100644 index f05d9f5d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnv.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.Data; - -@Data -public class TestOnApiEnv { - - private String id; - - private String name; - - private String url; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnvQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnvQuery.java deleted file mode 100644 index e5545f47..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnApiEnvQuery.java +++ /dev/null @@ -1,20 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class TestOnApiEnvQuery { - - private String repositoryId; - - // @ApiProperty(name = "orderParams", desc = "排序参数") - private List orderParams = OrderBuilders.instance().asc("id").get(); - - // @ApiProperty(name = "pageParam", desc = "分页参数") - private PageParam pageParam = new PageParam(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnv.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnv.java deleted file mode 100644 index 19976993..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnv.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.Data; - -@Data -public class TestOnAppEnv { - - - - private String id; - - private String name; - - private String url; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnvQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnvQuery.java deleted file mode 100644 index 87c3e333..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnAppEnvQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package cd.casic.module.process.task.test.model; - - - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class TestOnAppEnvQuery { - - private String repositoryId; - - // @ApiProperty(name = "orderParams", desc = "排序参数") - private List orderParams = OrderBuilders.instance().asc("id").get(); - - // @ApiProperty(name = "pageParam", desc = "分页参数") - private PageParam pageParam = new PageParam(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstance.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstance.java deleted file mode 100644 index 9119af39..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstance.java +++ /dev/null @@ -1,28 +0,0 @@ -package cd.casic.module.process.task.test.model; - - - -public class TestOnPlanCaseInstance { - - //@ApiProperty(name = "id", desc = "id") - private String id; - - //@ApiProperty(name = "testPlanInstanceId", desc = "所属测试计划实例") - private String testPlanInstanceId; - - //@ApiProperty(name = "caseInstanceId", desc = "用例实例id") - private String caseInstanceId; - - //@ApiProperty(name = "name", desc = "名称") - private String name; - - //@ApiProperty(name = "testType", desc = "测试类型") - private String testType; - - //@ApiProperty(name = "caseType", desc = "用例类型") - private String caseType; - - //@ApiProperty(name = "result", desc = "结果") - private Integer result; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstanceBindQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstanceBindQuery.java deleted file mode 100644 index a31c941e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanCaseInstanceBindQuery.java +++ /dev/null @@ -1,27 +0,0 @@ -package cd.casic.module.process.task.test.model; - - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class TestOnPlanCaseInstanceBindQuery { - - - // @ApiProperty(name = "caseInstanceId", desc = "历史id") - private String caseInstanceId; - - // @ApiProperty(name = "testPlanInstanceId", desc = "testPlanInstanceId") - private String testPlanInstanceId; - - - // @ApiProperty(name = "orderParams", desc = "排序参数") - private List orderParams = OrderBuilders.instance().asc("id").get(); - - // @ApiProperty(name = "pageParam", desc = "分页参数") - private PageParam pageParam = new PageParam(); - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanInstance.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanInstance.java deleted file mode 100644 index 7351cafd..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanInstance.java +++ /dev/null @@ -1,55 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.sql.Timestamp; -@Data -@NoArgsConstructor -public class TestOnPlanInstance { - - //@ApiProperty(name = "id", desc = "id") - private String id; - - //@ApiProperty(name = "testPlanId", desc = "所属计划") - private String testPlanId; - - private TestOnTestPlan testPlan; - - //@ApiProperty(name = "repositoryId", desc = "所属仓库") - private String repositoryId; - - //@ApiProperty(name = "executeNumber", desc = "执行次数") - private Integer executeNumber; - - //@ApiProperty(name = "result", desc = "结果") - private Integer result; - - //@ApiProperty(name = "total", desc = "测试总次数") - private Integer total; - - //@ApiProperty(name = "passNum", desc = "通过数") - private Integer passNum; - - //@ApiProperty(name = "failNum", desc = "错误数") - private Integer failNum; - - //@ApiProperty(name = "passRate", desc = "通过率") - private String passRate; - - //@ApiProperty(name = "errorRate", desc = "错误率") - private String errorRate; - - //@ApiProperty(name = "createTime", desc = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp createTime; - - //@ApiProperty(name = "createUser", desc = "执行人") - private String createUser; - - private String testPlanName; - - private String url; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanQuery.java deleted file mode 100644 index 5b3690d9..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanQuery.java +++ /dev/null @@ -1,30 +0,0 @@ -package cd.casic.module.process.task.test.model; - - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class TestOnPlanQuery { - - // @ApiProperty(name = "orderParams", desc = "排序参数") - private List orderParams = OrderBuilders.instance().asc("id").get(); - - // @ApiProperty(name = "pageParam", desc = "分页参数") - private PageParam pageParam = new PageParam(); - - // @ApiProperty(name = "repositoryId", desc = "空间id") - private String repositoryId; - - // @ApiProperty(name = "name", desc = "测试计划名字，模糊匹配") - private String name; - - // @ApiProperty(name = "state", desc = "测试计划名字，模糊匹配") - private Integer state; - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanTestData.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanTestData.java deleted file mode 100644 index f3f2c59e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnPlanTestData.java +++ /dev/null @@ -1,19 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.Data; - -@Data -public class TestOnPlanTestData { - - - private String testPlanId; - - private String repositoryId; - - private String apiEnvId; - - private String webEnv; - - private String appEnv; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnRelevance.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnRelevance.java deleted file mode 100644 index e8a83414..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnRelevance.java +++ /dev/null @@ -1,17 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TestOnRelevance { - - private String pipelineId; - - private String instanceId; - - private String authId; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnRepository.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnRepository.java deleted file mode 100644 index 81ca8690..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.Data; - -@Data -public class TestOnRepository { - - private String id; - - private String name; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnTestPlan.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnTestPlan.java deleted file mode 100644 index e374f496..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnTestPlan.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.Data; - -@Data -public class TestOnTestPlan { - - private String id; - - private String name; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnv.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnv.java deleted file mode 100644 index 03823c8d..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnv.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.process.task.test.model; - -import lombok.Data; - -@Data -public class TestOnWebEnv { - - private String id; - - private String name; - - private String preUrl; - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnvQuery.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnvQuery.java deleted file mode 100644 index 8b41d170..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestOnWebEnvQuery.java +++ /dev/null @@ -1,24 +0,0 @@ -package cd.casic.module.process.task.test.model; - - -import cd.casic.ci.commons.order.Order; -import cd.casic.ci.commons.order.OrderBuilders; -import cd.casic.framework.commons.pojo.PageParam; -import lombok.Data; - -import java.util.List; -@Data -public class TestOnWebEnvQuery { - - private String repositoryId; - - // @ApiProperty(name = "orderParams", desc = "排序参数") - private List orderParams = OrderBuilders.instance().asc("id").get(); - - // @ApiProperty(name = "pageParam", desc = "分页参数") - private PageParam pageParam = new PageParam(); - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestPlanExecResult.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestPlanExecResult.java deleted file mode 100644 index 8befc63f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/model/TestPlanExecResult.java +++ /dev/null @@ -1,23 +0,0 @@ -package cd.casic.module.process.task.test.model; - - -import lombok.Data; - -@Data -public class TestPlanExecResult { - - //@ApiProperty(name = "status", desc = "状态类型：0：未开始，1：正在执行,2：结束") - private Integer status; - - //@ApiProperty(name = "testPlanInstance", desc = "测试实例") - - private TestOnPlanInstance testPlanInstance; - - // @ApiProperty( - // name = "testPlanCaseInstanceList", - // desc = "测试计划用例历史" - // ) - // private List testPlanCaseInstanceList; - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/MavenTestService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/MavenTestService.java deleted file mode 100644 index beda5516..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/MavenTestService.java +++ /dev/null @@ -1,33 +0,0 @@ -package cd.casic.module.process.task.test.service; - - - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.task.test.model.MavenTest; -import cd.casic.module.process.task.test.model.MavenTestQuery; - -import java.util.List; - -public interface MavenTestService { - - String creatMavenTest(MavenTest mavenTest) ; - - void updateMavenTest(MavenTest mavenTest) ; - - - void deleteMavenTest(String testId) ; - - - MavenTest findOneMavenTest(String testId) ; - - List findAllMavenTest() ; - - - List findMavenTestList(MavenTestQuery testQuery); - - - PageResult findMavenTestPage(MavenTestQuery testQuery); - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/RelevanceTestOnService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/RelevanceTestOnService.java deleted file mode 100644 index 2e484660..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/RelevanceTestOnService.java +++ /dev/null @@ -1,78 +0,0 @@ -package cd.casic.module.process.task.test.service; - - -import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.module.process.task.test.model.RelevanceTestOn; -import cd.casic.module.process.task.test.model.RelevanceTestOnQuery; -import cd.casic.module.process.task.test.model.TestOnRelevance; - -import java.util.List; - -//@JoinProvider(model = RelevanceTestOn.class) -public interface RelevanceTestOnService { - - - void createRelevance(TestOnRelevance testOnRelevance); - - - /** - * 创建 - * @param relevanceTestOn 关联关系 - * @return 关联关系id - */ - String createRelevance(RelevanceTestOn relevanceTestOn); - - /** - * 删除 - * @param relevanceId 关联id - */ - void deleteRelevance(String relevanceId); - - - /** - * 根据配置id删除任务 - * @param pipelineId 流水线id - */ - void deleteAllRelevance(String pipelineId); - - /** - * 获取流水线关联的testOn关系 - * @param pipelineId 流水线id - * @return 关联关系 - */ - List findAllRelevance(String pipelineId); - - - /** - * 获取流水线关联的testOn关系 - * @param relevanceTestOnQuery 条件 - * @return 关联关系 - */ - PageResult findAllRelevancePage(RelevanceTestOnQuery relevanceTestOnQuery); - - - /** - * 查询单个信息 - * @param relevanceId 关联id - * @return 关联关系 - */ -// @FindOne - RelevanceTestOn findOneRelevance(String relevanceId); - - /** - * 查询所有信息 - * @return test信息集合 - */ -// @FindAll - List findAllRelevance(); - -// @FindList - List findAllRelevanceList(List idList); - - - - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/TaskTestOnService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/TaskTestOnService.java deleted file mode 100644 index afd27c33..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/test/service/TaskTestOnService.java +++ /dev/null @@ -1,121 +0,0 @@ -package cd.casic.module.process.task.test.service; - - - -import cd.casic.module.process.task.test.model.*; - -import java.util.List; - -public interface TaskTestOnService { - - /** - * 根据名称查询仓库 - * @param authId 认证id - * @param rpyId 仓库id - * @return 仓库 - */ - TestOnRepository findOneRepository(String authId, String rpyId); - - - /** - * 获取测试计划 - * @param authId 认证id - * @param planId 测试计划id - * @return 测试计划 - */ - TestOnTestPlan findOneTestPlan(String authId, String planId); - - - /** - * 获取test仓库 - * @param authId 认证id - * @return 仓库 - */ - List findAllRepository(String authId); - - - /** - * 获取teston测试计划 - * @param authId 认证id - * @param rpyId 仓库id - * @return 测试计划 - */ - List findAllTestPlan(String authId, String rpyId); - - /** - * 获取测试计划环境 - * @param authId 认证id - * @param rpyId 仓库id - * @param env 环境 - * @return 环境信息 - */ - List findAllEnv(String authId,String rpyId,String env); - - /** - * 获取测试集合执行需要的环境 - * @param authId teston环境地址 - * @param testPlanId 测试计划ID - * @return 需要的环境 - */ - List findTestPlanEnv(String authId,String testPlanId); - - /** - * 获取api环境地址 - * @param authId teston环境地址 - * @param id id - * @return api环境 - */ - TestOnApiEnv findOneTestOnApiEnv(String authId, String id); - - /** - * 获取app环境地址 - * @param authId teston环境地址 - * @param id id - * @return app环境 - */ - TestOnAppEnv findOneTestOnAppEnv(String authId, String id); - - /** - * 获取web环境地址 - * @param authId teston环境地址 - * @param id id - * @return web环境 - */ - TestOnWebEnv findOneTestOnWebEnv(String authId, String id); - - - /** - * 执行测试计划 - * @param authId 认证id - * @param testPlanTestData 执行信息 - */ - String execTestPlan(String authId, TestOnPlanTestData testPlanTestData); - - - /** - * 获取测试结果详情 - * @param authId 认证id - * @return 测试结果 - */ - List findTestPlanExecResult(String authId, String instanceId); - - - /** - * 获取测试结果 - * @param authId 认证id - * @return 测试结果 - */ - TestPlanExecResult findPlanExecResult(String authId,String testPlanId); - - /** - * 查询测试计划的详情 - * @param authId 认证id - * @param instanceId 实例id - * @return 测试计划详情 - */ - TestOnPlanInstance findAllTestPlanInstance(String authId, String instanceId); - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/BeanMapper.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/BeanMapper.java deleted file mode 100644 index c69d3198..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/BeanMapper.java +++ /dev/null @@ -1,168 +0,0 @@ -package cd.casic.module.process.toolkit.beans; - -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.module.process.core.util.BeanUtils; -import cd.casic.module.process.toolkit.beans.metadata.BeanMapperRegister; -import cd.casic.module.process.toolkit.beans.model.BeanMapping; -import cd.casic.module.process.toolkit.beans.model.FieldMapping; -import ognl.Ognl; -import ognl.OgnlException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class BeanMapper { - private static Logger logger = LoggerFactory.getLogger(BeanMapper.class); - - public BeanMapper() { - } - - public static T map(Object sourceObject, Class targetClz) { - if (sourceObject == null) { - return null; - } else if (targetClz == null) { - throw new SystemException("targetClass must not be null."); - } else { - try { - Class sourceClz = sourceObject.getClass(); - BeanMapping beanMapping = BeanMapperRegister.getBeanMapping(sourceClz, targetClz); - if (beanMapping == null) { - throw new SystemException(String.format("bean mapper not found,source:%s,target:%s.", sourceClz.getName(), targetClz.getName())); - } else { - T targetObject = targetClz.newInstance(); - List propertyMappingList = beanMapping.getPropertyMappingList(); - Iterator var6 = propertyMappingList.iterator(); - - while(var6.hasNext()) { - FieldMapping propertyMapping = (FieldMapping)var6.next(); - String source = propertyMapping.getSource(); - String target = propertyMapping.getTarget(); - - try { - Object fieldValue; - if (isComplexField(source)) { - fieldValue = getParentFiled(sourceObject, source); - if (fieldValue == null) { - continue; - } - } - - fieldValue = Ognl.getValue(source, sourceObject); - if (fieldValue != null) { - if (isComplexField(target)) { - initParentFieldIfNull(targetObject, target); - } - - Ognl.setValue(target, targetObject, fieldValue); - } - } catch (OgnlException var11) { - throw new SystemException("表达式解析失败"); - } - } - - return targetObject; - } - } catch (InstantiationException var12) { -// throw new SystemException(var12); - throw new SystemException("系统错误"); - } catch (IllegalAccessException var13) { -// throw new SystemException(var13); - throw new SystemException("系统错误"); - } - } - } - - static boolean isComplexField(String exp) { - return exp.contains("."); - } - - static Object getParentFiled(Object sourceObject, String exp) { - String[] arr = exp.split("\\."); - String fieldName = arr[0]; - PropertyDescriptor fieldPd = BeanUtils.getPropertyDescriptor(sourceObject.getClass(), fieldName); - Method fieldReadMethod = fieldPd.getReadMethod(); - if (!Modifier.isPublic(fieldReadMethod.getDeclaringClass().getModifiers())) { - fieldReadMethod.setAccessible(true); - } - - try { - Object fieldValue = fieldReadMethod.invoke(sourceObject); - return fieldValue; - } catch (IllegalAccessException var7) { -// throw new SystemException(var7); - throw new SystemException("系统错误"); - } catch (InvocationTargetException var8) { -// throw new SystemException(var8); - throw new SystemException("系统错误"); - } - } - - static void initParentFieldIfNull(Object targetObject, String exp) { - if (exp.contains(".")) { - String[] arr = exp.split("\\."); - String fieldName = arr[0]; - - try { - PropertyDescriptor fieldPd = BeanUtils.getPropertyDescriptor(targetObject.getClass(), fieldName); - Method fieldReadMethod = fieldPd.getReadMethod(); - if (!Modifier.isPublic(fieldReadMethod.getDeclaringClass().getModifiers())) { - fieldReadMethod.setAccessible(true); - } - - Object fieldValue = fieldReadMethod.invoke(targetObject); - if (fieldValue == null) { - Class fieldType = fieldPd.getPropertyType(); - fieldValue = fieldType.newInstance(); - if (fieldValue == null) { - throw new SystemException(String.format("init field value error.", fieldName)); - } else { - Method writeMethod = fieldPd.getWriteMethod(); - if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) { - writeMethod.setAccessible(true); - } - - writeMethod.invoke(targetObject, fieldValue); - } - } - } catch (IllegalAccessException var9) { -// throw new SystemException(var9); - throw new SystemException("系统错误"); - } catch (InvocationTargetException var10) { -// throw new SystemException(var10); - throw new SystemException("系统错误"); - } catch (InstantiationException var11) { -// throw new SystemException(var11); - throw new SystemException("系统错误"); - } - } - } - - public static List mapList(List sourceObjectList, Class targetClz) { - List targetList = new ArrayList(); - if (sourceObjectList != null && sourceObjectList.size() != 0) { - try { - Iterator var3 = sourceObjectList.iterator(); - - while(var3.hasNext()) { - Object sourceObject = var3.next(); - T targetObject = map(sourceObject, targetClz); - targetList.add(targetObject); - } - - return targetList; - } catch (Exception var6) { -// throw new SystemException(var6); - throw new SystemException("系统错误"); - } - } else { - return targetList; - } - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mapper.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mapper.java deleted file mode 100644 index eb8ae3a8..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cd.casic.module.process.toolkit.beans.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -public @interface Mapper { - Class source() default Object.class; - - Class target() default Object.class; - - String targetName() default ""; - - String targetAlias() default ""; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mappers.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mappers.java deleted file mode 100644 index fd62b1bf..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mappers.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.toolkit.beans.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -public @interface Mappers { - Mapper[] value(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mapping.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mapping.java deleted file mode 100644 index 0e62e786..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mapping.java +++ /dev/null @@ -1,14 +0,0 @@ -package cd.casic.module.process.toolkit.beans.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.METHOD, ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface Mapping { - String source() default ""; - - String target() default ""; -} \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mappings.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mappings.java deleted file mode 100644 index 5e7d8f28..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/annotation/Mappings.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.toolkit.beans.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.METHOD, ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface Mappings { - Mapping[] value(); -} \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/metadata/BeanMapperRegister.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/metadata/BeanMapperRegister.java deleted file mode 100644 index 8a318435..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/metadata/BeanMapperRegister.java +++ /dev/null @@ -1,267 +0,0 @@ -package cd.casic.module.process.toolkit.beans.metadata; - -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.module.process.core.resolver.AnnotationResourceResolver; -import cd.casic.module.process.toolkit.beans.annotation.Mapper; -import cd.casic.module.process.toolkit.beans.annotation.Mappers; -import cd.casic.module.process.toolkit.beans.annotation.Mapping; -import cd.casic.module.process.toolkit.beans.annotation.Mappings; -import cd.casic.module.process.toolkit.beans.model.BeanMapping; -import cd.casic.module.process.toolkit.beans.model.FieldMapping; -import org.springframework.util.StringUtils; - -import java.lang.reflect.Field; -import java.util.*; - -public class BeanMapperRegister { - private static Map mappers = new HashMap(); - private static final String RELA_SPLIT = "->"; - - public BeanMapperRegister() { - } - - public void scan(String basePackage) { - Set classSet = AnnotationResourceResolver.resolve(basePackage, Mapper.class); - Iterator var3; - Class cls; - if (classSet != null && classSet.size() > 0) { - var3 = classSet.iterator(); - - while(var3.hasNext()) { - cls = (Class)var3.next(); - Mapper mapper = (Mapper)cls.getAnnotation(Mapper.class); - this.parse(cls, mapper); - } - } - - classSet = AnnotationResourceResolver.resolve(basePackage, Mappers.class); - if (classSet != null && classSet.size() > 0) { - var3 = classSet.iterator(); - - while(var3.hasNext()) { - cls = (Class)var3.next(); - Mappers mappers = (Mappers)cls.getAnnotation(Mappers.class); - Mapper[] var6 = mappers.value(); - int var7 = var6.length; - - for(int var8 = 0; var8 < var7; ++var8) { - Mapper mapper = var6[var8]; - this.parse(cls, mapper); - } - } - } - - } - - public BeanMapperRegister map(Class sourceClass, Class targetClass) { - BeanMapping mapperMeta = new BeanMapping(); - mapperMeta.setSourceClass(sourceClass); - mapperMeta.setTargetClass(targetClass); - return this; - } - - void parse(Class mapperClz, Mapper mapper) { - BeanMapping beanMapping = null; - - try { - beanMapping = this.parseBeanMapping(mapperClz, mapper); - } catch (Exception var7) { - return; - } - - mappers.put(getBeanMappingKey(beanMapping), beanMapping); - BeanMapping reverseBeanMapping = null; - - try { - reverseBeanMapping = this.parseBeanMappingForReverse(beanMapping); - } catch (Exception var6) { - return; - } - - mappers.put(getBeanMappingKey(reverseBeanMapping), reverseBeanMapping); - } - - public BeanMapping parseBeanMappingForReverse(BeanMapping classMapping) { - BeanMapping reverseBeanMapping = new BeanMapping(); - reverseBeanMapping.setSourceClass(classMapping.getTargetClass()); - reverseBeanMapping.setTargetClass(classMapping.getSourceClass()); - Iterator var3 = classMapping.getPropertyMappingList().iterator(); - - while(var3.hasNext()) { - FieldMapping item = (FieldMapping)var3.next(); - FieldMapping propertyMapping = new FieldMapping(); - propertyMapping.setSource(item.getTarget()); - propertyMapping.setTarget(item.getSource()); - reverseBeanMapping.getPropertyMappingList().add(propertyMapping); - } - - return reverseBeanMapping; - } - - BeanMapping parseBeanMapping(Class mapperClz, Mapper mapper) { - try { - BeanMapping beanMapping = new BeanMapping(); - Class sourceClass = mapper.source(); - if (sourceClass == Object.class) { - sourceClass = mapperClz; - } - - Class targetClass = mapper.target(); - if (targetClass == Object.class) { - String targetName = mapper.targetName(); - if (!StringUtils.isEmpty(targetName)) { - targetClass = this.getClassByName(targetName); - } else { - targetClass = this.findTargetClassByRule(sourceClass); - } - } - - beanMapping.setSourceClass(sourceClass); - beanMapping.setTargetClass(targetClass); - List propertyMappingList = this.parsePropertiesMapping(beanMapping); - beanMapping.setPropertyMappingList(propertyMappingList); - return beanMapping; - } catch (Exception var7) { - throw new SystemException(String.format("parse class:%s failed.", mapperClz.getName())); -// throw new SystemException(String.format("parse class:%s failed.", mapperClz.getName()), var7); - } - } - - public Class findTargetClassByRule(Class sourceClass) { - String className = sourceClass.getName(); - String[] arr = className.split("\\."); - StringBuffer buffer = new StringBuffer(); - - for(int i = 0; i < arr.length; ++i) { - String item = arr[i]; - if (i < arr.length - 2) { - buffer.append(item).append("."); - } else if (i == arr.length - 2) { - buffer.append("entity").append("."); - } else if (i == arr.length - 1) { - String entityName = item + "Entity"; - buffer.append(entityName); - } - } - - String targetName = buffer.toString(); - Class targetClass = this.getClassByName(targetName); - return targetClass; - } - - Class getClassByName(String className) { - try { - Class targetClass = Class.forName(className); - return targetClass; - } catch (ClassNotFoundException var6) { - try { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - Class clazz = classLoader.loadClass(className); - return clazz; - } catch (ClassNotFoundException var5) { - throw new SystemException("class not found:" + className); -// throw new SystemException("class not found:" + className, var6); - } - } - } - - List parsePropertiesMapping(BeanMapping classMapping) { - List propertyMappingList = new ArrayList(); - Class sourceClz = classMapping.getSourceClass(); - Class targetClz = classMapping.getTargetClass(); - Field[] fields = sourceClz.getDeclaredFields(); - if (fields != null && fields.length > 0) { - } - - Field[] var6 = fields; - int var7 = fields.length; - - for(int var8 = 0; var8 < var7; ++var8) { - Field field = var6[var8]; - if (field.getAnnotation(Mapping.class) != null) { - Mapping mapping = (Mapping)field.getAnnotation(Mapping.class); - this.validField(sourceClz, mapping.source()); - this.validField(targetClz, mapping.target()); - FieldMapping propertyMapping = buildPropertyMapping(field, mapping); - propertyMappingList.add(propertyMapping); - } else if (field.getAnnotation(Mappings.class) != null) { - Mappings mappings = (Mappings)field.getAnnotation(Mappings.class); - Mapping[] var11 = mappings.value(); - int var12 = var11.length; - - for(int var13 = 0; var13 < var12; ++var13) { - Mapping mapping = var11[var13]; - this.validField(sourceClz, mapping.source()); - this.validField(targetClz, mapping.target()); - FieldMapping propertyMapping = buildPropertyMapping(field, mapping); - propertyMappingList.add(propertyMapping); - } - } else { - try { - this.validField(targetClz, field.getName()); - } catch (Exception var16) { - continue; - } - - FieldMapping propertyMapping = new FieldMapping(field.getName(), field.getName()); - propertyMappingList.add(propertyMapping); - } - } - - return propertyMappingList; - } - - void validField(Class clz, String fieldName) { - if (!fieldName.contains(".")) { - try { - clz.getDeclaredField(fieldName); - } catch (NoSuchFieldException var11) { - throw new SystemException(String.format("mapping field not found,clz:%s,field:%s", clz.getName(), fieldName)); - } - } else { - String[] arr = fieldName.split("\\."); - String parentFieldName = arr[0]; - Field parentField = null; - - try { - parentField = clz.getDeclaredField(parentFieldName); - } catch (NoSuchFieldException var10) { - throw new SystemException(String.format("mapping field not found,clz:%s,field:%s", clz.getName(), parentFieldName)); - } - - String childFieldName = arr[1]; - Class parentFieldClz = null; - - try { - parentFieldClz = parentField.getType(); - parentFieldClz.getDeclaredField(childFieldName); - } catch (NoSuchFieldException var9) { - throw new SystemException(String.format("mapping field not found,clz:%s,field:%s", parentFieldClz.getName(), childFieldName)); - } - } - - } - - static FieldMapping buildPropertyMapping(Field field, Mapping mapping) { - FieldMapping propertyMappingMeta = new FieldMapping(); - propertyMappingMeta.setSource(mapping.source()); - propertyMappingMeta.setTarget(mapping.target()); - return propertyMappingMeta; - } - - public static BeanMapping getBeanMapping(Class sourceClass, Class targetClass) { - String mappingKey = getBeanMappingKey(sourceClass, targetClass); - BeanMapping classMapping = (BeanMapping)mappers.get(mappingKey); - return classMapping; - } - - static String getBeanMappingKey(BeanMapping beanMapping) { - String var10000 = beanMapping.getSourceClass().getName(); - return var10000 + "->" + beanMapping.getTargetClass().getName(); - } - - static String getBeanMappingKey(Class sourceClass, Class targetClass) { - String var10000 = sourceClass.getName(); - return var10000 + "->" + targetClass.getName(); - } -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/model/BeanMapping.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/model/BeanMapping.java deleted file mode 100644 index 069c831e..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/model/BeanMapping.java +++ /dev/null @@ -1,12 +0,0 @@ -package cd.casic.module.process.toolkit.beans.model; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; -@Data -public class BeanMapping { - private Class sourceClass; - private Class targetClass; - private List propertyMappingList = new ArrayList(); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/join/JoinOperation.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/join/JoinOperation.java deleted file mode 100644 index 671c8bf2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/join/JoinOperation.java +++ /dev/null @@ -1,11 +0,0 @@ -package cd.casic.module.process.toolkit.join; - -import java.util.List; - -public interface JoinOperation { - void joinQuery(T var1); - - void joinQuery(List var1); - - void joinQuery(List var1, String[] var2); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/join/JoinTemplate.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/join/JoinTemplate.java deleted file mode 100644 index 4599e3ab..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/join/JoinTemplate.java +++ /dev/null @@ -1,11 +0,0 @@ -package cd.casic.module.process.toolkit.join; - -import java.util.List; - -public interface JoinTemplate extends JoinOperation{ - void joinQuery(T data); - - void joinQuery(List dataList); - - void joinQuery(List dataList, String[] includeFields); -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/user/user/User.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/user/user/User.java deleted file mode 100644 index dab75705..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/user/user/User.java +++ /dev/null @@ -1,19 +0,0 @@ -package cd.casic.module.process.user.user; - -import lombok.Data; - -@Data -public class User { - private String id; - private String name; - private String phone; - private String email; - private String avatar; - private String nickname; - private String dirId; - private String password; - private Integer status; - private Integer type; - private String openId; - private String newPassword; -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/config/MatflowWebSocketConfig.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/config/MatflowWebSocketConfig.java deleted file mode 100644 index 4fb9c3b7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/config/MatflowWebSocketConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package cd.casic.module.process.ws.config; - - -import cd.casic.module.process.ws.server.SocketServerHandler; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -import org.springframework.web.socket.config.annotation.WebSocketConfigurer; -import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; -import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean; - - -@Configuration -@EnableWebSocket -public class MatflowWebSocketConfig implements WebSocketConfigurer { - - @Override - public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - registry.addHandler(socketHandler(), "/arbess/handler") - .addInterceptors() - .setAllowedOrigins("*"); - } - - @Bean - public SocketServerHandler socketHandler() { - return new SocketServerHandler(); - } - - @Bean - public ServletServerContainerFactoryBean createWebSocketContainer() { - ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean(); - container.setMaxTextMessageBufferSize(5120 * 5120); // 设置文本消息缓冲区大小 - container.setMaxBinaryMessageBufferSize(5120 * 5120); // 设置二进制消息缓冲区大小 - return container; - } - - -} - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/SocketServerHandler.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/SocketServerHandler.java deleted file mode 100644 index 374c0707..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/SocketServerHandler.java +++ /dev/null @@ -1,151 +0,0 @@ -package cd.casic.module.process.ws.server; - -import cd.casic.ci.commons.exception.SystemException; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.ci.commons.bean.work.agent.AgentMessage; -import cd.casic.ci.commons.bean.work.agent.model.Agent; -import cd.casic.module.process.support.agent.service.AgentService; -import com.alibaba.fastjson.JSONObject; -import jakarta.annotation.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; -import org.springframework.web.socket.*; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.CopyOnWriteArrayList; - -@Service -public class SocketServerHandler implements WebSocketHandler { - @Resource - WebSocketMessageService webSocketMessageService; - - @Resource - AgentService agentService; - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - private final List dataList = new CopyOnWriteArrayList<>(); - - // 线程安全的集合，用于存储客户端会话 - public static final Map sessionMap = new HashMap<>(); - - public static SocketServerHandler instance(){ - return new SocketServerHandler(); - } - - @Override - public void afterConnectionEstablished(WebSocketSession session) throws Exception { - // 连接建立时的处理逻辑 - Agent agent = connentAgent(String.valueOf(session.getUri())); - sessionMap.put(agent.getAddress(),session); - agentService.initAgent(agent); - logger.info("客户端建立连接,{}", agent.getAddress()); - } - - @Override - public void handleMessage(WebSocketSession session, WebSocketMessage message) throws Exception { - // 接收到消息时的处理逻辑 - BinaryMessage binaryMessage = (BinaryMessage) message; - ByteBuffer payload = binaryMessage.getPayload(); - String receivedString = new String(payload.array(), StandardCharsets.UTF_8); - AgentMessage agentMessage = JSONObject.parseObject(receivedString, AgentMessage.class); - logger.warn("接受客户端消息,消息类型：{}", agentMessage.getType()); - - dataList.add(agentMessage); - } - - - @Scheduled(fixedRate = 800) - protected void syncMessage(){ - if (dataList.isEmpty()){ - return; - } - - int processedCount = 0; // 计数器 - for (AgentMessage message : dataList) { - if (processedCount >= 4) { // 限制每次处理的数量为6 - break; - } - - // 执行处理逻辑 - webSocketMessageService.distributeMessage(message); - processedCount++; - - // 处理完成后删除内存中的数据 - dataList.remove(message); - } - } - - /** - * 发送消息 - * @param id 消息ID - * @param agentMessage 消息内容 - */ - public void sendHandleMessage(String id, AgentMessage agentMessage){ - WebSocketSession session = sessionMap.get(id); - if (Objects.isNull(session) || !session.isOpen()) { - throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息："+id); - } - // 接收到消息时的处理逻辑 - String jsonString = JSONObject.toJSONString(agentMessage); - logger.warn("向客户端推送消息：{}",agentMessage.getType()); - try { - session.sendMessage(new TextMessage(jsonString)); - } catch (IOException e) { - throw new SystemException("客户端推送消息失败,错误信息：" + e.getMessage()); - } - } - - @Override - public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception { - // 发生传输错误时的处理逻辑 - logger.error("连接过程异常,异常信息：{}", exception.getMessage()); - Agent agent = connentAgent(Objects.requireNonNull(session.getUri()).toString()); - // connetMap.remove(agent.getAddress()); - sessionMap.remove(agent.getAddress(),session); - } - - @Override - public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception { - // 连接关闭时的处理逻辑 - Agent agent = connentAgent(Objects.requireNonNull(session.getUri()).toString()); - String address = agent.getAddress(); - logger.warn("客户端关闭连接,id:{},原因：{}", address,closeStatus.getReason()); - sessionMap.remove(address,session); - // agentService.deleteAgent(address); - } - - @Override - public boolean supportsPartialMessages() { - return false; - } - - /** - * 解析连接信息 - * @param uri 连接地址 - * @return 连接信息 - */ - public Agent connentAgent(String uri){ - String[] split = Objects.requireNonNull(uri).split("\\?"); - String[] split1 = split[1].split("&"); - Agent agent = new Agent(); - agent.setName(split1[0]); - agent.setTenantId(split1[1]); - agent.setIp(split1[2]); - agent.setCreateTime(PipelineUtil.date(1)); - agent.setAddress(split1[0]+"-"+split1[1]); - return agent; - } - - - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/WebSocketMessageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/WebSocketMessageService.java deleted file mode 100644 index c04a043f..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/WebSocketMessageService.java +++ /dev/null @@ -1,16 +0,0 @@ -package cd.casic.module.process.ws.server; - -import cd.casic.ci.commons.bean.work.agent.AgentMessage; - - -public interface WebSocketMessageService { - - - /** - * 分发处理消息 - * @param agentMessage 消息内容 - */ - String distributeMessage(AgentMessage agentMessage); - - -} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/impl/WebSocketMessageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/impl/WebSocketMessageServiceImpl.java deleted file mode 100644 index 26ef37b7..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/ws/server/impl/WebSocketMessageServiceImpl.java +++ /dev/null @@ -1,369 +0,0 @@ -package cd.casic.module.process.ws.server.impl; - -import cd.casic.ci.commons.bean.engine.job.TaskInstance; -import cd.casic.ci.commons.bean.engine.postprocess.PostprocessInstance; -import cd.casic.ci.commons.bean.process.definition.Pipeline; -import cd.casic.ci.commons.bean.process.instance.PipelineInstance; -import cd.casic.ci.commons.bean.process.stage.StageInstance; - -import cd.casic.ci.commons.bean.support.deploy.TaskDeployInstance; -import cd.casic.ci.commons.utils.PipelineFileUtil; -import cd.casic.ci.commons.utils.PipelineUtil; -import cd.casic.ci.commons.bean.work.agent.AgentMessage; -import cd.casic.module.process.engine.task.TasksInstanceService; -import cd.casic.module.process.home.service.PipelineHomeService; -import cd.casic.module.process.pipeline.definition.PipelineService; -import cd.casic.module.process.pipeline.execute.service.impl.PipelineExecServiceImpl; -import cd.casic.module.process.process.instance.PipelineInstanceService; -import cd.casic.module.process.stages.service.StageInstanceServer; -import cd.casic.module.process.support.postprocess.service.PostprocessInstanceService; -import cd.casic.module.process.support.util.PipelineUtilService; -import cd.casic.module.process.support.util.util.PipelineFinal; -import cd.casic.module.process.task.code.service.SpotbugsScanService; -import cd.casic.module.process.task.codescan.model.SpotbugsBugSummary; -import cd.casic.module.process.task.deploy.service.TaskDeployInstanceService; -import cd.casic.module.process.task.message.model.TaskMessage; -import cd.casic.module.process.task.task.service.TasksInstanceServiceImpl; -import cd.casic.module.process.task.test.model.MavenTest; -import cd.casic.module.process.task.test.model.TestOnRelevance; -import cd.casic.module.process.task.test.service.MavenTestService; -import cd.casic.module.process.task.test.service.RelevanceTestOnService; -import cd.casic.module.process.ws.server.WebSocketMessageService; -import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -@Service -public class WebSocketMessageServiceImpl implements WebSocketMessageService { - - @Autowired - PipelineService pipelineService; - - @Autowired - PipelineInstanceService pipelineInstanceService; - - @Autowired - StageInstanceServer stageInstanceServer; - - @Autowired - TasksInstanceService tasksInstanceService; - - @Autowired - MavenTestService mavenTestService; - - @Autowired - SpotbugsScanService spotbugsScanService; - - @Autowired - RelevanceTestOnService relevanceTestOnService; - - @Autowired - PipelineUtilService utilService; - - @Autowired - PipelineHomeService homeService; - - @Autowired - PostprocessInstanceService postprocessInstanceService; - - @Autowired - TaskDeployInstanceService deployInstanceService; - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Override - public String distributeMessage(AgentMessage agentMessage){ - String type = agentMessage.getType(); - Object message = agentMessage.getMessage(); - if (type.contains("deploy_instance_log")){ - messageTaskDeployInstanceLogHandle( message); - }else if (type.contains("deploy_end_instance_log")){ - messageTaskDeployInstanceLogHandle(message); - }else if (type.contains("log")){ - logMessageHandle(message); - }else if (type.contains("pipeline_run")){ - pipelineMessageHandle( message); - }else if (type.contains("stage_run")){ - stageMessageHandle(message); - } else if (type.contains("post_run")){ - postMessageHandle(message); - } else if (type.contains("task_run")){ - taskMessageHandle(message); - }else if (type.contains("maven_unittest")){ - mavenTestTaskMessageHandle(message); - }else if (type.contains("task_codescan")){ - codeScanTaskMessageHandle(message); - } else if (type.contains("test_teston_exec")){ - testOnTaskMessageHandle(message); - }else if (type.contains("send_message")){ - messageTaskMessageHandle(message); - } - return null; - } - - /** - * 流水线消息处理 - * @param message 消息内容 - */ - private void pipelineMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - PipelineInstance sourceInstance = JSONObject.parseObject(jsonString,PipelineInstance.class); - // 更新实例状态 - String instanceId = sourceInstance.getInstanceId(); - String runStatus = sourceInstance.getRunStatus(); - PipelineInstance instance = pipelineInstanceService.findOneInstance(instanceId); - int runtime = pipelineInstanceService.findInstanceRuntime(instanceId); - instance.setRunTime(runtime+1); - instance.setRunStatus(runStatus); - pipelineInstanceService.updateInstance(instance); - - // 设置流水线为未运行 - String pipelineId = instance.getPipeline().getId(); - Pipeline pipeline = pipelineService.findPipelineById(pipelineId); - pipeline.setState(1); - pipelineService.updatePipeline(pipeline); - PipelineExecServiceImpl.pipelineIdOrInstanceId.remove(pipelineId); - - sendPipelineRunMessage(pipeline,instanceId,runStatus); - - } - - // 发送消息 - public void sendPipelineRunMessage(Pipeline pipeline,String instanceId,String state){ - Map map = homeService.initMap(pipeline); - map.put("instanceId",instanceId); - map.put("link", PipelineFinal.RUN_LINK); - PipelineInstance instance = pipelineInstanceService.findOneInstance(instanceId); - - switch (state){ - case PipelineFinal.RUN_SUCCESS ->{ - map.put("message","运行成功"); - map.put("execStatus","运行成功"); - map.put("colour","info"); - } - case PipelineFinal.RUN_ERROR ->{ - map.put("colour","warning"); - map.put("message","运行失败"); - map.put("execStatus","运行失败"); - } - case PipelineFinal.RUN_HALT ->{ - map.put("colour","warning"); - map.put("message","停止运程"); - map.put("execStatus","停止运程"); - } - default -> { - map.put("colour","info"); - map.put("message","运行成功"); - map.put("execStatus","运行成功"); - } - } - - String time = PipelineUtil.formatDateTime(instance.getRunTime()); - map.put("execTime",time); - homeService.log(PipelineFinal.LOG_TYPE_RUN, map); - map.put("dmMessage",true); - homeService.settingMessage(PipelineFinal.MES_RUN, map); - } - - /** - * 阶段消息处理 - * @param message 消息内容 - */ - private void stageMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - StageInstance sourceStageInstance = JSONObject.parseObject(jsonString,StageInstance.class); - StageInstance stageInstance = stageInstanceServer.findOneStageInstance(sourceStageInstance.getId()); - stageInstance.setStageTime(sourceStageInstance.getStageTime()); - stageInstance.setStageState(sourceStageInstance.getStageState()); - stageInstanceServer.updateStageInstance(stageInstance); - } - - /** - * 任务消息处理 - * @param message 消息内容 - */ - private void taskMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - - TaskInstance sourceTaskInstance = JSONObject.parseObject(jsonString,TaskInstance.class); - String id = sourceTaskInstance.getId(); - TaskInstance taskInstance = tasksInstanceService.findOneTaskInstance(id); - - TaskInstance mapTaskInstance = TasksInstanceServiceImpl.taskInstanceMap.get(id); - if (!Objects.isNull(mapTaskInstance)){ - String runLog = mapTaskInstance.getRunLog(); - taskInstance.setRunTime(sourceTaskInstance.getRunTime()); - taskInstance.setRunLog(runLog); - taskInstance.setRunState(sourceTaskInstance.getRunState()); - String logAddress = taskInstance.getLogAddress(); - PipelineFileUtil.logWriteFile(runLog,logAddress); - } - tasksInstanceService.updateTaskInstance(taskInstance); - TasksInstanceServiceImpl.taskInstanceMap.remove(taskInstance.getId()); - } - - /** - * 日志消息处理 - * @param message 消息内容 - */ - private void logMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - TaskInstance sourceTaskInstance = JSONObject.parseObject(jsonString,TaskInstance.class); - String id = sourceTaskInstance.getId(); - TaskInstance taskInstance = TasksInstanceServiceImpl.taskInstanceMap.get(id); - if (!Objects.isNull(taskInstance)){ - if (!StringUtils.isEmpty(sourceTaskInstance.getRunLog())){ - sourceTaskInstance.setRunLog(taskInstance.getRunLog()+"\n"+sourceTaskInstance.getRunLog()); - }else { - sourceTaskInstance.setRunLog(taskInstance.getRunLog()); - } - } - updateTaskInstance(sourceTaskInstance); - TasksInstanceServiceImpl.taskInstanceMap.put(sourceTaskInstance.getId(), sourceTaskInstance); - } - - /** - * 日志过长更新 - * @param taskInstance 日志信息 - */ - private void updateTaskInstance(TaskInstance taskInstance){ - if (Objects.isNull(taskInstance)){ - return; - } - - String id = taskInstance.getId(); - TaskInstance oneTaskInstance = tasksInstanceService.findOneTaskInstance(id); - if (Objects.isNull(oneTaskInstance)){ - return; - } - - String runLog = taskInstance.getRunLog(); - if (StringUtils.isEmpty(runLog)){ - return; - } - - String[] split = runLog.split("\n"); - if (taskInstance.getTaskSort() < 2){ - if (split.length < 3){ - return; - } - }else { - if (split.length < 30){ - return; - } - } - String logAddress = oneTaskInstance.getLogAddress(); - logger.info("日志过长，写入文件：{}",logAddress); - - PipelineFileUtil.logWriteFile(runLog,logAddress); - - taskInstance.setRunLog(""); - } - - /** - * 单元测试结果 - * @param message 消息内容 - */ - private void mavenTestTaskMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - MavenTest mavenTest = JSONObject.parseObject(jsonString, MavenTest.class); - String id = mavenTest.getId(); - MavenTest oneMavenTest = mavenTestService.findOneMavenTest(id); - if (Objects.isNull(oneMavenTest)){ - mavenTestService.creatMavenTest(mavenTest); - }else { - mavenTestService.updateMavenTest(mavenTest); - } - } - - /** - * 发送消息结果 - * @param message 消息内容 - */ - private void messageTaskMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - TaskMessage taskMessage = JSONObject.parseObject(jsonString, TaskMessage.class); - Pipeline pipeline = pipelineService.findOnePipeline(taskMessage.getPipelineId()); - Map stringObjectMap = homeService.initMap(pipeline); - stringObjectMap.putAll(taskMessage.getMap()); - homeService.message(stringObjectMap,taskMessage.getList()); - } - - /** - * 发送消息结果 - * @param message 消息内容 - */ - private void messageTaskDeployInstanceLogHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - TaskDeployInstance deployInstance = JSONObject.parseObject(jsonString, TaskDeployInstance.class); - TaskDeployInstance sourceDeployInstance = deployInstanceService.findDeployInstance(deployInstance.getId()); - sourceDeployInstance.setRunStatus(deployInstance.getRunStatus()); - sourceDeployInstance.setRunTime(deployInstance.getRunTime()); - deployInstanceService.updateDeployInstance(sourceDeployInstance); - } - - private void messageTaskDeployInstanceLogEndHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - TaskDeployInstance deployInstance = JSONObject.parseObject(jsonString, TaskDeployInstance.class); - TaskDeployInstance sourceDeployInstance = deployInstanceService.findDeployInstance(deployInstance.getId()); - sourceDeployInstance.setRunStatus(deployInstance.getRunStatus()); - deployInstanceService.updateDeployInstance(sourceDeployInstance); - } - - /** - * 代码扫描结果 - * @param message 消息内容 - */ - private void codeScanTaskMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - SpotbugsBugSummary spotbugsBugSummary = JSONObject.parseObject(jsonString, SpotbugsBugSummary.class); - String xmlFileContent = spotbugsBugSummary.getXmlFileContent(); - String pipelineId = spotbugsBugSummary.getPipelineId(); - - String logAddress = utilService.findPipelineDefaultAddress(pipelineId, 2)+"/spotbugs/spotbugs-"+new Date().getTime()+".xml"; - - PipelineFileUtil.createFile(logAddress); - PipelineFileUtil.logWriteFile(xmlFileContent,logAddress); - logger.info("服务端报保存代码扫描文件：{}", logAddress); - spotbugsBugSummary.setXmlPath(logAddress); - spotbugsScanService.creatSpotbugs(spotbugsBugSummary); - } - - /** - * testOn自动化测试 - * @param message 消息内容 - */ - private void testOnTaskMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - TestOnRelevance testOnRelevance = JSONObject.parseObject(jsonString, TestOnRelevance.class); - relevanceTestOnService.createRelevance(testOnRelevance); - } - - /** - * testOn自动化测试 - * @param message 消息内容 - */ - private void postMessageHandle(Object message){ - String jsonString = JSONObject.toJSONString(message); - PostprocessInstance postprocessInstance = JSONObject.parseObject(jsonString, PostprocessInstance.class); - String instanceId = postprocessInstance.getInstanceId(); - - List postInstanceList = postprocessInstanceService.findPipelinePostInstance(instanceId); - if (postInstanceList.isEmpty()){ - return; - } - PostprocessInstance postInstance = postInstanceList.get(0); - postInstance.setPostState(postprocessInstance.getPostState()); - postprocessInstanceService.updatePostInstance(postInstance); - } - - -} diff --git a/modules/module-ci-repository/pom.xml b/modules/module-ci-repository/pom.xml new file mode 100644 index 00000000..a58fdf48 --- /dev/null +++ b/modules/module-ci-repository/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + cd.casic.boot + modules + ${revision} + + + module-ci-repository + + ${revision} + ${project.artifactId} + + + + + cd.casic.boot + commons + + + + cd.casic.boot + spring-boot-starter-mybatis + + + + cd.casic.boot + spring-boot-starter-security + + + + cd.casic.boot + spring-boot-starter-biz-tenant + + + + cd.casic.boot + module-ci-commons + + + + + com.antherd + sm-crypto + 0.3.2 + + + org.openjdk.nashorn + nashorn-core + 15.4 + + + + org.eclipse.jgit + org.eclipse.jgit + 6.7.0.202309050840-r + + + + \ No newline at end of file diff --git a/modules/module-ci-repository/src/main/java/cd/casic/ci/repository/dal/dataobject/OpsVcsDO.java b/modules/module-ci-repository/src/main/java/cd/casic/ci/repository/dal/dataobject/OpsVcsDO.java index ca28be8c..91bc8abc 100644 --- a/modules/module-ci-repository/src/main/java/cd/casic/ci/repository/dal/dataobject/OpsVcsDO.java +++ b/modules/module-ci-repository/src/main/java/cd/casic/ci/repository/dal/dataobject/OpsVcsDO.java @@ -1,6 +1,6 @@ package cd.casic.ci.repository.dal.dataobject; -import cd.casic.framework.mybatis.core.dataobject.BaseDO; +import cd.casic.framework.commons.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/modules/pom.xml b/modules/pom.xml index 8df221be..c6b28aba 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -10,12 +10,14 @@ + module-ci-commons module-infra-api module-infra-biz module-system-api module-system-biz - module-ci-process-api module-ci-process-biz + module-ci-repository + module-ci-execute modules diff --git a/pom.xml b/pom.xml index 69fdc741..ec8d324f 100644 --- a/pom.xml +++ b/pom.xml @@ -17,12 +17,6 @@ system-framework app-plugins ops-server - modules/module-ci-commons - modules/module-ci-plugin - modules/module-ci-engine - modules/module-ci-market - modules/module-ci-process-api - modules/module-ci-process-biz