From 97bce9f0c621667d82da901c88c2067a95150d82 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Thu, 21 May 2020 21:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E9=A1=B9=E7=9B=AE=E4=BE=9D?=
=?UTF-8?q?=E8=B5=96=E5=8D=87=E7=BA=A7=E8=87=B3=E8=BE=83=E6=96=B0=E7=A8=B3?=
=?UTF-8?q?=E5=AE=9A=E7=89=88=E6=9C=AC=EF=BC=8C=E5=A6=82netty=E3=80=81spri?=
=?UTF-8?q?ng=E3=80=81springboot=E7=AD=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/XXL-JOB官方文档.md | 3 ++-
pom.xml | 8 ++++----
.../src/main/resources/static/js/joblog.index.1.js | 9 +++++++--
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index e95000e9..10ad4d6e 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1988,7 +1988,8 @@ data: post-data
- 1、Cron编辑器增强：Cron编辑器修改cron时可实时查看最近运行时间;
- 2、Cron编辑器问题修复：修复小概率情况下cron单个字段修改时导致其他字段被重置问题；
- 3、邮箱告警配置优化：将"spring.mail.from"与"spring.mail.username"属性拆分开，更加灵活的支持一些无密码邮箱服务；
-- 4、[迭代中] 新增任务属性 "XxlJobContent" ，统一维护任务上下文信息，方便运行时存取任务相关信息；
+- 4、多个项目依赖升级至较新稳定版本，如netty、spring、springboot等；
+- 5、[迭代中] 新增任务属性 "XxlJobContent" ，统一维护任务上下文信息，方便运行时存取任务相关信息；
### TODO LIST
diff --git a/pom.xml b/pom.xml
index 9520005c..56b352a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,14 @@
1.8
true
- 4.1.48.Final
+ 4.1.50.Final
2.8.6
- 5.2.5.RELEASE
- 2.2.6.RELEASE
+ 5.2.6.RELEASE
+ 2.3.0.RELEASE
2.1.2
- 8.0.19
+ 8.0.20
1.7.30
4.13
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 d66029b0..2eed25f6 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
@@ -187,6 +187,12 @@ $(function() {
}*/
//return temp;
+ var logKillDiv = '';
+ if(row.handleCode == 0){
+ logKillDiv = ' \n' +
+ ' '+ I18n.joblog_kill_log +'\n';
+ }
+
var html = '\n' +
' \n' +
' \n' +
' \n' +
'
';