From 83ede1037ead8c8cc237b66c996c59d0d2e388f5 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Mon, 11 May 2020 14:49:29 +0800 Subject: [PATCH] blank in eamil and left font align #2648 (#2673) * script variable has "processDefinitionId" is error #2664 * blank in eamil and left font align #2648 Co-authored-by: qiaozhanwei --- .../template/impl/DefaultHTMLTemplate.java | 18 ++---------------- .../common/enums/ExecutionStatus.java | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java index 79123a1e80..7039d7c5c4 100644 --- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java @@ -140,21 +140,7 @@ public class DefaultHTMLTemplate implements AlertTemplate { checkNotNull(content); String htmlTableThead = StringUtils.isEmpty(title) ? "" : String.format("%s\n",title); - return "\n" + - " \n" + - " dolphinscheduler\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + htmlTableThead + content + - "
\n" + - " \n" + - ""; + return "dolphinscheduler " +htmlTableThead + content +"
"; } + } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java index 1c336c89a1..ce141d059a 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java @@ -76,7 +76,7 @@ public enum ExecutionStatus { * @return status */ public boolean typeIsFailure(){ - return this == FAILURE || this == NEED_FAULT_TOLERANCE; + return this == FAILURE || this == NEED_FAULT_TOLERANCE || this == KILL; } /**