From ad6264ae1bd71a2ff6c7f1c909716480151de6bc Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 1 Mar 2022 14:04:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E9=98=9F=E5=88=97=E4=B8=AD=E7=9A=84=E4=BB=BB=E5=8A=A1=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E4=BE=9D=E7=84=B6=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/sechedule/strategy/impl/EmailTaskHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index f7d14699c4..d7ec2a9886 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -15,6 +15,7 @@ import io.dataease.job.sechedule.strategy.TaskHandler; import io.dataease.plugins.common.entity.GlobalTaskEntity; import io.dataease.plugins.common.entity.GlobalTaskInstance; import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.email.dto.request.XpackEmailTaskRequest; import io.dataease.plugins.xpack.email.dto.request.XpackPixelEntity; import io.dataease.plugins.xpack.email.dto.response.XpackEmailTemplateDTO; import io.dataease.plugins.xpack.email.service.EmailXpackService; @@ -127,7 +128,10 @@ public class EmailTaskHandler extends TaskHandler implements Job { SysUserEntity user) { EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class); try { - + XpackEmailTaskRequest taskForm = emailXpackService.taskForm(taskInstance.getTaskId()); + if (ObjectUtils.isEmpty(taskForm) || CronUtils.taskExpire(taskForm.getEndTime())) { + return; + } String panelId = emailTemplateDTO.getPanelId(); String url = panelUrl(panelId); String token = tokenByUser(user); @@ -148,7 +152,6 @@ public class EmailTaskHandler extends TaskHandler implements Job { emailService.sendWithImage(recipients, emailTemplateDTO.getTitle(), contentStr, bytes); - Thread.sleep(10000); success(taskInstance); } catch (Exception e) { error(taskInstance, e);