发邮件 go1.9 有问题，改用 gopkg.in/gomail.v2

zhima1234 · zhima1234 · commit ea19b34ebad5 · 2017-10-30T12:12:50.000+08:00
diff --git a/src/logic/email.go b/src/logic/email.go
@@ -20,6 +20,7 @@ import (
 	"github.com/polaris1119/email"
 	"github.com/polaris1119/goutils"
 	"github.com/polaris1119/logger"
+	gomail "gopkg.in/gomail.v2"
 
 	. "db"
 	"model"
@@ -30,10 +31,30 @@ type EmailLogic struct{}
 
 var DefaultEmail = EmailLogic{}
 
-// SendMail 发送电子邮件
+// SendMail 发送电子邮件（使用 gopkg.in/gomail.v2）
 func (EmailLogic) SendMail(subject, content string, tos []string) (err error) {
 	emailConfig, _ := config.ConfigFile.GetSection("email")
 
+	m := gomail.NewMessage()
+	m.SetHeader("From", WebsiteSetting.Name+` <`+emailConfig["from_email"]+`>`)
+	m.SetHeader("To", tos...)
+	m.SetHeader("Subject", subject)
+	m.SetBody("text/html", content)
+
+	d := gomail.NewDialer(emailConfig["smtp_host"], goutils.MustInt(emailConfig["smtp_port"]), emailConfig["smtp_username"], emailConfig["smtp_password"])
+	if err = d.DialAndSend(m); err != nil {
+		logger.Errorln("Send Mail to", strings.Join(tos, ","), "error:", err)
+		return
+	}
+
+	logger.Infoln("Send Mail to", strings.Join(tos, ","), "Successfully")
+	return
+}
+
+// SendMail 发送电子邮件（使用 github.com/polaris1119/email），go 1.9 tls 有问题
+func (EmailLogic) SendMail1(subject, content string, tos []string) (err error) {
+	emailConfig, _ := config.ConfigFile.GetSection("email")
+
 	e := email.NewEmail()
 	e.From = WebsiteSetting.Name + ` <` + emailConfig["from_email"] + `>`
 	e.To = tos
diff --git a/src/logic/email_test.go b/src/logic/email_test.go
@@ -0,0 +1,20 @@
+package logic_test
+
+import (
+	. "github.com/polaris1119/config"
+	"github.com/polaris1119/logger"
+
+	"logic"
+	"testing"
+)
+
+func TestSendMail(t *testing.T) {
+	logger.Init(ROOT+"/log", ConfigFile.MustValue("global", "log_level", "DEBUG"))
+
+	err := logic.DefaultEmail.SendMail("中文test", "内容test content", []string{"xuxinhua@zhimadj.com"})
+	if err != nil {
+		t.Error(err)
+	} else {
+		t.Log("successful")
+	}
+}
diff --git a/src/vendor/manifest b/src/vendor/manifest
@@ -311,7 +311,7 @@
 		{
 			"importpath": "github.com/polaris1119/email",
 			"repository": "https://github.com/polaris1119/email",
-			"revision": "fab6eb4568abf395404252a598ff32d7fe445dbf",
+			"revision": "809494756a1ae301b702722e00b8584bdc7d68cc",
 			"branch": "master"
 		},
 		{
@@ -522,6 +522,12 @@
 			"revision": "dafb3384ad25363d928a9e97ce4ad3a2f0667e34",
 			"branch": "master",
 			"path": "/transform"
+		},
+		{
+			"importpath": "gopkg.in/gomail.v2",
+			"repository": "https://gopkg.in/gomail.v2",
+			"revision": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1",
+			"branch": "v2"
 		}
 	]
 }

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@`
`311`	`311`	`{`
`312`	`312`	`"importpath": "github.com/polaris1119/email",`
`313`	`313`	`"repository": "https://github.com/polaris1119/email",`
`314`		`- "revision": "fab6eb4568abf395404252a598ff32d7fe445dbf",`
	`314`	`+ "revision": "809494756a1ae301b702722e00b8584bdc7d68cc",`
`315`	`315`	`"branch": "master"`
`316`	`316`	`},`
`317`	`317`	`{`
`@@ -522,6 +522,12 @@`
`522`	`522`	`"revision": "dafb3384ad25363d928a9e97ce4ad3a2f0667e34",`
`523`	`523`	`"branch": "master",`
`524`	`524`	`"path": "/transform"`
	`525`	`+ },`
	`526`	`+ {`
	`527`	`+ "importpath": "gopkg.in/gomail.v2",`
	`528`	`+ "repository": "https://gopkg.in/gomail.v2",`
	`529`	`+ "revision": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1",`
	`530`	`+ "branch": "v2"`
`525`	`531`	`}`
`526`	`532`	`]`
`527`	`533`	`}`