diff --git a/src/main/java/com/gitee/jenkins/gitee/hook/model/WebHook.java b/src/main/java/com/gitee/jenkins/gitee/hook/model/WebHook.java index 60abcdecad58f9366bef32a53590e7243932baa4..dd233238d47f9db89b5adeecb8532aa79c643d96 100644 --- a/src/main/java/com/gitee/jenkins/gitee/hook/model/WebHook.java +++ b/src/main/java/com/gitee/jenkins/gitee/hook/model/WebHook.java @@ -14,6 +14,7 @@ public abstract class WebHook { private String objectKind; private String hookName; private String jsonBody; + private User sender; public String getJsonBody() { return this.jsonBody; } @@ -43,6 +44,14 @@ public abstract class WebHook { this.repository = repository; } + public User getSender() { + return sender; + } + + public void setSender(User sender) { + this.sender = sender; + } + public String getWebHookDescription() { return hookName; } @@ -60,6 +69,7 @@ public abstract class WebHook { .append(repository, webHook.repository) .append(objectKind, webHook.objectKind) .append(hookName, webHook.hookName) + .append(sender, webHook.sender) .isEquals(); } @@ -69,6 +79,7 @@ public abstract class WebHook { .append(repository) .append(hookName) .append(objectKind) + .append(sender) .toHashCode(); } @@ -78,6 +89,7 @@ public abstract class WebHook { .append("repository", repository) .append("hookName", hookName) .append("objectKind", objectKind) + .append("sender", sender) .toString(); } } 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 4eb48f754a13c9885fd242a6b7cf95f9f95b2c80..27137624a3a4b935e772f2e37052bdfd79567e27 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 @@ -170,7 +170,7 @@ class NoteHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler .withTargetNamespace(hook.getProject().getNamespace()) .withTargetRepoSshUrl(hook.getProject().getSshUrl()) .withTargetRepoHttpUrl(hook.getProject().getGitHttpUrl()) - .withTriggeredByUser(hook.getComment().getUser().getName()) + .withTriggeredByUser(hook.getSender().getName()) .withTriggerPhrase(hook.getComment().getBody()) .withSha(hook.getComment().getCommitId()) .withPathWithNamespace(hook.getProject().getPathWithNamespace()) @@ -201,7 +201,7 @@ class NoteHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler .withTargetNamespace(hook.getPullRequest().getTarget().getNamespace()) .withTargetRepoSshUrl(hook.getPullRequest().getTarget().getSshUrl()) .withTargetRepoHttpUrl(hook.getPullRequest().getTarget().getGitHttpUrl()) - .withTriggeredByUser(hook.getPullRequest().getHead().getUser().getName()) + .withTriggeredByUser(hook.getSender().getName()) .withLastCommit(hook.getPullRequest().getMergeCommitSha()) .withSha(hook.getPullRequest().getMergeCommitSha()) .withAfter(hook.getPullRequest().getMergeCommitSha()) diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImpl.java b/src/main/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImpl.java index 0b0a193244a83e53dd0bc26b8a519dd6ac54ea19..285a6ffe0ac2c2b95fe6f204c4da3fb8b5f4c15e 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImpl.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImpl.java @@ -228,7 +228,7 @@ class PullRequestHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler .withTargetNamespace("") .withTargetRepoSshUrl("") .withTargetRepoHttpUrl("") - .withTriggeredByUser(retrievePushedBy(hook)) + .withTriggeredByUser(hook.getSender().getName()) .withBefore(hook.getBefore()) .withAfter(hook.getAfter()) .withRef(hook.getRef())