Merge 719268659f into 05ac7148d4

# Conflicts:
#	officialaccount/material/material.go
#	util/http.go

miniprogram/security/security.go

@@ -95,14 +95,13 @@ func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID s
 // https://developers.weixin.qq.com/miniprogram/dev/framework/security.imgSecCheck.html
 // Deprecated
 // 在2021年9月1日停止更新。建议使用 MediaCheckAsync
-func (security *Security) ImageCheckV1(filename string) (err error) {
+func (security *Security) ImageCheckV1(directory string) (err error) {
 	accessToken, err := security.GetAccessToken()
 	if err != nil {
 		return
 	}
 
 	uri := fmt.Sprintf(imageCheckURL, accessToken)
-	var directory = filename
 	response, err := util.PostFile("media", nil, "", directory, uri)
 	if err != nil {
 		return

officialaccount/customerservice/manager.go

@@ -204,7 +204,7 @@ func (csm *Manager) InviteBind(kfAccount, inviteWX string) (err error) {
 }
 
 // UploadHeadImg 上传客服头像
-func (csm *Manager) UploadHeadImg(kfAccount, fileName string) (err error) {
+func (csm *Manager) UploadHeadImg(kfAccount, directory string) (err error) {
 	var accessToken string
 	accessToken, err = csm.GetAccessToken()
 	if err != nil {
@@ -212,7 +212,6 @@ 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
-	var directory = fileName
 	response, err = util.PostFile("media", nil, "", directory, uri)
 	if err != nil {
 		return

officialaccount/material/material.go

@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/silenceper/wechat/v2/officialaccount/context"
-	"github.com/silenceper/wechat/v2/util"
 	"io"
 	"os"
 	"path"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (

util/http.go

@@ -159,7 +159,7 @@ func PostFile(fieldName string, data []byte, fileName string, directory string,
 		fileContent = data
 		isFile = false
 	} else {
-		return nil, fmt.Errorf("Invalid argument: required  stream data and filename or only directory")
+		return nil, fmt.Errorf("error parameter required streamdata=%v and filename=%v or only directory=%v", data, fileName, directory)
 	}
 
 	fields := []MultipartFormField{

work/material/media.go

@@ -92,7 +92,7 @@ func (r *Client) UploadAttachment(filename string, mediaType string, attachmentT
 	}
 	var response []byte
 	var directory = filename
-	if response, err = util.PostFile("media", nil, "", directory, fmt.Sprintf(uploadTempFile, accessToken, mediaType)); err != nil {
+	if response, err = util.PostFile("media", nil, "", directory, fmt.Sprintf(uploadAttachment, accessToken, mediaType, attachmentType)); err != nil {
 		return nil, err
 	}
 	result := &UploadAttachmentResponse{}