From d69eee23f016ea4f832e5e0e61355e739be07b48 Mon Sep 17 00:00:00 2001 From: TossPig Date: Sat, 11 Oct 2014 00:38:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 不知道英文区的人能否看懂Cnglish。。。 --- utils/mail.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/mail.go b/utils/mail.go index 492ad06f..e70e3586 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -158,7 +158,8 @@ func (e *Email) Bytes() ([]byte, error) { // Add attach file to the send mail func (e *Email) AttachFile(args ...string) (a *Attachment, err error) { - if len(args) < 1 || len(args) > 2 { + if len(args) < 1 && len(args) > 2 { + err = errors.New("Must specify a file name and number of parameters can not exceed at least two") return } filename := args[0] @@ -178,13 +179,14 @@ func (e *Email) AttachFile(args ...string) (a *Attachment, err error) { // Attach is used to attach content from an io.Reader to the email. // Parameters include an io.Reader, the desired filename for the attachment, and the Content-Type. func (e *Email) Attach(r io.Reader, filename string, args ...string) (a *Attachment, err error) { - if len(args) < 1 || len(args) > 2 { + if len(args) < 1 && len(args) > 2 { + err = errors.New("Must specify a file type and number of parameters can not exceed at least two") return } - c := args[0] //Content-Type + c := args[0] //Content-Type id := "" if len(args) > 1 { - id = args[1] //Content-ID + id = args[1] //Content-ID } var buffer bytes.Buffer if _, err = io.Copy(&buffer, r); err != nil {