> getRequiredContext() {
+ return ImmutableSet.of(TaskListener.class, Run.class);
+ }
+
}
+
}
diff --git a/src/main/resources/com/gitee/jenkins/cause/GiteeWebHookCause/description.jelly b/src/main/resources/com/gitee/jenkins/cause/GiteeWebHookCause/description.jelly
index 37e85ef37f9496db3c5bb03618f37fafbc8b371d..acde758e3b307b81e4bca8a6915e1c926b1786c4 100644
--- a/src/main/resources/com/gitee/jenkins/cause/GiteeWebHookCause/description.jelly
+++ b/src/main/resources/com/gitee/jenkins/cause/GiteeWebHookCause/description.jelly
@@ -1,4 +1,6 @@
-
+
+
+
diff --git a/src/main/resources/com/gitee/jenkins/config/GiteeApiTokenConfig/credentials.jelly b/src/main/resources/com/gitee/jenkins/config/GiteeApiTokenConfig/credentials.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..1af5b85e2d419166f4a1a04a357fef4d6b5b82fa
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeApiTokenConfig/credentials.jelly
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeApiTokenImpl/credentials.properties b/src/main/resources/com/gitee/jenkins/config/GiteeApiTokenConfig/credentials.properties
similarity index 100%
rename from src/main/resources/com/gitee/jenkins/connection/GiteeApiTokenImpl/credentials.properties
rename to src/main/resources/com/gitee/jenkins/config/GiteeApiTokenConfig/credentials.properties
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeApiTokenImpl/credentials_zh_CN.properties b/src/main/resources/com/gitee/jenkins/config/GiteeApiTokenConfig/credentials_zh_CN.properties
similarity index 100%
rename from src/main/resources/com/gitee/jenkins/connection/GiteeApiTokenImpl/credentials_zh_CN.properties
rename to src/main/resources/com/gitee/jenkins/config/GiteeApiTokenConfig/credentials_zh_CN.properties
diff --git a/src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config.jelly b/src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..95991065a2d4f25a5effacf3380ecc350e4c6fc9
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config.jelly
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config.properties b/src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config.properties
similarity index 81%
rename from src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config.properties
rename to src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config.properties
index 544c0c5887ce26b0ceaaa07bc3412dacea99802c..1d12a0b018b41110a453b882b7eb38220901ede6 100644
--- a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config.properties
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config.properties
@@ -1,5 +1,3 @@
-Gitee.connections=Gitee connections
-Enable.authentication.end.point=Enable authentication for '/project' end-point
Connection.name=Connection name
Gitee.host.URL=Gitee host URL
Gitee.host.desc=The complete URL to the Gitee server (e.g. http://gitee.com)
@@ -12,4 +10,3 @@ Read.timeout.seconds=Read timeout (in seconds)
Read.timeout.desc=The time to wait while receiving the response
Test.Connection=Test Connection
Testing=Testing...
-Gitee.config=Gitee Configuration
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config_zh_CN.properties b/src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config_zh_CN.properties
similarity index 84%
rename from src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config_zh_CN.properties
rename to src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config_zh_CN.properties
index aee8561aaadab97535a73adf54252dcf131f7991..cf1c34f47e009fa7f70563349b63eb05b4597d21 100644
--- a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config_zh_CN.properties
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeConnectionConfig/config_zh_CN.properties
@@ -1,5 +1,3 @@
-Gitee.connections=Gitee \u94FE\u63A5
-Enable.authentication.end.point=\u5F00\u542F '/project' \u8DEF\u7531\u9A8C\u8BC1
Connection.name=\u94FE\u63A5\u540D
Gitee.host.URL=Gitee \u57DF\u540D URL
Gitee.host.desc=Gitee \u57DF\u540D\u5B8C\u6574URL\u5730\u5740 (\u4F8B\u5982 https://gitee.com)
@@ -12,4 +10,3 @@ Read.timeout.seconds=\u8BFB\u53D6\u8D85\u65F6\u65F6\u95F4\uFF0C\u5355\u4F4D\u79D
Read.timeout.desc=\u94FE\u63A5\u8BFB\u53D6\u8D85\u65F6\u65F6\u95F4
Test.Connection=\u6D4B\u8BD5\u94FE\u63A5
Testing=\u6D4B\u8BD5\u4E2D...
-Gitee.config=Gitee \u914D\u7F6E
diff --git a/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config.jelly b/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..ffee4d2ca91b3a4adf593a911cf20fb176b24be6
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config.jelly
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config.properties b/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config.properties
new file mode 100644
index 0000000000000000000000000000000000000000..74bc838a1a0c6efaeaba6c19886e7a7b985f54fe
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config.properties
@@ -0,0 +1,2 @@
+Gitee.config=Gitee Configuration
+Gitee.connections=Gitee connections
diff --git a/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config_zh_CN.properties b/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..8faea5bfd5deb4e0a20a3184da1fd7b6d9f2073a
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeGlobalConfig/config_zh_CN.properties
@@ -0,0 +1,3 @@
+Gitee.config=Gitee \u914D\u7F6E
+Gitee.connections=Gitee \u94FE\u63A5
+
diff --git a/src/main/resources/com/gitee/jenkins/config/GiteeItemConfig/config.jelly b/src/main/resources/com/gitee/jenkins/config/GiteeItemConfig/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..f5ec8092a083b585386514429c404aa3e5679fb4
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/config/GiteeItemConfig/config.jelly
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionProperty/config.properties b/src/main/resources/com/gitee/jenkins/config/GiteeItemConfig/config.properties
similarity index 100%
rename from src/main/resources/com/gitee/jenkins/connection/GiteeConnectionProperty/config.properties
rename to src/main/resources/com/gitee/jenkins/config/GiteeItemConfig/config.properties
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionProperty/config_zh_CN.properties b/src/main/resources/com/gitee/jenkins/config/GiteeItemConfig/config_zh_CN.properties
similarity index 100%
rename from src/main/resources/com/gitee/jenkins/connection/GiteeConnectionProperty/config_zh_CN.properties
rename to src/main/resources/com/gitee/jenkins/config/GiteeItemConfig/config_zh_CN.properties
diff --git a/src/main/resources/com/gitee/jenkins/connection/Messages.properties b/src/main/resources/com/gitee/jenkins/config/Messages.properties
similarity index 91%
rename from src/main/resources/com/gitee/jenkins/connection/Messages.properties
rename to src/main/resources/com/gitee/jenkins/config/Messages.properties
index 8d56ee0235aabac8de539f93c9e31da1b7f3d4a5..af3e17d622f6343697ef7045b5f1a4f80edaf80b 100644
--- a/src/main/resources/com/gitee/jenkins/connection/Messages.properties
+++ b/src/main/resources/com/gitee/jenkins/config/Messages.properties
@@ -6,4 +6,4 @@ connectionTimeout.required=Connection timeout is required
readTimeout.required=Read timeout is required
connection.success=Success
connection.error=Client error: {0}
-GiteeApiToken.name=Gitee API token
+GiteeApiToken.name=Gitee API token
\ No newline at end of file
diff --git a/src/main/resources/com/gitee/jenkins/connection/Messages_zh_CN.properties b/src/main/resources/com/gitee/jenkins/config/Messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/com/gitee/jenkins/connection/Messages_zh_CN.properties
rename to src/main/resources/com/gitee/jenkins/config/Messages_zh_CN.properties
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeApiTokenImpl/credentials.jelly b/src/main/resources/com/gitee/jenkins/connection/GiteeApiTokenImpl/credentials.jelly
deleted file mode 100644
index 295037854ad9902af038568099920c72da83089f..0000000000000000000000000000000000000000
--- a/src/main/resources/com/gitee/jenkins/connection/GiteeApiTokenImpl/credentials.jelly
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config.jelly b/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config.jelly
deleted file mode 100644
index 5d59bf8d3695e3c84fa35b02387d344964fc1d6b..0000000000000000000000000000000000000000
--- a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionConfig/config.jelly
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionProperty/config.jelly b/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionProperty/config.jelly
deleted file mode 100644
index 3966a734d93118924c1ac55f42c31381f724cb4e..0000000000000000000000000000000000000000
--- a/src/main/resources/com/gitee/jenkins/connection/GiteeConnectionProperty/config.jelly
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/src/main/resources/com/gitee/jenkins/cause/Messages.properties b/src/main/resources/com/gitee/jenkins/enums/Messages.properties
similarity index 80%
rename from src/main/resources/com/gitee/jenkins/cause/Messages.properties
rename to src/main/resources/com/gitee/jenkins/enums/Messages.properties
index a1311ab5714d9c40789d06a36bd58b787beb6da4..fdd7905e10c24e87c1269110eb4571e360292ff4 100644
--- a/src/main/resources/com/gitee/jenkins/cause/Messages.properties
+++ b/src/main/resources/com/gitee/jenkins/enums/Messages.properties
@@ -5,5 +5,3 @@ GiteeWebHookCause.ShortDescription.PullRequestHook_plain=Triggered by Gitee Pull
GiteeWebHookCause.ShortDescription.NoteHook_html=Triggered by {0} Gitee Pull Request #{1}: {2} => {3}
GiteeWebHookCause.ShortDescription.NoteHook_plain=Triggered by {0} Gitee Pull Request #{1}: {2} => {3}
GiteeWebHookCause.ShortDescription.Commit_comment=Started by Gitee comment by {0}
-GiteeWebHookCause.ShortDescription.PipelineHook_noStatus=Started by Gitee Pipeline event
-GiteeWebHookCause.ShortDescription.PipelineHook=Started by Gitee Pipeline event {0}
diff --git a/src/main/resources/com/gitee/jenkins/cause/Messages_zh_CN.properties b/src/main/resources/com/gitee/jenkins/enums/Messages_zh_CN.properties
similarity index 82%
rename from src/main/resources/com/gitee/jenkins/cause/Messages_zh_CN.properties
rename to src/main/resources/com/gitee/jenkins/enums/Messages_zh_CN.properties
index b86ca360b572fb2f70533421e5ccbf784659d8f2..66e735ee09738eb471e8cc0d50d3e13271674576 100644
--- a/src/main/resources/com/gitee/jenkins/cause/Messages_zh_CN.properties
+++ b/src/main/resources/com/gitee/jenkins/enums/Messages_zh_CN.properties
@@ -5,5 +5,3 @@ GiteeWebHookCause.ShortDescription.PullRequestHook_plain=\u7531 Gitee Pull Reque
GiteeWebHookCause.ShortDescription.NoteHook_html=\u7531 {0} Gitee Pull Request #{1}: {2} => {3} \u89E6\u53D1
GiteeWebHookCause.ShortDescription.NoteHook_plain=\u7531 {0} Gitee Pull Request #{1}: {2} => {3} \u89E6\u53D1
GiteeWebHookCause.ShortDescription.Commit_comment=Gitee \u7528\u6237 {0} \u8BC4\u8BBA\u63D0\u4EA4\u89E6\u53D1\u6784\u5EFA
-GiteeWebHookCause.ShortDescription.PipelineHook_noStatus=\u7531 Gitee Pipeline \u89E6\u53D1
-GiteeWebHookCause.ShortDescription.PipelineHook=\u7531 Gitee Pipeline {0} \u89E6\u53D1
diff --git a/src/main/resources/com/gitee/jenkins/publisher/GiteeCommitStatusPublisher/config.jelly b/src/main/resources/com/gitee/jenkins/publisher/GiteeCommitStatusPublisher/config.jelly
deleted file mode 100644
index 017a8241123eb7e37688c061a500e7b713eedf85..0000000000000000000000000000000000000000
--- a/src/main/resources/com/gitee/jenkins/publisher/GiteeCommitStatusPublisher/config.jelly
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/com/gitee/jenkins/publisher/GiteeMessagePublisher/config.jelly b/src/main/resources/com/gitee/jenkins/publisher/GiteeMessagePublisher/config.jelly
deleted file mode 100644
index 5975a96878e6b823683b957318ea9b5c38331d9c..0000000000000000000000000000000000000000
--- a/src/main/resources/com/gitee/jenkins/publisher/GiteeMessagePublisher/config.jelly
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/com/gitee/jenkins/publisher/Messages.properties b/src/main/resources/com/gitee/jenkins/publisher/Messages.properties
index a31e300df795a140f5633aef1e9aaf0f6fdc84cc..a48b9f50383cc49c268463af9ab6f3ba96adcc48 100644
--- a/src/main/resources/com/gitee/jenkins/publisher/Messages.properties
+++ b/src/main/resources/com/gitee/jenkins/publisher/Messages.properties
@@ -1,4 +1,2 @@
-GiteeCommitStatusPublisher.DisplayName=Publish build status to Gitee
-name.required=Build name required.
-GiteeMessagePublisher.DisplayName=Add note with build status on Gitee pull requests
-GiteeAcceptPullRequestPublisher.DisplayName=Accept Gitee pull request on success
+PullRequestBuildStatusPublisher.DisplayName=Add note with build status on Gitee pull requests
+AcceptPullRequestPublisher.DisplayName=Accept Gitee pull request on success
\ No newline at end of file
diff --git a/src/main/resources/com/gitee/jenkins/publisher/Messages_zh_CN.properties b/src/main/resources/com/gitee/jenkins/publisher/Messages_zh_CN.properties
index 9c79e1a59481a6d25e144f2fe215fd1210016dff..82a68ed654c02a18f68a7510c8a8bc8638963581 100644
--- a/src/main/resources/com/gitee/jenkins/publisher/Messages_zh_CN.properties
+++ b/src/main/resources/com/gitee/jenkins/publisher/Messages_zh_CN.properties
@@ -1,4 +1,2 @@
-GiteeCommitStatusPublisher.DisplayName=\u53D1\u5E03\u6784\u5EFA\u72B6\u6001\u5230 Gitee
-name.required=\u8BF7\u8F93\u5165\u6784\u5EFA\u540D\u79F0\u3002
-GiteeMessagePublisher.DisplayName=\u5C06\u6784\u5EFA\u72B6\u6001\u8BC4\u8BBA\u5230 Gitee Pull Request \u4E2D
-GiteeAcceptPullRequestPublisher.DisplayName=\u5F53\u6784\u5EFA\u6210\u529F\u81EA\u52A8\u5408\u5E76 Gitee \u7684 Pull Request
+PullRequestBuildStatusPublisher.DisplayName=\u5C06\u6784\u5EFA\u72B6\u6001\u8BC4\u8BBA\u5230 Gitee Pull Request \u4E2D
+AcceptPullRequestPublisher.DisplayName=\u5F53\u6784\u5EFA\u6210\u529F\u81EA\u52A8\u5408\u5E76 Gitee \u7684 Pull Request
diff --git a/src/main/resources/com/gitee/jenkins/publisher/PullRequestBuildStatusPublisher/config.jelly b/src/main/resources/com/gitee/jenkins/publisher/PullRequestBuildStatusPublisher/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..e1b5e537d5dda1939c107abc8dacc90afb097453
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/publisher/PullRequestBuildStatusPublisher/config.jelly
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/com/gitee/jenkins/publisher/GiteeMessagePublisher/config.properties b/src/main/resources/com/gitee/jenkins/publisher/PullRequestBuildStatusPublisher/config.properties
similarity index 100%
rename from src/main/resources/com/gitee/jenkins/publisher/GiteeMessagePublisher/config.properties
rename to src/main/resources/com/gitee/jenkins/publisher/PullRequestBuildStatusPublisher/config.properties
diff --git a/src/main/resources/com/gitee/jenkins/publisher/GiteeMessagePublisher/config_zh_CN.properties b/src/main/resources/com/gitee/jenkins/publisher/PullRequestBuildStatusPublisher/config_zh_CN.properties
similarity index 100%
rename from src/main/resources/com/gitee/jenkins/publisher/GiteeMessagePublisher/config_zh_CN.properties
rename to src/main/resources/com/gitee/jenkins/publisher/PullRequestBuildStatusPublisher/config_zh_CN.properties
diff --git a/src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config.jelly b/src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config.jelly
deleted file mode 100644
index e189b881f4e1f00fa0924ccd75702ecc2a77b2bb..0000000000000000000000000000000000000000
--- a/src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config.jelly
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config.jelly b/src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..6364eb511c1ec72edccaf75c7b0cac5f5d544bf2
--- /dev/null
+++ b/src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config.jelly
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config.properties b/src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config.properties
similarity index 53%
rename from src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config.properties
rename to src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config.properties
index 390c56304015950a8966ff97783566d73fb2e31c..c48ee04694f36ea6b4d6e71095e03801dda84a6c 100644
--- a/src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config.properties
+++ b/src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config.properties
@@ -1,45 +1,29 @@
-Secret.Token=Secret Token for Gitee WebHook
-Generate=Generate
-Clear=Clear
+Enabled.Gitee.Triggers=Enabled Gitee triggers
Push=Push Events
Commit.Comment=Commit Comment Events
-Enable.CI.Skip=Enable [ci-skip]
+Opened.Pull.Request=Opened Pull Requests Events
+Updated.Pull.Request=Updated Pull Requests Events
+Accepted.Pull.Request=Accepted Pull Requests Events
+Closed.Pull.Request=Closed Pull Requests Events
+Approved.Pull.Request=Approved Pull Requests
+Tested.Pull.Request=Tested Pull Requests
+Comments=Comment Pull Requests
+Comment.Regex=Comment (regex) for triggering a build
Build.Instruction.Filter=Build instruction filter
Build.Instruction.Filter.None=None
Build.Instruction.Filter.CiSkip=[ci-skip] skip build
Build.Instruction.Filter.CiBuild=[ci-build] trigger build
Enable.CI.SkipFroTestNotRequired=Skip ci when test not required
-Enabled.Gitee.Triggers=Enabled Gitee triggers
-Approved.Pull.Request=Approved Pull Requests
-Tested.Pull.Request=Tested Pull Requests
-Closed.Pull.Request=Closed Pull Requests Events
-Accepted.Pull.Request=Accepted Pull Requests Events
-Opened.Pull.Request=Opened Pull Requests Events
-Updated.Pull.Request=Updated Pull Requests Events
-Set.Build.Desctiption=Set build description to build cause (eg. Merge request or Git Push )
-Ignore.WIP.Merge.Requests=Ignore WIP Pull Requests
-CommitNotifier.Success=Build {0} succeeded in {1}
-CommitNotifier.Unstable=Build {0} found unstable in {1}
-CommitNotifier.Failed=Build {0} failed in {1}
-GitHubCommitNotifier.SettingCommitStatus=Setting commit status on Gitee for {0}
-GiteePushTrigger.BranchesNotFound=Following patterns don''t match any branch in source repository: {0}
-GiteePushTrigger.BranchesMatched=Matching {0} branch{0,choice,1#|2#s}.
-GiteePushTrigger.CannotCheckBranches=Cannot connect to Gitee to check whether selected branches exist.
-GiteePushTrigger.CannotConnectToGitee=Cannot connect to Gitee: {0}
-GiteePushTrigger.NoSourceRepository=Repository url must be saved first.
-GiteePushTrigger.LabelsNotFound=Following labels doesn''t exist in source repository: {0}
-GiteePushTrigger.LabelsMatched=Matching {0} label{0,choice,1#|2#s}.
+Ignore.Last.Commit.Has.Build=Ignore last commit has been build
+Cancel.Same.Pull.Request.Incomplete.Build=Cancel incomplete build on same Pull Requests
+Ignore.Pull.Request.Conflicts=Ignore Pull Request conflicts
Allowed.branches=Allowed branches
Allow.all.branches=Allow all branches to trigger this job
Filter.branches.by.name=Filter branches by name
Filter.branches.by.regex=Filter branches by regex
-Target.Branch.Regex=Target Branch Regex
-Filter.merge.request.by.label=Filter pull request by label
Exclude=Exclude
Include=Include
-Ignore.Last.Commit.Has.Build=Ignore last commit has been build
-Cancel.Same.Pull.Request.Incomplete.Build=Cancel incomplete build on same Pull Requests
-Ignore.Pull.Request.Conflicts=Ignore Pull Request conflicts
-Comments=Comment Pull Requests
-Comment.Regex=Comment (regex) for triggering a build
-Retry.Text=Jenkins please retry a build
+Target.Branch.Regex=Target Branch Regex
+Secret.Token=Secret Token for Gitee WebHook
+Generate=Generate
+Clear=Clear
\ No newline at end of file
diff --git a/src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config_zh_CN.properties b/src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config_zh_CN.properties
similarity index 54%
rename from src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config_zh_CN.properties
rename to src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config_zh_CN.properties
index 4a1e266b5e2b610da23af8cd506532b52cff360b..dd135a92a8e38534c2f75bfc0035fa1261ec41d7 100644
--- a/src/main/resources/com/gitee/jenkins/trigger/GiteePushTrigger/config_zh_CN.properties
+++ b/src/main/resources/com/gitee/jenkins/trigger/GiteeTrigger/config_zh_CN.properties
@@ -1,45 +1,29 @@
-Secret.Token=Gitee WebHook \u5BC6\u7801
-Generate=\u751F\u6210
-Clear=\u6E05\u9664
+Enabled.Gitee.Triggers=Gitee \u89E6\u53D1\u6784\u5EFA\u7B56\u7565
Push=\u63A8\u9001\u4EE3\u7801
Commit.Comment=\u8BC4\u8BBA\u63D0\u4EA4\u8BB0\u5F55
-Enable.CI.Skip=\u652F\u6301 [ci-skip] \u6307\u4EE4\u8FC7\u6EE4\u6784\u5EFA
-Enable.CI.SkipFroTestNotRequired=PR \u4E0D\u8981\u6C42\u5FC5\u987B\u6D4B\u8BD5\u65F6\u8FC7\u6EE4\u6784\u5EFA
+Opened.Pull.Request=\u65B0\u5EFA Pull Requests
+Updated.Pull.Request=\u66F4\u65B0 Pull Requests
+Accepted.Pull.Request=\u63A5\u53D7 Pull Requests
+Closed.Pull.Request=\u5173\u95ED Pull Requests
+Approved.Pull.Request=\u5BA1\u67E5\u901A\u8FC7 Pull Requests
+Tested.Pull.Request=\u6D4B\u8BD5\u901A\u8FC7 Pull Requests
+Comments=\u8BC4\u8BBA Pull Requests
+Comment.Regex=\u8BC4\u8BBA\u5185\u5BB9\u7684\u6B63\u5219\u8868\u8FBE\u5F0F
Build.Instruction.Filter=\u6784\u5EFA\u6307\u4EE4\u8FC7\u6EE4
Build.Instruction.Filter.None=\u65E0
Build.Instruction.Filter.CiSkip=[ci-skip] \u6307\u4EE4\u8DF3\u8FC7\u6784\u5EFA
Build.Instruction.Filter.CiBuild=[ci-build] \u6307\u4EE4\u89E6\u53D1\u6784\u5EFA
-Enabled.Gitee.Triggers=Gitee \u89E6\u53D1\u6784\u5EFA\u7B56\u7565
-Approved.Pull.Request=\u5BA1\u67E5\u901A\u8FC7 Pull Requests
-Tested.Pull.Request=\u6D4B\u8BD5\u901A\u8FC7 Pull Requests
-Closed.Pull.Request=\u5173\u95ED Pull Requests
-Accepted.Pull.Request=\u63A5\u53D7 Pull Requests
-Opened.Pull.Request=\u65B0\u5EFA Pull Requests
-Updated.Pull.Request=\u66F4\u65B0 Pull Requests
-Ignore.WIP.Merge.Requests=\u8FC7\u6EE4\u6B63\u5728\u8FDB\u884C\u6784\u5EFA\u7684Pull Requests
-Set.Build.Desctiption=\u8BBE\u7F6E\u6784\u5EFA\u63CF\u8FF0
-CommitNotifier.Success=\u6784\u5EFA {0} \u6210\u529F\u4E8E {1}
-CommitNotifier.Unstable=\u6784\u5EFA {0} \u53D1\u73B0 {1} \u4E0D\u7A33\u5B9A
-CommitNotifier.Failed=\u6784\u5EFA {0} \u5931\u8D25\u4E8E {1}
-GitHubCommitNotifier.SettingCommitStatus=\u6B63\u5728\u4E3A {0} \u8BBE\u7F6E\u63D0\u4EA4\u72B6\u6001
-GiteePushTrigger.BranchesNotFound=\u4EE5\u4E0B\u6A21\u5F0F\u5339\u914D\u4E0D\u5230\u76EE\u6807\u4ED3\u5E93\u7684\u4EFB\u610F\u5206\u652F\uFF1A{0}
-GiteePushTrigger.BranchesMatched=\u5339\u914D {0} \u5206\u652F {0,choice,1#|2#s}\u3002
-GiteePushTrigger.CannotCheckBranches=\u65E0\u6CD5\u94FE\u63A5\u5230 Gitee \u68C0\u67E5\u6240\u9009\u5206\u652F\u662F\u5426\u5B58\u5728\u3002
-GiteePushTrigger.CannotConnectToGitee=\u65E0\u6CD5\u94FE\u63A5\u5230 Gitee \uFF1A {0}
-GiteePushTrigger.NoSourceRepository=\u8BF7\u5148\u4FDD\u5B58\u4ED3\u5E93 URL \u5730\u5740\u3002
-GiteePushTrigger.LabelsNotFound=\u4EE5\u4E0B\u6807\u7B7E\u4E0D\u5728\u76EE\u6807\u4ED3\u5E93\u4E2D \uFF1A{0}
-GiteePushTrigger.LabelsMatched=\u5339\u914D {0} \u6807\u7B7E {0,choice,1#|2#s} \u3002
+Enable.CI.SkipFroTestNotRequired=PR \u4E0D\u8981\u6C42\u5FC5\u987B\u6D4B\u8BD5\u65F6\u8FC7\u6EE4\u6784\u5EFA
+Ignore.Last.Commit.Has.Build=\u8FC7\u6EE4\u5DF2\u7ECF\u6784\u5EFA\u7684 Commit \u7248\u672C
+Cancel.Same.Pull.Request.Incomplete.Build=\u53D6\u6D88\u76F8\u540C Pull Requests \u672A\u5B8C\u6210\u6784\u5EFA
+Ignore.Pull.Request.Conflicts=\u5FFD\u7565 Pull Request \u51B2\u7A81
Allowed.branches=\u5141\u8BB8\u89E6\u53D1\u6784\u5EFA\u7684\u5206\u652F
Allow.all.branches=\u5141\u8BB8\u6240\u6709\u5206\u652F\u89E6\u53D1\u6784\u5EFA
Filter.branches.by.name=\u6839\u636E\u5206\u652F\u540D\u8FC7\u6EE4
Filter.branches.by.regex=\u6839\u636E\u6B63\u5219\u8868\u8FBE\u5F0F\u8FC7\u6EE4\u5206\u652F
-Target.Branch.Regex=\u76EE\u6807\u5206\u652F\u7684\u6B63\u5219\u8868\u8FBE\u5F0F
-Filter.merge.request.by.label=\u6839\u636E\u6807\u7B7E\u8FC7\u6EE4PR
Exclude=\u6392\u9664
Include=\u5305\u62EC
-Ignore.Last.Commit.Has.Build=\u8FC7\u6EE4\u5DF2\u7ECF\u6784\u5EFA\u7684 Commit \u7248\u672C
-Cancel.Same.Pull.Request.Incomplete.Build=\u53D6\u6D88\u76F8\u540C Pull Requests \u672A\u5B8C\u6210\u6784\u5EFA
-Ignore.Pull.Request.Conflicts=\u5FFD\u7565 Pull Request \u51B2\u7A81
-Comments=\u8BC4\u8BBA Pull Requests
-Comment.Regex=\u8BC4\u8BBA\u5185\u5BB9\u7684\u6B63\u5219\u8868\u8FBE\u5F0F
-Retry.Text=Jenkins please retry a build
+Target.Branch.Regex=\u76EE\u6807\u5206\u652F\u7684\u6B63\u5219\u8868\u8FBE\u5F0F
+Secret.Token=Gitee WebHook \u5BC6\u7801
+Generate=\u751F\u6210
+Clear=\u6E05\u9664
\ No newline at end of file
diff --git a/src/main/resources/com/gitee/jenkins/trigger/GiteeWebHookPollingAction/index.jelly b/src/main/resources/com/gitee/jenkins/trigger/GiteeWebHookPollingAction/index.jelly
deleted file mode 100644
index 0d244e68fe6e8101c18a0d11884c7e71b07f76ff..0000000000000000000000000000000000000000
--- a/src/main/resources/com/gitee/jenkins/trigger/GiteeWebHookPollingAction/index.jelly
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
- ${%Last Gitee Push}
-
-
-
- ${%Polling has not run yet.}
-
-
-
-
- ${it.writeLogTo(output)}
-
-
-
-
-
-
diff --git a/src/main/resources/com/gitee/jenkins/trigger/help.jelly b/src/main/resources/com/gitee/jenkins/trigger/help.jelly
index 786ede9a008d380d409d0b3002a9ae619266bbf4..bb6112897683091d0f3f26f07881188fb37b4e1d 100644
--- a/src/main/resources/com/gitee/jenkins/trigger/help.jelly
+++ b/src/main/resources/com/gitee/jenkins/trigger/help.jelly
@@ -1,4 +1,4 @@
- Configure Gitee to deliver a POST request to your Jenkins instance like Gitee CI.
+ Configure Gitee to deliver a POST request to your Jenkins instance like Gitee CI.
diff --git a/src/main/resources/com/gitee/jenkins/webhook/status/failed.png b/src/main/resources/com/gitee/jenkins/webhook/status/failed.png
deleted file mode 100644
index e751ade074d2b6aebc89f7c0596381e0f8e00db1..0000000000000000000000000000000000000000
Binary files a/src/main/resources/com/gitee/jenkins/webhook/status/failed.png and /dev/null differ
diff --git a/src/main/resources/com/gitee/jenkins/webhook/status/running.png b/src/main/resources/com/gitee/jenkins/webhook/status/running.png
deleted file mode 100644
index 2398b4d5c6e6ee8537ef1cba203fb3a98750856e..0000000000000000000000000000000000000000
Binary files a/src/main/resources/com/gitee/jenkins/webhook/status/running.png and /dev/null differ
diff --git a/src/main/resources/com/gitee/jenkins/webhook/status/success.png b/src/main/resources/com/gitee/jenkins/webhook/status/success.png
deleted file mode 100644
index 83eef5c0aa7adbce9b6d76d835a340e3f781db39..0000000000000000000000000000000000000000
Binary files a/src/main/resources/com/gitee/jenkins/webhook/status/success.png and /dev/null differ
diff --git a/src/main/resources/com/gitee/jenkins/webhook/status/unknown.png b/src/main/resources/com/gitee/jenkins/webhook/status/unknown.png
deleted file mode 100644
index 04a43e8e288f65d1d8d3047839c5c226977ea687..0000000000000000000000000000000000000000
Binary files a/src/main/resources/com/gitee/jenkins/webhook/status/unknown.png and /dev/null differ
diff --git a/src/main/resources/com/gitee/jenkins/webhook/status/unstable.png b/src/main/resources/com/gitee/jenkins/webhook/status/unstable.png
deleted file mode 100644
index bd5f5260105120d97f61b66547e51f2767282993..0000000000000000000000000000000000000000
Binary files a/src/main/resources/com/gitee/jenkins/webhook/status/unstable.png and /dev/null differ
diff --git a/src/main/webapp/help/help-messagesOnResult_zh_CN.html b/src/main/webapp/help/help-messagesOnResult_zh_CN.html
deleted file mode 100644
index b9e81cce3723023f6449aedd94b598825313b667..0000000000000000000000000000000000000000
--- a/src/main/webapp/help/help-messagesOnResult_zh_CN.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
允许评论构建结构到 Gitee Pull Request.
-
您可以构建成功,失败或者中断自定义评论信息。
-
diff --git a/src/main/webapp/help/help-messagesOnResult.html b/src/main/webapp/help/help-pullRequestBuildStatus.html
similarity index 66%
rename from src/main/webapp/help/help-messagesOnResult.html
rename to src/main/webapp/help/help-pullRequestBuildStatus.html
index de90c5264baa013681fa71568cad8287e69fe751..ad9fdc9f020532bb3152e8286f70a72d79ce4c79 100644
--- a/src/main/webapp/help/help-messagesOnResult.html
+++ b/src/main/webapp/help/help-pullRequestBuildStatus.html
@@ -1,4 +1,4 @@
-
Enable sending message to Gitee Pull Request.
+
Enable sending build status to Gitee Pull Request.
You can change default message on success, failure and abort. (with support environment variables)
diff --git a/src/main/webapp/help/help-pullRequestBuildStatus_zh_CN.html b/src/main/webapp/help/help-pullRequestBuildStatus_zh_CN.html
new file mode 100644
index 0000000000000000000000000000000000000000..a57cdebbd5dd62d0f5c942115a55f14661cfd223
--- /dev/null
+++ b/src/main/webapp/help/help-pullRequestBuildStatus_zh_CN.html
@@ -0,0 +1,4 @@
+
+
允许评论构建结果到 Gitee Pull Request.
+
您可以自定义构建成功,失败或者中断自定义评论信息。(支持环境变量)
+
diff --git a/src/main/webapp/help/help-send-result-to-gitee.html b/src/main/webapp/help/help-send-result-to-gitee.html
deleted file mode 100644
index ca108cf358badacd58b3101fecced591b0fa3228..0000000000000000000000000000000000000000
--- a/src/main/webapp/help/help-send-result-to-gitee.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Send build result to Gitee. It will be visible in the commit and/or pull request UI as appropriate. You must have at least one Gitee connection/server configured in the Jenkins global configuration. If you have more than one, select the appropriate one from the 'Gitee connection' dropdown menu in the job configuration.
-
diff --git a/src/main/webapp/help/help-send-result-to-gitee_zh_CN.html b/src/main/webapp/help/help-send-result-to-gitee_zh_CN.html
deleted file mode 100644
index 6f2644ffb0cc4ddceee33f4b371b8b6a67314cd4..0000000000000000000000000000000000000000
--- a/src/main/webapp/help/help-send-result-to-gitee_zh_CN.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Send build result to Gitee.
- It will be visible in the commit and/or pull request UI as appropriate.
- You must have at least one Gitee connection/server configured in the Jenkins global configuration.
- If you have more than one, select the appropriate one from the 'Gitee connection' dropdown menu in the job configuration.
-
diff --git a/src/main/webapp/help/help-wip-pull-request.html b/src/main/webapp/help/help-wip-pull-request.html
deleted file mode 100644
index 04ff1d793689f397e49a20ca3c4d013bcab6e10d..0000000000000000000000000000000000000000
--- a/src/main/webapp/help/help-wip-pull-request.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Ignore WIP Pull Requests
-
diff --git a/src/main/webapp/help/help-wip-pull-request_zh_CN.html b/src/main/webapp/help/help-wip-pull-request_zh_CN.html
deleted file mode 100644
index 92184b4ec741c8782cb5a584417a262197682b94..0000000000000000000000000000000000000000
--- a/src/main/webapp/help/help-wip-pull-request_zh_CN.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 过滤正在进行构建的 Pull Request,防止同一个 PR 同时进行多次构建。
-
diff --git a/src/main/webapp/images/24x24/gitlab.png b/src/main/webapp/images/24x24/gitlab.png
deleted file mode 100644
index bc2ef601a538d69ef99d5bdafa605e63f902e8e4..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/images/24x24/gitlab.png and /dev/null differ