diff --git a/dependencies/.flattened-pom.xml b/dependencies/.flattened-pom.xml index 43e087d..c8b1b31 100644 --- a/dependencies/.flattened-pom.xml +++ b/dependencies/.flattened-pom.xml @@ -35,6 +35,7 @@ 2.2.7 2.17.0 2.6.10 + 3.2.1 6.0.0-M16 2.3.0 1.18.1 @@ -582,6 +583,11 @@ resilience4j-circuitbreaker ${resilience4j-circuitbreaker.version} + + ognl + ognl + ${ognl.version} + diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindAll.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindAll.java similarity index 88% rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindAll.java rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindAll.java index c6749b2..ff4b83a 100644 --- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindAll.java +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindAll.java @@ -1,4 +1,4 @@ -package cd.casic.ci.commons.join.annototion; +package cd.casic.ci.commons.annotation.join; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindList.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindList.java similarity index 88% rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindList.java rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindList.java index 161f33b..0970745 100644 --- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindList.java +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindList.java @@ -1,4 +1,4 @@ -package cd.casic.ci.commons.join.annototion; +package cd.casic.ci.commons.annotation.join; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindOne.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindOne.java similarity index 88% rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindOne.java rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindOne.java index bacaf7f..858e1bb 100644 --- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindOne.java +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindOne.java @@ -1,4 +1,4 @@ -package cd.casic.ci.commons.join.annototion; +package cd.casic.ci.commons.annotation.join; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/Join.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/Join.java similarity index 89% rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/Join.java rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/Join.java index 61d159d..4a117ac 100644 --- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/Join.java +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/Join.java @@ -1,4 +1,4 @@ -package cd.casic.ci.commons.join.annototion; +package cd.casic.ci.commons.annotation.join; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/JoinProvider.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/JoinProvider.java similarity index 89% rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/JoinProvider.java rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/JoinProvider.java index b0bce70..0b99a6b 100644 --- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/JoinProvider.java +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/JoinProvider.java @@ -1,4 +1,4 @@ -package cd.casic.ci.commons.join.annototion; +package cd.casic.ci.commons.annotation.join; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/rpc/annototion/Exporter.java b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/rpc/Exporter.java similarity index 91% rename from modules/module-ci-commons/src/main/java/cd/casic/ci/commons/rpc/annototion/Exporter.java rename to modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/rpc/Exporter.java index 128cc62..70e5a65 100644 --- a/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/rpc/annototion/Exporter.java +++ b/modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/rpc/Exporter.java @@ -1,4 +1,4 @@ -package cd.casic.ci.commons.rpc.annototion; +package cd.casic.ci.commons.annotation.rpc; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java index 91ac007..2828680 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java @@ -98,32 +98,33 @@ public class PipelineExecServiceImpl implements PipelineExecService { public final Logger logger = LoggerFactory.getLogger(PipelineExecServiceImpl.class); //流水线id:流水线实例id - public static final Map pipelineIdOrInstanceId = new HashMap<>(); + public static final Map pipelineIdOrInstanceId = new HashMap<>(); //流水线id:agent - public static final Map pipelineIdOrAgentId = new HashMap<>(); + public static final Map pipelineIdOrAgentId = new HashMap<>(); /** * 流水线开始运行 + * * @param runMsg 流水线id * @return 是否正在运行 */ @Override public PipelineInstance start(PipelineRunMsg runMsg) { Agent agent; - if (StringUtils.isEmpty(runMsg.getAgentId())){ + if (StringUtils.isEmpty(runMsg.getAgentId())) { agent = agentService.findDefaultAgent(); - }else { + } else { agent = agentService.findAgent(runMsg.getAgentId()); } - if (Objects.isNull(agent)){ - throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(),"无法获取到流水线执行Agent！"); + 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断开连接，无法执行。"); + if (Objects.isNull(session)) { + throw new ServiceException(GlobalErrorCodeConstants.LOCKED.getCode(), "流水线Agent断开连接，无法执行。"); } // 判断同一任务是否在运行 @@ -145,15 +146,16 @@ public class PipelineExecServiceImpl implements PipelineExecService { /** * 放入正在执行的流水线缓存中 + * * @param runMsg 流水线id * @return 流水线信息 */ - public Pipeline validExecPipeline(PipelineRunMsg runMsg){ + public Pipeline validExecPipeline(PipelineRunMsg runMsg) { String pipelineId = runMsg.getPipelineId(); List allMainStage = stageService.findAllMainStage(pipelineId); - if (allMainStage.isEmpty()){ - throw new ServiceException(2000,"当前流水线不存在可构建任务！"); + if (allMainStage.isEmpty()) { + throw new ServiceException(2000, "当前流水线不存在可构建任务！"); } Boolean isVip = versionService.isVip(); @@ -163,25 +165,26 @@ public class PipelineExecServiceImpl implements PipelineExecService { int size = pipelineIdOrInstanceId.size(); // 资源限制放入缓存中等待执行 - if ((!isVip && size >= 2) || (isVip && size >= 4) ){ - throw new ServiceException(2000,"并行任务已满，等待执行！"); + if ((!isVip && size >= 2) || (isVip && size >= 4)) { + throw new ServiceException(2000, "并行任务已满，等待执行！"); } return pipeline; } /** * 执行流水线 + * * @param runMsg 流水线信息 * @return 流水线实例 */ - public PipelineInstance beginExecPipeline(PipelineRunMsg runMsg){ + 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()); + logger.info("流水线{}开始运行", pipeline.getName()); PipelineInstance pipelineInstance = pipelineInstanceService.initializeInstance(runMsg); // 添加到缓存 String instanceId = pipelineInstance.getInstanceId(); @@ -212,8 +215,8 @@ public class PipelineExecServiceImpl implements PipelineExecService { pipelineDetails.setPostprocessList(postprocessList); // 数据路径，源码，日志保存 - String sourceDir = utilService.findPipelineDefaultAddress(pipelineId,1); - String logDir = utilService.findPipelineDefaultAddress(pipelineId,2); + String sourceDir = utilService.findPipelineDefaultAddress(pipelineId, 1); + String logDir = utilService.findPipelineDefaultAddress(pipelineId, 2); pipelineDetails.setSourceDir(sourceDir); pipelineDetails.setLogDir(logDir); @@ -236,27 +239,27 @@ public class PipelineExecServiceImpl implements PipelineExecService { WebSocketSession session = SocketServerHandler.sessionMap.get(id); if (Objects.isNull(session)) { - throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息："+id); + throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息：" + id); } try { - SocketServerHandler.instance().sendHandleMessage(id,agentMessage); + SocketServerHandler.instance().sendHandleMessage(id, agentMessage); } catch (Exception e) { throw new SystemException("客户端推送消息失败,错误信息：" + e.getMessage()); } - }catch (Exception e){ - logger.error("流水线执行出错了：{}",e.getMessage() ); + } catch (Exception e) { + logger.error("流水线执行出错了：{}", e.getMessage()); stop(pipelineId); } return pipelineInstance; } @Override - public void stop(String pipelineId){ + public void stop(String pipelineId) { Pipeline pipeline = pipelineService.findPipelineById(pipelineId); Agent agent = pipelineIdOrAgentId.get(pipelineId); - if (Objects.isNull(agent)){ + if (Objects.isNull(agent)) { pipeline.setState(1); pipelineService.updatePipeline(pipeline); @@ -280,8 +283,8 @@ public class PipelineExecServiceImpl implements PipelineExecService { agentMessage.setType("stop"); agentMessage.setMessage(pipelineId); agentMessage.setPipelineId(pipelineId); - SocketServerHandler.instance().sendHandleMessage(agent.getAddress(),agentMessage); - }catch (Exception e){ + SocketServerHandler.instance().sendHandleMessage(agent.getAddress(), agentMessage); + } catch (Exception e) { logger.error(e.getMessage()); } @@ -305,7 +308,7 @@ public class PipelineExecServiceImpl implements PipelineExecService { removeExecCache(pipelineId); } - public void removeExecCache(String pipelineId){ + public void removeExecCache(String pipelineId) { String instanceId = pipelineIdOrInstanceId.get(pipelineId); PipelineInstanceServiceImpl.runTimeMap.remove(instanceId); pipelineInstanceService.stopThread(instanceId); @@ -313,7 +316,7 @@ public class PipelineExecServiceImpl implements PipelineExecService { } @Override - public void keepOn(String pipelineId){ + public void keepOn(String pipelineId) { Agent agent = pipelineIdOrAgentId.get(pipelineId); String id = agent.getAddress(); AgentMessage agentMessage = new AgentMessage(); @@ -322,11 +325,11 @@ public class PipelineExecServiceImpl implements PipelineExecService { agentMessage.setPipelineId(pipelineId); WebSocketSession session = SocketServerHandler.sessionMap.get(id); if (Objects.isNull(session)) { - throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息："+id); + throw new SystemException("客户端推送消息失败，无法获取客户端连接,客户端信息：" + id); } try { - SocketServerHandler.instance().sendHandleMessage(id,agentMessage); + 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/support/postprocess/service/PostprocessService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java index 644e9e8..d2cd211 100644 --- 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 @@ -1,7 +1,7 @@ package cd.casic.module.process.support.postprocess.service; import cd.casic.ci.commons.bean.engine.postprocess.Postprocess; -import cd.casic.ci.commons.join.annototion.JoinProvider; +import cd.casic.ci.commons.annotation.join.JoinProvider; import java.util.List; 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 index ad1c534..38e9c75 100644 --- 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 @@ -1,8 +1,8 @@ package cd.casic.module.process.support.trigger.service; -import cd.casic.ci.commons.join.annototion.FindList; -import cd.casic.ci.commons.join.annototion.FindOne; -import cd.casic.ci.commons.join.annototion.JoinProvider; +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; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java index a85d07d..8de5e82 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java @@ -2,7 +2,7 @@ package cd.casic.module.process.support.trigger.service.impl; import cd.casic.ci.commons.bean.process.definition.Pipeline; import cd.casic.ci.commons.bean.utils.PipelineUtil; -import cd.casic.ci.commons.rpc.annototion.Exporter; +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; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java index d761927..925db3a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java @@ -3,7 +3,7 @@ package cd.casic.module.process.support.trigger.service.impl; import cd.casic.ci.commons.bean.exception.ApplicationException; -import cd.casic.ci.commons.rpc.annototion.Exporter; +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; 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 index c077775..3780195 100644 --- 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 @@ -7,10 +7,10 @@ package cd.casic.module.process.task.artifact.service; * @Version 1.0 */ -import cd.casic.ci.commons.join.annototion.FindAll; -import cd.casic.ci.commons.join.annototion.FindList; -import cd.casic.ci.commons.join.annototion.FindOne; -import cd.casic.ci.commons.join.annototion.JoinProvider; +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; 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 index 0898ba8..f2a693a 100644 --- 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 @@ -2,7 +2,7 @@ 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.rpc.annototion.Exporter; +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; 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 index 903bae1..cae1189 100644 --- 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 @@ -10,10 +10,10 @@ package cd.casic.module.process.task.build.service; -import cd.casic.ci.commons.join.annototion.FindAll; -import cd.casic.ci.commons.join.annototion.FindList; -import cd.casic.ci.commons.join.annototion.FindOne; -import cd.casic.ci.commons.join.annototion.JoinProvider; +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; 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 index d1e6cf6..3027999 100644 --- 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 @@ -8,7 +8,7 @@ package cd.casic.module.process.task.build.service.impl; * @Version 1.0 */ -import cd.casic.ci.commons.rpc.annototion.Exporter; +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; @@ -17,7 +17,6 @@ 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; 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 index abfdb2d..222eeb5 100644 --- 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 @@ -8,7 +8,7 @@ package cd.casic.module.process.task.build.service.impl; * @Version 1.0 */ -import cd.casic.ci.commons.rpc.annototion.Exporter; +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; @@ -17,7 +17,6 @@ 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; 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 index 9a054a4..5a1bce1 100644 --- 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 @@ -7,10 +7,10 @@ package cd.casic.module.process.task.code.service; * @Version 1.0 */ -import cd.casic.ci.commons.join.annototion.FindAll; -import cd.casic.ci.commons.join.annototion.FindList; -import cd.casic.ci.commons.join.annototion.FindOne; -import cd.casic.ci.commons.join.annototion.JoinProvider; +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; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java index fc5927c..a622120 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java @@ -10,7 +10,7 @@ package cd.casic.module.process.task.code.service.impl; import cd.casic.ci.commons.bean.process.setting.AuthThird; -import cd.casic.ci.commons.rpc.annototion.Exporter; +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; @@ -27,7 +27,6 @@ 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java index 5e1218f..f18b464 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java @@ -9,7 +9,7 @@ package cd.casic.module.process.task.codescan.service.impl; import cd.casic.ci.commons.bean.process.setting.AuthThird; import cd.casic.ci.commons.bean.utils.PipelineUtil; -import cd.casic.ci.commons.rpc.annototion.Exporter; +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;