MiaoStars/cloudreve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(mail): migrate to wneessen/go-mail (#2738)

Browse Source
This commit is contained in:
Aaron Liu
2025-08-10 10:40:21 +08:00
parent 4c08644b05
commit 8688069fac
5 changed files with 104 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
pkg/email/smtp.go
View File

@@ -9,8 +9,7 @@ import (
"github.com/cloudreve/Cloudreve/v4/inventory"
"github.com/cloudreve/Cloudreve/v4/pkg/logging"
"github.com/cloudreve/Cloudreve/v4/pkg/setting"
"github.com/go-mail/mail"
"github.com/gofrs/uuid"
"github.com/wneessen/go-mail"
)
// SMTPPool SMTP协议发送邮件
@@ -38,9 +37,11 @@ type SMTPConfig struct {
}
type message struct {
msg *mail.Message
cid string
userID int
msg *mail.Msg
to string
subject string
cid string
userID int
}
// NewSMTPPool initializes a new SMTP based email sending queue.
@@ -81,17 +82,21 @@ func (client *SMTPPool) Send(ctx context.Context, to, title, body string) error
return nil
}
m := mail.NewMessage()
m.SetAddressHeader("From", client.config.From, client.config.FromName)
m.SetAddressHeader("Reply-To", client.config.ReplyTo, client.config.FromName)
m.SetHeader("To", to)
m.SetHeader("Subject", title)
m.SetHeader("Message-ID", fmt.Sprintf("<%s@%s>", uuid.Must(uuid.NewV4()).String(), "cloudreve"))
m.SetBody("text/html", body)
m := mail.NewMsg()
if err := m.FromFormat(client.config.FromName, client.config.From); err != nil {
return err
}
m.ReplyToFormat(client.config.FromName, client.config.ReplyTo)
m.To(to)
m.Subject(title)
m.SetMessageID()
m.SetBodyString(mail.TypeTextHTML, body)
client.ch <- &message{
msg: m,
cid: logging.CorrelationID(ctx).String(),
userID: inventory.UserIDFromContext(ctx),
msg: m,
subject: title,
to: to,
cid: logging.CorrelationID(ctx).String(),
userID: inventory.UserIDFromContext(ctx),
}
return nil
}
@@ -116,17 +121,24 @@ func (client *SMTPPool) Init() {
}
}()
d := mail.NewDialer(client.config.Host, client.config.Port, client.config.User, client.config.Password)
d.Timeout = time.Duration(client.config.Keepalive+5) * time.Second
client.chOpen = true
// 是否启用 SSL
d.SSL = false
tlsPolicy := mail.TLSOpportunistic
if client.config.ForceEncryption {
d.SSL = true
tlsPolicy = mail.TLSMandatory
}
d.StartTLSPolicy = mail.OpportunisticStartTLS
var s mail.SendCloser
d, diaErr := mail.NewClient(client.config.Host,
mail.WithPort(client.config.Port),
mail.WithTimeout(time.Duration(client.config.Keepalive+5)*time.Second),
mail.WithSMTPAuth(mail.SMTPAuthAutoDiscover), mail.WithTLSPortPolicy(tlsPolicy),
mail.WithUsername(client.config.User), mail.WithPassword(client.config.Password),
)
if diaErr != nil {
client.l.Panic("Failed to create SMTP client: %s", diaErr)
return
}
client.chOpen = true
var err error
open := false
for {
@@ -139,22 +151,22 @@ func (client *SMTPPool) Init() {
}
if !open {
if s, err = d.Dial(); err != nil {
if err = d.DialWithContext(context.Background()); err != nil {
panic(err)
}
open = true
}
l := client.l.CopyWithPrefix(fmt.Sprintf("[Cid: %s]", m.cid))
if err := mail.Send(s, m.msg); err != nil {
if err := d.Send(m.msg); err != nil {
l.Warning("Failed to send email: %s, Cid=%s", err, m.cid)
} else {
l.Info("Email sent to %q, title: %q.", m.msg.GetHeader("To"), m.msg.GetHeader("Subject"))
l.Info("Email sent to %q, title: %q.", m.to, m.subject)
}
// 长时间没有新邮件，则关闭SMTP连接
case <-time.After(time.Duration(client.config.Keepalive) * time.Second):
if open {
if err := s.Close(); err != nil {
if err := d.Close(); err != nil {
client.l.Warning("Failed to close SMTP connection: %s", err)
}
open = false