Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ccc50a7dd0 | ||
|
|
d1a7ba8119 | ||
|
|
7c19a66cb5 | ||
|
|
90b72129a5 | ||
|
|
58bea0c09a |
3
go.mod
3
go.mod
@@ -47,6 +47,8 @@ require (
|
||||
github.com/gorilla/websocket v1.5.3 // indirect
|
||||
github.com/grokify/html-strip-tags-go v0.1.0 // indirect
|
||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
||||
github.com/haxqer/gofunc v0.0.0-20210609183449-586b0cce5fe4 // indirect
|
||||
github.com/haxqer/xthird v0.0.0-20210703071732-ff4f4dbb6e5d // indirect
|
||||
github.com/klauspost/compress v1.18.0 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
|
||||
github.com/magiconair/properties v1.8.9 // indirect
|
||||
@@ -60,6 +62,7 @@ require (
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
||||
github.com/olekukonko/tablewriter v0.0.5 // indirect
|
||||
github.com/pelletier/go-toml v1.9.3 // indirect
|
||||
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 // indirect
|
||||
github.com/prometheus/client_model v0.6.1 // indirect
|
||||
github.com/prometheus/common v0.62.0 // indirect
|
||||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
|
||||
7
go.sum
7
go.sum
@@ -225,6 +225,10 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
|
||||
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
|
||||
github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
|
||||
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
|
||||
github.com/haxqer/gofunc v0.0.0-20210609183449-586b0cce5fe4 h1:QQOImHnvEkzqEbozZup+76WLv+W0QhO84GTLHppMY1M=
|
||||
github.com/haxqer/gofunc v0.0.0-20210609183449-586b0cce5fe4/go.mod h1:XQaEUze5QCq3D9oenfHItzPQUD+NGg+0TDt1kJhJAAc=
|
||||
github.com/haxqer/xthird v0.0.0-20210703071732-ff4f4dbb6e5d h1:e2qgvCNjMrp9fNtUQr3gQnK15B0C2CIUjPWMc7jZnbo=
|
||||
github.com/haxqer/xthird v0.0.0-20210703071732-ff4f4dbb6e5d/go.mod h1:9avb74vS4djGUwtueA6V01grbpskLGisSy0jxFZIBY8=
|
||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
@@ -296,6 +300,8 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
|
||||
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 h1:xoIK0ctDddBMnc74udxJYBqlo9Ylnsp1waqjLsnef20=
|
||||
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
|
||||
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
|
||||
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
@@ -457,6 +463,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
|
||||
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
|
||||
30
package/pay/func.go
Normal file
30
package/pay/func.go
Normal file
@@ -0,0 +1,30 @@
|
||||
package pay
|
||||
|
||||
import "strings"
|
||||
|
||||
func FormatPublicKey(publicKey string) (pKey string) {
|
||||
var buffer strings.Builder
|
||||
buffer.WriteString("-----BEGIN PUBLIC KEY-----\n")
|
||||
rawLen := 64
|
||||
keyLen := len(publicKey)
|
||||
raws := keyLen / rawLen
|
||||
temp := keyLen % rawLen
|
||||
if temp > 0 {
|
||||
raws++
|
||||
}
|
||||
start := 0
|
||||
end := start + rawLen
|
||||
for i := 0; i < raws; i++ {
|
||||
if i == raws-1 {
|
||||
buffer.WriteString(publicKey[start:])
|
||||
} else {
|
||||
buffer.WriteString(publicKey[start:end])
|
||||
}
|
||||
buffer.WriteByte('\n')
|
||||
start += rawLen
|
||||
end = start + rawLen
|
||||
}
|
||||
buffer.WriteString("-----END PUBLIC KEY-----\n")
|
||||
pKey = buffer.String()
|
||||
return
|
||||
}
|
||||
5
package/pay/honor/const.go
Normal file
5
package/pay/honor/const.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package honor
|
||||
|
||||
const (
|
||||
Host = "https://iap-api.cloud.honor.com"
|
||||
)
|
||||
65
package/pay/honor/honor.go
Normal file
65
package/pay/honor/honor.go
Normal file
@@ -0,0 +1,65 @@
|
||||
package honor
|
||||
|
||||
import (
|
||||
"crypto"
|
||||
"crypto/rsa"
|
||||
"crypto/sha256"
|
||||
"crypto/x509"
|
||||
"encoding/base64"
|
||||
"encoding/pem"
|
||||
"errors"
|
||||
"github.com/ayflying/utility_go/package/pay"
|
||||
)
|
||||
|
||||
type Pay struct {
|
||||
PubKey string `json:"pubKey"`
|
||||
AppId string `json:"appId"`
|
||||
}
|
||||
|
||||
func New(pay *Pay) *Pay {
|
||||
return &Pay{
|
||||
AppId: pay.AppId,
|
||||
PubKey: pay.PubKey,
|
||||
}
|
||||
}
|
||||
|
||||
// VerifyRSASignature 验证RSA数字签名
|
||||
// data: 原始数据字节
|
||||
// sign: 签名的Base64编码字符串
|
||||
// pubKey: PEM格式的公钥字符串
|
||||
// 返回验证结果和可能的错误
|
||||
func (p *Pay) VerifyRSASignature(data []byte, sign string) (bool, error) {
|
||||
// 解码Base64格式的签名
|
||||
signBytes, err := base64.StdEncoding.DecodeString(sign)
|
||||
if err != nil {
|
||||
return false, errors.New("签名解码失败: " + err.Error())
|
||||
}
|
||||
|
||||
pubkey := pay.FormatPublicKey(p.PubKey)
|
||||
// 解析PEM格式的公钥
|
||||
block, _ := pem.Decode([]byte(pubkey))
|
||||
if block == nil {
|
||||
return false, errors.New("无效的PEM格式公钥")
|
||||
}
|
||||
|
||||
// 解析公钥
|
||||
publicKey, err := x509.ParsePKIXPublicKey(block.Bytes)
|
||||
if err != nil {
|
||||
return false, errors.New("公钥解析失败: " + err.Error())
|
||||
}
|
||||
|
||||
// 类型断言为公钥
|
||||
rsaPubKey, ok := publicKey.(*rsa.PublicKey)
|
||||
if !ok {
|
||||
return false, errors.New("不是有效的RSA公钥")
|
||||
}
|
||||
|
||||
// 计算数据的SHA-256哈希
|
||||
hasher := sha256.New()
|
||||
hasher.Write(data)
|
||||
hash := hasher.Sum(nil)
|
||||
|
||||
// 验证签名
|
||||
err = rsa.VerifyPKCS1v15(rsaPubKey, crypto.SHA256, hash, signBytes)
|
||||
return err == nil, err
|
||||
}
|
||||
45
package/pay/honor/model.go
Normal file
45
package/pay/honor/model.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package honor
|
||||
|
||||
type PayCallbackHeader struct {
|
||||
Charset string `json:"charset" dc:"字符集,当前只支持utf-8。"`
|
||||
SignType string `json:"signType" dc:"签名算法类型, 当前只支持RSA"`
|
||||
Sign string `json:"sign" dc:"notificationMessage的签名,已废弃,请用signature。"`
|
||||
Signature string `json:"signature" dc:"对data的签名。"`
|
||||
AppId string `json:"appId" dc:"应用ID"`
|
||||
}
|
||||
|
||||
type PayCallback struct {
|
||||
Env string `json:"env" dc:"发送通知的环境,sandbox为沙盒测试环境,非sandbox为正式环境"`
|
||||
EventType string `json:"eventType" dc:"事件类型,如付款成功、退款失败等"`
|
||||
EventCode int `json:"eventCode" dc:"事件类型对应的code值"`
|
||||
Version string `json:"version" dc:"iap版本"`
|
||||
EventTime string `json:"eventTime" dc:"通知时间"`
|
||||
Data PayCallbackData `json:"data" dc:"通知内容notificationMessage的json字符串"`
|
||||
}
|
||||
|
||||
type PayCallbackData struct {
|
||||
AppId string `json:"appId" dc:"应用ID"`
|
||||
OrderId string `json:"orderId" dc:"订单ID"`
|
||||
BizOrderNo string `json:"bizOrderNo,omitempty" dc:"max-length:64#业务订单号"`
|
||||
ProductType int `json:"productType" dc:"商品类型0:消耗型,1:非消耗型,2:订阅型"`
|
||||
ProductId string `json:"productId" dc:"商品ID"`
|
||||
ProductName string `json:"productName" dc:"商品名称"`
|
||||
PurchaseTime int64 `json:"purchaseTime" dc:"购买时间UTC时间戳(毫秒)"`
|
||||
PurchaseState int `json:"purchaseState" dc:"订单状态 0:已购买 1:已退款 2:付款失败 3:退款失败 4:未支付 5:退款中"`
|
||||
ConsumptionState int `json:"consumptionState" dc:"消耗状态 0:未消耗 1:已消耗"`
|
||||
PurchaseToken string `json:"purchaseToken" dc:"购买令牌"`
|
||||
Currency string `json:"currency" dc:"币种"`
|
||||
Price string `json:"price" dc:"商品价格"`
|
||||
PayMoney string `json:"payMoney" dc:"实际支付金额"`
|
||||
DeveloperPayload string `json:"developerPayload,omitempty" dc:"max-length:1024#商户信息"`
|
||||
OriOrder string `json:"oriOrder" dc:"原订单信息"`
|
||||
SandboxFlag int `json:"sandboxFlag" dc:"沙盒标识"`
|
||||
AgreementNo string `json:"agreementNo,omitempty" dc:"订阅合约号"`
|
||||
ExecuteTime string `json:"executeTime,omitempty" dc:"下次扣费时间(订阅)"`
|
||||
SecondChargeTime int64 `json:"secondChargeTime,omitempty" dc:"第二次扣费时间(订阅升级)"`
|
||||
OldProductId string `json:"oldProductId,omitempty" dc:"老商品ID(订阅升级)"`
|
||||
SubStartTime string `json:"subStartTime,omitempty" dc:"订阅开始时间"`
|
||||
SubEndTime string `json:"subEndTime,omitempty" dc:"订阅结束时间"`
|
||||
OriginalPrice string `json:"originalPrice" dc:"原始价格"`
|
||||
CancelTime string `json:"cancelTime,omitempty" dc:"订阅取消时间"`
|
||||
}
|
||||
26
package/pay/honor/notification.go
Normal file
26
package/pay/honor/notification.go
Normal file
@@ -0,0 +1,26 @@
|
||||
package honor
|
||||
|
||||
import (
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func (p *Pay) Notification(r *http.Request) {
|
||||
|
||||
}
|
||||
|
||||
// ConsumeProduct 商品消耗
|
||||
func (p *Pay) ConsumeProduct(purchaseToken string) (err error) {
|
||||
url := Host + "/iap/server/consumeProduct"
|
||||
_, err = g.Client().ContentJson().Post(gctx.New(), url, g.Map{
|
||||
"purchaseToken": purchaseToken,
|
||||
"developerChallenge": "",
|
||||
})
|
||||
if err != nil {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
97
package/pay/oppo/login.go
Normal file
97
package/pay/oppo/login.go
Normal file
@@ -0,0 +1,97 @@
|
||||
package oppo
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/hmac"
|
||||
"crypto/sha1"
|
||||
"encoding/base64"
|
||||
"github.com/gogf/gf/v2/encoding/gjson"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gtime"
|
||||
"github.com/gogf/gf/v2/util/grand"
|
||||
"io"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
const host = "https://iopen.game.heytapmobi.com"
|
||||
|
||||
// oppo参数类型
|
||||
type LoginType struct {
|
||||
Token string `json:"token"`
|
||||
Ssoid string `json:"ssoid"`
|
||||
Channel int `json:"channel"`
|
||||
AdId string `json:"adId"`
|
||||
}
|
||||
|
||||
//登录回复
|
||||
type LoginResType struct {
|
||||
ResultCode string `json:"resultCode" dc:"响应码,成功为 200"`
|
||||
ResultMsg string `json:"resultMsg" dc:"响应信息"`
|
||||
LoginToken string `json:"loginToken" dc:"透传的token"`
|
||||
Ssoid string `json:"ssoid" dc:"透传的ssoid"`
|
||||
//AppKey string `json:"appKey" dc:"秘钥key,因隐私安全规范,该字段目前已不返回信息"`
|
||||
UserName string `json:"userName" dc:"用户ssoid绑定的账户昵称"`
|
||||
//Email string `json:"email" dc:"因隐私安全规范,该字段目前已不返回信息"`
|
||||
//MobileNumber string `json:"mobileNumber" dc:"因隐私安全规范,该字段目前已不返回信息"`
|
||||
//CreateTime string `json:"createTime" dc:"因隐私安全规范,该字段目前已不返回信息"`
|
||||
UserStatus string `json:"userStatus" dc:"用户状态:NORMAL 表示正常"`
|
||||
}
|
||||
|
||||
func (p *OppoType) FileIdInfo(ctx context.Context, oauthToken string, ssoid string) (res *LoginResType, err error) {
|
||||
url := host + "/sdkopen/user/fileIdInfo"
|
||||
header := p.GetHeader(oauthToken)
|
||||
getHtml, err := g.Client().Header(header).Get(ctx, url, g.Map{
|
||||
"token": oauthToken,
|
||||
"fileId": ssoid,
|
||||
})
|
||||
getRes := getHtml.ReadAllString()
|
||||
gjson.DecodeTo(getRes, &res)
|
||||
//g.Log().Debugf(ctx, "当前登陆请求的:%v", res)
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
func (p *OppoType) GenParam(oauthToken, oauthTimestamp, oauthNonce string) string {
|
||||
// 注意:拼接的顺序不能有改变,不然会导致联运方验签失败
|
||||
params := []string{
|
||||
"oauthConsumerKey=" + url.QueryEscape(p.AppKey),
|
||||
"oauthToken=" + url.QueryEscape(oauthToken),
|
||||
"oauthSignatureMethod=" + url.QueryEscape("HMAC-SHA1"),
|
||||
"oauthTimestamp=" + url.QueryEscape(oauthTimestamp),
|
||||
"oauthNonce=" + url.QueryEscape(oauthNonce),
|
||||
"oauthVersion=" + url.QueryEscape("1.0"),
|
||||
}
|
||||
return strings.Join(params, "&") + "&"
|
||||
}
|
||||
|
||||
// 生成签名
|
||||
func (p *OppoType) GenOauthSignature(param string) string {
|
||||
oauthSignatureKey := p.AppSecret + "&"
|
||||
mac := hmac.New(sha1.New, []byte(oauthSignatureKey))
|
||||
io.WriteString(mac, param)
|
||||
signature := base64.StdEncoding.EncodeToString(mac.Sum(nil))
|
||||
return url.QueryEscape(signature)
|
||||
}
|
||||
|
||||
func (p *OppoType) GetHeader(oauthToken string) (headers map[string]string) {
|
||||
|
||||
// 没有做过 urlEncode 的 token,由游戏客户端调用 OPPO SDK 直接获取
|
||||
//oauthToken := "TICKET_Ajnxxxxx"
|
||||
oauthTimestamp := gtime.Now().TimestampStr()
|
||||
oauthNonce := grand.S(5)
|
||||
|
||||
// 生成请求头参数和签名
|
||||
param := p.GenParam(oauthToken, oauthTimestamp, oauthNonce)
|
||||
oauthSignature := p.GenOauthSignature(param)
|
||||
|
||||
// 封装请求头
|
||||
headers = map[string]string{
|
||||
"param": param,
|
||||
"oauthSignature": oauthSignature,
|
||||
}
|
||||
|
||||
//fmt.Println("游戏服务端登录鉴权请求头为:", headers)
|
||||
|
||||
return
|
||||
}
|
||||
@@ -2,118 +2,40 @@ package oppo
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto"
|
||||
"crypto/rsa"
|
||||
"crypto/sha1"
|
||||
"crypto/x509"
|
||||
"encoding/base64"
|
||||
"encoding/pem"
|
||||
"fmt"
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"net/http"
|
||||
"strings"
|
||||
"github.com/haxqer/xthird/oppo"
|
||||
)
|
||||
|
||||
// 跟充值平台通信的加密key
|
||||
//const PUBLIC_KEY = `dfsdfs`
|
||||
|
||||
type OppoType struct {
|
||||
AppId string `json:"app_id"`
|
||||
AppKey string `json:"app_key"`
|
||||
AppSecret string `json:"app_secret"`
|
||||
PublicKey string `json:"public_key"`
|
||||
}
|
||||
|
||||
func New(PublicKey string) *OppoType {
|
||||
func New(cfg *OppoType) *OppoType {
|
||||
|
||||
return &OppoType{
|
||||
PublicKey: PublicKey,
|
||||
AppKey: cfg.AppKey,
|
||||
AppSecret: cfg.AppSecret,
|
||||
PublicKey: cfg.PublicKey,
|
||||
}
|
||||
}
|
||||
|
||||
func (p *OppoType) Verify(ctx context.Context, data map[string]string) error {
|
||||
func (p *OppoType) Verify(ctx context.Context) (err error) {
|
||||
// OPPO公钥. 在官方给的 demo 中. 无需修改,改了就验证不过
|
||||
oppoPublicKey := "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmreYIkPwVovKR8rLHWlFVw7YDfm9uQOJKL89Smt6ypXGVdrAKKl0wNYc3/jecAoPi2ylChfa2iRu5gunJyNmpWZzlCNRIau55fxGW0XEu553IiprOZcaw5OuYGlf60ga8QT6qToP0/dpiL/ZbmNUO9kUhosIjEu22uFgR+5cYyQIDAQAB"
|
||||
//oppoPublicKey := p.PublicKey
|
||||
// 解析请求参数
|
||||
for k, v := range data {
|
||||
if v == "" || v == "0" {
|
||||
delete(data, k)
|
||||
}
|
||||
}
|
||||
|
||||
//data["notifyId"] = getParam(r, "notifyId")
|
||||
//data["partnerOrder"] = getParam(r, "partnerOrder")
|
||||
//data["productName"] = getParam(r, "productName")
|
||||
//data["productDesc"] = getParam(r, "productDesc")
|
||||
//data["price"] = getParam(r, "price")
|
||||
//data["count"] = getParam(r, "count")
|
||||
//data["attach"] = getParam(r, "attach")
|
||||
//data["sign"] = getParam(r, "sign")
|
||||
|
||||
// 验证签名
|
||||
result, err := p.rsaVerify(data)
|
||||
bodyMap, err := oppo.ParseNotifyToBodyMap(g.RequestFromCtx(ctx).Request)
|
||||
if err != nil {
|
||||
//http.Error(w, "Verification error: "+err.Error(), http.StatusInternalServerError)
|
||||
g.Log().Errorf(ctx, "Verification error: %v", err.Error())
|
||||
return err
|
||||
// 解析失败, 处理错误逻辑
|
||||
return
|
||||
}
|
||||
|
||||
if result {
|
||||
// TODO::验证成功,处理后续逻辑
|
||||
//fmt.Fprint(w, "Verification successful")
|
||||
//g.Log().Errorf(ctx, "Verification error: %v", err.Error())
|
||||
} else {
|
||||
// TODO::验证失败,处理后续逻辑
|
||||
//http.Error(w, "Verification failed", http.StatusBadRequest)
|
||||
g.Log().Error(ctx, "Verification failed")
|
||||
err = gerror.New("Verification failed")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *OppoType) getParam(r *http.Request, paramName string) string {
|
||||
r.ParseForm()
|
||||
if value := r.FormValue(paramName); value != "" {
|
||||
return strings.TrimSpace(value)
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (p *OppoType) rsaVerify(contents map[string]string) (bool, error) {
|
||||
// 构建待签名字符串
|
||||
strContents := fmt.Sprintf("notifyId=%s&partnerOrder=%s&productName=%s&productDesc=%s&price=%s&count=%s&attach=%s",
|
||||
contents["notifyId"], contents["partnerOrder"], contents["productName"],
|
||||
contents["productDesc"], contents["price"], contents["count"], contents["attach"])
|
||||
|
||||
// 解析公钥
|
||||
publicKey := p.PublicKey
|
||||
pemData := []byte("-----BEGIN PUBLIC KEY-----\n" +
|
||||
strings.ReplaceAll(publicKey, " ", "\n") +
|
||||
"\n-----END PUBLIC KEY-----")
|
||||
|
||||
block, _ := pem.Decode(pemData)
|
||||
if block == nil {
|
||||
return false, fmt.Errorf("failed to decode PEM block")
|
||||
}
|
||||
|
||||
pubInterface, err := x509.ParsePKIXPublicKey(block.Bytes)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
pubKey, ok := pubInterface.(*rsa.PublicKey)
|
||||
if !ok {
|
||||
return false, fmt.Errorf("public key is not an RSA public key")
|
||||
}
|
||||
|
||||
// 解码签名
|
||||
signature, err := base64.StdEncoding.DecodeString(contents["sign"])
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
// 计算内容的哈希值
|
||||
hash := sha1.New()
|
||||
hash.Write([]byte(strContents))
|
||||
hashed := hash.Sum(nil)
|
||||
|
||||
// 验证签名
|
||||
err = rsa.VerifyPKCS1v15(pubKey, crypto.SHA1, hashed, signature)
|
||||
return err == nil, err
|
||||
err = oppo.VerifySign(oppoPublicKey, bodyMap)
|
||||
return
|
||||
}
|
||||
|
||||
15
package/pay/vivo/client.go
Normal file
15
package/pay/vivo/client.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package vivo
|
||||
|
||||
type Pay struct {
|
||||
AppId string
|
||||
AppKey string
|
||||
//AppSecret string
|
||||
}
|
||||
|
||||
func New(cfg *Pay) (client *Pay) {
|
||||
return &Pay{
|
||||
AppId: cfg.AppId,
|
||||
AppKey: cfg.AppKey,
|
||||
//AppSecret: cfg.AppSecret,
|
||||
}
|
||||
}
|
||||
9
package/pay/vivo/const.go
Normal file
9
package/pay/vivo/const.go
Normal file
@@ -0,0 +1,9 @@
|
||||
package vivo
|
||||
|
||||
const (
|
||||
AuthTokenUrl = "https://joint-account.vivo.com.cn/cp/user/auth"
|
||||
LocationShanghai = "Asia/Shanghai"
|
||||
|
||||
RSA = "RSA"
|
||||
RSA2 = "RSA2"
|
||||
)
|
||||
34
package/pay/vivo/model.go
Normal file
34
package/pay/vivo/model.go
Normal file
@@ -0,0 +1,34 @@
|
||||
package vivo
|
||||
|
||||
type TokenAuthResponse struct {
|
||||
ReturnCode int `json:"retcode"`
|
||||
Data *TokenAuthResponseData `json:"data,omitempty"`
|
||||
}
|
||||
|
||||
type TokenAuthResponseData struct {
|
||||
Success bool `json:"success,omitempty"`
|
||||
OpenId string `json:"openid,omitempty"`
|
||||
}
|
||||
|
||||
type LoginType struct {
|
||||
Token string `json:"token"`
|
||||
Ssoid string `json:"ssoid"`
|
||||
Channel int `json:"channel"`
|
||||
AdId string `json:"adId"`
|
||||
}
|
||||
|
||||
type PayCallback struct {
|
||||
AppId string `json:"appId"`
|
||||
CpId string `json:"cpId"`
|
||||
CpOrderNumber string `json:"cpOrderNumber"`
|
||||
ExtInfo string `json:"extInfo"`
|
||||
OrderAmount string `json:"orderAmount"`
|
||||
OrderNumber string `json:"orderNumber"`
|
||||
PayTime string `json:"payTime"`
|
||||
RespCode string `json:"respCode"`
|
||||
RespMsg string `json:"respMsg"`
|
||||
SignMethod string `json:"signMethod"`
|
||||
Signature string `json:"signature"`
|
||||
TradeStatus string `json:"tradeStatus"`
|
||||
TradeType string `json:"tradeType"`
|
||||
}
|
||||
3
package/pay/vivo/payment_api.go
Normal file
3
package/pay/vivo/payment_api.go
Normal file
@@ -0,0 +1,3 @@
|
||||
package vivo
|
||||
|
||||
|
||||
48
package/pay/vivo/sign.go
Normal file
48
package/pay/vivo/sign.go
Normal file
@@ -0,0 +1,48 @@
|
||||
package vivo
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"github.com/gogf/gf/v2/crypto/gmd5"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/util/gconv"
|
||||
|
||||
"sort"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func (p *Pay) VerifySign(bm g.Map, key string) bool {
|
||||
signature := bm["signature"]
|
||||
delete(bm, "signature")
|
||||
delete(bm, "signMethod")
|
||||
sign := p.sign(bm, key)
|
||||
return signature == sign
|
||||
}
|
||||
|
||||
func (p *Pay) sign(bm g.Map, key string) string {
|
||||
s, _ := p.buildSignStr(bm)
|
||||
s += "&" + gmd5.MustEncrypt(key)
|
||||
return gmd5.MustEncrypt(s)
|
||||
}
|
||||
|
||||
func (p *Pay) buildSignStr(bm g.Map) (string, error) {
|
||||
var (
|
||||
buf strings.Builder
|
||||
keyList []string
|
||||
)
|
||||
for k := range bm {
|
||||
keyList = append(keyList, k)
|
||||
}
|
||||
sort.Strings(keyList)
|
||||
for _, k := range keyList {
|
||||
if v := bm[k]; v != "" {
|
||||
buf.WriteString(k)
|
||||
buf.WriteByte('=')
|
||||
buf.WriteString(gconv.String(v))
|
||||
buf.WriteByte('&')
|
||||
}
|
||||
}
|
||||
if buf.Len() <= 0 {
|
||||
return "", errors.New("length is error")
|
||||
}
|
||||
return buf.String()[:buf.Len()-1], nil
|
||||
}
|
||||
49
package/pay/vivo/sign_test.go
Normal file
49
package/pay/vivo/sign_test.go
Normal file
@@ -0,0 +1,49 @@
|
||||
package vivo
|
||||
|
||||
import (
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestVerifySign(t *testing.T) {
|
||||
type args struct {
|
||||
bm g.Map
|
||||
key string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "testCase-01",
|
||||
args: args{
|
||||
bm: map[string]interface{}{
|
||||
"appId": "111",
|
||||
"cpId": "11",
|
||||
"cpOrderNumber": "111",
|
||||
"extInfo": "扩展参数",
|
||||
"orderAmount": "1",
|
||||
"orderNumber": "11",
|
||||
"payTime": "20210610213219",
|
||||
"respCode": "200",
|
||||
"respMsg": "交易成功",
|
||||
"signMethod": "MD5",
|
||||
"signature": "111",
|
||||
"tradeStatus": "0000",
|
||||
"tradeType": "01",
|
||||
"uid": "111",
|
||||
},
|
||||
key: "1111",
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := New(nil).VerifySign(tt.args.bm, tt.args.key); got != tt.want {
|
||||
t.Errorf("VerifySign() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
52
package/pay/vivo/user_api.go
Normal file
52
package/pay/vivo/user_api.go
Normal file
@@ -0,0 +1,52 @@
|
||||
package vivo
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
func (p *Pay) AuthToken(bm g.Map) (rsp *TokenAuthResponse, err error) {
|
||||
if _, ok := bm["opentoken"]; !ok {
|
||||
return
|
||||
}
|
||||
//err = bm.CheckEmptyError("opentoken")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
bs, err := p.doAuthToken(bm)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rsp = new(TokenAuthResponse)
|
||||
if err = json.Unmarshal(bs, rsp); err != nil {
|
||||
return nil, fmt.Errorf("json.Unmarshal(%s):%w", string(bs), err)
|
||||
}
|
||||
return rsp, nil
|
||||
}
|
||||
|
||||
func (p *Pay) doAuthToken(bm g.Map) (bs []byte, err error) {
|
||||
param := p.FormatURLParam(bm)
|
||||
//httpClient := xhttp.NewClient()
|
||||
//res, bs, errs := httpClient.Type(xhttp.TypeFormData).Post(AuthTokenUrl).SendString(param).EndBytes()
|
||||
res, err := g.Client().Post(gctx.New(), AuthTokenUrl, param)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if res.StatusCode != 200 {
|
||||
return nil, fmt.Errorf("HTTP Request Error, StatusCode = %d", res.StatusCode)
|
||||
}
|
||||
return res.ReadAll(), nil
|
||||
}
|
||||
|
||||
// 格式化请求URL参数
|
||||
func (p *Pay) FormatURLParam(body g.Map) (urlParam string) {
|
||||
v := url.Values{}
|
||||
for key, value := range body {
|
||||
v.Add(key, value.(string))
|
||||
}
|
||||
return v.Encode()
|
||||
}
|
||||
70
package/pay/vivo/user_api_test.go
Normal file
70
package/pay/vivo/user_api_test.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package vivo
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestAuthToken(t *testing.T) {
|
||||
type args struct {
|
||||
bm g.Map
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
wantRsp *TokenAuthResponse
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "testCase-01",
|
||||
args: args{
|
||||
bm: map[string]interface{}{
|
||||
"opentoken": "_STV1_797e3324f7e3f1a3_797e3324f7e3f1a3_8db97942_Awykia3hpb90kcu3l",
|
||||
},
|
||||
},
|
||||
wantRsp: nil,
|
||||
wantErr: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
gotRsp, err := New(nil).AuthToken(tt.args.bm)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("AuthToken() error = %v, wantErr %v", err, tt.wantErr)
|
||||
return
|
||||
}
|
||||
if !reflect.DeepEqual(gotRsp, tt.wantRsp) {
|
||||
if gotRsp != nil {
|
||||
marshal, _ := json.Marshal(gotRsp)
|
||||
println(string(marshal))
|
||||
}
|
||||
t.Errorf("AuthToken() gotRsp = %v, want %v", gotRsp, tt.wantRsp)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFormatURLParam(t *testing.T) {
|
||||
type args struct {
|
||||
body g.Map
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
wantUrlParam string
|
||||
}{
|
||||
{name: "testCase-01", args: args{body: map[string]interface{}{
|
||||
"opentoken": "_STV1_797e3324f7e3f1a3_797e3324f7e3f1a3_8db97942_Abbccayhpb90kvd3m",
|
||||
"123": "123",
|
||||
}}},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if gotUrlParam := New(nil).FormatURLParam(tt.args.body); gotUrlParam != tt.wantUrlParam {
|
||||
t.Errorf("FormatURLParam() = %v, want %v", gotUrlParam, tt.wantUrlParam)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user