From 0d13f04ebb2de9a20e936363ce9e9e7ea44933d9 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Fri, 30 Oct 2020 22:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E7=94=9F?= =?UTF-8?q?=E5=91=BD=E5=91=A8=E6=9C=9F=E9=87=8D=E6=9E=84=EF=BC=9A=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=EF=BC=88schedule=EF=BC=89=E3=80=81=E8=A7=A6=E5=8F=91(?= =?UTF-8?q?trigger)=E3=80=81=E6=89=A7=E8=A1=8C=EF=BC=88handle=EF=BC=89?= =?UTF-8?q?=E3=80=81=E5=9B=9E=E8=B0=83(callback)=E3=80=81=E5=90=8E?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=88posthandle=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/i18n/message_en.properties | 2 +- .../resources/i18n/message_zh_CN.properties | 4 ++-- .../resources/i18n/message_zh_TC.properties | 4 ++-- .../templates/jobinfo/jobinfo.index.ftl | 24 +++++++++++-------- 4 files changed, 19 insertions(+), 15 deletions(-) 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 f51a3431..ffba3f1e 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -153,7 +153,7 @@ misfire_strategy=Misfire strategy misfire_strategy_do_nothing=Do nothing misfire_strategy_fire_once_now=Fire once now jobinfo_conf_base=Base configuration -jobinfo_conf_trigger=Trigger configuration +jobinfo_conf_schedule=Schedule configuration jobinfo_conf_job=Job configuration jobinfo_conf_advanced=Advanced configuration diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties index 01deed40..756e5033 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties @@ -153,9 +153,9 @@ misfire_strategy=调度过期策略 misfire_strategy_do_nothing=忽略 misfire_strategy_fire_once_now=立即执行一次 jobinfo_conf_base=基础配置 -jobinfo_conf_trigger=触发配置 +jobinfo_conf_schedule=调度配置 jobinfo_conf_job=任务配置 -jobinfo_conf_advanced=高级信息 +jobinfo_conf_advanced=高级配置 ## job log joblog_name=调度日志 diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties index 20a79de7..e330f19e 100755 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties @@ -153,9 +153,9 @@ misfire_strategy=調度過期策略 misfire_strategy_do_nothing=忽略 misfire_strategy_fire_once_now=立即執行壹次 jobinfo_conf_base=基礎配置 -jobinfo_conf_trigger=觸發配置 +jobinfo_conf_schedule=調度配置 jobinfo_conf_job=任務配置 -jobinfo_conf_advanced=高級信息 +jobinfo_conf_advanced=高級配置 ## job log joblog_name=調度日誌 diff --git a/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl index f4d4d359..396cbe1b 100644 --- a/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl @@ -115,7 +115,7 @@
-

- ${I18n.jobinfo_conf_base} -

<#-- 基础信息 --> +

${I18n.jobinfo_conf_base}

<#-- 基础信息 -->
@@ -136,7 +136,8 @@
-

- ${I18n.jobinfo_conf_trigger} -

<#-- 触发配置 --> +
+

${I18n.jobinfo_conf_schedule}

<#-- 调度 -->
@@ -164,7 +165,8 @@
-

- ${I18n.jobinfo_conf_job} -

<#-- 任务配置 --> +
+

${I18n.jobinfo_conf_job}

<#-- 任务配置 -->
@@ -186,7 +188,8 @@
-

- ${I18n.jobinfo_conf_advanced} -

<#-- 高级配置 --> +
+

${I18n.jobinfo_conf_advanced}

<#-- 高级配置 -->
@@ -359,9 +362,7 @@ exit 0
- - -

- ${I18n.jobinfo_conf_base} -

<#-- 基础信息 --> +

${I18n.jobinfo_conf_base}

<#-- 基础信息 -->
@@ -382,7 +383,8 @@ exit 0
-

- ${I18n.jobinfo_conf_trigger} -

<#-- 触发配置 --> +
+

${I18n.jobinfo_conf_schedule}

<#-- 调度配置 -->
@@ -410,7 +412,8 @@ exit 0
-

- ${I18n.jobinfo_conf_job} -

<#-- 任务配置 --> +
+

${I18n.jobinfo_conf_job}

<#-- 任务配置 -->
@@ -432,7 +435,8 @@ exit 0
-

- ${I18n.jobinfo_conf_advanced} -

<#-- 高级配置 --> +
+

${I18n.jobinfo_conf_advanced}

<#-- 高级配置 -->