From 4f6fdc70cc93de1b135e712c00db97ca23d55485 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 3 Nov 2018 22:17:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E9=87=8D=E8=AF=95=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E4=BC=9A=E6=8C=89=E7=85=A7=E5=85=B6=E9=A2=84?= =?UTF-8?q?=E8=AE=BE=E7=9A=84=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E4=B8=BB=E5=8A=A8=E8=BF=9B=E8=A1=8C=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 3 ++- .../main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index f083a588..08b11c0a 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1342,7 +1342,8 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 9、任务状态规范：新增任务默认停止状态，任务更新时保持任务状态不变； - 10、命令行任务：原生提供通用命令行任务Handler（Bean任务，"CommandJobHandler"）；业务方只需要提供命令行即可； - 11、项目依赖升级 groovy 至较新稳定版本；pom清理； -- 12、[迭代中]docker镜像，并且推送docker镜像到中央仓库，更进一步实现产品开箱即用； +- 12、子任务失败重试重试逻辑优化，子任务失败时将会按照其预设的失败重试次数主动进行重试 +- 13、[迭代中]docker镜像，并且推送docker镜像到中央仓库，更进一步实现产品开箱即用； ### TODO LIST diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java index 00550593..d34b7abb 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java @@ -71,7 +71,7 @@ public class AdminBizImpl implements AdminBiz { int childJobId = (StringUtils.isNotBlank(childJobIds[i]) && StringUtils.isNumeric(childJobIds[i]))?Integer.valueOf(childJobIds[i]):-1; if (childJobId > 0) { - JobTriggerPoolHelper.trigger(childJobId, TriggerTypeEnum.PARENT, 0, null, null); + JobTriggerPoolHelper.trigger(childJobId, TriggerTypeEnum.PARENT, -1, null, null); ReturnT triggerChildResult = ReturnT.SUCCESS; // add msg