diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryBranch.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryBranch.java index 5c68953d..78fa296d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryBranch.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryBranch.java @@ -37,9 +37,6 @@ public class RepositoryBranch extends Entity { @Column(name = "last_commit_time") private LocalDateTime lastCommitTime; - @Column(name = "is_protected") - private Boolean isProtected = false; - @Column(name = "developers_can_push") private Boolean developersCanPush = true; @@ -58,6 +55,6 @@ public class RepositoryBranch extends Entity { @Column(name = "project_id", nullable = false) private Long projectId; - @Column(name = "external_system_id") + @Column(name = "external_system_id", nullable = false) private Long externalSystemId; } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/GitServiceIntegrationImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/GitServiceIntegrationImpl.java index ff95334c..33ea1ecb 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/GitServiceIntegrationImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/GitServiceIntegrationImpl.java @@ -130,7 +130,8 @@ public class GitServiceIntegrationImpl implements IGitServiceIntegration { entity, String.class ); - log.info("GitLab API raw response for project {}: {}", projectId, rawResponse.getBody()); + log.info("First branch from GitLab API: {}", + rawResponse.getBody() != null ? rawResponse.getBody().split("},")[0] + "}" : null); // 然后解析为对象 ResponseEntity> response = restTemplate.exchange( @@ -140,12 +141,7 @@ public class GitServiceIntegrationImpl implements IGitServiceIntegration { new ParameterizedTypeReference<>() {} ); - List branches = response.getBody(); - if (branches != null && !branches.isEmpty()) { - log.info("First branch details: {}", branches.get(0)); - } - - return branches != null ? branches : Collections.emptyList(); + return response.getBody() != null ? response.getBody() : Collections.emptyList(); } catch (Exception e) { log.error("Failed to fetch git branches for system: {} and project: {}", system.getName(), projectId, e); return Collections.emptyList(); diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitBranchResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitBranchResponse.java index 38431e9e..73118a17 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitBranchResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/response/GitBranchResponse.java @@ -18,8 +18,6 @@ public class GitBranchResponse { @JsonProperty("default") private Boolean isDefaultBranch; - private Boolean isProtected; - @JsonProperty("can_push") private Boolean canPush; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java index 548c6657..a53fba85 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java @@ -203,7 +203,6 @@ public class RepositoryBranchServiceImpl extends BaseServiceImpl