Merge b47cbba92c into 05ac7148d4

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/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 请求并返回二维码二进制数据

officialaccount/material/material.go

@@ -164,7 +164,7 @@ type resAddMaterial struct {
 }
 
 // AddMaterialFromReader 上传永久性素材（处理视频需要单独上传），从 io.Reader 中读取
-func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath string, reader io.Reader) (mediaID string, url string, err error) {
+func (material *Material) AddMaterialFromReader(mediaType MediaType, directory string, reader io.Reader) (mediaID string, url string, err error) {
 	if mediaType == MediaTypeVideo {
 		err = errors.New("永久视频素材上传使用 AddVideo 方法")
 		return
@@ -177,9 +177,9 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath st
 
 	uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType)
 	// 获取文件名
-	filename := path.Base(filePath)
+	filename := path.Base(directory)
 	var response []byte
-	response, err = util.PostFileFromReader("media", filePath, filename, uri, reader)
+	response, err = util.PostFileFromReader("media", directory, filename, uri, reader)
 	if err != nil {
 		return
 	}
@@ -214,7 +214,7 @@ type reqVideo struct {
 }
 
 // AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取
-func (material *Material) AddVideoFromReader(filePath, title, introduction string, reader io.Reader) (mediaID string, url string, err error) {
+func (material *Material) AddVideoFromReader(directory, title, introduction string, reader io.Reader) (mediaID string, url string, err error) {
 	var accessToken string
 	accessToken, err = material.GetAccessToken()
 	if err != nil {
@@ -232,12 +232,12 @@ func (material *Material) AddVideoFromReader(filePath, title, introduction strin
 	if err != nil {
 		return
 	}
-	fileName := path.Base(filePath)
+	fileName := path.Base(directory)
 	fields := []util.MultipartFormField{
 		{
 			IsFile:     true,
 			Fieldname:  "media",
-			FilePath:   filePath,
+			Directory:  directory,
 			Filename:   fileName,
 			FileReader: reader,
 		},

officialaccount/material/media.go

@@ -3,8 +3,6 @@ package material
 import (
 	"encoding/json"
 	"fmt"
-	"io"
-
 	"github.com/silenceper/wechat/v2/util"
 )
 
@@ -39,7 +37,7 @@ type Media struct {
 }
 
 // MediaUpload 临时素材上传
-func (material *Material) MediaUpload(mediaType MediaType, filename string) (media Media, err error) {
+func (material *Material) MediaUpload(mediaType MediaType, url string) (media Media, err error) {
 	var accessToken string
 	accessToken, err = material.GetAccessToken()
 	if err != nil {
@@ -47,38 +45,10 @@ func (material *Material) MediaUpload(mediaType MediaType, filename string) (med
 	}
 
 	uri := fmt.Sprintf("%s?access_token=%s&type=%s", mediaUploadURL, accessToken, mediaType)
-	var response []byte
-	response, err = util.PostFile("media", filename, uri)
+	filename, byteData, err := util.GetFileSourceByURL(url)
 	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
-}
-
-// 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 {

util/http.go

@@ -8,13 +8,13 @@ import (
 	"encoding/pem"
 	"encoding/xml"
 	"fmt"
+	"golang.org/x/crypto/pkcs12"
 	"io"
 	"log"
 	"mime/multipart"
 	"net/http"
 	"os"
-
-	"golang.org/x/crypto/pkcs12"
+	"path"
 )
 
 // URIModifier URI修改器
@@ -159,25 +159,44 @@ func PostFileByStream(fieldName, fileName, uri string, byteData []byte) ([]byte,
 	return PostMultipartForm(fields, uri)
 }
 
+// GetFileSourceByURL 从给定的 URL 获取文件名和文件字节数据
+func GetFileSourceByURL(url string) (filename string, byteData []byte, err error) {
+	// 获取文件名
+	filename = path.Base(url)
+	// 获取资源
+	resp, err := http.Get(url)
+	if err != nil {
+		err = fmt.Errorf("get resp error: %v", err)
+		return
+	}
+	byteData, err = io.ReadAll(resp.Body)
+	defer func() { _ = resp.Body.Close() }()
+	if err != nil {
+		err = fmt.Errorf("read resp error: %v", err)
+		return
+	}
+	return
+}
+
 // PostFile 上传文件
-func PostFile(fieldName, filePath, uri string) ([]byte, error) {
+func PostFile(fieldName, directory, uri string) ([]byte, error) {
 	fields := []MultipartFormField{
 		{
 			IsFile:    true,
 			Fieldname: fieldName,
-			FilePath:  filePath,
+			Directory: directory,
 		},
 	}
 	return PostMultipartForm(fields, uri)
 }
 
 // PostFileFromReader 上传文件，从 io.Reader 中读取
-func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Reader) ([]byte, error) {
+func PostFileFromReader(filedName, directory, fileName, uri string, reader io.Reader) ([]byte, error) {
 	fields := []MultipartFormField{
 		{
 			IsFile:     true,
 			Fieldname:  filedName,
-			FilePath:   filePath,
+			Directory:  directory,
 			Filename:   fileName,
 			FileReader: reader,
 		},
@@ -190,7 +209,7 @@ type MultipartFormField struct {
 	IsFile     bool
 	Fieldname  string
 	Value      []byte
-	FilePath   string
+	Directory  string
 	Filename   string
 	FileReader io.Reader
 }
@@ -212,7 +231,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 			}
 
 			if field.FileReader == nil {
-				fh, e := os.Open(field.FilePath)
+				fh, e := os.Open(field.Directory)
 				if e != nil {
 					err = fmt.Errorf("error opening file , err=%v", e)
 					return

work/material/media.go

@@ -2,8 +2,6 @@ package material
 
 import (
 	"fmt"
-	"io"
-
 	"github.com/silenceper/wechat/v2/util"
 )
 
@@ -60,7 +58,8 @@ func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
 // UploadTempFile 上传临时素材
 // @see https://developer.work.weixin.qq.com/document/path/90253
 // @mediaType 媒体文件类型，分别有图片（image）、语音（voice）、视频（video），普通文件（file）
-func (r *Client) UploadTempFile(filename string, mediaType string) (*UploadTempFileResponse, error) {
+// 临时素材一般都是存储在oss上的，可以直接传递url
+func (r *Client) UploadTempFile(url string, mediaType string) (*UploadTempFileResponse, error) {
 	var (
 		accessToken string
 		err         error
@@ -68,49 +67,7 @@ func (r *Client) UploadTempFile(filename string, mediaType string) (*UploadTempF
 	if accessToken, err = r.GetAccessToken(); err != nil {
 		return nil, err
 	}
-	var response []byte
-	if response, err = util.PostFile("media", filename, fmt.Sprintf(uploadTempFile, accessToken, mediaType)); err != nil {
-		return nil, err
-	}
-	result := &UploadTempFileResponse{}
-	err = util.DecodeWithError(response, result, "UploadTempFile")
-	return result, err
-}
-
-// UploadAttachment 上传附件资源
-// @see https://developer.work.weixin.qq.com/document/path/95098
-// @mediaType 媒体文件类型，分别有图片（image）、视频（video）、普通文件（file）
-// @attachment_type 附件类型，不同的附件类型用于不同的场景。1：朋友圈；2:商品图册
-func (r *Client) UploadAttachment(filename string, mediaType string, attachmentType int) (*UploadAttachmentResponse, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = r.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.PostFile("media", filename, fmt.Sprintf(uploadAttachment, accessToken, mediaType, attachmentType)); err != nil {
-		return nil, err
-	}
-	result := &UploadAttachmentResponse{}
-	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)
+	filename, byteData, err := util.GetFileSourceByURL(url)
 	if err != nil {
 		return nil, err
 	}
@@ -123,11 +80,11 @@ func (r *Client) UploadTempFileFromReader(filename, mediaType string, reader io.
 	return result, err
 }
 
-// UploadAttachmentFromReader 上传附件资源
+// UploadAttachment 上传附件资源
 // @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) {
+func (r *Client) UploadAttachment(url string, mediaType string, attachmentType int) (*UploadAttachmentResponse, error) {
 	var (
 		accessToken string
 		err         error
@@ -135,8 +92,7 @@ func (r *Client) UploadAttachmentFromReader(filename, mediaType string, reader i
 	if accessToken, err = r.GetAccessToken(); err != nil {
 		return nil, err
 	}
-	var byteData []byte
-	byteData, err = io.ReadAll(reader)
+	filename, byteData, err := util.GetFileSourceByURL(url)
 	if err != nil {
 		return nil, err
 	}