diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/JenkinsBuildResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/JenkinsBuildResponse.java index 4738c1a2..6df92c26 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/JenkinsBuildResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/JenkinsBuildResponse.java @@ -151,10 +151,11 @@ public class JenkinsBuildResponse { } @Data + @JsonIgnoreProperties(ignoreUnknown = true) public static class ChangeSetItem { private String commitId; private String author; - private String message; + private String msg; private Long timestamp; private List affectedPaths; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java index 419e3ede..991250e9 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java @@ -560,10 +560,18 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl builds = jenkinsServiceIntegration.listBuilds(externalSystem, job.getJobName()); - return builds.stream() - .filter(b -> b.getNumber().equals(buildNumber)) - .findFirst() - .orElse(null); - } catch (Exception e) { - log.warn("从Jenkins获取构建信息失败: job={}, buildNumber={}, error={}", job.getJobName(), buildNumber, e.getMessage()); - return null; - } - } - /** * 判断状态是否为已完成 */ @@ -869,17 +861,18 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl 0) { commitMessages.append("\n"); } // 截取 commitId 前8位 String shortCommitId = commitId.length() > 8 ? commitId.substring(0, 8) : commitId; - commitMessages.append(String.format("[%s] %s - %s", shortCommitId, message.trim(), author)); + commitMessages.append(String.format("[%s] %s - %s", shortCommitId, msg.trim(), author)); } } }