From 4c8190f6a82bb085a89b94c0e5c953ee2139023e Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sun, 19 Aug 2018 01:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xxl/job/admin/core/thread/JobFailMonitorHelper.java     | 2 +-
 xxl-job-admin/src/main/resources/i18n/message.properties        | 2 --
 xxl-job-admin/src/main/resources/i18n/message_en.properties     | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
index c5e4dd66..46228d8e 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
@@ -76,7 +76,7 @@ public class JobFailMonitorHelper {
 										// TODO，分片任务失败重试优化，仅重试失败分片
 
 										JobTriggerPoolHelper.trigger(log.getJobId(), (log.getExecutorFailRetryCount()-1), I18nUtil.getString("jobconf_trigger_type_retry"));
-										String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_fail_trigger_retry") +"<<<<<<<<<<< </span><br>";
+										String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_type_retry") +"<<<<<<<<<<< </span><br>";
 										log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
 										XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(log);
 									}
diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties
index 1eb03db1..caaba9a6 100644
--- a/xxl-job-admin/src/main/resources/i18n/message.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message.properties
@@ -197,8 +197,6 @@ jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
 jobconf_block_SERIAL_EXECUTION=单机串行
 jobconf_block_DISCARD_LATER=丢弃后续调度
 jobconf_block_COVER_EARLY=覆盖之前调度
-jobconf_fail_trigger_retry=调度失败重试
-jobconf_fail_handle_retry=执行失败重试
 jobconf_route_first=第一个
 jobconf_route_last=最后一个
 jobconf_route_round=轮询
diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties
index 99c83724..9b63d4bc 100644
--- a/xxl-job-admin/src/main/resources/i18n/message_en.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties
@@ -197,8 +197,6 @@ jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
 jobconf_block_SERIAL_EXECUTION=Serial execution
 jobconf_block_DISCARD_LATER=Discard Later
 jobconf_block_COVER_EARLY=Cover Early
-jobconf_fail_trigger_retry=Trigger Fail Retry
-jobconf_fail_handle_retry=Handle Fail Retry
 jobconf_route_first=First
 jobconf_route_last=Last
 jobconf_route_round=Round