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

annotation位置修改

Browse Source
This commit is contained in:
mianbin 2025-05-07 14:45:14 +08:00
parent 0eab7cbf4f
commit 296ac900f7
20 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dependencies/.flattened-pom.xml vendored
View File

@ -35,6 +35,7 @@
<lock4j.version>2.2.7</lock4j.version>
<commons-io.version>2.17.0</commons-io.version>
<apk-parser.version>2.6.10</apk-parser.version>
<ognl.version>3.2.1</ognl.version>
<hutool-6.version>6.0.0-M16</hutool-6.version>
<resilience4j-circuitbreaker.version>2.3.0</resilience4j-circuitbreaker.version>
<jsoup.version>1.18.1</jsoup.version>
@ -582,6 +583,11 @@
<artifactId>resilience4j-circuitbreaker</artifactId>
<version>${resilience4j-circuitbreaker.version}</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>${ognl.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

2
modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindAll.java → modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindAll.java
View File

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

2
modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindList.java → modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindList.java
View File

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

2
modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/FindOne.java → modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindOne.java
View File

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

2
modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/Join.java → modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/Join.java
View File

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

2
modules/module-ci-commons/src/main/java/cd/casic/ci/commons/join/annototion/JoinProvider.java → modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/JoinProvider.java
View File

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

2
modules/module-ci-commons/src/main/java/cd/casic/ci/commons/rpc/annototion/Exporter.java → modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/rpc/Exporter.java
View File

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

61
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/pipeline/execute/service/impl/PipelineExecServiceImpl.java
View File

@ -98,32 +98,33 @@ public class PipelineExecServiceImpl implements PipelineExecService {
public final Logger logger = LoggerFactory.getLogger(PipelineExecServiceImpl.class);
//流水线id:流水线实例id
public static final Map<String,String> pipelineIdOrInstanceId = new HashMap<>();
public static final Map<String, String> pipelineIdOrInstanceId = new HashMap<>();
//流水线id:agent
public static final Map<String , Agent> pipelineIdOrAgentId = new HashMap<>();
public static final Map<String, Agent> 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<Stage> 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());
}

2
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java
View File

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

6
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerTimeService.java
View File

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

2
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java
View File

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

2
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java
View File

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

8
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactService.java
View File

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

2
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactServiceImpl.java
View File

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

8
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildService.java
View File

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

3
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildProductServiceImpl.java
View File

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

3
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildServiceImpl.java
View File

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

8
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeService.java
View File

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

3
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java
View File

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

2
modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java
View File

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