Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bf8adf5

Browse files
committed
只有注册验证时,网易的采用网易发,确保不会超
1 parent 0cfa585 commit bf8adf5

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

src/logic/email.go

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type EmailLogic struct{}
3131
var DefaultEmail = EmailLogic{}
3232

3333
// SendMail 发送电子邮件
34-
func (EmailLogic) SendMail(subject, content string, tos []string) (err error) {
34+
func (EmailLogic) SendMail(subject, content string, tos []string, isRegs ...bool) (err error) {
3535
emailConfig, _ := config.ConfigFile.GetSection("email")
3636

3737
fromEmail := emailConfig["from_email"]
@@ -40,16 +40,19 @@ func (EmailLogic) SendMail(subject, content string, tos []string) (err error) {
4040
smtpHost := emailConfig["smtp_host"]
4141
smtpPort := emailConfig["smtp_port"]
4242

43-
for _, to := range tos {
44-
if strings.HasSuffix(to, "163.com") || strings.HasSuffix(to, "126.com") {
45-
email163Config, _ := config.ConfigFile.GetSection("email.163")
46-
fromEmail = email163Config["from_email"]
47-
smtpUsername = email163Config["smtp_username"]
48-
smtpPassword = email163Config["smtp_password"]
49-
smtpHost = email163Config["smtp_host"]
50-
smtpPort = email163Config["smtp_port"]
51-
52-
break
43+
// 注册才区别使用 163,尽可能确保能收到
44+
if len(isRegs) > 0 && isRegs[0] {
45+
for _, to := range tos {
46+
if strings.HasSuffix(to, "163.com") || strings.HasSuffix(to, "126.com") {
47+
email163Config, _ := config.ConfigFile.GetSection("email.163")
48+
fromEmail = email163Config["from_email"]
49+
smtpUsername = email163Config["smtp_username"]
50+
smtpPassword = email163Config["smtp_password"]
51+
smtpHost = email163Config["smtp_host"]
52+
smtpPort = email163Config["smtp_port"]
53+
54+
break
55+
}
5356
}
5457
}
5558

@@ -104,7 +107,7 @@ func (self EmailLogic) SendActivateMail(email, uuid string, isHttps ...bool) {
104107
感谢您选择了` + WebsiteSetting.Name + `,请点击下面的地址激活你在` + WebsiteSetting.Name + `的帐号(有效期4小时):<br/><br/>
105108
<a href="` + activeUrl + `">` + activeUrl + `</a><br/><br/>
106109
<div style="text-align:right;">&copy;` + global.App.Copyright + ` ` + WebsiteSetting.Name + `</div>`
107-
self.SendMail(WebsiteSetting.Name+"帐号激活邮件", content, []string{email})
110+
self.SendMail(WebsiteSetting.Name+"帐号激活邮件", content, []string{email}, true)
108111
}
109112

110113
func (EmailLogic) genActivateSign(email, uuid string, ts int64) string {
@@ -131,7 +134,7 @@ func (self EmailLogic) SendResetpwdMail(email, uuid string, isHttps ...bool) {
131134
如果您有任何疑问,可以回复这封邮件向我们提问。谢谢!<br/><br/>
132135
133136
<div style="text-align:right;">&copy;` + global.App.Copyright + ` ` + WebsiteSetting.Name + `</div>`
134-
self.SendMail("【"+WebsiteSetting.Name+"】重设密码 ", content, []string{email})
137+
self.SendMail("【"+WebsiteSetting.Name+"】重设密码 ", content, []string{email}, true)
135138
}
136139

137140
// 自定义模板函数

0 commit comments

Comments
 (0)