Merge de92dc0dcd into 74795e86ee

.github/ISSUE_TEMPLATE/bug.md

@@ -1,6 +1,6 @@
 ---
-name: 报告 Bug
-about: 反馈 BUG 信息
+name: 报告Bug
+about: 反馈BUG信息
 title: "[BUG]"
 labels: bug
 assignees: ''
@@ -18,4 +18,4 @@ assignees: ''
 
 
 **使用的版本**
- - SDK 版本：[比如 v0.0.0]
+ - SDK版本: [比如 v0.0.0]

.github/ISSUE_TEMPLATE/feature.md

@@ -1,6 +1,6 @@
 ---
-name: API 需求
-about: 待实现的 API 接口，SDK 的强大离不开社区的帮助，欢迎为项目贡献 PR
+name: API需求
+about: 待实现的API接口，SDK的强大离不开社区的帮助，欢迎为项目贡献PR
 title: "[Feature]"
 labels: enhancement
 assignees: ''
@@ -8,8 +8,8 @@ assignees: ''
 ---
 
 <!--
-!!!SDK 的强大离不开社区的帮助，欢迎为本项目贡献 PR!!!
+!!!SDK的强大离不开社区的帮助，欢迎为本项目贡献PR!!!
 -->
-**你想要实现的模块或 API**
+**你想要实现的模块或API**
 
 

.github/ISSUE_TEMPLATE/question.md

@@ -1,6 +1,6 @@
 ---
 name: 使用咨询
-about: 关于 SDK 使用相关的咨询，在使用前请先阅读官方微信文档
+about: 关于SDK使用相关的咨询，在使用前请先阅读官方微信文档
 title: "[咨询]"
 labels: question
 assignees: ''
@@ -9,7 +9,7 @@ assignees: ''
 
 <!--
 重要：
-1、在使用本 SDK 前请先阅读对应的官方微信 API 文档：https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html
-2、本 SDK 部分接口文档：https://silenceper.com/wechat/
+1、在使用本SDK前请先阅读对应的官方微信API文档：https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html
+2、本SDK部分接口文档： https://silenceper.com/wechat/
 -->
 **请描述您的问题**

.github/workflows/go.yml

@@ -2,9 +2,9 @@ name: Go
 
 on:
   push:
