Merge d678af24dd into 05ac7148d4

fix issue
Merge branch 'feature_add_stream_upload' into v2
2026-02-23 13:42:25 +08:00 · 2024-07-18 15:17:23 +00:00 · 2024-07-18 23:12:33 +08:00 · 2024-07-18 08:47:41 +08:00 · 2024-07-16 23:35:37 +08:00 · 2024-07-16 21:02:59 +08:00
1 changed files with 3 additions and 2 deletions
--- a/officialaccount/material/material.go
+++ b/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 (
Author	SHA1	Message	Date
oah8	ba1440d1c2	Merge `d678af24dd` into `05ac7148d4`	2024-07-18 15:17:23 +00:00
_oah	d678af24dd	fix issue	2024-07-18 23:12:33 +08:00
_oah	807a8a11e5	Merge branch 'feature_add_stream_upload' into v2 # Conflicts: # officialaccount/material/material.go # util/http.go	2024-07-18 08:47:41 +08:00
_oah	3b888ddbf5	Merge remote-tracking branch 'origin/feature_add_stream_upload' into feature_add_stream_upload # Conflicts: # officialaccount/material/media.go	2024-07-16 23:35:37 +08:00
Ji Luo Yang	05ac7148d4	feat: 公众号新增模板接口，支持模板参数传递 (#783 ) * feat: 公众号新增模板接口，支持模板参数传递 * fix: 公众号新增模板接口，合并定义参数 * fix: 公众号新增模板接口，统一代码风格 --------- Co-authored-by: yangj23 <yangj23@mingyuanyun.com>	2024-07-16 21:02:59 +08:00
sam	6b3532cc2d	feat: Material 增加 AddMaterialFromReader 与 AddVideoFromReader 方法 (#780 ) * feat: Material 增加 AddMaterialFromReader 与 AddVideoFromReader 方法 * update: 调整 PostFileFromReader 参数。	2024-07-16 15:43:18 +08:00