fix(通知管理): 修复邮件收件方不显示自定义的发件人昵称 (#327)
This commit is contained in:
parent
6259181f26
commit
4b5fa4a0dc
|
|
@ -7,6 +7,7 @@ import lombok.Getter;
|
|||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.hswebframework.web.bean.FastBeanCopier;
|
||||
import org.hswebframework.web.exception.BusinessException;
|
||||
import org.hswebframework.web.id.IDGenerator;
|
||||
|
|
@ -66,6 +67,10 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
|
|||
@Setter
|
||||
private String sender;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
private String username;
|
||||
|
||||
@Getter
|
||||
private final String notifierId;
|
||||
|
||||
|
|
@ -101,6 +106,7 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
|
|||
mailSender.setJavaMailProperties(properties.createJavaMailProperties());
|
||||
this.notifierId = id;
|
||||
this.sender = properties.getSender();
|
||||
this.username = properties.getUsername();
|
||||
this.javaMailSender = mailSender;
|
||||
this.fileManager = fileManager;
|
||||
}
|
||||
|
|
@ -136,8 +142,11 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
|
|||
.fromCallable(() -> {
|
||||
MimeMessage mimeMessage = this.javaMailSender.createMimeMessage();
|
||||
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "utf-8");
|
||||
|
||||
if (StringUtils.isNotBlank(this.username)) {
|
||||
helper.setFrom(this.sender + '<' + this.username + '>');
|
||||
} else {
|
||||
helper.setFrom(this.sender);
|
||||
}
|
||||
helper.setTo(template.getSendTo().toArray(new String[0]));
|
||||
helper.setSubject(template.getSubject());
|
||||
helper.setText(new String(template.getText().getBytes(), StandardCharsets.UTF_8), true);
|
||||
|
|
|
|||
Loading…
Reference in New Issue