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

# Conflicts:
#	officialaccount/material/media.go

cache/redis.go

@@ -16,7 +16,6 @@ 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"`
@@ -29,7 +28,6 @@ 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,

miniprogram/content/content.go

@@ -53,9 +53,12 @@ func (content *Content) CheckImage(media string) error {
 	if err != nil {
 		return err
 	}
+	var directory = media
 	response, err := util.PostFile(
 		"media",
-		media,
+		nil,
+		"",
+		directory,
 		fmt.Sprintf(checkImageURL, accessToken),
 	)
 	if err != nil {

miniprogram/qrcode/qrcode.go

@@ -54,8 +54,6 @@ 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 请求并返回二维码二进制数据

miniprogram/security/security.go

@@ -102,7 +102,8 @@ func (security *Security) ImageCheckV1(filename string) (err error) {
 	}
 
 	uri := fmt.Sprintf(imageCheckURL, accessToken)
-	response, err := util.PostFile("media", filename, uri)
+	var directory = filename
+	response, err := util.PostFile("media", nil, "", directory, uri)
 	if err != nil {
 		return
 	}

officialaccount/customerservice/manager.go

@@ -212,7 +212,8 @@ func (csm *Manager) UploadHeadImg(kfAccount, fileName string) (err error) {
 	}
 	uri := fmt.Sprintf("%s?access_token=%s&kf_account=%s", customerServiceUploadHeadImg, accessToken, kfAccount)
 	var response []byte
-	response, err = util.PostFile("media", fileName, uri)
+	var directory = fileName
+	response, err = util.PostFile("media", nil, "", directory, uri)
 	if err != nil {
 		return
 	}

officialaccount/material/material.go

@@ -4,9 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
-	"os"
-	"path"
 
 	"github.com/silenceper/wechat/v2/officialaccount/context"
 	"github.com/silenceper/wechat/v2/util"
@@ -163,8 +160,8 @@ type resAddMaterial struct {
 	URL     string `json:"url"`
 }
 
-// AddMaterialFromReader 上传永久性素材（处理视频需要单独上传），从 io.Reader 中读取
-func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath string, reader io.Reader) (mediaID string, url string, err error) {
+// AddMaterial 上传永久性素材（处理视频需要单独上传）
+func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
 	if mediaType == MediaTypeVideo {
 		err = errors.New("永久视频素材上传使用 AddVideo 方法")
 		return
@@ -176,10 +173,9 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath 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", filePath, filename, uri, reader)
+	var directory = filename
+	response, err = util.PostFile("media", nil, "", directory, uri)
 	if err != nil {
 		return
 	}
@@ -197,24 +193,13 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath st
 	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"`
 }
 
-// AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取
-func (material *Material) AddVideoFromReader(filePath, title, introduction string, reader io.Reader) (mediaID string, url string, err error) {
+// AddVideo 永久视频素材文件上传
+func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) {
 	var accessToken string
 	accessToken, err = material.GetAccessToken()
 	if err != nil {
@@ -232,19 +217,16 @@ func (material *Material) AddVideoFromReader(filePath, title, introduction strin
 	if err != nil {
 		return
 	}
-	fileName := path.Base(filePath)
+
 	fields := []util.MultipartFormField{
 		{
-			IsFile:     true,
-			Fieldname:  "media",
-			FilePath:   filePath,
-			Filename:   fileName,
-			FileReader: reader,
+			IsFile:    true,
+			Fieldname: "media",
+			Filename:  filename,
 		},
 		{
 			IsFile:    false,
 			Fieldname: "description",
-			Filename:  fileName,
 			Value:     fieldValue,
 		},
 	}
@@ -269,17 +251,6 @@ func (material *Material) AddVideoFromReader(filePath, title, introduction strin
 	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"`
 }

officialaccount/material/media.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"net/http"
+	"strings"
 
 	"github.com/silenceper/wechat/v2/util"
 )
@@ -39,16 +41,32 @@ type Media struct {
 }
 
 // MediaUpload 临时素材上传
-func (material *Material) MediaUpload(mediaType MediaType, filename string) (media Media, err error) {
+func (material *Material) MediaUpload(mediaType MediaType, url string) (media Media, err error) {
 	var accessToken string
-	accessToken, err = material.GetAccessToken()
-	if err != nil {
+	if accessToken, err = material.GetAccessToken(); err != nil {
 		return
 	}
-
 	uri := fmt.Sprintf("%s?access_token=%s&type=%s", mediaUploadURL, accessToken, mediaType)
+	// 使用strings.LastIndex函数找到最后一个斜杠的位置
+	lastSlashIndex := strings.LastIndex(url, "/")
+	// 从最后一个斜杠的位置截取到最后，获取文件名
+	filename := url[lastSlashIndex+1:]
+	// 获取资源
+	resp, err := http.Get(url)
+	if err != nil {
+		err = fmt.Errorf("get image error: %v", err)
+		return
+	}
+	// 读取响应到内存
+	var imageData []byte
+	imageData, err = io.ReadAll(resp.Body)
+	defer resp.Body.Close()
+	if err != nil {
+		err = fmt.Errorf("read image error: %v", err)
+		return
+	}
 	var response []byte
-	response, err = util.PostFile("media", filename, uri)
+	response, err = util.PostFile("media", imageData, filename, "", uri)
 	if err != nil {
 		return
 	}
@@ -57,39 +75,7 @@ func (material *Material) MediaUpload(mediaType MediaType, filename string) (med
 		return
 	}
 	if media.ErrCode != 0 {
-		err = fmt.Errorf("MediaUpload error : errcode=%v , errmsg=%v", media.ErrCode, media.ErrMsg)
-		return
-	}
-	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)
+		err = fmt.Errorf("MediaUpload error : errcode=%v, errmsg=%v", media.ErrCode, media.ErrMsg)
 		return
 	}
 	return
@@ -124,7 +110,8 @@ func (material *Material) ImageUpload(filename string) (url string, err error) {
 
 	uri := fmt.Sprintf("%s?access_token=%s", mediaUploadImageURL, accessToken)
 	var response []byte
-	response, err = util.PostFile("media", filename, uri)
+	var directory = filename
+	response, err = util.PostFile("media", nil, "", directory, uri)
 	if err != nil {
 		return
 	}

officialaccount/message/template.go

@@ -61,15 +61,15 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
 	if err != nil {
 		return
 	}
-	var (
-		uri      = fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
-		response []byte
-	)
-	if response, err = util.PostJSON(uri, msg); err != nil {
+	uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
 		return
 	}
 	var result resTemplateSend
-	if err = json.Unmarshal(response, &result); err != nil {
+	err = json.Unmarshal(response, &result)
+	if err != nil {
 		return
 	}
 	if result.ErrCode != 0 {
@@ -103,11 +103,10 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) {
 	if err != nil {
 		return
 	}
-	var (
-		uri      = fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
-		response []byte
-	)
-	if response, err = util.HTTPGet(uri); err != nil {
+	uri := fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
 		return
 	}
 	var res resTemplateList
@@ -122,23 +121,22 @@ type resTemplateAdd struct {
 }
 
 // Add 添加模板.
-func (tpl *Template) Add(shortID string, keyNameList []string) (templateID string, err error) {
+func (tpl *Template) Add(shortID 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"`
-			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 {
+	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 {
 		return
 	}
+
 	var result resTemplateAdd
 	err = util.DecodeWithError(response, &result, "AddTemplate")
 	return result.TemplateID, err
@@ -151,14 +149,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)
-		response []byte
-	)
-	if response, err = util.PostJSON(uri, msg); err != nil {
+	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 {
 		return
 	}
 	return util.DecodeWithCommonError(response, "DeleteTemplate")

util/http.go

@@ -146,40 +146,23 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 	return responseData, contentType, err
 }
 
-// PostFileByStream 上传文件
-func PostFileByStream(fieldName, fileName, uri string, byteData []byte) ([]byte, error) {
+// PostFile 支持流或文件形式上传
+func PostFile(fieldName string, data []byte, fileName string, directory string, uri string) ([]byte, error) {
+	var fileContent []byte
+	var isFile bool
+	// 数据为空且文件目录不为空则按文件形式上传
+	if len(data) == 0 && directory != "" {
+		isFile = true
+	} else {
+		fileContent = data
+	}
 	fields := []MultipartFormField{
 		{
-			IsFile:    false,
+			IsFile:    isFile,
 			Fieldname: fieldName,
+			Value:     fileContent,
 			Filename:  fileName,
-			Value:     byteData,
-		},
-	}
-	return PostMultipartForm(fields, uri)
-}
-
-// PostFile 上传文件
-func PostFile(fieldName, filePath, uri string) ([]byte, error) {
-	fields := []MultipartFormField{
-		{
-			IsFile:    true,
-			Fieldname: fieldName,
-			FilePath:  filePath,
-		},
-	}
-	return PostMultipartForm(fields, uri)
-}
-
-// PostFileFromReader 上传文件，从 io.Reader 中读取
-func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Reader) ([]byte, error) {
-	fields := []MultipartFormField{
-		{
-			IsFile:     true,
-			Fieldname:  filedName,
-			FilePath:   filePath,
-			Filename:   fileName,
-			FileReader: reader,
+			Directory: directory,
 		},
 	}
 	return PostMultipartForm(fields, uri)
@@ -187,12 +170,11 @@ func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Rea
 
 // MultipartFormField 保存文件或其他字段信息
 type MultipartFormField struct {
-	IsFile     bool
-	Fieldname  string
-	Value      []byte
-	FilePath   string
-	Filename   string
-	FileReader io.Reader
+	IsFile    bool
+	Fieldname string
+	Value     []byte
+	Filename  string
+	Directory string
 }
 
 // PostMultipartForm 上传文件或其他多个字段
@@ -205,27 +187,21 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 
 	for _, field := range fields {
 		if field.IsFile {
-			fileWriter, e := bodyWriter.CreateFormFile(field.Fieldname, field.Filename)
+			fileWriter, e := bodyWriter.CreateFormFile(field.Fieldname, field.Directory)
 			if e != nil {
 				err = fmt.Errorf("error writing to buffer , err=%v", e)
 				return
 			}
 
-			if field.FileReader == nil {
-				fh, e := os.Open(field.FilePath)
-				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
-				}
+			fh, e := os.Open(field.Directory)
+			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
 			}
 		} else {
 			partWriter, e := bodyWriter.CreateFormFile(field.Fieldname, field.Filename)
@@ -250,7 +226,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, resp.StatusCode)
+		return nil, err
 	}
 	respBody, err = io.ReadAll(resp.Body)
 	return

work/material/media.go

@@ -2,7 +2,6 @@ package material
 
 import (
 	"fmt"
-	"io"
 
 	"github.com/silenceper/wechat/v2/util"
 )
@@ -49,7 +48,8 @@ func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
 		return nil, err
 	}
 	var response []byte
-	if response, err = util.PostFile("media", filename, fmt.Sprintf(uploadImgURL, accessToken)); err != nil {
+	var directory = filename
+	if response, err = util.PostFile("media", nil, "", directory, fmt.Sprintf(uploadImgURL, accessToken)); err != nil {
 		return nil, err
 	}
 	result := &UploadImgResponse{}
@@ -69,7 +69,8 @@ func (r *Client) UploadTempFile(filename string, mediaType string) (*UploadTempF
 		return nil, err
 	}
 	var response []byte
-	if response, err = util.PostFile("media", filename, fmt.Sprintf(uploadTempFile, accessToken, mediaType)); err != nil {
+	var directory = filename
+	if response, err = util.PostFile("media", nil, "", directory, fmt.Sprintf(uploadTempFile, accessToken, mediaType)); err != nil {
 		return nil, err
 	}
 	result := &UploadTempFileResponse{}
@@ -90,58 +91,8 @@ func (r *Client) UploadAttachment(filename string, mediaType string, attachmentT
 		return nil, err
 	}
 	var response []byte
-	if response, err = util.PostFile("media", filename, fmt.Sprintf(uploadAttachment, accessToken, mediaType, attachmentType)); err != nil {
-		return nil, err
-	}
-	result := &UploadAttachmentResponse{}
-	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 {
+	var directory = filename
+	if response, err = util.PostFile("media", nil, "", directory, fmt.Sprintf(uploadTempFile, accessToken, mediaType)); err != nil {
 		return nil, err
 	}
 	result := &UploadAttachmentResponse{}