From 108a65ecf34f2749170329e0a935f406d070b19d Mon Sep 17 00:00:00 2001
From: stepbystep2 <770954908@qq.com>
Date: Thu, 28 Jul 2022 00:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0GetPhoneNumberContext?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20(#587)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/auth/auth.go | 23 +++++++++++++++++++----
 util/http.go             | 11 ++++++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/miniprogram/auth/auth.go b/miniprogram/auth/auth.go
index 880effd..638ac53 100644
--- a/miniprogram/auth/auth.go
+++ b/miniprogram/auth/auth.go
@@ -84,7 +84,9 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
 	if at, err = auth.GetAccessToken(); err != nil {
 		return
 	}
-	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), "encrypted_msg_hash="+encryptedMsgHash); err != nil {
+
+	// 由于GetPhoneNumberContext需要传入JSON，所以HTTPPostContext入参改为[]byte
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), []byte("encrypted_msg_hash="+encryptedMsgHash), nil); err != nil {
 		return
 	}
 	if err = util.DecodeWithError(response, &result, "CheckEncryptedDataAuth"); err != nil {
@@ -111,8 +113,8 @@ type PhoneInfo struct {
 	} `json:"watermark"` // 数据水印
 }
 
-// GetPhoneNumber 小程序通过code获取用户手机号
-func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
+// GetPhoneNumberContext 小程序通过code获取用户手机号
+func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*GetPhoneNumberResponse, error) {
 	var response []byte
 	var (
 		at  string
@@ -124,12 +126,25 @@ func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
 	body := map[string]interface{}{
 		"code": code,
 	}
-	if response, err = util.PostJSON(fmt.Sprintf(getPhoneNumber, at), body); err != nil {
+
+	bodyBytes, err := json.Marshal(body)
+	if err != nil {
 		return nil, err
 	}
+
+	header := map[string]string{"Content-Type": "application/json;charset=utf-8"}
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, at), bodyBytes, header); err != nil {
+		return nil, err
+	}
+
 	var result GetPhoneNumberResponse
 	if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
+
+// GetPhoneNumber 小程序通过code获取用户手机号
+func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
+	return auth.GetPhoneNumberContext(context2.Background(), code)
+}
diff --git a/util/http.go b/util/http.go
index 22cab34..6341093 100644
--- a/util/http.go
+++ b/util/http.go
@@ -43,16 +43,21 @@ func HTTPGetContext(ctx context.Context, uri string) ([]byte, error) {
 
 // HTTPPost post 请求
 func HTTPPost(uri string, data string) ([]byte, error) {
-	return HTTPPostContext(context.Background(), uri, data)
+	return HTTPPostContext(context.Background(), uri, []byte(data), nil)
 }
 
 // HTTPPostContext post 请求
-func HTTPPostContext(ctx context.Context, uri string, data string) ([]byte, error) {
-	body := bytes.NewBuffer([]byte(data))
+func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[string]string) ([]byte, error) {
+	body := bytes.NewBuffer(data)
 	request, err := http.NewRequestWithContext(ctx, http.MethodPost, uri, body)
 	if err != nil {
 		return nil, err
 	}
+
+	for key, value := range header {
+		request.Header.Set(key, value)
+	}
+
 	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return nil, err