fix:修改了url地址

web/src/main/java/cn/seecoder/web/core/pipeline/handler/JavaImageBuildHandler.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.core.pipeline.handler;
 
+import cn.seecoder.api.ApplicationProperties;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
 import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
@@ -17,6 +18,7 @@ import org.eclipse.jgit.lib.Ref;
 import cn.seecoder.api.docker.DockerApi;
 import cn.seecoder.api.git.GitApi;
 import cn.seecoder.common.util.SpringUtil;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -37,13 +39,16 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 public class JavaImageBuildHandler extends AbstractHandler {
 
-    public final DockerApi dockerApi;
+    private final DockerApi dockerApi;
 
-    public final GitApi gitApi;
+    private final GitApi gitApi;
+
+    private final ApplicationProperties applicationProperties;
 
     public JavaImageBuildHandler() {
         dockerApi = SpringUtil.getBean(DockerApi.class);
         gitApi = SpringUtil.getBean(GitApi.class);
+        this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
     }
 
     private String repoUrl;
@@ -63,6 +68,8 @@ public class JavaImageBuildHandler extends AbstractHandler {
         try {
             //注：temp文件/目录系统会定时删，实际文件名喂 prefix + 它生成的suffix随机数，所以不会命名冲突
             directory = Files.createTempDirectory("seecoder-devcloud-");
+            UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(repoUrl);
+            repoUrl = builder.scheme("http").host(applicationProperties.getGitlab().getHost().replace("http://","")).path(".git/").toUriString();
             Git git = gitApi.clone(repoUrl, directory.toString());
             git.checkout().setCreateBranch(false).setStartPoint("origin/" + branchName).setName("origin/" + branchName).call();
         } catch (Exception e) {

web/src/main/java/cn/seecoder/web/core/pipeline/handler/NodeImageBuildHandler.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.core.pipeline.handler;
 
+import cn.seecoder.api.ApplicationProperties;
 import cn.seecoder.web.core.pipeline.Context;
 import cn.seecoder.web.core.pipeline.PipelineException;
 import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
@@ -16,6 +17,7 @@ import org.eclipse.jgit.api.Git;
 import cn.seecoder.api.docker.DockerApi;
 import cn.seecoder.api.git.GitApi;
 import cn.seecoder.common.util.SpringUtil;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -33,16 +35,19 @@ import java.util.Date;
 @Slf4j
 @EqualsAndHashCode(callSuper=false)
 public class NodeImageBuildHandler extends AbstractHandler{
-    public final DockerApi dockerApi;
+    private final DockerApi dockerApi;
 
-    public final GitApi gitApi;
+    private final GitApi gitApi;
 
-    public final PipelineService pipelineService;
+    private final PipelineService pipelineService;
+
+    private final ApplicationProperties applicationProperties;
 
     public NodeImageBuildHandler() {
         dockerApi = SpringUtil.getBean(DockerApi.class);
         gitApi = SpringUtil.getBean(GitApi.class);
         pipelineService = SpringUtil.getBean(PipelineService.class);
+        applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
     }
 
     private String repoUrl;
@@ -62,6 +67,8 @@ public class NodeImageBuildHandler extends AbstractHandler{
         try {
             //注：temp文件/目录系统会定时删，实际文件名喂 prefix + 它生成的suffix随机数，所以不会命名冲突
             directory = Files.createTempDirectory("seecoder-devcloud-");
+            UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(repoUrl);
+            repoUrl = builder.scheme("http").host(applicationProperties.getGitlab().getHost().replace("http://","")).path(".git/").toUriString();
             Git git = gitApi.clone(repoUrl, directory.toString());
             git.checkout().setName(branchName).call();
         } catch (Exception e) {

web/src/main/java/cn/seecoder/web/core/pipeline/handler/SonarJavaImageBuildHandler.java

@@ -67,7 +67,7 @@ public class SonarJavaImageBuildHandler extends AbstractHandler {
         String repoUrl = project.getGitRemoteUrl();
         // convert url for local test
         UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(repoUrl);
-        repoUrl = builder.scheme("http").host("environment-2-2.seec.svc.cluster.local").path(".git/").toUriString();
+        repoUrl = builder.scheme("http").host(applicationProperties.getGitlab().getHost().replace("http://","")).path(".git/").toUriString();
         BranchVO branch = branchService.getBranchByName(projectId, branchOrHash);
         String commitHash;
         boolean isBranch;