晚上oppo支付回调与登录回调

cmd/update.go

@@ -124,9 +124,9 @@ var (
 					FileUrl: url[v.S3],
 				})
 				if err != nil {
+					Proxy := g.Cfg().MustGet(ctx, "update_proxy", "http://192.168.50.170:10808").String()
 					g.Log().Debugf(ctx, "切换代理进行上传:err=%v", err)
-					get, err = client.Proxy("http://192.168.50.114:10808").
+					get, err = client.Proxy(Proxy).Post(ctx, address+"/callback/update", &UpdateReq{
-						Post(ctx, address+"/callback/update", &UpdateReq{
 						FileUrl: url[v.S3],
 					})
 				}

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

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=

internal/logic/gameAct/gameAct.go

@@ -134,7 +134,8 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 
 	//循环获取缓存数据
 	err = tools.Redis.RedisScanV2(cacheKey, func(keys []string) (err error) {
-		var add []interface{}
+		var add = make([]*entity.GameAct, 0)
+		var update = make([]*entity.GameAct, 0)
 		var delKey []string
 		for _, cacheKey = range keys {
 			result := strings.Split(cacheKey, ":")
@@ -176,25 +177,51 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 			}
 			actionData := cacheGet.String()
 			if data == nil {
-				//data =
+				add = append(add, &entity.GameAct{
-				add = append(add, &do.GameAct{
 					ActId:  actId,
 					Uid:    uid,
 					Action: actionData,
 				})
 			} else {
 				//覆盖数据
+				data.ActId = actId
+				data.Uid = uid
 				data.Action = actionData
-				add = append(add, data)
+				update = append(update, data)
 			}
 			//最后删除key
 			delKey = append(delKey, cacheKey)
 		}
 
 		//批量写入数据库
-		if len(add) > 0 {
+		if len(delKey) > 0 {
-			dbRes, err2 := g.Model(Name).Batch(30).Data(add).Save()
+			for _, v := range update {
-			add = make([]interface{}, 0)
+				v.UpdatedAt = gtime.Now()
+				_, err2 := g.Model(Name).Where(do.GameAct{
+					Uid:       v.Uid,
+					ActId:     v.ActId,
+					UpdatedAt: v.UpdatedAt,
+				}).Data(v).Update()
+				if err2 != nil {
+					g.Log().Error(ctx, err2)
+					return
+				}
+				////获取多少个数据，删除不是当前修改的数据
+				//count, _ := g.Model(Name).Where(do.GameAct{
+				//	Uid:   v.Uid,
+				//	ActId: v.ActId,
+				//}).Count()
+				//if count > 1 {
+				//	g.Model(Name).Where(do.GameAct{
+				//		Uid:   v.Uid,
+				//		ActId: v.ActId,
+				//	}).WhereNot("updated_at", v.UpdatedAt).Delete()
+				//}
+			}
+			//dbRes, err2 := g.Model(Name).Batch(50).Data(add).Update()
+			update = make([]*entity.GameAct, 0)
+			dbRes, err2 := g.Model(Name).Batch(50).Data(add).Save()
+			add = make([]*entity.GameAct, 0)
 			if err2 != nil {
 				g.Log().Error(ctx, err2)
 				return

package/pay/oppo/login.go

@@ -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
+}

package/pay/oppo/model.go

@@ -0,0 +1,13 @@
+package oppo
+
+// OPPO支付回调参数结构体
+type PayCallback struct {
+	NotifyId     string `json:"notifyId" dc:"回调通知单号，以GC开头，必填，示例:GC20230314657000"`
+	PartnerOrder string `json:"partnerOrder" dc:"开发者订单号，必填，示例:123456"`
+	ProductName  string `json:"productName" dc:"商品名称，必填，示例:10元宝"`
+	ProductDesc  string `json:"productDesc" dc:"商品描述，必填，示例:10元宝等于1元"`
+	Price        int64  `json:"price" dc:"商品价格，单位为分，需要游戏服务端做验证，必填，示例:100"`
+	Count        int    `json:"count" dc:"商品数量（一般为1），必填，示例:1"`
+	Attach       string `json:"attach" dc:"请求支付时上传的附加参数，可能为空，选填"`
+	Sign         string `json:"sign" dc:"OPPO服务端签名，需要游戏服务端做验证，必填"`
+}

package/pay/oppo/oppo.go

@@ -0,0 +1,41 @@
+package oppo
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/frame/g"
+	"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(cfg *OppoType) *OppoType {
+
+	return &OppoType{
+		AppKey:    cfg.AppKey,
+		AppSecret: cfg.AppSecret,
+		PublicKey: cfg.PublicKey,
+	}
+}
+
+func (p *OppoType) Verify(ctx context.Context) (err error) {
+	// OPPO公钥. 在官方给的 demo 中. 无需修改,改了就验证不过
+	oppoPublicKey := "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmreYIkPwVovKR8rLHWlFVw7YDfm9uQOJKL89Smt6ypXGVdrAKKl0wNYc3/jecAoPi2ylChfa2iRu5gunJyNmpWZzlCNRIau55fxGW0XEu553IiprOZcaw5OuYGlf60ga8QT6qToP0/dpiL/ZbmNUO9kUhosIjEu22uFgR+5cYyQIDAQAB"
+	//oppoPublicKey := p.PublicKey
+	// 解析请求参数
+	bodyMap, err := oppo.ParseNotifyToBodyMap(g.RequestFromCtx(ctx).Request)
+	if err != nil {
+		// 解析失败, 处理错误逻辑
+		return
+	}
+
+	err = oppo.VerifySign(oppoPublicKey, bodyMap)
+	return
+}

package/pay/xiaomi/model.go

@@ -0,0 +1,20 @@
+package xiaomi
+
+import "github.com/gogf/gf/v2/os/gtime"
+
+type PayCallback struct {
+	AppID              string      `json:"appId" dc:"游戏ID" required:"true"`
+	CPOrderID          string      `json:"cpOrderId" dc:"开发商订单ID" required:"true"`
+	CPUserInfo         string      `json:"cpUserInfo" dc:"开发商透传信息" required:"false"`
+	OrderConsumeType   int         `json:"orderConsumeType" dc:"订单类型：10：普通订单 11：直充直消订单" required:"false"`
+	OrderID            string      `json:"orderId" dc:"游戏平台订单ID" required:"true"`
+	OrderStatus        string      `json:"orderStatus" dc:"订单状态，TRADE_SUCCESS代表成功" required:"true"`
+	PayFee             int         `json:"payFee" dc:"支付金额，单位为分，即0.01米币。（请务必使用payFee字段值与游戏发起订单金额做校验，确保订单金额一致性）" required:"true"`
+	PayTime            *gtime.Time `json:"payTime" dc:"支付时间，格式yyyy-MM-dd HH:mm:ss" required:"true"`
+	ProductCode        string      `json:"productCode" dc:"商品代码" required:"true"`
+	ProductCount       int         `json:"productCount" dc:"商品数量" required:"true"`
+	ProductName        string      `json:"productName" dc:"商品名称" required:"true"`
+	UID                string      `json:"uid" dc:"用户ID" required:"true"`
+	PartnerGiftConsume int64       `json:"partnerGiftConsume" dc:"使用游戏券金额（如果订单使用游戏券则有，long型），如果有则参与签名" required:"false"`
+	Signature          string      `json:"signature" dc:"签名，签名方法见后面说明" required:"true"`
+}

package/s3/s3.go

@@ -270,7 +270,7 @@ func (s *Mod) GetPath(url string) (filePath string) {
 	return url[len(get+bucketName)+1:]
 }
 
-// 复制文件
+// CopyObject 复制文件
 func (s *Mod) CopyObject(bucketName string, dstStr string, srcStr string) (err error) {
 
 	// 原始文件
@@ -288,3 +288,15 @@ func (s *Mod) CopyObject(bucketName string, dstStr string, srcStr string) (err e
 	_, err = s.client.CopyObject(ctx, dst, src)
 	return
 }
+
+// Rename 重命名文件
+func (s *Mod) Rename(bucketName string, name string, newName string) (err error) {
+	// 复制文件到新的名称
+	err = s.CopyObject(bucketName, name, newName)
+	if err != nil {
+		return
+	}
+	// 删除原始文件
+	err = s.RemoveObject(bucketName, name)
+	return
+}

pkg/s3/s3.go

@@ -150,6 +150,7 @@ func (s *Mod) PutObject(f io.Reader, name string, bucketName string, _size ...in
 }
 
 // RemoveObject 从指定存储桶中删除指定名称的文件
+// Deprecation: to新方法 RemoveObjectV2
 func (s *Mod) RemoveObject(name string, bucketName string) (err error) {
 	opts := minio.RemoveObjectOptions{
 		ForceDelete: true,
@@ -161,6 +162,18 @@ func (s *Mod) RemoveObject(name string, bucketName string) (err error) {
 	return
 }
 
+// RemoveObjectV2 从指定存储桶中删除指定名称的文件
+func (s *Mod) RemoveObjectV2(bucketName string, name string) (err error) {
+	opts := minio.RemoveObjectOptions{
+		ForceDelete: true,
+		//GovernanceBypass: true,
+		//VersionID:        "myversionid",
+	}
+	// 调用 S3 客户端删除文件
+	err = s.client.RemoveObject(ctx, bucketName, name, opts)
+	return
+}
+
 // ListObjects 获取指定存储桶中指定前缀的文件列表
 // 返回一个包含文件信息的通道
 func (s *Mod) ListObjects(bucketName string, prefix string) (res <-chan minio.ObjectInfo, err error) {
@@ -216,21 +229,43 @@ func (s *Mod) GetPath(url string) (filePath string) {
 }
 
 // CopyObject 在指定存储桶内复制文件
-// 支持指定源文件和目标文件路径
+// bucketName 存储桶名称
+// dstStr 目标文件路径
+// srcStr 源文件路径
+// 返回操作过程中可能出现的错误
 func (s *Mod) CopyObject(bucketName string, dstStr string, srcStr string) (err error) {
-	// 定义目标文件选项
+	// 定义目标文件的复制选项，包含存储桶名称和目标文件路径
 	var dst = minio.CopyDestOptions{
 		Bucket: bucketName,
 		Object: dstStr,
 	}
 
-	// 定义源文件选项
+	// 定义源文件的复制选项，包含存储桶名称和源文件路径
 	var src = minio.CopySrcOptions{
 		Bucket: bucketName,
 		Object: srcStr,
 	}
 
-	// 调用 S3 客户端复制文件
+	// 调用 S3 客户端的 CopyObject 方法，将源文件复制到目标位置
+	// 忽略返回的复制信息，仅关注是否发生错误
 	_, err = s.client.CopyObject(ctx, dst, src)
 	return
 }
+
+// Rename 重命名文件
+func (s *Mod) Rename(bucketName string, oldName string, newName string) (err error) {
+	// 复制文件到新的名称
+	g.Log().Debugf(nil, "仓库=%v,rename %s to %s", bucketName, oldName, newName)
+	err = s.CopyObject(bucketName, newName, oldName)
+	if err != nil {
+		g.Log().Error(ctx, err)
+		return
+	}
+	// 删除原始文件
+	err = s.RemoveObjectV2(bucketName, oldName)
+	if err != nil {
+		g.Log().Error(ctx, err)
+		return
+	}
+	return
+}