From 0d9b82b61af8b0c9b0cee35cffe2b167da7a8dd0 Mon Sep 17 00:00:00 2001
From: cgw <guowei.cao@weimob.com>
Date: Sun, 27 Nov 2022 21:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7gitlab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/strategy/repo/GitLabCodeRepoStrategy.java  | 4 ++--
 pom.xml                                                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/repo/GitLabCodeRepoStrategy.java b/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/repo/GitLabCodeRepoStrategy.java
index 03b73759..93531239 100644
--- a/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/repo/GitLabCodeRepoStrategy.java
+++ b/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/repo/GitLabCodeRepoStrategy.java
@@ -40,7 +40,7 @@ public class GitLabCodeRepoStrategy extends CodeRepoStrategy {
 
 	@Override
 	public boolean doDownloadBranch(DeployContext context) {
-		int appId = Integer.parseInt(context.getApp().getCodeRepoPath());
+		String appId = context.getApp().getCodeRepoPath();
 		String branchName = context.getBranchName();
 		GitLabApi gitLabApi = gitLabApi(context.getGlobalConfigAgg().getCodeRepo());
 		try {
@@ -103,7 +103,7 @@ public void mergeBranch(DeployContext context) {
 		MergeRequestApi mergeRequestApi = gitLabApi.getMergeRequestApi();
 		MergeRequestFilter filter = new MergeRequestFilter();
 		filter.setState(MergeRequestState.OPENED);
-		filter.setProjectId(Integer.valueOf(context.getApp().getCodeRepoPath()));
+		filter.setProjectId(Long.valueOf(context.getApp().getCodeRepoPath()));
 		MergeRequest mergeRequest = null;
 		try {
 			//1.如果存在未合并的请求，直接报错
diff --git a/pom.xml b/pom.xml
index 04c14080..625c4989 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
 			<dependency>
 				<groupId>org.gitlab4j</groupId>
 				<artifactId>gitlab4j-api</artifactId>
-				<version>4.17.0</version>
+				<version>5.0.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
@@ -138,7 +138,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>30.1.1-jre</version>
+				<version>31.1-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>io.kubernetes</groupId>