1
0
mirror of https://github.com/silenceper/wechat.git synced 2026-02-11 08:12:26 +08:00

improve code

This commit is contained in:
houseme
2023-09-22 17:28:17 +08:00
parent 9e810be88a
commit aa1afc5a35
3 changed files with 54 additions and 24 deletions

View File

@@ -15,6 +15,8 @@ const (
checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s" checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s"
getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s" getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
checkSessionURL = "https://api.weixin.qq.com/wxa/checksession?access_token=%s&openid=%s&signature=%s&sig_method=hmac_sha256"
) )
// Auth 登录/用户信息 // Auth 登录/用户信息
@@ -114,37 +116,61 @@ type PhoneInfo struct {
} }
// GetPhoneNumberContext 小程序通过 code 获取用户手机号 // GetPhoneNumberContext 小程序通过 code 获取用户手机号
func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*GetPhoneNumberResponse, error) { func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (result *GetPhoneNumberResponse, err error) {
var response []byte var accessToken string
var ( if accessToken, err = auth.GetAccessToken(); err != nil {
at string
err error
)
if at, err = auth.GetAccessToken(); err != nil {
return nil, err return nil, err
} }
body := map[string]interface{}{
"code": code,
}
bodyBytes, err := json.Marshal(body) bodyBytes, err := json.Marshal(map[string]interface{}{
"code": code,
})
if err != nil { if err != nil {
return nil, err return nil, err
} }
header := map[string]string{"Content-Type": "application/json;charset=utf-8"} var (
if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, at), bodyBytes, header); err != nil { header = map[string]string{"Content-Type": "application/json;charset=utf-8"}
response []byte
)
if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, accessToken), bodyBytes, header); err != nil {
return nil, err return nil, err
} }
var result GetPhoneNumberResponse err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber")
if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil { return
return nil, err
}
return &result, nil
} }
// GetPhoneNumber 小程序通过 code 获取用户手机号 // GetPhoneNumber 小程序通过 code 获取用户手机号
func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) { func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
return auth.GetPhoneNumberContext(context2.Background(), code) return auth.GetPhoneNumberContext(context2.Background(), code)
} }
// // CheckSession 检验登录态是否过期。
// func (auth *Auth) CheckSession(sessionKey, openID string) (result *CheckSessionResponse, err error) {
// return auth.CheckSessionContext(context2.Background(), sessionKey, openID)
// }
//
// // CheckSessionContext 检验登录态是否过期。
// func (auth *Auth) CheckSessionContext(ctx context2.Context, sessionKey, openID string) (result *CheckSessionResponse, err error) {
// var accessToken string
// if accessToken, err = auth.GetAccessToken(); err != nil {
// return nil, err
// }
// var (
// response []byte
// signature string = sessionKey
// )
// if response, err = util.HTTPGetContext(ctx, fmt.Sprintf(checkSessionURL, accessToken, openID, signature)); err != nil {
// return nil, err
// }
//
// err = util.DecodeWithError(response, &result, "CheckSessionContext")
// return
// }
//
// // CheckSessionResponse 检验登录态是否过期。
// type CheckSessionResponse struct {
// util.CommonError
// }

View File

@@ -117,6 +117,9 @@ const (
// queryPublishGoods 查询批量发布道具任务状态 // queryPublishGoods 查询批量发布道具任务状态
queryPublishGoods = "/xpay/query_publish_goods" queryPublishGoods = "/xpay/query_publish_goods"
// defaultUnifiedOrderURL default unified order url
defaultUnifiedOrderURL = "requestVirtualPayment"
) )
const ( const (

View File

@@ -479,6 +479,7 @@ func (s *VirtualPayment) requestAddress(params URLParams) (url string, err error
case queryUserBalance: case queryUserBalance:
case currencyPay: case currencyPay:
case cancelCurrencyPay: case cancelCurrencyPay:
case defaultUnifiedOrderURL:
if params.PaySign, params.Signature, err = s.PaySignature(params.Path, params.Content); err != nil { if params.PaySign, params.Signature, err = s.PaySignature(params.Path, params.Content); err != nil {
return return
} }