natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35 from Baoqi/dev_dont_send_email_when_no_recipts 

before send mail, check whether no receivers && cc receivers
This commit is contained in:
乔占卫 2019-04-11 17:22:15 +08:00 committed by GitHub
parent 6fcfb7b20e 4fbd9380de
commit e42d2aa558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
View File

@ -103,10 +103,14 @@ public class MailUtils {
public static Map<String,Object> sendMails(Collection<String> receivers, Collection<String> receiversCc, String title, String content, ShowType showType) {
Map<String,Object> retMap = new HashMap<>();
retMap.put(Constants.STATUS, false);
// if there is no receivers && no receiversCc, no need to process
if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) {
return retMap;
}
receivers.removeIf((from) -> (StringUtils.isEmpty(from)));
if (showType == ShowType.TABLE || showType == ShowType.TEXT){
// send email
HtmlEmail email = new HtmlEmail();