git/wechat
1
0
Fork 0
mirror of https://github.com/silenceper/wechat.git synced 2026-02-12 00:32:26 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature_add_stream_upload' into feature_add_stream_upload

Browse Source
This commit is contained in:
_oah
2024-07-16 23:35:37 +08:00
parent afaa30759a f3024864cf
commit 7efb8f96e9
2 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
officialaccount/material/material.go
View File

@@ -4,9 +4,11 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/silenceper/wechat/v2/officialaccount/context"
"github.com/silenceper/wechat/v2/util"
"io"
"os"
"path"
)
const (
@@ -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, directory string, reader io.Reader) (mediaID string, url string, err error) {
if mediaType == MediaTypeVideo {
err = errors.New("永久视频素材上传使用 AddVideo 方法")
return
@@ -174,8 +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
var directory = filename
response, err = util.PostFile("media", nil, "", directory, uri)
response, err = util.PostFileFromReader("media", directory, uri, reader)
if err != nil {
return
}
@@ -193,13 +194,24 @@ func (material *Material) AddMaterial(mediaType MediaType, filename string) (med
return
}
// AddMaterial 上传永久性素材（处理视频需要单独上传）
func (material *Material) AddMaterial(mediaType MediaType, directory string) (mediaID string, url string, err error) {
f, err := os.Open(directory)
if err != nil {
return
}
defer func() { _ = f.Close() }()
return material.AddMaterialFromReader(mediaType, directory, 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(directory, title, introduction string, reader io.Reader) (mediaID string, url string, err error) {
var accessToken string
accessToken, err = material.GetAccessToken()
if err != nil {
@@ -217,12 +229,15 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI
if err != nil {
return
}
// 获取文件名
fileName := path.Base(directory)
fields := []util.MultipartFormField{
{
IsFile: true,
Fieldname: "media",
Filename: filename,
IsFile: true,
Fieldname: "media",
Filename: fileName,
Directory: directory,
FileReader: reader,
},
{
IsFile: false,
@@ -251,6 +266,17 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI
return
}
// AddVideo 永久视频素材文件上传
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(directory, title, introduction, f)
}
type reqDeleteMaterial struct {
MediaID string `json:"media_id"`
}