Fix: user encryption setting will now overwrite the default one in go…

…mail (cloudreve#869 cloudreve#857 cloudreve#723 cloudreve#545)
noko8023 · Apr 25, 2021 · 641fe35 · 641fe35
1 parent 96712fb
commit 641fe35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/assets b/assets
diff --git a/pkg/email/smtp.go b/pkg/email/smtp.go
@@ -77,11 +77,12 @@ func (client *SMTP) 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
 		if client.Config.Encryption {
 			d.SSL = true
 		}
+		d.StartTLSPolicy = mail.OpportunisticStartTLS
 
 		var s mail.SendCloser
 		var err error
+5 −2		src/component/Admin/Setting/Mail.js
+4 −1		src/component/Navbar/StorageBar.js
+0 −1		src/component/Viewer/Video.js