增加s3文件重命名方法

cmd/make/config

@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/ayflying/utility_go"
-	"github.com/gogf/gf/v2/util/gutil"
-	"sync"
+	"github.com/ayflying/utility_go/pkg"
+    "github.com/gogf/gf/v2/util/gutil"
+    "sync"
 )
 
 type {cfg}Cfg struct {
@@ -23,7 +23,7 @@ func (c *{mod}Mod) Load(_cfg ...string) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 	c.cfgArr = make([]*{cfg}Cfg, 0)
-	data, err := utility_go.Config.GetFile("{file}")
+	data, err := pkg.Config().GetFile("{file}")
 	err = data.Scan(&c.cfgArr)
 	if err != nil {
 		panic(err)

cmd/update.go

@@ -124,11 +124,11 @@ 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").
-						Post(ctx, address+"/callback/update", &UpdateReq{
-							FileUrl: url[v.S3],
-						})
+					get, err = client.Proxy(Proxy).Post(ctx, address+"/callback/update", &UpdateReq{
+						FileUrl: url[v.S3],
+					})
 				}
 				if err != nil {
 					g.Log().Error(ctx, err)

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, &do.GameAct{
+				add = append(add, &entity.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 {
-			dbRes, err2 := g.Model(Name).Batch(30).Data(add).Save()
-			add = make([]interface{}, 0)
+		if len(delKey) > 0 {
+			for _, v := range update {
+				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/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,119 @@
+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"
+)
+
+// 跟充值平台通信的加密key
+//const PUBLIC_KEY = `dfsdfs`
+
+type OppoType struct {
+	PublicKey string `json:"public_key"`
+}
+
+func New(PublicKey string) *OppoType {
+
+	return &OppoType{
+		PublicKey: PublicKey,
+	}
+}
+
+func (p *OppoType) Verify(ctx context.Context, data map[string]string) error {
+	// 解析请求参数
+	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)
+	if err != nil {
+		//http.Error(w, "Verification error: "+err.Error(), http.StatusInternalServerError)
+		g.Log().Errorf(ctx, "Verification error: %v", err.Error())
+		return err
+	}
+
+	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
+}

package/pay/taptap/sign.go

@@ -1,60 +1,62 @@
 package taptap
 
 import (
-	"bytes"
-	"context"
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/util/grand"
 	"io"
 	"net/http"
 	"sort"
-	"strconv"
 	"strings"
 )
 
 type pTapTap struct {
-	Secret   string `json:"secret" dc:"秘钥"`
-	OrderId  string `json:"order_id" dc:"订单唯一 ID"`
+	Secret string `json:"secret" dc:"秘钥"`
+	//OrderId  string `json:"order_id" dc:"订单唯一 ID"`
 	ClientId string `json:"client_id" dc:"应用的 Client ID"`
 }
 
-func New(orderId string) *pTapTap {
+func New(clientId string, secret string) *pTapTap {
 	return &pTapTap{
-		Secret:   "5AFEWnadBA0NgJK2mxeBLQEde0qyIefxLSc4XKHsx9AwkQRhxzkQ9DixsOkK6gcV",
-		ClientId: "mox88lbz43edfukdgk",
-		OrderId:  orderId,
+		Secret:   secret,
+		ClientId: clientId,
+		//OrderId:  orderId,
 	}
 }
 
-func (p *pTapTap) Sign(url string, body []byte) (sign string, ts int64, nonce string, err error) {
-	//nolint:gosec
-	secret := p.Secret
-	//body := gjson.MustEncode(g.Map{})
-	//body := []byte(`{"event_type":"charge.succeeded","order":{"order_id":"1790288650833465345","purchase_token":"rT2Et9p0cfzq4fwjrTsGSacq0jQExFDqf5gTy1alp+Y=","client_id":"o6nD4iNavjQj75zPQk","open_id":"4+Axcl2RFgXbt6MZwdh++w==","user_region":"US","goods_open_id":"com.goods.open_id","goods_name":"TestGoodsName","status":"charge.succeeded","amount":"19000000000","currency":"USD","create_time":"1716168000","pay_time":"1716168000","extra":"1111111111111111111"}}`)
-	//url := "https://example.com/my-service/v1/my-method"
-	ts = gtime.Now().Unix()
-	nonce = grand.S(5)
-	method := "POST"
-	header := http.Header{
-		"Content-Type": {"Content-Type: application/json; charset=utf-8"},
-		"X-Tap-Ts":     {strconv.FormatInt(ts, 10)},
-		"X-Tap-Nonce":  {nonce},
-	}
-	ctx := context.Background()
-	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewBuffer(body))
-	req.Header = header
-	sign, err = Sign(req, secret)
-	if err != nil {
-		panic(err)
-	}
-	req.Header.Set("X-Tap-Sign", sign)
-	return
+// Sign signs the request.
+func (p *pTapTap) Sign(req *http.Request, secret string) (string, error) {
+	//获取请求参数
+	//req := g.RequestFromCtx(ctx).Request
+	return Sign(req, secret)
 }
 
+//func (p *pTapTap) SignOld(ctx context.Context, method, url string, token string, data any) (sign string, ts int64, nonce string, err error) {
+//	//secret := p.Secret
+//	//ts = gtime.Now().Unix()
+//	//nonce = grand.S(5)
+//	//header := http.Header{
+//	//	"Content-Type": {"Content-Type: application/json; charset=utf-8"},
+//	//	"X-Tap-Ts":     {strconv.FormatInt(ts, 10)},
+//	//	"X-Tap-Nonce":  {nonce},
+//	//}
+//	//if method == "POST" {
+//	//	header.Set("Content-Type", "application/json; charset=utf-8")
+//	//}
+//	////ctx := context.Background()
+//	//request := g.RequestFromCtx(ctx).Request
+//	//body, _ := json.Marshal(data)
+//	////req, err := http.NewRequestWithContext(ctx, method, url, strings.NewReader(string(body)))
+//	//req.Header = header
+//	//sign, err = Sign(req, secret)
+//	//if err != nil {
+//	//	panic(err)
+//	//}
+//	//req.Header.Set("X-Tap-Sign", sign)
+//	//return
+//}
+
 // Sign signs the request.
 func Sign(req *http.Request, secret string) (string, error) {
 	methodPart := req.Method

package/pay/taptap/taptap.go

@@ -1,59 +1,129 @@
 package taptap
 
 import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gclient"
 	"github.com/gogf/gf/v2/os/gctx"
-	"strconv"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/grand"
+	"io"
+	"net/http"
 )
 
 type GetPayData struct {
 	Data struct {
 		Order struct {
+			Order
 		} `json:"order"`
 	} `json:"data"`
 	Success bool `json:"success"`
 }
 
-//查询订单信息
-func (p *pTapTap) Info(orderId string, clientId string, token []byte) (res string, err error) {
-	url := fmt.Sprintf("https://cloud-payment.tapapis.cn/order/v1/info?client_id=%v&order_id=%v", orderId, clientId)
-	res, err = p.get(url, token)
-	return
+type Order struct {
+	OrderID       string        `json:"order_id"`       // 订单唯一 ID
+	PurchaseToken string        `json:"purchase_token"` // 用于订单核销的 token
+	ClientID      string        `json:"client_id"`      // 应用的 Client ID
+	OpenID        string        `json:"open_id"`        // 用户的开放平台 ID
+	UserRegion    string        `json:"user_region"`    // 用户地区
+	GoodsOpenID   string        `json:"goods_open_id"`  // 商品唯一 ID
+	GoodsName     string        `json:"goods_name"`     // 商品名称
+	Status        PaymentStatus `json:"status"`         // 订单状态
+	Amount        string        `json:"amount"`         // 金额（本币金额 x 1,000,000）
+	Currency      string        `json:"currency"`       // 币种
+	CreateTime    string        `json:"create_time"`    // 创建时间
+	PayTime       string        `json:"pay_time"`       // 支付时间
+	Extra         string        `json:"extra"`          // 商户自定义数据，如角色信息等，长度不超过 255 UTF-8 字符
 }
+type PaymentStatus string
 
-//验证并核销订单
-func (p *pTapTap) Verify(orderId string, clientId string, token []byte) (res string, err error) {
-	url := fmt.Sprintf("https://cloud-payment.tapapis.cn/order/v1/verify?client_id=%v", clientId)
-	res, err = p.get(url, token)
-	return
-}
+const (
+	ChargePending   PaymentStatus = "charge.pending"   // 待支付
+	ChargeSucceeded PaymentStatus = "charge.succeeded" //支付成功
+	ChargeConfirmed PaymentStatus = "charge.confirmed" //已核销
+	ChargeOverdue   PaymentStatus = "charge.overdue"   //支付超时关闭
+	RefundPending   PaymentStatus = "refund.pending"   //退款中
+	RefundSucceeded PaymentStatus = "refund.succeeded" //退款成功
+	RefundFailed    PaymentStatus = "refund.failed"    //退款失败
+	RefundRejected  PaymentStatus = "refund.rejected"  //退款被拒绝
+)
 
-func (p *pTapTap) get(url string, token []byte, _data ...any) (res string, err error) {
-	sign, ts, nonce, err := p.Sign(url, token)
+// 查询订单信息
+func (p *pTapTap) Info(ctx context.Context, order string) (getPayData *GetPayData, err error) {
+	url := fmt.Sprintf("https://cloud-payment.tapapis.cn/order/v1/info?client_id=%v&order_id=%v", p.ClientId, order)
+	getPayData, err = p.get(ctx, url)
 	if err != nil {
 		return
 	}
+	return
+}
+
+// 验证并核销订单
+func (p *pTapTap) Verify(ctx context.Context, req any) (getPayData *GetPayData, err error) {
+	url := fmt.Sprintf("https://cloud-payment.tapapis.cn/order/v1/verify?client_id=%v", p.ClientId)
+	getPayData, err = p.get(ctx, url, req)
+	if err != nil {
+		return
+	}
+	return
+}
+
+func (p *pTapTap) get(ctx context.Context, url string, _data ...any) (getPayData *GetPayData, err error) {
+
 	var _get *gclient.Response
-	if len(_data) == 0 {
-		_get, err = g.Client().Header(map[string]string{
-			"X-Tap-Sign":  sign,
-			"X-Tap-Nonce": nonce,
-			"X-Tap-Ts":    strconv.FormatInt(ts, 10),
-		}).Get(gctx.New(), url)
 
+	var header = map[string]string{
+		"Content-Type": "Content-Type: application/json; charset=utf-8",
+		"X-Tap-Nonce":  grand.S(6),
+		"X-Tap-Ts":     gtime.Now().TimestampStr(),
+	}
+	ctx2 := context.Background()
+	var method = "GET"
+	if len(_data) > 0 {
+		method = "POST"
+
+	}
+
+	//temp := []byte(`{"event_type":"charge.succeeded","order":{"order_id":"1790288650833465345","purchase_token":"rT2Et9p0cfzq4fwjrTsGSacq0jQExFDqf5gTy1alp+Y=","client_id":"o6nD4iNavjQj75zPQk","open_id":"4+Axcl2RFgXbt6MZwdh++w==","user_region":"US","goods_open_id":"com.goods.open_id","goods_name":"TestGoodsName","status":"charge.succeeded","amount":"19000000000","currency":"USD","create_time":"1716168000","pay_time":"1716168000","extra":"1111111111111111111"}}`)
+	var body io.Reader
+	if len(_data) > 0 {
+		body = bytes.NewBuffer(gjson.MustEncode(_data[0]))
 	} else {
-		_get, err = g.Client().Header(map[string]string{
-			"X-Tap-Sign":  sign,
-			"X-Tap-Nonce": nonce,
-			"X-Tap-Ts":    strconv.FormatInt(ts, 10),
-		}).Post(gctx.New(), url, _data[0])
+		body = bytes.NewBuffer([]byte{})
+	}
+	req, _ := http.NewRequestWithContext(ctx2, method, url, body)
+	for k, v := range header {
+		req.Header.Set(k, v)
+	}
+	sign, err2 := p.Sign(req, p.Secret)
+	if err2 != nil {
+		err = err2
+		return
+	}
+	req.Header.Set("X-Tap-Sign", sign)
+	header["X-Tap-Sign"] = sign
+	if len(_data) == 0 {
+		_get, err = g.Client().Header(header).ContentJson().Get(gctx.New(), url)
+	} else {
+		_get, err = g.Client().Header(header).ContentJson().Post(gctx.New(), url, _data[0])
 	}
 
 	if err != nil {
 		return
 	}
-	res = _get.ReadAllString()
+	getPayData = &GetPayData{}
+	resData := _get.ReadAll()
+	g.Dump(resData)
+	if err = json.Unmarshal(resData, &getPayData); err != nil {
+		return
+	}
+	if !getPayData.Success {
+		err = errors.New(string(resData))
+	}
 	return
 }

package/pay/taptap/webhook.go

@@ -1,40 +0,0 @@
-package taptap
-
-import "github.com/gogf/gf/v2/encoding/gjson"
-
-type WebhookData struct {
-	Order     *Order `json:"order"`
-	EventType string `json:"event_type"`
-}
-
-// Order 订单信息结构体
-type Order struct {
-	OrderID       string `json:"order_id" dc:"订单唯一ID"`
-	PurchaseToken string `json:"purchase_token" dc:"用于订单核销的token"`
-	ClientID      string `json:"client_id" dc:"应用的Client ID"`
-	OpenID        string `json:"open_id" dc:"用户的开放平台ID"`
-	UserRegion    string `json:"user_region" dc:"用户地区"`
-	GoodsOpenID   string `json:"goods_open_id" dc:"商品唯一ID"`
-	GoodsName     string `json:"goods_name" dc:"商品名称"`
-	Status        string `json:"status" dc:"订单状态"`
-	Amount        string `json:"amount" dc:"金额（本币金额x1,000,000）"`
-	Currency      string `json:"currency" dc:"币种"`
-	CreateTime    string `json:"create_time" dc:"创建时间"`
-	PayTime       string `json:"pay_time" dc:"支付时间"`
-	Extra         string `json:"extra" dc:"商户自定义数据，如角色信息等，长度不超过255 UTF-8字符"`
-}
-
-func (p *pTapTap) Webhook(body []byte) (res string, err error) {
-	var data *WebhookData
-	gjson.DecodeTo(body, &data)
-
-	switch data.EventType {
-	case "charge.succeeded": //充值成功
-		//todo 处理订单信息
-
-	case "refund.succeeded": //退款成功
-	case "refund.failed": //退款失败
-	}
-
-	return
-}

package/pay/xiaomi/helper.go

@@ -0,0 +1,63 @@
+package xiaomi
+
+import (
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/hex"
+	"fmt"
+	"sort"
+	"strings"
+)
+
+// SignatureHelper 签名辅助类
+type SignatureHelper struct{}
+
+// hmacSHA1 计算HMAC-SHA1哈希值
+func hmacSHA1(data, key string) string {
+	h := hmac.New(sha1.New, []byte(key))
+	h.Write([]byte(data))
+	return hex.EncodeToString(h.Sum(nil))
+}
+
+// Sign 计算hmac-sha1签名
+func (m *MiPay) Sign(params map[string]string, secretKey string) string {
+	if _, ok := params["signature"]; ok {
+		delete(params, "signature")
+	}
+	for k, v := range params {
+		if v == "" || v == "0" {
+			delete(params, k)
+		}
+	}
+	sortString := m.buildSortString(params)
+	signature := hmacSHA1(sortString, secretKey)
+	return signature
+}
+
+// VerifySignature 验证签名
+func (m *MiPay) VerifySignature(params map[string]string, signature, secretKey string) bool {
+	tmpSign := m.Sign(params, secretKey)
+	return tmpSign == signature
+}
+
+// buildSortString 构造排序字符串
+func (m *MiPay) buildSortString(params map[string]string) string {
+	if len(params) == 0 {
+		return ""
+	}
+
+	// 按键排序
+	keys := make([]string, 0, len(params))
+	for k := range params {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	// 构建排序字符串
+	var fields []string
+	for _, k := range keys {
+		fields = append(fields, fmt.Sprintf("%s=%s", k, params[k]))
+	}
+
+	return strings.Join(fields, "&")
+}

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/pay/xiaomi/xiaomi.go

@@ -0,0 +1,29 @@
+package xiaomi
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+// Config 小米支付配置信息
+type Config struct {
+	AppID     string `json:"app_id"`     // 应用ID
+	AppSecret string `json:"app_secret"` // 应用密钥
+	//PrivateKey string // 商户私钥（如需证书）
+	//MIAPIURL   string // 小米支付API基础地址
+	//IsSandbox  bool   // 是否沙箱环境
+}
+
+// Miipay 小米支付客户端
+type MiPay struct {
+	config *Config
+}
+
+func New() *MiPay {
+	_cfg, _ := g.Cfg().Get(gctx.New(), "pay.xiaomi")
+	var cfg *Config
+	_cfg.Scan(&cfg)
+	return &MiPay{
+		config: cfg,
+	}
+}

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/elasticsearch/elasticsearch.go

@@ -12,6 +12,7 @@ import (
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 var (
@@ -23,6 +24,13 @@ type Elastic struct {
 	name   string
 }
 
+type elkBulk struct {
+	Index struct {
+		Index string `json:"_index"`
+		Id    string `json:"_id"`
+	} `json:"index"`
+}
+
 func NewV1(name string) *Elastic {
 	var cfg elasticsearch.Config
 	_cfg := g.Cfg().MustGetWithEnv(gctx.New(), "elasticsearch")
@@ -52,7 +60,7 @@ func NewV1(name string) *Elastic {
 //	fmt.Printf("index:%#v\n", resp.Index)
 //}
 
-// Set 索引文档
+// Set 添加文档索引文档
 func (s *Elastic) Set(ctx context.Context, key string, data interface{}) (err error) {
 	// 添加文档
 	_, err = s.client.Index(s.name).Id(key).Document(data).Do(ctx)
@@ -61,11 +69,20 @@ func (s *Elastic) Set(ctx context.Context, key string, data interface{}) (err er
 
 // SetBulk 批量添加文档
 func (s *Elastic) SetBulk(ctx context.Context, data []any) (err error) {
-	var save *bulk.Request
-	save = &bulk.Request{
-		data,
+	var save bulk.Request
+	save = make(bulk.Request, 0)
+	for _, v := range data {
+		val := gconv.Map(v)
+		var saveIndex = elkBulk{}
+		saveIndex.Index.Index = s.name
+		if _, ok := val["uuid"]; ok {
+			saveIndex.Index.Id = val["uuid"].(string)
+		}
+		save = append(save, saveIndex)
+		save = append(save, v)
 	}
-	s.client.Bulk().Index(s.name).Request(save).Do(ctx)
+	//save = data
+	_, err = s.client.Bulk().Index(s.name).Request(&save).Do(ctx)
 	return
 }
 

pkg/s3/s3.go

@@ -63,9 +63,9 @@ func New(_name ...string) *Mod {
 	obj, err := minio.New(
 		cfg.Address,
 		&minio.Options{
-			Creds:        credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
-			Secure:       cfg.Ssl,
-			BucketLookup: minio.BucketLookupPath,
+			Creds:  credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
+			Secure: cfg.Ssl,
+			//BucketLookup: minio.BucketLookupPath,
 		},
 	)
 	if err != nil {
@@ -135,9 +135,9 @@ func (s *Mod) ListBuckets() []minio.BucketInfo {
 func (s *Mod) PutObject(f io.Reader, name string, bucketName string, _size ...int64) (res minio.UploadInfo, err error) {
 	// 初始化文件大小为 -1，表示将读取文件至结束
 	var size = int64(-1)
-	if len(_size) > 0 {
-		size = _size[0]
-	}
+	//if len(_size) > 0 {
+	//	size = _size[0]
+	//}
 	// 调用 S3 客户端上传文件，设置内容类型为 "application/octet-stream"
 	res, err = s.client.PutObject(ctx, bucketName, name, f, size, minio.PutObjectOptions{
 		//ContentType: "application/octet-stream",
@@ -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) {
@@ -192,12 +205,13 @@ func (s *Mod) GetUrl(filePath string, defaultFile ...string) (url string) {
 		filePath = defaultFile[0]
 	}
 
-	switch s.cfg.Provider {
-	case "qiniu":
-		url = get + path.Join(bucketName, filePath)
-	default:
-		url = get + filePath
-	}
+	//switch s.cfg.Provider {
+	//case "qiniu":
+	//	url = get + path.Join(bucketName, filePath)
+	//default:
+	//	url = get + filePath
+	//}
+	url = get + filePath
 
 	if !s.cfg.Ssl {
 		url = get + path.Join(bucketName, filePath)
@@ -215,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
+}