|
@@ -48,12 +48,11 @@ func getDialer(flag bool, auth *GmailAuth, to string) *gomail.Dialer {
|
|
|
return <-auth.PoolChan
|
|
|
}
|
|
|
|
|
|
-//发送普通
|
|
|
+// 发送普通
|
|
|
func GSendMail(from, to, cc, bcc, subject, body, fname, rename string, auth *GmailAuth) bool {
|
|
|
m := gomail.NewMessage()
|
|
|
- m.SetAddressHeader("From", auth.User, from) // 发件人
|
|
|
- m.SetHeader("To",
|
|
|
- m.FormatAddress(to, "收件人")) // 收件人
|
|
|
+ m.SetAddressHeader("From", auth.User, from) // 发件人
|
|
|
+ m.SetHeader("To", strings.Split(to, ",")...) // 收件人
|
|
|
if cc != "" {
|
|
|
m.SetHeader("Cc", m.FormatAddress(cc, "收件人")) //抄送
|
|
|
}
|
|
@@ -74,7 +73,7 @@ func GSendMail(from, to, cc, bcc, subject, body, fname, rename string, auth *Gma
|
|
|
return gSend(reTry, auth, m, to)
|
|
|
}
|
|
|
|
|
|
-//如果附件是byte,用这个
|
|
|
+// 如果附件是byte,用这个
|
|
|
func GSendMail_B(from, to, cc, bcc, subject, body, fname string, fb []byte, auth *GmailAuth) bool {
|
|
|
m := gomail.NewMessage()
|
|
|
m.SetAddressHeader("From", auth.User, from) // 发件人
|
|
@@ -100,8 +99,8 @@ func GSendMail_B(from, to, cc, bcc, subject, body, fname string, fb []byte, auth
|
|
|
return gSend(reTry, auth, m, to)
|
|
|
}
|
|
|
|
|
|
-//如果附件是byte,用这个,这个是为企业级服务修改的
|
|
|
-//20191206 @ren to用|分隔的是抄送用,分隔的是并列
|
|
|
+// 如果附件是byte,用这个,这个是为企业级服务修改的
|
|
|
+// 20191206 @ren to用|分隔的是抄送用,分隔的是并列
|
|
|
func GSendMail_Bq(from, to, cc, bcc, subject, body, fname string, fb []byte, auth *GmailAuth) bool {
|
|
|
m := gomail.NewMessage()
|
|
|
m.SetAddressHeader("From", auth.User, from) // 发件人
|
|
@@ -146,8 +145,8 @@ func GSendMail_Bq(from, to, cc, bcc, subject, body, fname string, fb []byte, aut
|
|
|
return gSend(reTry, auth, m, to)
|
|
|
}
|
|
|
|
|
|
-//发送普通这个是为企业级服务修改的
|
|
|
-//20191206 @ren to用|分隔的是抄送,分隔的是并列
|
|
|
+// 发送普通这个是为企业级服务修改的
|
|
|
+// 20191206 @ren to用|分隔的是抄送,分隔的是并列
|
|
|
func GSendMail_q(from, to, cc, bcc, subject, body, fname, rename string, auth *GmailAuth) bool {
|
|
|
m := gomail.NewMessage()
|
|
|
m.SetAddressHeader("From", auth.User, from) // 发件人
|
|
@@ -192,7 +191,6 @@ func GSendMail_q(from, to, cc, bcc, subject, body, fname, rename string, auth *G
|
|
|
return gSend(reTry, auth, m, to)
|
|
|
}
|
|
|
|
|
|
-//
|
|
|
func gSend(retry int, auth *GmailAuth, m *gomail.Message, to string) bool {
|
|
|
defer common.Catch()
|
|
|
dialer := getDialer(false, auth, to)
|
|
@@ -215,7 +213,7 @@ func gSend(retry int, auth *GmailAuth, m *gomail.Message, to string) bool {
|
|
|
return status
|
|
|
}
|
|
|
|
|
|
-//先取模后轮询获取一个mail实例
|
|
|
+// 先取模后轮询获取一个mail实例
|
|
|
func PollingMail(email string, array []*GmailAuth, f func(g *GmailAuth) bool) bool {
|
|
|
if len(array) == 0 {
|
|
|
return false
|