From 6b3532cc2d47bc815f2ba322433fb88d09824c19 Mon Sep 17 00:00:00 2001 From: sam Date: Tue, 16 Jul 2024 15:43:18 +0800 Subject: [PATCH 1/5] =?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/5] =?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") From c22a036b7fc7c33e9720ce4ff0379a53cfb64dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=8F=B6=E7=9F=A5=E7=A7=8B?= <42715919+sappan@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:08:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=20(#793)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cache/redis.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cache/redis.go b/cache/redis.go index f51f7bf..bcaa8b8 100644 --- a/cache/redis.go +++ b/cache/redis.go @@ -16,6 +16,7 @@ type Redis struct { // RedisOpts redis 连接属性 type RedisOpts struct { Host string `yml:"host" json:"host"` + Username string `yaml:"username" json:"username"` Password string `yml:"password" json:"password"` Database int `yml:"database" json:"database"` MaxIdle int `yml:"max_idle" json:"max_idle"` @@ -28,6 +29,7 @@ func NewRedis(ctx context.Context, opts *RedisOpts) *Redis { conn := redis.NewUniversalClient(&redis.UniversalOptions{ Addrs: []string{opts.Host}, DB: opts.Database, + Username: opts.Username, Password: opts.Password, IdleTimeout: time.Second * time.Duration(opts.IdleTimeout), MinIdleConns: opts.MaxIdle, From c1770130a0a89e201f2dc6cd182010e1978b912f Mon Sep 17 00:00:00 2001 From: oah8 <122527972+oah8@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:21:58 +0800 Subject: [PATCH 4/5] add stream_upload_source (#786) Co-authored-by: _oah <57302072@qq.com> --- officialaccount/material/material.go | 21 ++++++----- officialaccount/material/media.go | 33 ++++++++++++++++++ util/http.go | 25 ++++++++++--- work/material/media.go | 52 ++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 13 deletions(-) diff --git a/officialaccount/material/material.go b/officialaccount/material/material.go index d8a43b9..18f5225 100644 --- a/officialaccount/material/material.go +++ b/officialaccount/material/material.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "os" + "path" "github.com/silenceper/wechat/v2/officialaccount/context" "github.com/silenceper/wechat/v2/util" @@ -163,7 +164,7 @@ type resAddMaterial struct { } // AddMaterialFromReader 上传永久性素材（处理视频需要单独上传），从 io.Reader 中读取 -func (material *Material) AddMaterialFromReader(mediaType MediaType, filename string, reader io.Reader) (mediaID string, url string, err error) { +func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath string, reader io.Reader) (mediaID string, url string, err error) { if mediaType == MediaTypeVideo { err = errors.New("永久视频素材上传使用 AddVideo 方法") return @@ -175,8 +176,10 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, filename st } uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType) + // 获取文件名 + filename := path.Base(filePath) var response []byte - response, err = util.PostFileFromReader("media", filename, uri, reader) + response, err = util.PostFileFromReader("media", filePath, filename, uri, reader) if err != nil { return } @@ -211,7 +214,7 @@ type reqVideo struct { } // AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取 -func (material *Material) AddVideoFromReader(filename, title, introduction string, reader io.Reader) (mediaID string, url string, err error) { +func (material *Material) AddVideoFromReader(filePath, title, introduction string, reader io.Reader) (mediaID string, url string, err error) { var accessToken string accessToken, err = material.GetAccessToken() if err != nil { @@ -229,17 +232,19 @@ func (material *Material) AddVideoFromReader(filename, title, introduction strin if err != nil { return } - + fileName := path.Base(filePath) fields := []util.MultipartFormField{ { IsFile: true, Fieldname: "media", - Filename: filename, + FilePath: filePath, + Filename: fileName, FileReader: reader, }, { IsFile: false, Fieldname: "description", + Filename: fileName, Value: fieldValue, }, } @@ -265,14 +270,14 @@ func (material *Material) AddVideoFromReader(filename, title, introduction strin } // AddVideo 永久视频素材文件上传 -func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) { - f, err := os.Open(filename) +func (material *Material) AddVideo(directory, title, introduction string) (mediaID string, url string, err error) { + f, err := os.Open(directory) if err != nil { return "", "", err } defer func() { _ = f.Close() }() - return material.AddVideoFromReader(filename, title, introduction, f) + return material.AddVideoFromReader(directory, title, introduction, f) } type reqDeleteMaterial struct { diff --git a/officialaccount/material/media.go b/officialaccount/material/media.go index 316758f..b7d6573 100644 --- a/officialaccount/material/media.go +++ b/officialaccount/material/media.go @@ -3,6 +3,7 @@ package material import ( "encoding/json" "fmt" + "io" "github.com/silenceper/wechat/v2/util" ) @@ -62,6 +63,38 @@ func (material *Material) MediaUpload(mediaType MediaType, filename string) (med return } +// MediaUploadFromReader 临时素材上传 +func (material *Material) MediaUploadFromReader(mediaType MediaType, filename string, reader io.Reader) (media Media, err error) { + var accessToken string + accessToken, err = material.GetAccessToken() + if err != nil { + return + } + + uri := fmt.Sprintf("%s?access_token=%s&type=%s", mediaUploadURL, accessToken, mediaType) + + var byteData []byte + byteData, err = io.ReadAll(reader) + if err != nil { + return + } + + var response []byte + response, err = util.PostFileByStream("media", filename, uri, byteData) + if err != nil { + return + } + err = json.Unmarshal(response, &media) + if err != nil { + return + } + if media.ErrCode != 0 { + err = fmt.Errorf("MediaUpload error : errcode=%v , errmsg=%v", media.ErrCode, media.ErrMsg) + return + } + return +} + // GetMediaURL 返回临时素材的下载地址供用户自己处理 // NOTICE: URL 不可公开，因为含access_token 需要立即另存文件 func (material *Material) GetMediaURL(mediaID string) (mediaURL string, err error) { diff --git a/util/http.go b/util/http.go index b9b4b00..948e38f 100644 --- a/util/http.go +++ b/util/http.go @@ -146,24 +146,38 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e return responseData, contentType, err } +// PostFileByStream 上传文件 +func PostFileByStream(fieldName, fileName, uri string, byteData []byte) ([]byte, error) { + fields := []MultipartFormField{ + { + IsFile: false, + Fieldname: fieldName, + Filename: fileName, + Value: byteData, + }, + } + return PostMultipartForm(fields, uri) +} + // PostFile 上传文件 -func PostFile(fieldName, filename, uri string) ([]byte, error) { +func PostFile(fieldName, filePath, uri string) ([]byte, error) { fields := []MultipartFormField{ { IsFile: true, Fieldname: fieldName, - Filename: filename, + FilePath: filePath, }, } return PostMultipartForm(fields, uri) } // PostFileFromReader 上传文件，从 io.Reader 中读取 -func PostFileFromReader(filedName, fileName, uri string, reader io.Reader) ([]byte, error) { +func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Reader) ([]byte, error) { fields := []MultipartFormField{ { IsFile: true, Fieldname: filedName, + FilePath: filePath, Filename: fileName, FileReader: reader, }, @@ -176,6 +190,7 @@ type MultipartFormField struct { IsFile bool Fieldname string Value []byte + FilePath string Filename string FileReader io.Reader } @@ -197,7 +212,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte } if field.FileReader == nil { - fh, e := os.Open(field.Filename) + fh, e := os.Open(field.FilePath) if e != nil { err = fmt.Errorf("error opening file , err=%v", e) return @@ -213,7 +228,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte } } } else { - partWriter, e := bodyWriter.CreateFormField(field.Fieldname) + partWriter, e := bodyWriter.CreateFormFile(field.Fieldname, field.Filename) if e != nil { err = e return diff --git a/work/material/media.go b/work/material/media.go index b32785a..b9647ad 100644 --- a/work/material/media.go +++ b/work/material/media.go @@ -2,6 +2,7 @@ package material import ( "fmt" + "io" "github.com/silenceper/wechat/v2/util" ) @@ -96,3 +97,54 @@ func (r *Client) UploadAttachment(filename string, mediaType string, attachmentT err = util.DecodeWithError(response, result, "UploadAttachment") return result, err } + +// UploadTempFileFromReader 上传临时素材 +// @see https://developer.work.weixin.qq.com/document/path/90253 +// @mediaType 媒体文件类型，分别有图片（image）、语音（voice）、视频（video），普通文件（file） +func (r *Client) UploadTempFileFromReader(filename, mediaType string, reader io.Reader) (*UploadTempFileResponse, error) { + var ( + accessToken string + err error + ) + if accessToken, err = r.GetAccessToken(); err != nil { + return nil, err + } + var byteData []byte + byteData, err = io.ReadAll(reader) + if err != nil { + return nil, err + } + var response []byte + if response, err = util.PostFileByStream("media", filename, fmt.Sprintf(uploadTempFile, accessToken, mediaType), byteData); err != nil { + return nil, err + } + result := &UploadTempFileResponse{} + err = util.DecodeWithError(response, result, "UploadTempFile") + return result, err +} + +// UploadAttachmentFromReader 上传附件资源 +// @see https://developer.work.weixin.qq.com/document/path/95098 +// @mediaType 媒体文件类型，分别有图片（image）、视频（video）、普通文件（file） +// @attachment_type 附件类型，不同的附件类型用于不同的场景。1：朋友圈；2:商品图册 +func (r *Client) UploadAttachmentFromReader(filename, mediaType string, reader io.Reader, attachmentType int) (*UploadAttachmentResponse, error) { + var ( + accessToken string + err error + ) + if accessToken, err = r.GetAccessToken(); err != nil { + return nil, err + } + var byteData []byte + byteData, err = io.ReadAll(reader) + if err != nil { + return nil, err + } + var response []byte + if response, err = util.PostFileByStream("media", filename, fmt.Sprintf(uploadAttachment, accessToken, mediaType, attachmentType), byteData); err != nil { + return nil, err + } + result := &UploadAttachmentResponse{} + err = util.DecodeWithError(response, result, "UploadAttachment") + return result, err +} From 2e0708845b4bc65de9251ec366380a3e94e658df Mon Sep 17 00:00:00 2001 From: Lien Li Date: Mon, 26 Aug 2024 10:20:39 +0800 Subject: [PATCH 5/5] add-show_splash_ad-for-qrcodeparam (#794) --- miniprogram/qrcode/qrcode.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/miniprogram/qrcode/qrcode.go b/miniprogram/qrcode/qrcode.go index 41e67e5..bb51b03 100644 --- a/miniprogram/qrcode/qrcode.go +++ b/miniprogram/qrcode/qrcode.go @@ -54,6 +54,8 @@ type QRCoder struct { IsHyaline bool `json:"is_hyaline,omitempty"` // envVersion 要打开的小程序版本。正式版为 "release"，体验版为 "trial"，开发版为 "develop" EnvVersion string `json:"env_version,omitempty"` + // ShowSplashAd 控制通过该小程序码进入小程序是否展示封面广告1、默认为true，展示封面广告2、传入为false时，不展示封面广告 + ShowSplashAd bool `json:"show_splash_ad,omitempty"` } // fetchCode 请求并返回二维码二进制数据