Merge branch 'release-2.4.1' into 'master'

Release 2.4.1 See merge request hand-yanqianyun-yq-devops/gitlab-service!31
open-hand · May 5, 2023 · 085c2a1 · 085c2a1
2 parents 238bdb5 + 65d222b
commit 085c2a1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/JobController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/JobController.java
@@ -114,7 +114,8 @@ public ResponseEntity<Job> play(
             @ApiParam(value = "jobId", required = true)
             @PathVariable Integer jobId,
             @ApiParam(value = "userId")
-            @RequestParam(value = "userId", required = false) Integer userId) {
-        return ResponseEntity.ok(jobService.play(projectId, userId, jobId));
+            @RequestParam(value = "userId", required = false) Integer userId,
+            AppExternalConfigDTO appExternalConfigDTO) {
+        return ResponseEntity.ok(jobService.play(projectId, userId, jobId, appExternalConfigDTO));
     }
 }
diff --git a/src/main/java/io/choerodon/gitlab/app/service/JobService.java b/src/main/java/io/choerodon/gitlab/app/service/JobService.java
@@ -32,7 +32,7 @@ public interface JobService {
     String queryTrace(Integer projectId, Integer userId, Integer jobId, AppExternalConfigDTO appExternalConfigDTO);
 
 
-    Job play(Integer projectId, Integer userId, Integer jobId);
+    Job play(Integer projectId, Integer userId, Integer jobId, AppExternalConfigDTO appExternalConfigDTO);
 
     Job retry(Integer projectId, Integer userId, Integer jobId, AppExternalConfigDTO appExternalConfigDTO);
 }
diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/JobServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/JobServiceImpl.java
@@ -81,9 +81,15 @@ public Job retry(Integer projectId, Integer userId, Integer jobId, AppExternalCo
     }
 
     @Override
-    public Job play(Integer projectId, Integer userId, Integer jobId) {
+    public Job play(Integer projectId, Integer userId, Integer jobId, AppExternalConfigDTO appExternalConfigDTO) {
         try {
-            return gitlab4jclient.getGitLabApi(userId)
+            GitLabApi gitLabApi;
+            if (appExternalConfigDTO == null || appExternalConfigDTO.getGitlabUrl() == null) {
+                gitLabApi = gitlab4jclient.getGitLabApi(userId);
+            } else {
+                gitLabApi = ExternalGitlabApiUtil.createGitLabApi(appExternalConfigDTO);
+            }
+            return gitLabApi
                     .getJobApi().playJob(projectId, jobId);
         } catch (GitLabApiException e) {
             throw new FeignException(e.getMessage(), e);