From ae05b5ce3658ef9d44262497695e90d345c75a19 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Thu, 9 Apr 2020 19:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BA=A4=E4=BA=92=E5=BE=AE?=
=?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/XXL-JOB官方文档.md | 9 ++++----
.../main/resources/i18n/message_en.properties | 2 +-
.../resources/i18n/message_zh_CN.properties | 2 +-
.../resources/i18n/message_zh_TC.properties | 2 +-
.../resources/static/js/joblog.index.1.js | 22 ++++++++++++++++---
5 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index c87bccc3..ec514a61 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1730,11 +1730,10 @@ data: post-data
- 15、执行器注册逻辑优化:新增配置项 ”注册地址 / xxl.job.executor.address“,优先使用该配置作为注册地址,为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。
- 16、执行器初始化逻辑优化:修复懒加载的Bean被提前初始化问题;
- 17、任务复制功能:点击复制是弹出新建任务弹框,并初始化被复制任务信息;
-- 18、[迭代中]自定义失败重试时间间隔;
-- 19、[迭代中]新增执行器描述、任务描述属性;
-- 20、[迭代中]任务执行一次的时候指定IP;
-- 21、[迭代中]任务日志支持单个清理和状态转移,方便触发子任务;
-- 22、[迭代中]任务结果丢失处理:针对长期处于运行中的任务(设置过期时间时,运行超过"过期时间+1min";未设置超时时间时,运行超过"30min"),主动检测该执行器是否在线,如果不在线主动标记失败;
+- 18、[迭代中]新增执行器描述、任务描述属性;
+- 19、[迭代中]任务执行一次的时候指定IP;
+- 20、[迭代中]自定义失败重试时间间隔;
+- 21、[迭代中]任务结果丢失处理:针对长期处于运行中的任务(设置过期时间时,运行超过"过期时间+1min";未设置超时时间时,运行超过"30min"),主动检测该执行器是否在线,如果不在线主动标记失败;
### TODO LIST
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 1b168bfb..1eb911b1 100644
--- a/xxl-job-admin/src/main/resources/i18n/message_en.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties
@@ -176,7 +176,7 @@ joblog_handleCode_500=Fail
joblog_handleCode_502=Timeout
joblog_kill_log=Kill Job
joblog_kill_log_limit=Trigger Fail, can not kill job
-joblog_kill_log_byman=Manual operation to active kill job
+joblog_kill_log_byman=Manual operation, kill job
joblog_rolling_log=Rolling log
joblog_rolling_log_refresh=Refresh
joblog_rolling_log_triggerfail=The job trigger fail, can not view the rolling log
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 3199fc24..619044ba 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
@@ -176,7 +176,7 @@ joblog_handleCode_500=失败
joblog_handleCode_502=失败(超时)
joblog_kill_log=终止任务
joblog_kill_log_limit=调度失败,无法终止日志
-joblog_kill_log_byman=人为操作主动终止
+joblog_kill_log_byman=人为操作,主动终止
joblog_rolling_log=执行日志
joblog_rolling_log_refresh=刷新
joblog_rolling_log_triggerfail=任务发起调度失败,无法查看执行日志
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 84b76402..5297c505 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
@@ -176,7 +176,7 @@ joblog_handleCode_500=失敗
joblog_handleCode_502=失敗(超時)
joblog_kill_log=终止任務
joblog_kill_log_limit=調度失敗,無法终止日誌
-joblog_kill_log_byman=人為操作主動終止
+joblog_kill_log_byman=人為操作,主動終止
joblog_rolling_log=執行日誌
joblog_rolling_log_refresh=更新
joblog_rolling_log_triggerfail=任務發起調度失敗,無法查看執行日誌
diff --git a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
index 056a9c11..d66029b0 100644
--- a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
@@ -180,11 +180,27 @@ $(function() {
// better support expression or string, not function
return function () {
if (row.triggerCode == 200 || row.handleCode != 0){
- var temp = ''+ I18n.joblog_rolling_log +'';
+
+ /*var temp = ''+ I18n.joblog_rolling_log +'';
if(row.handleCode == 0){
temp += '
'+ I18n.joblog_kill_log +'';
- }
- return temp;
+ }*/
+ //return temp;
+
+ var html = '