1
0
mirror of https://github.com/silenceper/wechat.git synced 2026-03-01 00:35:26 +08:00

Compare commits

..

3 Commits

Author SHA1 Message Date
markwang
06b89b6ca2 Merge ea684369a9 into 179704187b 2024-03-15 08:24:06 +00:00
markwang
ea684369a9 feat: optimized-error-handling 2024-03-15 16:23:48 +08:00
markwang
6053598a03 feat: optimized-error-handling&remove unused constant 2024-03-15 14:38:10 +08:00
15 changed files with 75 additions and 348 deletions

View File

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

View File

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

View File

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

View File

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

2
cache/redis.go vendored
View File

@@ -16,7 +16,6 @@ type Redis struct {
// RedisOpts redis 连接属性 // RedisOpts redis 连接属性
type RedisOpts struct { type RedisOpts struct {
Host string `yml:"host" json:"host"` Host string `yml:"host" json:"host"`
Username string `yaml:"username" json:"username"`
Password string `yml:"password" json:"password"` Password string `yml:"password" json:"password"`
Database int `yml:"database" json:"database"` Database int `yml:"database" json:"database"`
MaxIdle int `yml:"max_idle" json:"max_idle"` 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{ conn := redis.NewUniversalClient(&redis.UniversalOptions{
Addrs: []string{opts.Host}, Addrs: []string{opts.Host},
DB: opts.Database, DB: opts.Database,
Username: opts.Username,
Password: opts.Password, Password: opts.Password,
IdleTimeout: time.Second * time.Duration(opts.IdleTimeout), IdleTimeout: time.Second * time.Duration(opts.IdleTimeout),
MinIdleConns: opts.MaxIdle, MinIdleConns: opts.MaxIdle,

View File

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

View File

@@ -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"`
}

View File

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

View File

@@ -54,8 +54,6 @@ type QRCoder struct {
IsHyaline bool `json:"is_hyaline,omitempty"` IsHyaline bool `json:"is_hyaline,omitempty"`
// envVersion 要打开的小程序版本。正式版为 "release",体验版为 "trial",开发版为 "develop" // envVersion 要打开的小程序版本。正式版为 "release",体验版为 "trial",开发版为 "develop"
EnvVersion string `json:"env_version,omitempty"` EnvVersion string `json:"env_version,omitempty"`
// ShowSplashAd 控制通过该小程序码进入小程序是否展示封面广告1、默认为true展示封面广告2、传入为false时不展示封面广告
ShowSplashAd bool `json:"show_splash_ad,omitempty"`
} }
// fetchCode 请求并返回二维码二进制数据 // fetchCode 请求并返回二维码二进制数据

View File

@@ -79,10 +79,6 @@ type sendRequest struct {
Mpnews map[string]interface{} `json:"mpnews,omitempty"` Mpnews map[string]interface{} `json:"mpnews,omitempty"`
// 发送语音 // 发送语音
Voice map[string]interface{} `json:"voice,omitempty"` Voice map[string]interface{} `json:"voice,omitempty"`
// 发送视频
Mpvideo map[string]interface{} `json:"mpvideo,omitempty"`
// 发送图片-预览使用
Image map[string]interface{} `json:"image,omitempty"`
// 发送图片 // 发送图片
Images *Image `json:"images,omitempty"` Images *Image `json:"images,omitempty"`
// 发送卡券 // 发送卡券
@@ -187,13 +183,7 @@ func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error
ToUser: nil, ToUser: nil,
MsgType: MsgTypeImage, MsgType: MsgTypeImage,
} }
if broadcast.preview { req.Images = images
req.Image = map[string]interface{}{
"media_id": images.MediaIDs[0],
}
} else {
req.Images = images
}
req, sendURL := broadcast.chooseTagOrOpenID(user, req) req, sendURL := broadcast.chooseTagOrOpenID(user, req)
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak) url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
data, err := util.PostJSON(url, req) data, err := util.PostJSON(url, req)
@@ -215,7 +205,7 @@ func (broadcast *Broadcast) SendVideo(user *User, mediaID string, title, descrip
ToUser: nil, ToUser: nil,
MsgType: MsgTypeVideo, MsgType: MsgTypeVideo,
} }
req.Mpvideo = map[string]interface{}{ req.Voice = map[string]interface{}{
"media_id": mediaID, "media_id": mediaID,
"title": title, "title": title,
"description": description, "description": description,

View File

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

View File

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

View File

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

View File

@@ -146,40 +146,13 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
return responseData, contentType, err 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 上传文件 // PostFile 上传文件
func PostFile(fieldName, filePath, uri string) ([]byte, error) { func PostFile(fieldName, filename, uri string) ([]byte, error) {
fields := []MultipartFormField{ fields := []MultipartFormField{
{ {
IsFile: true, IsFile: true,
Fieldname: fieldName, Fieldname: fieldName,
FilePath: filePath, Filename: filename,
},
}
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,
}, },
} }
return PostMultipartForm(fields, uri) return PostMultipartForm(fields, uri)
@@ -187,12 +160,10 @@ func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Rea
// MultipartFormField 保存文件或其他字段信息 // MultipartFormField 保存文件或其他字段信息
type MultipartFormField struct { type MultipartFormField struct {
IsFile bool IsFile bool
Fieldname string Fieldname string
Value []byte Value []byte
FilePath string Filename string
Filename string
FileReader io.Reader
} }
// PostMultipartForm 上传文件或其他多个字段 // PostMultipartForm 上传文件或其他多个字段
@@ -211,24 +182,18 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
return return
} }
if field.FileReader == nil { fh, e := os.Open(field.Filename)
fh, e := os.Open(field.FilePath) if e != nil {
if e != nil { err = fmt.Errorf("error opening file , err=%v", e)
err = fmt.Errorf("error opening file , err=%v", e) return
return }
} defer fh.Close()
_, err = io.Copy(fileWriter, fh)
_ = fh.Close() if _, err = io.Copy(fileWriter, fh); err != nil {
if err != nil { return
return
}
} else {
if _, err = io.Copy(fileWriter, field.FileReader); err != nil {
return
}
} }
} else { } else {
partWriter, e := bodyWriter.CreateFormFile(field.Fieldname, field.Filename) partWriter, e := bodyWriter.CreateFormField(field.Fieldname)
if e != nil { if e != nil {
err = e err = e
return return
@@ -250,7 +215,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { 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) respBody, err = io.ReadAll(resp.Body)
return return

View File

@@ -2,7 +2,6 @@ package material
import ( import (
"fmt" "fmt"
"io"
"github.com/silenceper/wechat/v2/util" "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") err = util.DecodeWithError(response, result, "UploadAttachment")
return result, err 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
}