V3媒体上传接口

Author: blusewang

http_client_test.go

@@ -41,11 +41,8 @@ func TestMt_RoundTrip(t *testing.T) {
 	})
 
 	var mch = MchAccount{
-		MchId:           "",
-		MchKey:          "",
-		MchSSLCert:      nil,
-		MchSSLKey:       nil,
-		MchRSAPublicKey: nil,
+		MchId:  "",
+		MchKey: "",
 	}
 	mch.NewMchReq(mch_api.PayOrderQuery)
 }

mch.go

@@ -25,7 +25,6 @@ import (
 	"fmt"
 	"github.com/blusewang/wx/mch_api"
 	"github.com/blusewang/wx/mch_api_v3"
-	"log"
 	"net/http"
 	"strconv"
 	"time"
@@ -232,7 +231,6 @@ func (ma MchAccount) DownloadV3Cert() (err error) {
 		if err != nil {
 			return err
 		}
-		log.Println(string(ct))
 		cb, _ := pem.Decode(ct)
 		cert, err := x509.ParseCertificate(cb.Bytes)
 		if err != nil {
@@ -245,10 +243,6 @@ func (ma MchAccount) DownloadV3Cert() (err error) {
 
 // SignBaseV3 V3版通用签名
 func (ma MchAccount) SignBaseV3(message string) (sign string, err error) {
-	//pk, err := ma.getPrivateKey()
-	//if err != nil {
-	//	return
-	//}
 	s := sha256.New()
 	s.Write([]byte(message))
 	raw, err := rsa.SignPKCS1v15(rand2.Reader, ma.privateKey, crypto.SHA256, s.Sum(nil))

mch_api_v3/constant.go

@@ -11,6 +11,8 @@ type MchApiV3 string
 const (
 	// OtherCertificates 获取平台证书列表
 	OtherCertificates = "certificates"
+	OtherUploadImage  = "merchant/media/upload"
+	OtherUploadVideo  = "merchant/media/video_upload"
 
 	// PartnerApplyment4Sub 特约商户进件申请单
 	PartnerApplyment4Sub = "applyment4sub/applyment/"

mch_api_v3/other.go

@@ -21,3 +21,7 @@ type OtherCertificatesResp struct {
 		} `json:"encrypt_certificate"`
 	} `json:"data"`
 }
+
+type OtherUploadResp struct {
+	MediaId string `json:"media_id"`
+}

mch_req_v3.go

@@ -8,6 +8,7 @@ package wx
 
 import (
 	"bytes"
+	"crypto/sha256"
 	"crypto/x509"
 	"encoding/json"
 	"errors"
@@ -16,6 +17,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"path"
 	"strings"
 	"time"
 )
@@ -98,6 +100,81 @@ func (mr *mchReqV3) Do(method string) (err error) {
 	}
 }
 
+// Upload 上传图片视频
+func (mr *mchReqV3) Upload(fileName string, raw []byte) (err error) {
+	// 准备证书
+	if len(wechatPayCerts) == 0 {
+		wechatPayCerts[""] = nil
+		if err = mr.account.DownloadV3Cert(); err != nil {
+			return
+		}
+	}
+	// 准备描述
+	s := sha256.New()
+	s.Write(raw)
+	meta, err := json.Marshal(H{"filename": fileName, "sha256": fmt.Sprintf("%X", s.Sum(nil))})
+	if err != nil {
+		return
+	}
+	// 开始构建请求体
+	// 微信不承认golang 自带的 multipart 规范
+	var body = new(bytes.Buffer)
+	var nonce = NewRandStr(23)
+	var boundary = fmt.Sprintf("--%v\r\n", nonce)
+	body.WriteString(boundary)
+	body.WriteString("Content-Disposition: form-data; name=\"meta\";\r\n")
+	body.WriteString("Content-Type: application/json\r\n\r\n")
+	body.Write(meta)
+	body.WriteString("\r\n")
+	body.WriteString(boundary)
+	body.WriteString(fmt.Sprintf("Content-Disposition: form-data; name=\"file\"; filename=\"%v\";\r\n", fileName))
+	body.WriteString(fmt.Sprintf("Content-Type: image/%v\r\n\r\n", path.Ext(fileName)))
+	body.Write(raw)
+	body.WriteString("\r\n")
+	body.WriteString(fmt.Sprintf("--%v--\r\n", nonce))
+
+	// 构建API地址
+	api := fmt.Sprintf("https://api.mch.weixin.qq.com/v3/%v", mr.api)
+	if strings.HasPrefix(string(mr.api), "http") {
+		api = string(mr.api)
+	}
+	// 构建请求
+	req, err := http.NewRequest(http.MethodPost, api, bytes.NewReader(body.Bytes()))
+	if err != nil {
+		return
+	}
+	// 签名
+	if err = mr.sign(req, meta); err != nil {
+		return
+	}
+	req.Header.Set("Content-Type", "multipart/form-data")
+	// 网络操作
+	resp, err := client().Do(req)
+	if err != nil {
+		return
+	}
+
+	// 处理结果
+	raw, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusAccepted && resp.StatusCode != http.StatusNoContent {
+		var rs mch_api_v3.ErrorResp
+		_ = json.Unmarshal(raw, &rs)
+		log.Println(api, rs, resp.Header.Get("Request-ID"))
+		return errors.New(fmt.Sprintf("%v | Request-ID:%v", rs.Message, resp.Header.Get("Request-ID")))
+	}
+	if err = mr.account.VerifyV3(resp, raw); err != nil {
+		return
+	}
+	if resp.StatusCode == http.StatusOK {
+		return json.Unmarshal(raw, &mr.res)
+	} else {
+		return
+	}
+}
+
 func (mr *mchReqV3) sign(request *http.Request, body []byte) (err error) {
 	request.Header.Set("User-Agent", "Gdb/1.0")
 	request.Header.Set("Content-Type", "application/json")
@@ -115,5 +192,9 @@ func (mr *mchReqV3) sign(request *http.Request, body []byte) (err error) {
 	}
 	request.Header.Set("Authorization", fmt.Sprintf(`WECHATPAY2-SHA256-RSA2048 mchid="%v",nonce_str="%v",signature="%v",timestamp="%v",serial_no="%X"`,
 		mr.account.MchId, nonce, sign, ts, mr.account.certX509.SerialNumber))
+	//log.Println(fmt.Sprintf("%v\n%v\n%v\n%v\n%v\n", request.Method,
+	//	request.URL.Path, ts, nonce, string(body)))
+	//log.Println("Authorization", fmt.Sprintf(`WECHATPAY2-SHA256-RSA2048 mchid="%v",nonce_str="%v",signature="%v",timestamp="%v",serial_no="%X"`,
+	//	mr.account.MchId, nonce, sign, ts, mr.account.certX509.SerialNumber))
 	return
 }

mch_v3_test.go

@@ -7,6 +7,7 @@
 package wx
 
 import (
+	"bytes"
 	"crypto"
 	"crypto/aes"
 	"crypto/cipher"
@@ -21,11 +22,30 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"mime/multipart"
 	"net/http"
 	"testing"
 	"time"
 )
 
+func TestNewRandStrs(t *testing.T) {
+	log.SetFlags(log.Ltime | log.Lshortfile)
+	buf := new(bytes.Buffer)
+	f := multipart.NewWriter(buf)
+	r, err := f.CreateFormField("meta")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = json.NewEncoder(r).Encode(H{"filename": "x.jpg", "sha256": "435dfslkdjfa;sldkfja;sdf"}); err != nil {
+		t.Fatal(err)
+	}
+	r, err = f.CreateFormFile("file", "file.jpg")
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, _ = r.Write([]byte("asdfasdf"))
+	log.Println(buf.String())
+}
 func TestNewRandStr(t *testing.T) {
 	log.SetFlags(log.Ltime | log.Lshortfile)
 	mchId := "1276387801"

mp_req.go

@@ -111,7 +111,7 @@ func (mp *mpReq) Do() (err error) {
 	return
 }
 
-// 上传文档。
+// Upload 上传文档。
 // reader 一个打开的文件reader。
 // fileExtension 该文件的后缀名。
 func (mp *mpReq) Upload(reader io.Reader, fileExtension string) (err error) {