Merge f3024864cf into 1138a7db0e

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, directory 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
@@ -177,7 +174,8 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, directory s
 
 	uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType)
 	var response []byte
-	response, err = util.PostFileFromReader("media", directory, uri, reader)
+	var directory = filename
+	response, err = util.PostFile("media", nil, "", directory, uri)
 	if err != nil {
 		return
 	}
@@ -195,24 +193,13 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, directory s
 	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"`
 }
 
-// AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取
-func (material *Material) AddVideoFromReader(directory, 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 {
@@ -230,15 +217,12 @@ func (material *Material) AddVideoFromReader(directory, title, introduction stri
 	if err != nil {
 		return
 	}
-	// 获取文件名
-	fileName := path.Base(directory)
+
 	fields := []util.MultipartFormField{
 		{
-			IsFile:     true,
-			Fieldname:  "media",
-			Filename:   fileName,
-			Directory:  directory,
-			FileReader: reader,
+			IsFile:    true,
+			Fieldname: "media",
+			Filename:  filename,
 		},
 		{
 			IsFile:    false,
@@ -267,17 +251,6 @@ func (material *Material) AddVideoFromReader(directory, title, introduction stri
 	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

@@ -51,7 +51,7 @@ func (material *Material) MediaUpload(mediaType MediaType, url string) (media Me
 	lastSlashIndex := strings.LastIndex(url, "/")
 	// 从最后一个斜杠的位置截取到最后，获取文件名
 	filename := url[lastSlashIndex+1:]
-	// 获取资源
+	// 获取图片
 	resp, err := http.Get(url)
 	if err != nil {
 		err = fmt.Errorf("get image error: %v", err)

util/http.go

@@ -13,7 +13,6 @@ import (
 	"mime/multipart"
 	"net/http"
 	"os"
-	"path"
 
 	"golang.org/x/crypto/pkcs12"
 )
@@ -151,17 +150,12 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 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 != "" {
-		fileName = path.Base(directory)
 		isFile = true
-	} else if len(data) > 0 && fileName != "" {
-		fileContent = data
-		isFile = false
 	} else {
-		return nil, fmt.Errorf("Invalid argument: required  stream data and filename or only directory")
+		fileContent = data
 	}
-
 	fields := []MultipartFormField{
 		{
 			IsFile:    isFile,
@@ -174,30 +168,13 @@ func PostFile(fieldName string, data []byte, fileName string, directory string,
 	return PostMultipartForm(fields, uri)
 }
 
-// PostFileFromReader 上传文件，从 io.Reader 中读取
-func PostFileFromReader(filedName, directory, uri string, reader io.Reader) ([]byte, error) {
-	// 获取文件名
-	fileName := path.Base(directory)
-	fields := []MultipartFormField{
-		{
-			IsFile:     true,
-			Fieldname:  filedName,
-			Filename:   fileName,
-			Directory:  directory,
-			FileReader: reader,
-		},
-	}
-	return PostMultipartForm(fields, uri)
-}
-
 // MultipartFormField 保存文件或其他字段信息
 type MultipartFormField struct {
-	IsFile     bool
-	Fieldname  string
-	Value      []byte
-	Filename   string
-	Directory  string
-	FileReader io.Reader
+	IsFile    bool
+	Fieldname string
+	Value     []byte
+	Filename  string
+	Directory string
 }
 
 // PostMultipartForm 上传文件或其他多个字段
@@ -210,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.Directory)
-				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)
@@ -255,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