lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 18:50:54 +00:00
Code Issues Releases Activity

添加错误返回

Browse Source 
不知道英文区的人能否看懂Cnglish。。。
This commit is contained in:
TossPig 2014-10-11 00:38:31 +08:00
parent 41de7c7db6
commit d69eee23f0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/mail.go
View File

@ -158,7 +158,8 @@ func (e *Email) Bytes() ([]byte, error) {
// Add attach file to the send mail // Add attach file to the send mail
func (e *Email) AttachFile(args ...string) (a *Attachment, err error) { 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 return
} }
filename := args[0] 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. // 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. // 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) { 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 return
} }
c := args[0] //Content-Type c := args[0] //Content-Type
id := "" id := ""
if len(args) > 1 { if len(args) > 1 {
id = args[1] //Content-ID id = args[1] //Content-ID
} }
var buffer bytes.Buffer var buffer bytes.Buffer
if _, err = io.Copy(&buffer, r); err != nil { if _, err = io.Copy(&buffer, r); err != nil {