From 1dfde72452e891e46bb9d39affe6d74996685574 Mon Sep 17 00:00:00 2001 From: johnnygo920 <61645312+johnnygo920@users.noreply.github.com> Date: Tue, 14 Jul 2020 23:22:42 +0800 Subject: [PATCH 1/2] [BUG#2359][Alert] Mail Chinese name is too long garbled (#3199) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 解决中文附件名过长时邮件附件中文乱码问题 * Solve the problem of messy Chinese name in excel attachment * SonarCloud Code Analysis is not running . retry commit * Update MailUtils.java Co-authored-by: johnnygo920 Co-authored-by: dailidong --- .../org/apache/dolphinscheduler/alert/utils/MailUtils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java index bb565f5133..6f67462771 100644 --- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java @@ -65,6 +65,10 @@ public class MailUtils { public static final AlertTemplate alertTemplate = AlertTemplateFactory.getMessageTemplate(); + //Solve the problem of messy Chinese name in excel attachment + static { + System.setProperty("mail.mime.splitlongparameters","false"); + } /** * send mail to receivers @@ -341,4 +345,5 @@ public class MailUtils { retMap.put(Constants.MESSAGE, "Send email to {" + String.join(",", receivers) + "} failed，" + e.toString()); } + } From c453a5bd4ce8e9a0367ef52948053161164ac418 Mon Sep 17 00:00:00 2001 From: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com> Date: Wed, 15 Jul 2020 10:46:54 +0800 Subject: [PATCH 2/2] dag add close buttion (#3195) * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * dag add close button * reset last version * reset last version * dag add close buttion dag add close buttion * update CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * Update CreateWorkflowLocator.java modify submit workflow button * Update CreateWorkflowLocator.java * Update CreateWorkflowLocator.java modify CLICK_ADD_BUTTON * Update CreateWorkflowLocator.java delete print * Update CreateWorkflowLocator.java 1 * Update CreateWorkflowLocator.java 1 * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dag.vue * Update dag.vue * Update dag.vue * Update CreateWorkflowLocator.java * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks" This reverts commit 3a2cba7a Co-authored-by: dailidong Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> --- .../js/conf/home/pages/dag/_source/dag.vue | 21 +++++++++++++++++++ .../project/CreateWorkflowLocator.java | 9 ++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index eb58da46f6..7b7315147a 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -101,6 +101,17 @@ @click="_rtNodesDag" > {{$t('Return_1')}} + + {{$t('Close')}} + @import "./dag"; + + diff --git a/e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateWorkflowLocator.java b/e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateWorkflowLocator.java index 5163f0f66f..ad18b6217c 100644 --- a/e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateWorkflowLocator.java +++ b/e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateWorkflowLocator.java @@ -24,7 +24,6 @@ public class CreateWorkflowLocator { /** * jump workflow define page */ - // click project name public static final By CLICK_PROJECT_NAME = By.xpath("//span/a"); @@ -119,14 +118,14 @@ public class CreateWorkflowLocator { public static final By CLICK_DELETE_CUSTOM_PARAMETERS = By.xpath("//div[2]/span/a/em"); //click submit button - public static final By CLICK_SUBMIT_BUTTON = By.xpath("//button[2]/span"); + public static final By CLICK_SUBMIT_BUTTON = By.xpath("//div[3]/div/button[2]/span"); /** * save workflow */ //click save workflow button - public static final By CLICK_SAVE_WORKFLOW_BUTTON = By.xpath("//button/span"); + public static final By CLICK_SAVE_WORKFLOW_BUTTON = By.xpath("//div[2]/div[1]/div[2]/button[2]"); //input workflow name public static final By INPUT_WORKFLOW_NAME = By.xpath("//input"); @@ -166,8 +165,7 @@ public class CreateWorkflowLocator { public static final By CLICK_DELETE_WORKFLOW_GLOBAL_PARAMETERS = By.xpath("//div[2]/span/a/em"); //click add button - public static final By CLICK_ADD_BUTTON = By.xpath("//button[2]/span"); - + public static final By CLICK_ADD_BUTTON = By.xpath("//div[2]/div/button[2]/span"); //scroll to element bottom public static final By SCROLL_BOTTOM = By.xpath("//span/a/em"); @@ -192,4 +190,5 @@ public class CreateWorkflowLocator { //click confirm delete workflow button public static final By CONFIRM_DELETE_WORKFLOW_BOTTOM = By.xpath("//div[2]/div/button[2]/span"); + }