From 6b3532cc2d47bc815f2ba322433fb88d09824c19 Mon Sep 17 00:00:00 2001 From: sam Date: Tue, 16 Jul 2024 15:43:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20Material=20=E5=A2=9E=E5=8A=A0=20Add?= =?UTF-8?q?MaterialFromReader=20=E4=B8=8E=20AddVideoFromReader=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20(#780)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Material 增加 AddMaterialFromReader 与 AddVideoFromReader 方法 * update: 调整 PostFileFromReader 参数。 --- officialaccount/material/material.go | 41 +++++++++++++++++++----- util/http.go | 48 ++++++++++++++++++++-------- 2 files changed, 67 insertions(+), 22 deletions(-) diff --git a/officialaccount/material/material.go b/officialaccount/material/material.go index 5b5f1c6..d8a43b9 100644 --- a/officialaccount/material/material.go +++ b/officialaccount/material/material.go @@ -4,6 +4,8 @@ import ( "encoding/json" "errors" "fmt" + "io" + "os" "github.com/silenceper/wechat/v2/officialaccount/context" "github.com/silenceper/wechat/v2/util" @@ -160,8 +162,8 @@ type resAddMaterial struct { URL string `json:"url"` } -// AddMaterial 上传永久性素材（处理视频需要单独上传） -func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) { +// AddMaterialFromReader 上传永久性素材（处理视频需要单独上传），从 io.Reader 中读取 +func (material *Material) AddMaterialFromReader(mediaType MediaType, filename string, reader io.Reader) (mediaID string, url string, err error) { if mediaType == MediaTypeVideo { err = errors.New("永久视频素材上传使用 AddVideo 方法") return @@ -174,7 +176,7 @@ func (material *Material) AddMaterial(mediaType MediaType, filename string) (med uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType) var response []byte - response, err = util.PostFile("media", filename, uri) + response, err = util.PostFileFromReader("media", filename, uri, reader) if err != nil { return } @@ -192,13 +194,24 @@ func (material *Material) AddMaterial(mediaType MediaType, filename string) (med return } +// AddMaterial 上传永久性素材（处理视频需要单独上传） +func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) { + f, err := os.Open(filename) + if err != nil { + return + } + defer func() { _ = f.Close() }() + + return material.AddMaterialFromReader(mediaType, filename, f) +} + type reqVideo struct { Title string `json:"title"` Introduction string `json:"introduction"` } -// AddVideo 永久视频素材文件上传 -func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) { +// AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取 +func (material *Material) AddVideoFromReader(filename, title, introduction string, reader io.Reader) (mediaID string, url string, err error) { var accessToken string accessToken, err = material.GetAccessToken() if err != nil { @@ -219,9 +232,10 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI fields := []util.MultipartFormField{ { - IsFile: true, - Fieldname: "media", - Filename: filename, + IsFile: true, + Fieldname: "media", + Filename: filename, + FileReader: reader, }, { IsFile: false, @@ -250,6 +264,17 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI return } +// AddVideo 永久视频素材文件上传 +func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) { + f, err := os.Open(filename) + if err != nil { + return "", "", err + } + defer func() { _ = f.Close() }() + + return material.AddVideoFromReader(filename, title, introduction, f) +} + type reqDeleteMaterial struct { MediaID string `json:"media_id"` } diff --git a/util/http.go b/util/http.go index 26e4a7b..b9b4b00 100644 --- a/util/http.go +++ b/util/http.go @@ -158,12 +158,26 @@ func PostFile(fieldName, filename, uri string) ([]byte, error) { return PostMultipartForm(fields, uri) } +// PostFileFromReader 上传文件，从 io.Reader 中读取 +func PostFileFromReader(filedName, fileName, uri string, reader io.Reader) ([]byte, error) { + fields := []MultipartFormField{ + { + IsFile: true, + Fieldname: filedName, + Filename: fileName, + FileReader: reader, + }, + } + return PostMultipartForm(fields, uri) +} + // MultipartFormField 保存文件或其他字段信息 type MultipartFormField struct { - IsFile bool - Fieldname string - Value []byte - Filename string + IsFile bool + Fieldname string + Value []byte + Filename string + FileReader io.Reader } // PostMultipartForm 上传文件或其他多个字段 @@ -182,15 +196,21 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte return } - fh, e := os.Open(field.Filename) - if e != nil { - err = fmt.Errorf("error opening file , err=%v", e) - return - } - defer fh.Close() - - if _, err = io.Copy(fileWriter, fh); err != nil { - return + if field.FileReader == nil { + fh, e := os.Open(field.Filename) + if e != nil { + err = fmt.Errorf("error opening file , err=%v", e) + return + } + _, err = io.Copy(fileWriter, fh) + _ = fh.Close() + if err != nil { + return + } + } else { + if _, err = io.Copy(fileWriter, field.FileReader); err != nil { + return + } } } else { partWriter, e := bodyWriter.CreateFormField(field.Fieldname) @@ -215,7 +235,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - return nil, err + return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, resp.StatusCode) } respBody, err = io.ReadAll(resp.Body) return From 05ac7148d4c82e39e93085f61d90b41397867307 Mon Sep 17 00:00:00 2001 From: Ji Luo Yang Date: Tue, 16 Jul 2024 21:02:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A8=A1=E6=9D=BF=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E9=80=92=20(#783)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 公众号新增模板接口，支持模板参数传递 * fix: 公众号新增模板接口，合并定义参数 * fix: 公众号新增模板接口，统一代码风格 --------- Co-authored-by: yangj23 --- officialaccount/message/template.go | 56 +++++++++++++++-------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/officialaccount/message/template.go b/officialaccount/message/template.go index 1c657ea..1717635 100644 --- a/officialaccount/message/template.go +++ b/officialaccount/message/template.go @@ -61,15 +61,15 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) { if err != nil { return } - uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken) - var response []byte - response, err = util.PostJSON(uri, msg) - if err != nil { + var ( + uri = fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken) + response []byte + ) + if response, err = util.PostJSON(uri, msg); err != nil { return } var result resTemplateSend - err = json.Unmarshal(response, &result) - if err != nil { + if err = json.Unmarshal(response, &result); err != nil { return } if result.ErrCode != 0 { @@ -103,10 +103,11 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) { if err != nil { return } - uri := fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken) - var response []byte - response, err = util.HTTPGet(uri) - if err != nil { + var ( + uri = fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken) + response []byte + ) + if response, err = util.HTTPGet(uri); err != nil { return } var res resTemplateList @@ -121,22 +122,23 @@ type resTemplateAdd struct { } // Add 添加模板. -func (tpl *Template) Add(shortID string) (templateID string, err error) { +func (tpl *Template) Add(shortID string, keyNameList []string) (templateID string, err error) { var accessToken string accessToken, err = tpl.GetAccessToken() if err != nil { return } - var msg = struct { - ShortID string `json:"template_id_short"` - }{ShortID: shortID} - uri := fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken) - var response []byte - response, err = util.PostJSON(uri, msg) - if err != nil { + var ( + msg = struct { + ShortID string `json:"template_id_short"` + KeyNameList []string `json:"keyword_name_list"` + }{ShortID: shortID, KeyNameList: keyNameList} + uri = fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken) + response []byte + ) + if response, err = util.PostJSON(uri, msg); err != nil { return } - var result resTemplateAdd err = util.DecodeWithError(response, &result, "AddTemplate") return result.TemplateID, err @@ -149,14 +151,14 @@ func (tpl *Template) Delete(templateID string) (err error) { if err != nil { return } - var msg = struct { - TemplateID string `json:"template_id"` - }{TemplateID: templateID} - - uri := fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken) - var response []byte - response, err = util.PostJSON(uri, msg) - if err != nil { + var ( + msg = struct { + TemplateID string `json:"template_id"` + }{TemplateID: templateID} + uri = fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken) + response []byte + ) + if response, err = util.PostJSON(uri, msg); err != nil { return } return util.DecodeWithCommonError(response, "DeleteTemplate")