mirror of
https://github.com/silenceper/wechat.git
synced 2026-02-05 21:22:27 +08:00
Compare commits
2 Commits
v2.1.6
...
feature/au
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1cee8868e | ||
|
|
aa1afc5a35 |
@@ -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 登录/用户信息
|
||||||
@@ -33,7 +35,7 @@ type ResCode2Session struct {
|
|||||||
|
|
||||||
OpenID string `json:"openid"` // 用户唯一标识
|
OpenID string `json:"openid"` // 用户唯一标识
|
||||||
SessionKey string `json:"session_key"` // 会话密钥
|
SessionKey string `json:"session_key"` // 会话密钥
|
||||||
UnionID string `json:"unionid"` // 用户在开放平台的唯一标识符,在满足UnionID下发条件的情况下会返回
|
UnionID string `json:"unionid"` // 用户在开放平台的唯一标识符,在满足 UnionID 下发条件的情况下会返回
|
||||||
}
|
}
|
||||||
|
|
||||||
// RspCheckEncryptedData .
|
// RspCheckEncryptedData .
|
||||||
@@ -70,12 +72,12 @@ func (auth *Auth) GetPaidUnionID() {
|
|||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckEncryptedData .检查加密信息是否由微信生成(当前只支持手机号加密数据),只能检测最近3天生成的加密数据
|
// CheckEncryptedData .检查加密信息是否由微信生成(当前只支持手机号加密数据),只能检测最近 3 天生成的加密数据
|
||||||
func (auth *Auth) CheckEncryptedData(encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
|
func (auth *Auth) CheckEncryptedData(encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
|
||||||
return auth.CheckEncryptedDataContext(context2.Background(), encryptedMsgHash)
|
return auth.CheckEncryptedDataContext(context2.Background(), encryptedMsgHash)
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckEncryptedDataContext .检查加密信息是否由微信生成(当前只支持手机号加密数据),只能检测最近3天生成的加密数据
|
// CheckEncryptedDataContext .检查加密信息是否由微信生成(当前只支持手机号加密数据),只能检测最近 3 天生成的加密数据
|
||||||
func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
|
func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
|
||||||
var response []byte
|
var response []byte
|
||||||
var (
|
var (
|
||||||
@@ -85,7 +87,7 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 由于GetPhoneNumberContext需要传入JSON,所以HTTPPostContext入参改为[]byte
|
// 由于 GetPhoneNumberContext 需要传入 JSON,所以 HTTPPostContext 入参改为 []byte
|
||||||
if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), []byte("encrypted_msg_hash="+encryptedMsgHash), nil); err != nil {
|
if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), []byte("encrypted_msg_hash="+encryptedMsgHash), nil); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -113,38 +115,62 @@ type PhoneInfo struct {
|
|||||||
} `json:"watermark"` // 数据水印
|
} `json:"watermark"` // 数据水印
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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
|
||||||
|
// }
|
||||||
|
|||||||
@@ -117,6 +117,24 @@ const (
|
|||||||
|
|
||||||
// queryPublishGoods 查询批量发布道具任务状态
|
// queryPublishGoods 查询批量发布道具任务状态
|
||||||
queryPublishGoods = "/xpay/query_publish_goods"
|
queryPublishGoods = "/xpay/query_publish_goods"
|
||||||
|
|
||||||
|
// queryBizBalance 查询商家账户里的可提现余额
|
||||||
|
queryBizBalance = "/xpay/query_biz_balance"
|
||||||
|
|
||||||
|
// queryTransferAccount 查询广告金充值账户
|
||||||
|
queryTransferAccount = "/xpay/query_transfer_account"
|
||||||
|
|
||||||
|
// queryAdverFunds 查询广告金发放记录
|
||||||
|
queryAdverFunds = "/xpay/query_adver_funds"
|
||||||
|
|
||||||
|
// createFundsBill 充值广告金
|
||||||
|
createFundsBill = "/xpay/create_funds_bill"
|
||||||
|
|
||||||
|
// bindTransferAccount 绑定广告金充值账户
|
||||||
|
bindTransferAccount = "/xpay/bind_transfer_accout"
|
||||||
|
|
||||||
|
// defaultUnifiedOrderURL default unified order url
|
||||||
|
defaultUnifiedOrderURL = "requestVirtualPayment"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -145,6 +145,8 @@ type OrderItem struct {
|
|||||||
WxOrderID string `json:"wx_order_id"` // 微信内部单号
|
WxOrderID string `json:"wx_order_id"` // 微信内部单号
|
||||||
ChannelOrderID string `json:"channel_order_id"` // 渠道订单号,为用户微信支付详情页面上的商户单号
|
ChannelOrderID string `json:"channel_order_id"` // 渠道订单号,为用户微信支付详情页面上的商户单号
|
||||||
WxPayOrderID string `json:"wxpay_order_id"` // 微信支付交易单号,为用户微信支付详情页面上的交易单号
|
WxPayOrderID string `json:"wxpay_order_id"` // 微信支付交易单号,为用户微信支付详情页面上的交易单号
|
||||||
|
SettTime int64 `json:"sett_time"` // 结算时间,unix 秒级时间戳,结算时间的秒级时间戳,大于 0 表示结算成功
|
||||||
|
SettState uint `json:"sett_state"` // 结算状态 0-未开始结算 1-结算中 2-结算成功
|
||||||
}
|
}
|
||||||
|
|
||||||
// QueryOrderResponse 查询创建的订单(现金单,非代币单)响应参数
|
// QueryOrderResponse 查询创建的订单(现金单,非代币单)响应参数
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user