github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: user encryption setting will now overwrite the default one in gomail (#869 #857 #723 #545)

pull/831/head^2
HFO4 2021-04-25 16:06:22 +08:00
parent 96712fb066
commit 641fe352da
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 08a301d53a39d0a67a2714caef9866c1eeaa4ee3 Subproject commit 997b73312aad0fd8caae91cd1fde386701ce37c0

3
pkg/email/smtp.go
View File

@ -77,11 +77,12 @@ func (client *SMTP) Init() {
d := mail.NewDialer(client.Config.Host, client.Config.Port, client.Config.User, client.Config.Password) 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 d.Timeout = time.Duration(client.Config.Keepalive+5) * time.Second
client.chOpen = true client.chOpen = true
// 是否启用 SSL // 是否启用 SSL
d.SSL = false
if client.Config.Encryption { if client.Config.Encryption {
d.SSL = true d.SSL = true
} }
d.StartTLSPolicy = mail.OpportunisticStartTLS
var s mail.SendCloser var s mail.SendCloser
var err error var err error