diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java b/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java index d86220e97dcc4104b990a57a8bcab37dd2679848..b3ce04612a100a35535d8dc1ae5a947486583670 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java @@ -15,7 +15,6 @@ import hudson.scm.SCM; import jenkins.model.ParameterizedJobMixIn; import jenkins.triggers.SCMTriggerItem; import net.karneim.pojobuilder.GeneratePojoBuilder; -import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.URIish; import org.jenkinsci.plugins.workflow.job.WorkflowRun; @@ -23,8 +22,6 @@ import javax.servlet.ServletException; import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -90,22 +87,10 @@ public abstract class AbstractWebHookTriggerHandler implement protected abstract BuildStatusUpdate retrieveBuildStatusUpdate(H hook); - protected URIish retrieveUrIish(WebHook hook, GitSCM gitSCM) { - if (hook.getRepository() == null || gitSCM == null) { - return null; - } + protected URIish retrieveUrIish(WebHook hook) { try { - Set set = new HashSet<>(); - set.add(new URIish(hook.getRepository().getUrl())); - set.add(new URIish(hook.getRepository().getGitHttpUrl())); - set.add(new URIish(hook.getRepository().getGitSshUrl())); - // uri 需与当前项目仓库个url一致,避免触发多个构建 - for (RemoteConfig remote : gitSCM.getRepositories()) { - for (URIish remoteURL : remote.getURIs()) { - if (set.contains(remoteURL)) { - return remoteURL; - } - } + if (hook.getRepository() != null) { + return new URIish(hook.getRepository().getUrl()); } } catch (URISyntaxException e) { LOGGER.log(Level.WARNING, "could not parse URL"); diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java b/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java index 27137624a3a4b935e772f2e37052bdfd79567e27..7da6aa025c6384d5a354b1059a8e52ab446449d8 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java @@ -220,7 +220,7 @@ class NoteHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler if (gitSCM == null) { return new RevisionParameterAction(retrieveRevisionToBuild(hook)); } - URIish urIish = retrieveUrIish(hook, gitSCM); + URIish urIish = retrieveUrIish(hook); // webhook与git源码管理仓库对不上 if (urIish == null) { return new RevisionParameterAction(retrieveRevisionToBuild2(hook)); diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java b/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java index 247307eb37b393cf5984c8d90bd43d6ebf225691..c091a81c937cdeb8ff6e4f183174e0f60514e58f 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java @@ -133,7 +133,7 @@ class PipelineHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler @Override protected RevisionParameterAction createRevisionParameter(PushHook hook, GitSCM gitSCM) throws NoRevisionToBuildException { - return new RevisionParameterAction(retrieveRevisionToBuild(hook, gitSCM), retrieveUrIish(hook, gitSCM)); + return new RevisionParameterAction(retrieveRevisionToBuild(hook, gitSCM), retrieveUrIish(hook)); } @Override