Merge de92dc0dcd into 05ac7148d4

* feat: 公众号新增模板接口，支持模板参数传递

* fix: 公众号新增模板接口，合并定义参数

* fix: 公众号新增模板接口，统一代码风格

---------

Co-authored-by: yangj23 <yangj23@mingyuanyun.com>

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 上传永久性素材（处理视频需要单独上传）
+// AddMaterialFromReader 上传永久性素材（处理视频需要单独上传），从 io.Reader 中读取
-func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
+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 永久视频素材文件上传
+// AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取
-func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) {
+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,
+			IsFile:     true,
-			Fieldname: "media",
+			Fieldname:  "media",
-			Filename:  filename,
+			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"`
 }

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 (
-	var response []byte
+		uri      = fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
-	response, err = util.PostJSON(uri, msg)
+		response []byte
-	if err != nil {
+	)
+	if response, err = util.PostJSON(uri, msg); err != nil {
 		return
 	}
 	var result resTemplateSend
-	err = json.Unmarshal(response, &result)
+	if err = json.Unmarshal(response, &result); err != nil {
-	if 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 (
-	var response []byte
+		uri      = fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
-	response, err = util.HTTPGet(uri)
+		response []byte
-	if err != nil {
+	)
+	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 {
+	var (
-		ShortID string `json:"template_id_short"`
+		msg = struct {
-	}{ShortID: shortID}
+			ShortID     string   `json:"template_id_short"`
-	uri := fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
+			KeyNameList []string `json:"keyword_name_list"`
-	var response []byte
+		}{ShortID: shortID, KeyNameList: keyNameList}
-	response, err = util.PostJSON(uri, msg)
+		uri      = fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
-	if err != nil {
+		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 {
+	var (
-		TemplateID string `json:"template_id"`
+		msg = struct {
-	}{TemplateID: templateID}
+			TemplateID string `json:"template_id"`
-
+		}{TemplateID: templateID}
-	uri := fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
+		uri      = fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
-	var response []byte
+		response []byte
-	response, err = util.PostJSON(uri, msg)
+	)
-	if err != nil {
+	if response, err = util.PostJSON(uri, msg); err != nil {
 		return
 	}
 	return util.DecodeWithCommonError(response, "DeleteTemplate")

openplatform/miniprogram/auth/auth.go

@@ -0,0 +1,60 @@
+package auth
+
+import (
+	stdContext "context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/openplatform/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	code2SessionURL = "https://api.weixin.qq.com/sns/component/jscode2session?appid=%s&js_code=%s&grant_type=authorization_code&component_appid=%s&component_access_token=%s"
+)
+
+// Auth 登录/用户信息
+type Auth struct {
+	*context.Context
+	authorizerAppID string
+}
+
+// NewAuth new auth (授权方appID)
+func NewAuth(ctx *context.Context, appID string) *Auth {
+	return &Auth{ctx, appID}
+}
+
+// ResCode2Session 登录凭证校验的返回结果
+type ResCode2Session struct {
+	util.CommonError
+	OpenID     string `json:"openid"`      // 用户唯一标识
+	SessionKey string `json:"session_key"` // 会话密钥
+	UnionID    string `json:"unionid"`     // 用户在开放平台的唯一标识符，在满足UnionID下发条件的情况下会返回
+}
+
+// Code2Session 登录凭证校验。
+func (auth *Auth) Code2Session(jsCode string) (result ResCode2Session, err error) {
+	return auth.Code2SessionContext(stdContext.Background(), jsCode)
+}
+
+// Code2SessionContext 登录凭证校验。
+func (auth *Auth) Code2SessionContext(ctx stdContext.Context, jsCode string) (result ResCode2Session, err error) {
+	var response []byte
+	var componentAccessToken string
+	componentAccessToken, err = auth.GetComponentAccessToken()
+	if err != nil {
+		return
+	}
+	parse := fmt.Sprintf(code2SessionURL, auth.authorizerAppID, jsCode, auth.Context.AppID, componentAccessToken)
+	if response, err = util.HTTPGetContext(ctx, parse); err != nil {
+		return
+	}
+	if err = json.Unmarshal(response, &result); err != nil {
+		return
+	}
+	if result.ErrCode != 0 {
+		err = fmt.Errorf("Code2Session error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
+		return
+	}
+	return
+}

openplatform/miniprogram/miniprogram.go

@@ -9,6 +9,7 @@ import (
 	miniContext "github.com/silenceper/wechat/v2/miniprogram/context"
 	"github.com/silenceper/wechat/v2/miniprogram/urllink"
 	openContext "github.com/silenceper/wechat/v2/openplatform/context"
+	"github.com/silenceper/wechat/v2/openplatform/miniprogram/auth"
 	"github.com/silenceper/wechat/v2/openplatform/miniprogram/basic"
 	"github.com/silenceper/wechat/v2/openplatform/miniprogram/component"
 )
@@ -72,6 +73,11 @@ func (miniProgram *MiniProgram) GetURLLink() *urllink.URLLink {
 	})
 }
 
+// GetAuth 登录/用户信息相关接口
+func (miniProgram *MiniProgram) GetAuth() *auth.Auth {
+	return auth.NewAuth(miniProgram.openContext, miniProgram.AppID)
+}
+
 // DefaultAuthrAccessToken 默认获取授权ak的方法
 type DefaultAuthrAccessToken struct {
 	opCtx *openContext.Context

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
+	IsFile     bool
-	Fieldname string
+	Fieldname  string
-	Value     []byte
+	Value      []byte
-	Filename  string
+	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 field.FileReader == nil {
-			if e != nil {
+				fh, e := os.Open(field.Filename)
-				err = fmt.Errorf("error opening file , err=%v", e)
+				if e != nil {
-				return
+					err = fmt.Errorf("error opening file , err=%v", e)
-			}
+					return
-			defer fh.Close()
+				}
-
+				_, err = io.Copy(fileWriter, fh)
-			if _, err = io.Copy(fileWriter, fh); err != nil {
+				_ = fh.Close()
-				return
+				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