From 215b96c881ac8fbd749df6e286bab109e39788a1 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sat, 29 May 2021 15:25:41 +0800 Subject: [PATCH] Let SendEmail() return string. --- object/email.go | 9 +++++++-- object/verification.go | 10 +--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/object/email.go b/object/email.go index afe328c6..cbefd252 100644 --- a/object/email.go +++ b/object/email.go @@ -18,7 +18,7 @@ package object import "github.com/go-gomail/gomail" -func SendEmail(provider *Provider, title, content, dest, sender string) (string, error) { +func SendEmail(provider *Provider, title, content, dest, sender string) string { dialer := gomail.NewDialer(provider.Host, provider.Port, provider.ClientId, provider.ClientSecret) message := gomail.NewMessage() @@ -27,5 +27,10 @@ func SendEmail(provider *Provider, title, content, dest, sender string) (string, message.SetHeader("Subject", title) message.SetBody("text/html", content) - return "", dialer.DialAndSend(message) + err := dialer.DialAndSend(message) + if err == nil { + return "" + } else { + return err.Error() + } } diff --git a/object/verification.go b/object/verification.go index 5f1d53cc..98bf6bb4 100644 --- a/object/verification.go +++ b/object/verification.go @@ -54,15 +54,7 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide return result } - msg, err := SendEmail(provider, title, content, dest, sender) - if msg != "" { - return msg - } - if err != nil { - panic(err) - } - - return "" + return SendEmail(provider, title, content, dest, sender) } func SendVerificationCodeToPhone(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string) string {