From 458583030a168146e905f07c6a28d50fc816767a Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Sun, 17 Nov 2019 23:58:11 -0600
Subject: [PATCH] =?UTF-8?q?data=20type=20convert=20error=20=EF=BC=8Cemail?=
 =?UTF-8?q?=20send=20error=20bug=20fix=20(#1266)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ConnectionFactory add paging intercepter

* remove spotbugs-annotations.jar LGPL protocol

* test

* catch exception transaction method does not take effect to modify

* .evn rollback

* DataSourceService rollback

* LogViewServiceGrpc rollback

* dockerfile add application-api.properties and change application.properties to application-dao.properties

* server startup error modify

* data type convert error ，email send error bug fix
---
 .../apache/dolphinscheduler/alert/utils/MailUtils.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 b321a1ee3c..d6edde240b 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
@@ -188,17 +188,17 @@ public class MailUtils {
             String title = "";
             for (LinkedHashMap mapItems : mapItemsList){
 
-                Set<Map.Entry<String, String>> entries = mapItems.entrySet();
+                Set<Map.Entry<String, Object>> entries = mapItems.entrySet();
 
-                Iterator<Map.Entry<String, String>> iterator = entries.iterator();
+                Iterator<Map.Entry<String, Object>> iterator = entries.iterator();
 
                 StringBuilder t = new StringBuilder(Constants.TR);
                 StringBuilder cs = new StringBuilder(Constants.TR);
                 while (iterator.hasNext()){
 
-                    Map.Entry<String, String> entry = iterator.next();
+                    Map.Entry<String, Object> entry = iterator.next();
                     t.append(Constants.TH).append(entry.getKey()).append(Constants.TH_END);
-                    cs.append(Constants.TD).append(entry.getValue()).append(Constants.TD_END);
+                    cs.append(Constants.TD).append(String.valueOf(entry.getValue())).append(Constants.TD_END);
 
                 }
                 t.append(Constants.TR_END);