From 6b7608efe88ece48c3f491e8dd3820604159e835 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Mon, 24 Sep 2018 00:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=81=E8=B0=83=E5=BA=A6=E6=97=A5=E5=BF=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E8=B0=83=E6=95=B4=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BAtext=E7=B1=BB=E5=9E=8B=E5=B9=B6=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 2 ++ doc/db/tables_xxl_job.sql | 4 ++-- .../main/java/com/xxl/job/admin/core/model/XxlJobLog.java | 8 -------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 1ea34009..1b5978fe 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1290,6 +1290,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 34、任务属性枚举 "任务模式、阻塞策略" 国际化优化; - 35、分片任务失败重试优化,仅重试当前失败的分片; - 36、任务触发时支持动态传参,调度中心与API服务均提供提供动态参数功能; +- 37、任务执行日志、调度日志字段类型调整,改为text类型并取消字数限制; ### TODO LIST @@ -1314,6 +1315,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 19、SimpleTrigger 支持; - 20、Release发布时,一同发布调度中心安装包,真正实现开箱即用; - 21、Cron TimeZone 自定义; +- 22、忙碌转移优化,全部机器忙碌时不再直接失败; ## 七、其他 diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index fc3d7cb0..5258e708 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -183,10 +183,10 @@ CREATE TABLE `XXL_JOB_QRTZ_TRIGGER_LOG` ( `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数', `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间', `trigger_code` int(11) NOT NULL COMMENT '调度-结果', - `trigger_msg` varchar(2048) DEFAULT NULL COMMENT '调度-日志', + `trigger_msg` text COMMENT '调度-日志', `handle_time` datetime DEFAULT NULL COMMENT '执行-时间', `handle_code` int(11) NOT NULL COMMENT '执行-状态', - `handle_msg` varchar(2048) DEFAULT NULL COMMENT '执行-日志', + `handle_msg` text COMMENT '执行-日志', PRIMARY KEY (`id`), KEY `I_trigger_time` (`trigger_time`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java index bdecc1c2..ee029242 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java @@ -116,10 +116,6 @@ public class XxlJobLog { } public void setTriggerMsg(String triggerMsg) { - // plugin - if (triggerMsg!=null && triggerMsg.length()>2000) { - triggerMsg = triggerMsg.substring(0, 2000); - } this.triggerMsg = triggerMsg; } @@ -144,10 +140,6 @@ public class XxlJobLog { } public void setHandleMsg(String handleMsg) { - // plugin - if (handleMsg!=null && handleMsg.length()>2000) { - handleMsg = handleMsg.substring(0, 2000); - } this.handleMsg = handleMsg; } }