From c09d82e7b5e173b254dceab3de54e6ff6f3a5f50 Mon Sep 17 00:00:00 2001 From: dengqichen Date: Sat, 15 Nov 2025 10:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/JenkinsServiceIntegrationImpl.java | 11 ++++------- .../deploy/backend/framework/enums/ResponseCode.java | 3 +-- backend/src/main/resources/messages.properties | 1 - backend/src/main/resources/messages_en_US.properties | 1 - backend/src/main/resources/messages_zh_CN.properties | 1 - 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/JenkinsServiceIntegrationImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/JenkinsServiceIntegrationImpl.java index 0973a798..24a79399 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/JenkinsServiceIntegrationImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/JenkinsServiceIntegrationImpl.java @@ -452,13 +452,9 @@ public class JenkinsServiceIntegrationImpl extends BaseExternalSystemIntegration throw new BusinessException(ResponseCode.JENKINS_API_ERROR, new Object[] {200, "队列信息为空"}); } - // 检查是否被取消 - Boolean cancelled = (Boolean) queueInfo.get("cancelled"); - if (Boolean.TRUE.equals(cancelled)) { - throw new BusinessException(ResponseCode.JENKINS_BUILD_CANCELLED_IN_QUEUE); - } - // 检查是否已开始执行 + // 注意：即使 cancelled=true，Jenkins 也可能已分配 buildNumber + // 此时应继续获取 buildNumber，让后续 pollBuildStatus 检测到 ABORTED 状态 Map executable = (Map) queueInfo.get("executable"); if (executable != null) { return new JenkinsQueueBuildInfoResponse( @@ -466,7 +462,8 @@ public class JenkinsServiceIntegrationImpl extends BaseExternalSystemIntegration (String) executable.get("url") ); } - // 还在队列中 + + // 还在队列中等待 return null; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java index 5816cb8b..d9495ff9 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java @@ -252,8 +252,7 @@ public enum ResponseCode { JENKINS_QUEUE_TIMEOUT(3205, "jenkins.queue.timeout"), JENKINS_BUILD_TIMEOUT(3206, "jenkins.build.timeout"), JENKINS_API_ERROR(3207, "jenkins.api.error"), - JENKINS_RESPONSE_PARSE_ERROR(3208, "jenkins.response.parse.error"), - JENKINS_BUILD_CANCELLED_IN_QUEUE(3209, "jenkins.build.cancelled.in.queue"); + JENKINS_RESPONSE_PARSE_ERROR(3208, "jenkins.response.parse.error"); private final int code; private final String messageKey; // 国际化消息key diff --git a/backend/src/main/resources/messages.properties b/backend/src/main/resources/messages.properties index 592edb3a..eab4256a 100644 --- a/backend/src/main/resources/messages.properties +++ b/backend/src/main/resources/messages.properties @@ -275,4 +275,3 @@ jenkins.queue.timeout=Jenkins构建队列超时，等待时间超过{0}秒 jenkins.build.timeout=Jenkins构建超时：job={0}, buildNumber={1}, 超时时间{2}分钟 jenkins.api.error=Jenkins API调用失败：HTTP {0}, {1} jenkins.response.parse.error=Jenkins响应解析失败：{0} -jenkins.build.cancelled.in.queue=Jenkins构建在队列中被取消 diff --git a/backend/src/main/resources/messages_en_US.properties b/backend/src/main/resources/messages_en_US.properties index 52bca48d..131a5aa5 100644 --- a/backend/src/main/resources/messages_en_US.properties +++ b/backend/src/main/resources/messages_en_US.properties @@ -208,4 +208,3 @@ jenkins.queue.timeout=Jenkins build queue timeout, waited more than {0} seconds jenkins.build.timeout=Jenkins build timeout: job={0}, buildNumber={1}, timeout {2} minutes jenkins.api.error=Jenkins API call failed: HTTP {0}, {1} jenkins.response.parse.error=Jenkins response parse error: {0} -jenkins.build.cancelled.in.queue=Jenkins build was cancelled in queue diff --git a/backend/src/main/resources/messages_zh_CN.properties b/backend/src/main/resources/messages_zh_CN.properties index a393b2a4..1897b0c0 100644 --- a/backend/src/main/resources/messages_zh_CN.properties +++ b/backend/src/main/resources/messages_zh_CN.properties @@ -208,4 +208,3 @@ jenkins.queue.timeout=Jenkins构建队列超时，等待时间超过{0}秒 jenkins.build.timeout=Jenkins构建超时：job={0}, buildNumber={1}, 超时时间{2}分钟 jenkins.api.error=Jenkins API调用失败：HTTP {0}, {1} jenkins.response.parse.error=Jenkins响应解析失败：{0} -jenkins.build.cancelled.in.queue=Jenkins构建在队列中被取消