-    branches: [ master,release-*,v2,feature/**,fix/** ]
+    branches: [ master,release-*,v2,feature/** ]
   pull_request:
-    branches: [ master,release-*,v2,feature/**,fix/** ]
+    branches: [ master,release-*,v2,feature/** ]
 
 jobs:
   golangci:
@@ -15,13 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Golang ${{ matrix.go-version }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v1.52.2
@@ -42,12 +42,12 @@ jobs:
     # strategy set
     strategy:
       matrix:
-        go: [ '1.16','1.17','1.18','1.19','1.20','1.21','1.22' ]
+        go: [ '1.16','1.17','1.18','1.19','1.20','1.21' ]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up Go 1.x
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
         id: 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/auth/auth.go

@@ -138,8 +138,10 @@ func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*Get
 	}
 
 	var result GetPhoneNumberResponse
-	err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber")
-	return &result, err
+	if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
+		return nil, err
+	}
+	return &result, nil
 }
 
 // GetPhoneNumber 小程序通过code获取用户手机号

miniprogram/business/phone_number.go

@@ -45,5 +45,10 @@ func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneI
 		PhoneInfo PhoneInfo `json:"phone_info"`
 	}
 	err = util.DecodeWithError(response, &resp, "business.GetPhoneNumber")
-	return resp.PhoneInfo, err
+	if nil != err {
+		return
+	}
+
+	info = resp.PhoneInfo
+	return
 }

miniprogram/message/message.go

@@ -398,7 +398,7 @@ type PushDataSecVodUpload struct {
 
 // SecVodUploadEvent 短剧媒资上传完成事件
 type SecVodUploadEvent struct {
-	MediaID       int64  `json:"media_id" xml:"media_id"`             // 媒资 id
+	MediaID       string `json:"media_id" xml:"media_id"`             // 媒资 id
 	SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值。
 	ErrCode       int    `json:"errcode" xml:"errcode"`               // 错误码，上传失败时该值非
 	ErrMsg        string `json:"errmsg" xml:"errmsg"`                 // 错误提示
@@ -412,7 +412,7 @@ type PushDataSecVodAudit struct {
 
 // SecVodAuditEvent 短剧媒资审核状态事件
 type SecVodAuditEvent struct {
-	DramaID       int64            `json:"drama_id" xml:"drama_id"`             // 剧目 id
+	DramaID       string           `json:"drama_id" xml:"drama_id"`             // 剧目 id
 	SourceContext string           `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值
 	AuditDetail   DramaAuditDetail `json:"audit_detail" xml:"audit_detail"`     // 剧目审核结果，单独每一集的审核结果可以根据 drama_id 查询剧集详情得到
 }

miniprogram/message/updatable_msg.go

@@ -1,102 +0,0 @@
-package message
-
-import (
-	"fmt"
-
-	"github.com/silenceper/wechat/v2/miniprogram/context"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	// createActivityURL 创建activity_id
-	createActivityURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?access_token=%s"
-	// SendUpdatableMsgURL 修改动态消息
-	setUpdatableMsgURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?access_token=%s"
-)
-
-// UpdatableTargetState 动态消息状态
-type UpdatableTargetState int
-
-const (
-	// TargetStateNotStarted 未开始
-	TargetStateNotStarted UpdatableTargetState = 0
-	// TargetStateStarted 已开始
-	TargetStateStarted UpdatableTargetState = 1
-	// TargetStateFinished 已结束
-	TargetStateFinished UpdatableTargetState = 2
-)
-
-// UpdatableMessage 动态消息
-type UpdatableMessage struct {
-	*context.Context
-}
-
-// NewUpdatableMessage 实例化
-func NewUpdatableMessage(ctx *context.Context) *UpdatableMessage {
-	return &UpdatableMessage{
-		Context: ctx,
-	}
-}
-
-// CreateActivityID 创建activity_id
-func (updatableMessage *UpdatableMessage) CreateActivityID() (res CreateActivityIDResponse, err error) {
-	accessToken, err := updatableMessage.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(createActivityURL, accessToken)
-	response, err := util.HTTPGet(uri)
-	if err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "CreateActivityID")
-	return
-}
-
-// SetUpdatableMsg 修改动态消息
-func (updatableMessage *UpdatableMessage) SetUpdatableMsg(activityID string, targetState UpdatableTargetState, template UpdatableMsgTemplate) (err error) {
-	accessToken, err := updatableMessage.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(setUpdatableMsgURL, accessToken)
-	data := SendUpdatableMsgReq{
-		ActivityID:   activityID,
-		TargetState:  targetState,
-		TemplateInfo: template,
-	}
-
-	response, err := util.PostJSON(uri, data)
-	if err != nil {
-		return
-	}
-	return util.DecodeWithCommonError(response, "SendUpdatableMsg")
-}
-
-// CreateActivityIDResponse 创建activity_id 返回
-type CreateActivityIDResponse struct {
-	util.CommonError
-
-	ActivityID     string `json:"activity_id"`
-	ExpirationTime int64  `json:"expiration_time"`
-}
-
-// UpdatableMsgTemplate 动态消息模板
-type UpdatableMsgTemplate struct {
-	ParameterList []UpdatableMsgParameter `json:"parameter_list"`
-}
-
-// UpdatableMsgParameter 动态消息参数
-type UpdatableMsgParameter struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-// SendUpdatableMsgReq 修改动态消息参数
-type SendUpdatableMsgReq struct {
-	ActivityID   string               `json:"activity_id"`
-	TemplateInfo UpdatableMsgTemplate `json:"template_info"`
-	TargetState  UpdatableTargetState `json:"target_state"`
-}

miniprogram/miniprogram.go

@@ -161,8 +161,3 @@ func (miniProgram *MiniProgram) GetMiniDrama() *minidrama.MiniDrama {
 func (miniProgram *MiniProgram) GetRedPacketCover() *redpacketcover.RedPacketCover {
 	return redpacketcover.NewRedPacketCover(miniProgram.ctx)
 }
-
-// GetUpdatableMessage 小程序动态消息
-func (miniProgram *MiniProgram) GetUpdatableMessage() *message.UpdatableMessage {
-	return message.NewUpdatableMessage(miniProgram.ctx)
-}

miniprogram/privacy/privacy.go

@@ -103,8 +103,11 @@ func (s *Privacy) GetPrivacySetting(privacyVer int) (GetPrivacySettingResponse,
 	}
 	// 返回错误信息
 	var result GetPrivacySettingResponse
-	err = util.DecodeWithError(response, &result, "getprivacysetting")
-	return result, err
+	if err = util.DecodeWithError(response, &result, "getprivacysetting"); err != nil {
+		return GetPrivacySettingResponse{}, err
+	}
+
+	return result, nil
 }
 
 // SetPrivacySetting 更新小程序权限配置
@@ -127,7 +130,11 @@ func (s *Privacy) SetPrivacySetting(privacyVer int, ownerSetting OwnerSetting, s
 	}
 
 	// 返回错误信息
-	return util.DecodeWithCommonError(response, "setprivacysetting")
+	if err = util.DecodeWithCommonError(response, "setprivacysetting"); err != nil {
+		return err
+	}
+
+	return err
 }
 
 // UploadPrivacyExtFileResponse 上传权限定义模板响应参数
@@ -152,6 +159,9 @@ func (s *Privacy) UploadPrivacyExtFile(fileData []byte) (UploadPrivacyExtFileRes
 
 	// 返回错误信息
 	var result UploadPrivacyExtFileResponse
-	err = util.DecodeWithError(response, &result, "setprivacysetting")
+	if err = util.DecodeWithError(response, &result, "setprivacysetting"); err != nil {
+		return UploadPrivacyExtFileResponse{}, err
+	}
+
 	return result, err
 }

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

@@ -51,7 +51,12 @@ func (security *Security) MediaCheckAsyncV1(in *MediaCheckAsyncV1Request) (trace
 		TraceID string `json:"trace_id"`
 	}
 	err = util.DecodeWithError(response, &res, "MediaCheckAsyncV1")
-	return res.TraceID, err
+	if err != nil {
+		return
+	}
+
+	traceID = res.TraceID
+	return
 }
 
 // MediaCheckAsyncRequest 图片/音频异步校验请求参数
@@ -88,7 +93,12 @@ func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID s
 		TraceID string `json:"trace_id"`
 	}
 	err = util.DecodeWithError(response, &res, "MediaCheckAsync")
-	return res.TraceID, err
+	if err != nil {
+		return
+	}
+
+	traceID = res.TraceID
+	return
 }
 
 // ImageCheckV1 校验一张图片是否含有违法违规内容（同步）

miniprogram/shortlink/shortlink.go

@@ -60,7 +60,11 @@ func (shortLink *ShortLink) generate(shortLinkParams ShortLinker) (string, error
 	// 使用通用方法返回错误
 	var res resShortLinker
 	err = util.DecodeWithError(response, &res, "GenerateShortLink")
-	return res.Link, err
+	if err != nil {
+		return "", err
+	}
+
+	return res.Link, nil
 }
 
 // GenerateShortLinkPermanent 生成永久 shortLink

miniprogram/subscribe/subscribe.go

@@ -168,7 +168,11 @@ func (s *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (templa
 	}
 	var result resSubscribeAdd
 	err = util.DecodeWithError(response, &result, "AddSubscribe")
-	return result.TemplateID, err
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
 }
 
 // Delete 删除私有模板

miniprogram/urllink/urllink.go

@@ -65,5 +65,8 @@ func (u *URLLink) Generate(params *ULParams) (string, error) {
 	}
 	var resp ULResult
 	err = util.DecodeWithError(response, &resp, "URLLink.Generate")
-	return resp.URLLink, err
+	if err != nil {
+		return "", err
+	}
+	return resp.URLLink, nil
 }

miniprogram/urlscheme/query.go

@@ -62,5 +62,9 @@ func (u *URLScheme) QueryScheme(querySchemeParams QueryScheme) (schemeInfo Schem
 	// 使用通用方法返回错误
 	var res resQueryScheme
 	err = util.DecodeWithError(response, &res, "QueryScheme")
-	return res.SchemeInfo, res.VisitOpenid, err
+	if err != nil {
+		return
+	}
+
+	return res.SchemeInfo, res.VisitOpenid, nil
 }

miniprogram/urlscheme/urlscheme.go

@@ -78,5 +78,8 @@ func (u *URLScheme) Generate(params *USParams) (string, error) {
 	}
 	var resp USResult
 	err = util.DecodeWithError(response, &resp, "URLScheme.Generate")
-	return resp.OpenLink, err
+	if err != nil {
+		return "", err
+	}
+	return resp.OpenLink, nil
 }

officialaccount/basic/short_url.go

@@ -44,6 +44,9 @@ func (basic *Basic) Long2ShortURL(longURL string) (shortURL string, err error) {
 	if err != nil {
 		return
 	}
-	err = util.DecodeWithError(responseBytes, resp, long2shortAction)
-	return resp.ShortURL, err
+	if err = util.DecodeWithError(responseBytes, resp, long2shortAction); err != nil {
+		return
+	}
+	shortURL = resp.ShortURL
+	return
 }

officialaccount/customerservice/manager.go

@@ -72,7 +72,11 @@ func (csm *Manager) List() (customerServiceList []*KeFuInfo, err error) {
 	}
 	var res resKeFuList
 	err = util.DecodeWithError(response, &res, "ListCustomerService")
-	return res.KfList, err
+	if err != nil {
+		return
+	}
+	customerServiceList = res.KfList
+	return
 }
 
 // KeFuOnlineInfo 客服在线信息
@@ -103,7 +107,11 @@ func (csm *Manager) OnlineList() (customerServiceOnlineList []*KeFuOnlineInfo, e
 	}
 	var res resKeFuOnlineList
 	err = util.DecodeWithError(response, &res, "ListOnlineCustomerService")
-	return res.KfOnlineList, err
+	if err != nil {
+		return
+	}
+	customerServiceOnlineList = res.KfOnlineList
+	return
 }
 
 // Add 添加客服账号

officialaccount/datacube/publisher.go

@@ -183,6 +183,9 @@ func (cube *DataCube) fetchData(params ParamsPublisher) (response []byte, err er
 	uri := fmt.Sprintf("%s?%s", publisherURL, v.Encode())
 
 	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
 	return
 }
 

officialaccount/draft/draft.go

@@ -64,7 +64,11 @@ func (draft *Draft) AddDraft(articles []*Article) (mediaID string, err error) {
 		MediaID string `json:"media_id"`
 	}
 	err = util.DecodeWithError(response, &res, "AddDraft")
-	return res.MediaID, err
+	if err != nil {
+		return
+	}
+	mediaID = res.MediaID
+	return
 }
 
 // GetDraft 获取草稿
@@ -90,7 +94,12 @@ func (draft *Draft) GetDraft(mediaID string) (articles []*Article, err error) {
 		NewsItem []*Article `json:"news_item"`
 	}
 	err = util.DecodeWithError(response, &res, "GetDraft")
-	return res.NewsItem, err
+	if err != nil {
+		return
+	}
+
+	articles = res.NewsItem
+	return
 }
 
 // DeleteDraft 删除草稿
@@ -163,7 +172,12 @@ func (draft *Draft) CountDraft() (total uint, err error) {
 		Total uint `json:"total_count"`
 	}
 	err = util.DecodeWithError(response, &res, "CountDraft")
-	return res.Total, err
+	if nil != err {
+		return
+	}
+
+	total = res.Total
+	return
 }
 
 // ArticleList 草稿列表

officialaccount/freepublish/freepublish.go

@@ -73,7 +73,12 @@ func (freePublish *FreePublish) Publish(mediaID string) (publishID int64, err er
 		PublishID int64 `json:"publish_id"`
 	}
 	err = util.DecodeWithError(response, &res, "SubmitFreePublish")
-	return res.PublishID, err
+	if err != nil {
+		return
+	}
+
+	publishID = res.PublishID
+	return
 }
 
 // PublishStatusList 发布任务状态列表
@@ -186,7 +191,12 @@ func (freePublish *FreePublish) First(articleID string) (list []Article, err err
 		NewsItem []Article `json:"news_item"`
 	}
 	err = util.DecodeWithError(response, &res, "FirstFreePublish")
-	return res.NewsItem, err
+	if err != nil {
+		return
+	}
+
+	list = res.NewsItem
+	return
 }
 
 // ArticleList 发布列表

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,8 @@ 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)
+	response, err = util.PostFile("media", filename, uri)
 	if err != nil {
 		return
 	}
@@ -197,24 +192,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 +216,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 +250,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

@@ -3,7 +3,6 @@ package material
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 
 	"github.com/silenceper/wechat/v2/util"
 )
@@ -63,38 +62,6 @@ func (material *Material) MediaUpload(mediaType MediaType, filename string) (med
 	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)
-		return
-	}
-	return
-}
-
 // GetMediaURL 返回临时素材的下载地址供用户自己处理
 // NOTICE: URL 不可公开，因为含access_token 需要立即另存文件
 func (material *Material) GetMediaURL(mediaID string) (mediaURL string, err error) {

officialaccount/message/subscribe.go

@@ -90,7 +90,11 @@ func (tpl *Subscribe) List() (templateList []*PrivateSubscribeItem, err error) {
 	}
 	var res resPrivateSubscribeList
 	err = util.DecodeWithError(response, &res, "ListSubscribe")
-	return res.SubscriptionList, err
+	if err != nil {
+		return
+	}
+	templateList = res.SubscriptionList
+	return
 }
 
 type resSubscribeAdd struct {
@@ -119,7 +123,11 @@ func (tpl *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (temp
 	}
 	var result resSubscribeAdd
 	err = util.DecodeWithError(response, &result, "AddSubscribe")
-	return result.TemplateID, err
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
 }
 
 // Delete 删除私有模板
@@ -167,7 +175,11 @@ func (tpl *Subscribe) GetCategory() (categoryList []*PublicTemplateCategory, err
 	}
 	var result resSubscribeCategoryList
 	err = util.DecodeWithError(response, &result, "GetCategory")
-	return result.CategoryList, err
+	if err != nil {
+		return
+	}
+	categoryList = result.CategoryList
+	return
 }
 
 // PublicTemplateKeyWords 模板中的关键词
@@ -198,7 +210,11 @@ func (tpl *Subscribe) GetPubTplKeyWordsByID(titleID string) (keyWordsList []*Pub
 	}
 	var result resPublicTemplateKeyWordsList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateKeyWords")
-	return result.KeyWordsList, err
+	if err != nil {
+		return
+	}
+	keyWordsList = result.KeyWordsList
+	return
 }
 
 // PublicTemplateTitle 类目下的公共模板
@@ -230,5 +246,10 @@ func (tpl *Subscribe) GetPublicTemplateTitleList(ids string, start int, limit in
 	}
 	var result resPublicTemplateTitleList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateTitle")
-	return result.Count, result.TemplateTitleList, err
+	if err != nil {
+		return
+	}
+	count = result.Count
+	templateTitleList = result.TemplateTitleList
+	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,16 +103,19 @@ 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
 	err = util.DecodeWithError(response, &res, "ListTemplate")
-	return res.TemplateList, err
+	if err != nil {
+		return
+	}
+	templateList = res.TemplateList
+	return
 }
 
 type resTemplateAdd struct {
@@ -122,26 +125,29 @@ 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
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
 }
 
 // Delete 删除私有模板.
@@ -151,14 +157,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")

officialaccount/user/migrate.go

@@ -62,6 +62,10 @@ func (user *User) ListChangeOpenIDs(fromAppID string, openIDs ...string) (list *
 	}
 
 	err = util.DecodeWithError(resp, list, "ListChangeOpenIDs")
+	if err != nil {
+		return
+	}
+
 	return
 }
 

officialaccount/user/tag.go

@@ -126,7 +126,10 @@ func (user *User) GetTag() (tags []*TagInfo, err error) {
 		Tags []*TagInfo `json:"tags"`
 	}
 	err = json.Unmarshal(response, &result)
-	return result.Tags, err
+	if err != nil {
+		return
+	}
+	return result.Tags, nil
 }
 
 // OpenIDListByTag 获取标签下粉丝列表
@@ -151,6 +154,9 @@ func (user *User) OpenIDListByTag(tagID int32, nextOpenID ...string) (userList *
 	}
 	userList = new(TagOpenIDList)
 	err = json.Unmarshal(response, &userList)
+	if err != nil {
+		return
+	}
 	return
 }
 

openplatform/context/accessToken.go

@@ -100,8 +100,11 @@ func (ctx *Context) GetPreCodeContext(stdCtx context.Context) (string, error) {
 	var ret struct {
 		PreCode string `json:"pre_auth_code"`
 	}
-	err = json.Unmarshal(body, &ret)
-	return ret.PreCode, err
+	if err := json.Unmarshal(body, &ret); err != nil {
+		return "", err
+	}
+
+	return ret.PreCode, nil
 }
 
 // GetPreCode 获取预授权码

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

@@ -146,40 +146,13 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 	return responseData, contentType, err
 }
 
-// PostFileByStream 上传文件
-func PostFileByStream(fieldName, fileName, uri string, byteData []byte) ([]byte, error) {
-	fields := []MultipartFormField{
-		{
-			IsFile:    false,
-			Fieldname: fieldName,
-			Filename:  fileName,
-			Value:     byteData,
-		},
-	}
-	return PostMultipartForm(fields, uri)
-}
-
 // PostFile 上传文件
-func PostFile(fieldName, filePath, uri string) ([]byte, error) {
+func PostFile(fieldName, filename, 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,
+			Filename:  filename,
 		},
 	}
 	return PostMultipartForm(fields, uri)
@@ -187,12 +160,10 @@ 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
 }
 
 // PostMultipartForm 上传文件或其他多个字段
@@ -211,24 +182,18 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 				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.Filename)
+			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)
+			partWriter, e := bodyWriter.CreateFormField(field.Fieldname)
 			if e != nil {
 				err = e
 				return
@@ -250,7 +215,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"
 )
@@ -97,54 +96,3 @@ func (r *Client) UploadAttachment(filename string, mediaType string, attachmentT
 	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 {
-		return nil, err
-	}
-	result := &UploadAttachmentResponse{}
-	err = util.DecodeWithError(response, result, "UploadAttachment")
-	return result, err
-}