From c31d23bdbf2ff46a396c4c13113de2e17117fd83 Mon Sep 17 00:00:00 2001 From: wind Date: Mon, 19 Feb 2024 10:05:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E5=8F=AF=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=90=BA=E5=B8=A6=E5=8F=91=E9=80=81=E4=BA=BA?= =?UTF-8?q?=E6=98=B5=E7=A7=B0=E7=9A=84=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../email/comm/config/MailSmtpConfig.java | 5 ++++ .../dromara/email/core/service/MailBuild.java | 25 ++++++++++++++++--- .../jakarta/comm/config/MailSmtpConfig.java | 5 ++++ .../email/jakarta/core/service/MailBuild.java | 25 ++++++++++++++++--- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java index aec4d63e..2b1e87b4 100644 --- a/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java +++ b/sms4j-Email-plugin/sms4j-Email-comm/src/main/java/org/dromara/email/comm/config/MailSmtpConfig.java @@ -26,6 +26,11 @@ public class MailSmtpConfig { * */ private String fromAddress; + /** + * 发送人昵称 + * */ + private String nickName; + /** * 服务器地址 * */ diff --git a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailBuild.java b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailBuild.java index 001d98bf..67066f98 100644 --- a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailBuild.java +++ b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailBuild.java @@ -1,6 +1,7 @@ package org.dromara.email.core.service; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import lombok.Data; import org.dromara.email.api.Blacklist; import org.dromara.email.api.MailClient; @@ -15,6 +16,7 @@ import javax.mail.Session; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -49,7 +51,15 @@ public class MailBuild { } }); this.message = new MimeMessage(session); - this.message.setFrom(new InternetAddress(config.getFromAddress())); + try { + if (StrUtil.isEmpty(config.getNickName())){ + this.message.setFrom(new InternetAddress(config.getFromAddress())); + }else { + this.message.setFrom(new InternetAddress(config.getFromAddress(),config.getNickName())); + } + } catch (UnsupportedEncodingException e) { + throw new MailException(e); + } this.config = config; this.retryInterval = config.getRetryInterval(); this.maxRetries = config.getMaxRetries(); @@ -70,7 +80,15 @@ public class MailBuild { } }); this.message = new MimeMessage(session); - this.message.setFrom(new InternetAddress(config.getFromAddress())); + try { + if (StrUtil.isEmpty(config.getNickName())){ + this.message.setFrom(new InternetAddress(config.getFromAddress())); + }else { + this.message.setFrom(new InternetAddress(config.getFromAddress(),config.getNickName())); + } + } catch (UnsupportedEncodingException e) { + throw new MailException(e); + } this.config = config; this.blacklist = blacklist; this.retryInterval = config.getRetryInterval(); @@ -96,7 +114,8 @@ public class MailBuild { if (Objects.isNull(blacklist)) { return InternetAddress.parse(Objects.requireNonNull(CollUtil.join(source, ","))); } - for (String s : blacklist.getBlacklist()) { + List blacklist1 = blacklist.getBlacklist(); + for (String s : blacklist1) { if (!source.contains(s)) { list.add(s); } diff --git a/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java b/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java index 61b696b1..fce2a1fb 100644 --- a/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java +++ b/sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/config/MailSmtpConfig.java @@ -26,6 +26,11 @@ public class MailSmtpConfig { * */ private String fromAddress; + /** + * 发送人昵称 + * */ + private String nickName; + /** * 服务器地址 * */ diff --git a/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailBuild.java b/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailBuild.java index 2faef9aa..69fefca2 100644 --- a/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailBuild.java +++ b/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/service/MailBuild.java @@ -1,6 +1,7 @@ package org.dromara.email.jakarta.core.service; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import jakarta.mail.Authenticator; import jakarta.mail.Message; import jakarta.mail.MessagingException; @@ -15,6 +16,7 @@ import org.dromara.email.jakarta.api.MailClient; import org.dromara.email.jakarta.comm.config.MailSmtpConfig; import org.dromara.email.jakarta.comm.errors.MailException; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -49,7 +51,15 @@ public class MailBuild { } }); this.message = new MimeMessage(session); - this.message.setFrom(new InternetAddress(config.getFromAddress())); + try { + if (StrUtil.isEmpty(config.getNickName())){ + this.message.setFrom(new InternetAddress(config.getFromAddress())); + }else { + this.message.setFrom(new InternetAddress(config.getFromAddress(),config.getNickName())); + } + } catch (UnsupportedEncodingException e) { + throw new MailException(e); + } this.config = config; this.retryInterval = config.getRetryInterval(); this.maxRetries = config.getMaxRetries(); @@ -70,7 +80,15 @@ public class MailBuild { } }); this.message = new MimeMessage(session); - this.message.setFrom(new InternetAddress(config.getFromAddress())); + try { + if (StrUtil.isEmpty(config.getNickName())){ + this.message.setFrom(new InternetAddress(config.getFromAddress())); + }else { + this.message.setFrom(new InternetAddress(config.getFromAddress(),config.getNickName())); + } + } catch (UnsupportedEncodingException e) { + throw new MailException(e); + } this.config = config; this.blacklist = blacklist; this.retryInterval = config.getRetryInterval(); @@ -96,7 +114,8 @@ public class MailBuild { if (Objects.isNull(blacklist)) { return InternetAddress.parse(Objects.requireNonNull(CollUtil.join(source, ","))); } - for (String s : blacklist.getBlacklist()) { + List blacklist1 = blacklist.getBlacklist(); + for (String s : blacklist1) { if (!source.contains(s)) { list.add(s); }