增加有优雅的持久化管道，提高上传速度与抗打断机制

修一个map的并发

See merge request public_project/utility_go!2

cmd/make/config

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/ayflying/utility_go"
+	"github.com/ayflying/utility_go/pkg"
     "github.com/gogf/gf/v2/util/gutil"
     "sync"
 )
@@ -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,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],
 					})
 				}

config/config.go

@@ -1,17 +1,11 @@
 package config
 
 import (
-	"fmt"
-	"github.com/apolloconfig/agollo/v4"
-	apolloConfig "github.com/apolloconfig/agollo/v4/env/config"
 	"github.com/apolloconfig/agollo/v4/storage"
+	"github.com/ayflying/utility_go/pkg"
 	"github.com/gogf/gf/contrib/config/apollo/v2"
-	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gres"
-	"github.com/gogf/gf/v2/text/gstr"
 	"sync"
 )
 
@@ -31,137 +25,28 @@ type Cfg struct {
 	Lock sync.Mutex
 }
 
+// Deprecated : pkg.Config().GetDbFile(name)
 func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
-	get2, err := g.Model("game_config").
+	res, err = pkg.Config().GetDbFile(name)
-		Where("name", name).Master().Value("data")
-	err = get2.Scan(&res)
-	if res == nil {
-		res = &gvar.Var{}
-	}
 	return
 }
 
+// Deprecated : pkg.Config().GetFile(name, obj...)
 func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
-	pathStr := "manifest/game/"
+	jsonObj, err = pkg.Config().GetFile(filename)
-	filePath := pathStr + filename + ".json"
-	//err := gres.Load(pathStr + filename)
-
-	//载入静态资源到文件对象
-	err = gres.Load(filePath)
-	var bytes []byte
-
-	if gfile.IsFile(filePath) {
-		bytes = gfile.GetBytes(filePath)
-	} else {
-		bytes = gres.GetContent(filePath)
-	}
-
-	jsonObj, err = gjson.DecodeToJson(bytes)
-	//g.Dump(filePath, jsonObj)
 	return
 }
 
 // getUrlFile 获取远程配置
+// Deprecated : pkg.Config().GetUrlFile(name)
 func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
-	urlStr := fmt.Sprintf("http://sdf.sdfs.sdf/%s.json", name)
+	jsonObj, err = pkg.Config().GetUrlFile(name)
-	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
-	bytes := getUrl.ReadAll()
-	jsonObj, err = gjson.DecodeToJson(bytes)
 	return
 }
 
-// 获取阿波罗
+// Deprecated : pkg.Config().GetApollo(name, obj)
-//func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
-//	jsonObj, err = c.GetApolloV2(name, obj)
-//	return
-//
-//	//c.Lock.Lock()
-//	//defer c.Lock.Unlock()
-//	//
-//	//Item2Obj[name+".json"] = obj
-//	//var cfg = apolloConfig.AppConfig{
-//	//	AppID:             ApolloCfg.AppID,
-//	//	Cluster:           ApolloCfg.Cluster,
-//	//	IP:                ApolloCfg.IP,
-//	//	NamespaceName:     name + ".json",
-//	//	Secret:            ApolloCfg.Secret,
-//	//	IsBackupConfig:    ApolloCfg.IsBackupConfig,
-//	//	BackupConfigPath:  ApolloCfg.BackupConfigPath,
-//	//	SyncServerTimeout: 60,
-//	//	MustStart:         true,
-//	//}
-//	////cfg.NamespaceName = name + ".json"
-//	//
-//	//client, err := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
-//	//	return ApolloCfg, nil
-//	//})
-//	//if client == nil {
-//	//	return
-//	//}
-//	//var getStr string
-//	//var getApollo *storage.Config
-//	//for range 5 {
-//	//	getApollo = client.GetConfig(cfg.NamespaceName)
-//	//	if getApollo != nil {
-//	//		break
-//	//	}
-//	//	time.Sleep(time.Second * 5)
-//	//}
-//	//
-//	//if getApollo != nil {
-//	//	getStr = getApollo.GetValue("content")
-//	//	if getStr != "" {
-//	//		//写入配置
-//	//		gfile.PutContents(path.Join("manifest", "game", name+".json"), getStr)
-//	//	}
-//	//} else {
-//	//	jsonObj, err = c.GetFile(name)
-//	//}
-//	//jsonObj, err = gjson.DecodeToJson(getStr)
-//	////首次运行加入监听器
-//	//if !gstr.InArray(ApolloListener, name) {
-//	//	c2 := &CustomChangeListener{}
-//	//	client.AddChangeListener(c2)
-//	//	ApolloListener = append(ApolloListener, name)
-//	//}
-//	//return
-//}
-
 func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
-	Item2Obj[name+".json"] = obj
+	jsonObj, err = pkg.Config().GetApollo(name, obj)
-
-	// 接入阿波罗配置
-	ApolloCfg.NamespaceName = name + ".json"
-	adapter, err := apollo.New(nil, *ApolloCfg)
-	if err != nil {
-		g.Log().Fatalf(nil, `%+v`, err)
-	}
-	// Change the adapter of default configuration instance.
-	g.Cfg(name).SetAdapter(adapter)
-
-	//首次运行加入监听器
-	if !gstr.InArray(ApolloListener, name+".json") {
-		//放置监听器
-		client, _ := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
-			return &apolloConfig.AppConfig{
-				AppID:             ApolloCfg.AppID,
-				Cluster:           ApolloCfg.Cluster,
-				NamespaceName:     ApolloCfg.NamespaceName,
-				IP:                ApolloCfg.IP,
-				IsBackupConfig:    ApolloCfg.IsBackupConfig,
-				BackupConfigPath:  ApolloCfg.BackupConfigPath,
-				Secret:            ApolloCfg.Secret,
-				SyncServerTimeout: ApolloCfg.SyncServerTimeout,
-				MustStart:         ApolloCfg.MustStart,
-			}, nil
-		})
-		c2 := &CustomChangeListener{}
-		client.AddChangeListener(c2)
-		ApolloListener = append(ApolloListener, name+".json")
-	}
-
-	cfg, err := g.Cfg(name).Get(nil, "content")
-	cfg.Scan(&jsonObj)
 	return
 }
 

go.mod

@@ -4,34 +4,32 @@ go 1.24.0
 
 require (
 	github.com/apolloconfig/agollo/v4 v4.4.0
-	github.com/ayflying/excel2json v1.1.3
+	github.com/ayflying/excel2json v1.1.9
-	github.com/elastic/go-elasticsearch/v8 v8.17.1
+	github.com/elastic/go-elasticsearch/v8 v8.18.0
 	github.com/go-pay/crypto v0.0.1
 	github.com/go-pay/gopay v1.5.109
 	github.com/go-pay/util v0.0.4
-	github.com/goccy/go-json v0.10.4
+	github.com/goccy/go-json v0.10.5
 	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0
 	github.com/gogf/gf/v2 v2.9.0
-	github.com/gorilla/websocket v1.5.3
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230
-	github.com/minio/minio-go/v7 v7.0.85
+	github.com/minio/minio-go/v7 v7.0.91
-	github.com/prometheus/client_golang v1.21.1
+	github.com/prometheus/client_golang v1.22.0
 	github.com/xuri/excelize/v2 v2.9.0
-	golang.org/x/oauth2 v0.24.0
+	golang.org/x/oauth2 v0.26.0
 	google.golang.org/api v0.44.0
-	google.golang.org/protobuf v1.36.1
+	google.golang.org/protobuf v1.36.6
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )
 
 require (
 	cloud.google.com/go v0.81.0 // indirect
-	github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect
+	github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -43,17 +41,19 @@ require (
 	github.com/go-pay/xlog v0.0.3 // indirect
 	github.com/go-pay/xtime v0.0.2 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	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/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/minio/crc64nvme v1.0.1 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
@@ -73,22 +73,23 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.8.1 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
+	github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79 // indirect
-	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
+	github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
-	golang.org/x/crypto v0.33.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/crypto v0.37.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
-	google.golang.org/grpc v1.38.0 // indirect
+	google.golang.org/grpc v1.72.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/ini.v1 v1.62.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -38,8 +38,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks=
-github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
@@ -52,8 +50,8 @@ github.com/apolloconfig/agollo/v4 v4.4.0/go.mod h1:6WjI68IzqMk/Y6ghMtrj5AX6Uewo2
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/ayflying/excel2json v1.1.3 h1:Qy7HnF5aib7lIknaOqICvvZsSwAieLu6KJFeUccOISo=
+github.com/ayflying/excel2json v1.1.9 h1:AKaUFc/FNQXV/53/VSgp3J+2d4PMWhVpTDRj/yx3VOs=
-github.com/ayflying/excel2json v1.1.3/go.mod h1:aNzB271bUAuRq+P4J+S8a3NAltcghLIGR2HdM6akqFU=
+github.com/ayflying/excel2json v1.1.9/go.mod h1:GjXYP2cDzeTgQxssQ3ba8QRa9JsScAeJMwCrZ7QTlQo=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
@@ -77,10 +75,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4=
+github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
-github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
+github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
-github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q=
+github.com/elastic/go-elasticsearch/v8 v8.18.0 h1:ANNq1h7DEiPUaALb8+5w3baQzaS08WfHV0DNzp0VG4M=
-github.com/elastic/go-elasticsearch/v8 v8.17.1/go.mod h1:MVJCtL+gJJ7x5jFeUmA20O7rvipX8GcQmo5iBcmaJn4=
+github.com/elastic/go-elasticsearch/v8 v8.18.0/go.mod h1:WLqwXsJmQoYkoA9JBFeEwPkQhCfAZuUvfpdU/NvSSf0=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -123,8 +121,8 @@ github.com/go-pay/xlog v0.0.3 h1:avyMhCL/JgBHreoGx/am/kHxfs1udDOAeVqbmzP/Yes=
 github.com/go-pay/xlog v0.0.3/go.mod h1:mH47xbobrdsSHWsmFtSF5agWbMHFP+tK0ZbVCk5OAEw=
 github.com/go-pay/xtime v0.0.2 h1:7YR4/iuELsEHpJ6LUO0SVK80hQxDO9MLCfuVYIiTCRM=
 github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcUE9xE=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0 h1:BewnDc3gq2iqYzPH56FtOelmT9F9WcAm6nnlOVgw3J8=
 github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0/go.mod h1:uNjaJcnMvMl7bkcoL0amxwcrOM+Q5XGADKKwKTY+8MY=
@@ -160,8 +158,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -175,8 +174,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -199,7 +198,6 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -232,15 +230,14 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -267,10 +264,12 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY=
+github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.85 h1:9psTLS/NTvC3MWoyjhjXpwcKoNbkongaCSF3PNpSuXo=
+github.com/minio/minio-go/v7 v7.0.91 h1:tWLZnEfo3OZl5PoXQwcwTAPNNrjyWwOh6cbZitW5JQc=
-github.com/minio/minio-go/v7 v7.0.85/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY=
+github.com/minio/minio-go/v7 v7.0.91/go.mod h1:uvMUcGrpgeSAAI6+sD3818508nUyMULw94j2Nxku/Go=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
@@ -297,8 +296,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/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+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=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
@@ -322,9 +321,7 @@ github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
@@ -339,7 +336,6 @@ github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -351,17 +347,18 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU0=
 github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZMibh0H/k=
-github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d h1:llb0neMWDQe87IzJLS4Ci7psK/lVsjIS2otl+1WyRyY=
+github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79 h1:78nKszZqigiBRBVcoe/AuPzyLTWW5B+ltBaUX1rlIXA=
-github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
 github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE=
 github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
-github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 h1:hPVCafDV85blFTabnqKgNhDCkJX25eik94Si9cTER4A=
+github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba h1:DhIu6n3qU0joqG9f4IO6a/Gkerd+flXrmlJ+0yX2W8U=
-github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
+github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
@@ -373,14 +370,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
-go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
-go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
-go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
-go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
-go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
@@ -391,8 +392,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -430,6 +432,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -466,8 +469,9 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -480,8 +484,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -493,6 +497,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -534,11 +539,15 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -546,8 +555,10 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -602,6 +613,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -635,8 +647,9 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -698,8 +711,9 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
+google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -712,8 +726,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -723,8 +737,9 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
-gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/boot/boot.go

@@ -2,8 +2,10 @@ package boot
 
 import (
 	"context"
+
 	v1 "github.com/ayflying/utility_go/api/system/v1"
 	"github.com/ayflying/utility_go/service"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 )
 
@@ -13,14 +15,20 @@ var (
 )
 
 func Boot() (err error) {
-	err = service.SystemCron().StartCron()
+	// 启动计划任务定时器，预防debug工具激活计划任务造成重复执行，此处不执行计划任务
+	//err = service.SystemCron().StartCron()
 
-	//用户活动持久化
+	//用户活动持久化每小时执行一次
-	service.SystemCron().AddCronV2(v1.CronType_DAILY, func(ctx context.Context) error {
+	service.SystemCron().AddCronV2(v1.CronType_HOUR, func(context.Context) error {
+		go func() {
 			err = service.GameKv().SavesV1()
-		err = service.GameAct().Saves(ctx)
+			err = service.GameAct().SavesV2()
-		return err
+			if err != nil {
-	})
+				g.Log().Error(gctx.New(), err)
+			}
+		}()
+		return nil
+	}, true)
 
 	//初始化自启动方法
 	for _, v := range _func {

internal/logic/gameAct/gameAct.go

@@ -2,7 +2,12 @@ package gameAct
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/ayflying/utility_go/internal/model/do"
 	"github.com/ayflying/utility_go/internal/model/entity"
 	"github.com/ayflying/utility_go/pkg"
@@ -13,15 +18,14 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/gconv"
-	"strconv"
-	"strings"
-	"time"
 )
 
 var (
-	ctx     = gctx.New()
 	Name       = "game_act"
 	ActList    = gset.New(true)
+	RunTimeMax *gtime.Time
+	addChan    chan *entity.GameAct
+	updateChan chan *entity.GameAct
 )
 
 type sGameAct struct {
@@ -44,6 +48,7 @@ func init() {
 // @return data *v1.Act: 返回活动信息结构体指针
 // @return err error: 返回错误信息
 func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return
@@ -86,6 +91,7 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
 // @param data interface{}: 要存储的活动信息数据。
 // @return err error: 返回错误信息，如果操作成功，则返回nil。
 func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return
@@ -106,36 +112,54 @@ func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
 	return
 }
 
-func (s *sGameAct) Saves(ctx context.Context) (err error) {
+// Saves 保存游戏活动数据
-	getCache, _ := pkg.Cache("redis").Get(nil, "cron:game_act")
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @return err error: 返回错误信息
+// Deprecated: 该方法已被弃用，建议使用SavesV2方法
+func (s *sGameAct) Saves() (err error) {
+	var ctx = gctx.New()
+	g.Log().Debug(ctx, "开始执行游戏act数据保存了")
 	//如果没有执行过，设置时间戳
-	if getCache.Int64() > 0 {
+	// 最大允许执行时间
-		return
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
-	} else {
-		pkg.Cache("redis").Set(nil, "cron:game_act", gtime.Now().Unix(), time.Hour)
-	}
-
 	//遍历执行
 	ActList.Iterator(func(i interface{}) bool {
+		//在时间内允许执行
+		if gtime.Now().Before(RunTimeMax) {
+			g.Log().Debugf(ctx, "开始执行游戏act数据保存:act=%v", i)
 			err = s.Save(ctx, i.(int))
+		} else {
+			g.Log().Errorf(ctx, "游戏act数据保存超时:act=%v", i)
+		}
 		return true
 	})
 	return
 }
 
+// Save 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param actId int: 活动ID
+// @return err error: 返回错误信息
+// deprecated: 该方法已被弃用，建议使用SaveV2方法
 func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 
 	cacheKey := fmt.Sprintf("act:%v:*", actId)
-	//获取当前用户的key值
+	var add = make([]*entity.GameAct, 0)
-	//keys, err := utils.RedisScan(cacheKey)
+	var update = make([]*entity.GameAct, 0)
-	//if len(keys) > 10000 {
-	//	keys = keys[:10000]
-	//}
-
 	//循环获取缓存数据
 	err = tools.Redis.RedisScanV2(cacheKey, func(keys []string) (err error) {
-		var add []interface{}
+		//判断是否超时
-		var delKey []string
+		if gtime.Now().After(RunTimeMax) {
+			g.Log().Debug(ctx, "act执行超时了,停止执行！")
+			err = errors.New("act执行超时了,停止执行！")
+			return
+		}
+
 		for _, cacheKey = range keys {
 			result := strings.Split(cacheKey, ":")
 			actId, err = strconv.Atoi(result[1])
@@ -143,6 +167,7 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 			uid = gconv.Int64(result[2])
 			//uid, err = strconv.ParseInt(result[2], 10, 64)
 			if err != nil {
+				g.Log().Error(ctx, err)
 				continue
 			}
 
@@ -171,46 +196,81 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 				ActId: actId,
 			}).Fields("uid,act_id").Scan(&data)
 			if err != nil {
-				g.Log().Debugf(ctx, "当前数据错误: %v", cacheKey)
+				g.Log().Errorf(ctx, "当前数据错误: %v", cacheKey)
 				continue
 			}
 			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 {
+		updateCount := 0
-			dbRes, err2 := g.Model(Name).Batch(30).Data(add).Save()
+
-			add = make([]interface{}, 0)
+		//g.Log().Debugf(ctx, "当前 %v 要更新的数据: %v 条", actId, len(update))
+		if len(update) > 100 {
+			for _, v := range update {
+				v.UpdatedAt = gtime.Now()
+				updateRes, err2 := g.Model(Name).Where(do.GameAct{
+					Uid:   v.Uid,
+					ActId: v.ActId,
+				}).Data(v).Update()
 				if err2 != nil {
 					g.Log().Error(ctx, err2)
 					return
 				}
+				if row, _ := updateRes.RowsAffected(); row == 0 {
+					g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+					continue
+				}
 
-			for _, v := range delKey {
+				//删除缓存
-				_, err2 = g.Redis().Del(ctx, v)
+				go s.DelCacheKey(ctx, v.ActId, v.Uid)
-				if err2 != nil {
+
+				updateCount++
+				update = make([]*entity.GameAct, 0)
+			}
+			g.Log().Debugf(ctx, "当前 %v 更新数据库: %v 条", actId, updateCount)
+			update = make([]*entity.GameAct, 0)
+		}
+
+		var count int64
+		//g.Log().Debugf(ctx, "当前 %v 要添加的数据: %v 条", actId, len(add))
+		if len(add) > 100 {
+			dbRes, err2 := g.Model(Name).Data(add).Save()
+
+			err = err2
+			if err != nil {
 				g.Log().Error(ctx, err2)
 				return
 			}
+			count, _ = dbRes.RowsAffected()
+			if count == 0 {
+				g.Log().Error(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+				for _, vTemp := range add {
+					g.Log().Debugf(ctx, "当前act：%v，add写入数据: %v,内容：%v", vTemp.ActId, vTemp.Uid, vTemp.Action)
+				}
+				return
 			}
-			delKey = make([]string, 0)
 
-			count, _ := dbRes.RowsAffected()
+			for _, v2 := range add {
-			g.Log().Debugf(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+				//删除缓存
+				go s.DelCacheKey(ctx, v2.ActId, v2.Uid)
+			}
+
+			//g.Log().Debugf(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+			add = make([]*entity.GameAct, 0)
 		}
 
 		if err != nil {
@@ -223,17 +283,240 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 	return
 }
 
+// SavesV2 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @return err error: 返回错误信息
+func (s *sGameAct) SavesV2() (err error) {
+	var ctx = gctx.New()
+	g.Log().Debug(ctx, "开始执行游戏act数据保存了")
+	//如果没有执行过，设置时间戳
+	// 最大允许执行时间
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
+
+	//cacheKey := fmt.Sprintf("act:%v:*", actId)
+
+	addChan = make(chan *entity.GameAct, 1000)
+	updateChan = make(chan *entity.GameAct, 1000)
+
+	go func() {
+		//循环获取缓存数据
+		err = tools.Redis.RedisScanV2("act:*", func(keys []string) (err error) {
+			for _, key := range keys {
+				//格式化数据
+				err = s.SaveV2(ctx, key)
+
+			}
+			return err
+		})
+		//关闭通道
+		close(addChan)
+		close(updateChan)
+	}()
+	// 启动缓存数据到数据库通道
+	s.Cache2SqlChan(ctx)
+
+	return
+}
+
+// SaveV2 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param cacheKey string: 缓存键
+// @param add []*entity.GameAct: 添加数据
+// @param update []*entity.GameAct: 更新数据
+// @return err error: 返回错误信息
+func (s *sGameAct) SaveV2(ctx context.Context, cacheKey string) (err error) {
+
+	result := strings.Split(cacheKey, ":")
+	actId := gconv.Int(result[1])
+	if actId == 0 {
+		return
+	}
+	var uid int64
+	uid = gconv.Int64(result[2])
+	if uid == 0 {
+		//跳过为空的用户缓存
+		return
+	}
+
+	//获取缓存数据
+	cacheGet, _ := g.Redis().Get(ctx, cacheKey)
+
+	if cacheGet.IsEmpty() {
+		//空数据也不保存
+		return
+	}
+
+	//如果有活跃，跳过持久化
+	if getBool, _ := pkg.Cache("redis").
+		Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+		return
+	}
+
+	//获取数据库数据
+	var data *entity.GameAct
+	// 从数据库中查询活动信息
+	err = g.Model(Name).Where(do.GameAct{
+		Uid:   uid,
+		ActId: actId,
+	}).Fields("uid,act_id").Scan(&data)
+	if err != nil {
+		g.Log().Errorf(ctx, "当前数据错误: %v", cacheKey)
+		return
+	}
+
+	//如果没有数据，添加
+	actionData := cacheGet.String()
+	if data == nil {
+		//add = append(add, &entity.GameAct{
+		//	ActId:  actId,
+		//	Uid:    uid,
+		//	Action: actionData,
+		//})
+		addChan <- &entity.GameAct{
+			ActId:  actId,
+			Uid:    uid,
+			Action: actionData,
+		}
+	} else {
+		//覆盖数据
+		data.ActId = actId
+		data.Uid = uid
+		data.Action = actionData
+		//update = append(update, data)
+		updateChan <- data
+	}
+
+	return
+}
+
+// Cache2Sql 缓存持久化到数据库
+// @Description: 缓存持久化到数据库
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param add []*entity.GameAct: 添加数据
+// @param update []*entity.GameAct: 更新数据
+// @return err error: 返回错误信息
+func (s *sGameAct) Cache2Sql(ctx context.Context, add, update []*entity.GameAct) {
+	//批量写入数据库
+	updateCount := 0
+	if len(update) > 0 {
+		for _, v := range update {
+			v.UpdatedAt = gtime.Now()
+			updateRes, err2 := g.Model(Name).Where(do.GameAct{
+				Uid:   v.Uid,
+				ActId: v.ActId,
+			}).Data(v).Update()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := updateRes.RowsAffected(); row == 0 {
+				g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+				continue
+			}
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+			updateCount++
+		}
+		g.Log().Debugf(ctx, "act当前更新数据库: %v 条", updateCount)
+		update = (update)[:0]
+	}
+
+	var addCount int64
+	if len(add) > 0 {
+		for _, v := range add {
+			addRes, err2 := g.Model(Name).Data(v).Insert()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := addRes.RowsAffected(); row == 0 {
+				g.Log().Error(ctx, "本次新增为0，新增数据失败: %v", v)
+				continue
+			}
+			addCount++
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+		}
+		g.Log().Debugf(ctx, "act当前写入数据库: %v 条", addCount)
+		add = (add)[:0]
+	}
+	return
+}
+
+// Cache2SqlChan 缓存持久化到数据库
+// @Description: 缓存持久化到数据库
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+func (s *sGameAct) Cache2SqlChan(ctx context.Context) {
+	//批量写入数据库
+	updateCount := 0
+	for v := range updateChan {
+		v.UpdatedAt = gtime.Now()
+		updateRes, err2 := g.Model(Name).Where(do.GameAct{
+			Uid:   v.Uid,
+			ActId: v.ActId,
+		}).Data(v).Update()
+		if err2 != nil {
+			g.Log().Error(ctx, err2)
+			continue
+		}
+		if row, _ := updateRes.RowsAffected(); row == 0 {
+			g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+			continue
+		}
+		//删除缓存
+		s.DelCacheKey(ctx, v.ActId, v.Uid)
+		updateCount++
+	}
+	g.Log().Debugf(ctx, "act当前更新数据库: %v 条", updateCount)
+
+	var addCount int64
+	for v := range addChan {
+		addRes, err2 := g.Model(Name).Data(v).Insert()
+		if err2 != nil {
+			g.Log().Error(ctx, err2)
+			continue
+		}
+		if row, _ := addRes.RowsAffected(); row == 0 {
+			g.Log().Error(ctx, "本次新增为0，新增数据失败: %v", v)
+			continue
+		}
+		addCount++
+		//删除缓存
+		s.DelCacheKey(ctx, v.ActId, v.Uid)
+	}
+	g.Log().Debugf(ctx, "act当前写入数据库: %v 条", addCount)
+
+	return
+}
+
+// 删除缓存key
+func (s *sGameAct) DelCacheKey(ctx context.Context, aid int, uid int64) {
+	cacheKey := fmt.Sprintf("act:%v:%v", aid, uid)
+	_, err := g.Redis().Del(ctx, cacheKey)
+	if err != nil {
+		g.Log().Error(ctx, err)
+	}
+}
+
 // 清空GetRedDot缓存
 func (s *sGameAct) RefreshGetRedDotCache(uid int64) {
 	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("d"), uid)
 	_, err := pkg.Cache("redis").Remove(gctx.New(), cacheKey)
 	if err != nil {
-		g.Log().Error(ctx, err)
+		g.Log().Error(gctx.New(), err)
 		g.Dump(err)
 	}
 }
 
 func (s *sGameAct) Del(uid int64, actId int) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return

internal/logic/gameKv/gameKv.go

@@ -1,22 +1,25 @@
 package gameKv
 
 import (
+	"context"
+	"errors"
 	"fmt"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
 	"github.com/ayflying/utility_go/pkg"
 	"github.com/ayflying/utility_go/service"
 	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
 )
 
 var (
-	ctx  = gctx.New()
 	Name       = "game_kv"
+	RunTimeMax *gtime.Time
 )
 
 type sGameKv struct {
@@ -37,17 +40,11 @@ func init() {
 // @receiver s: sGameKv的实例。
 // @return err: 错误信息，如果操作成功，则为nil。
 func (s *sGameKv) SavesV1() (err error) {
-	getCache, err := pkg.Cache("redis").Get(nil, "cron:game_kv")
+	var ctx = gctx.New()
-	//如果没有执行过，设置时间戳
+	// 最大允许执行时间
-	if getCache.Int64() > 0 {
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
-		return
+	g.Log().Debug(ctx, "开始执行游戏kv数据保存")
-	} else {
-		pkg.Cache("redis").Set(nil, "cron:game_kv", gtime.Now().Unix(), time.Hour)
-	}
 
-	// 从Redis列表中获取所有用户KV索引的键
-	//keys, err := utils.RedisScan("user:kv:*")
-	err = tools.Redis.RedisScanV2("user:kv:*", func(keys []string) (err error) {
 	// 定义用于存储用户数据的结构体
 	type ListData struct {
 		Uid int64       `json:"uid"`
@@ -56,8 +53,19 @@ func (s *sGameKv) SavesV1() (err error) {
 	var list []*ListData
 	// 初始化列表，长度与keys数组一致
 	list = make([]*ListData, 0)
+
+	// 从Redis列表中获取所有用户KV索引的键
+	//keys, err := utils.RedisScan("user:kv:*")
+	err = tools.Redis.RedisScanV2("user:kv:*", func(keys []string) (err error) {
+		//判断是否超时
+		if gtime.Now().After(RunTimeMax) {
+			g.Log().Error(ctx, "kv执行超时了,停止执行！")
+			err = errors.New("kv执行超时了,停止执行！")
+			return
+		}
+
 		//需要删除的key
-		var delKey []string
+
 		// 遍历keys，获取每个用户的数据并填充到list中
 		for _, cacheKey := range keys {
 			//g.Log().Infof(ctx, "保存用户kv数据%v", v)
@@ -90,30 +98,21 @@ func (s *sGameKv) SavesV1() (err error) {
 				Uid: uid,
 				Kv:  data,
 			})
-
-			delKey = append(delKey, cacheKey)
 		}
 
 		// 将列表数据保存到数据库
-		if len(list) > 0 {
+		if len(list) > 100 {
-			_, err2 := g.Model("game_kv").Batch(30).Data(list).Save()
+			_, err2 := g.Model("game_kv").Data(list).Save()
-			list = make([]*ListData, 0)
+
 			if err2 != nil {
 				g.Log().Error(ctx, err2)
 				return
 			}
-
+			//删除当前key
-			//批量删除key
+			for _, v := range list {
-			for _, v := range delKey {
+				go s.DelCacheKey(ctx, v.Uid)
-				_, err2 = g.Redis().Del(ctx, v)
-				if err2 != nil {
-					g.Log().Errorf(ctx, "删除存档错误：%v,err=%v", v, err2)
-					return
 			}
-			}
+			list = make([]*ListData, 0)
-
-			delKey = make([]string, 0)
-
 		}
 		if err != nil {
 			g.Log().Error(ctx, "当前kv数据入库失败: %v", err)
@@ -122,17 +121,14 @@ func (s *sGameKv) SavesV1() (err error) {
 		return
 	})
 
-	//if err != nil {
-	//	return err
-	//}
-	////跳过
-	//if len(keys) == 0 {
-	//	return
-	//}
-	////一次最多处理10w条
-	//if len(keys) > 10000 {
-	//	keys = keys[:10000]
-	//}
-
 	return
 }
+
+// 删除缓存key
+func (s *sGameKv) DelCacheKey(ctx context.Context, uid int64) {
+	cacheKey := fmt.Sprintf("user:kv:%v", uid)
+	_, err := g.Redis().Del(ctx, cacheKey)
+	if err != nil {
+		g.Log().Error(ctx, err)
+	}
+}

internal/logic/ip2region/ip2region.go

@@ -1,13 +1,14 @@
 package ip2region
 
 import (
+	"net"
+	"strings"
+
 	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/lionsoul2014/ip2region/binding/golang/xdb"
-	"net"
-	"strings"
 )
 
 var (
@@ -15,6 +16,8 @@ var (
 	wait = false
 )
 
+const IpDbPath = "runtime/library/ip2region.xdb"
+
 type sIp2region struct {
 	searcher *xdb.Searcher
 }
@@ -35,16 +38,17 @@ func init() {
 // Load 加载到内存中
 //
 //	@Description: 加载ip2region数据库到内存中。
+
 //	@receiver s *sIp2region: sIp2region的实例。
 func (s *sIp2region) Load() {
 	var err error
 
-	var dbPath = "runtime/library/ip2region.xdb"
+	//var dbPath = "runtime/library/ip2region.xdb"
-	var url = "https://github.com/ayflying/resource/raw/refs/heads/main/attachment/ip2region.xdb"
+	var url = "https://github.com/ayflying/resource/raw/refs/heads/master/attachment/ip2region.xdb"
 	if wait {
 		return
 	}
-	if gfile.IsEmpty(dbPath) {
+	if gfile.IsEmpty(IpDbPath) {
 		wait = true
 		defer func() {
 			wait = false
@@ -55,9 +59,9 @@ func (s *sIp2region) Load() {
 		if err2 != nil {
 			return
 		}
-		err = gfile.PutBytes(dbPath, putData.ReadAll())
+		err = gfile.PutBytes(IpDbPath, putData.ReadAll())
 	}
-	cBuff := gfile.GetBytes(dbPath)
+	cBuff := gfile.GetBytes(IpDbPath)
 	/*
 		var cBuff []byte
 		if gres.Contains(dbPath) {
@@ -78,7 +82,9 @@ func (s *sIp2region) Load() {
 
 func (s *sIp2region) GetIp(ip string) (res []string) {
 	//初始化加载
+	if s.searcher == nil {
 		s.Load()
+	}
 
 	res = make([]string, 5)
 	if s.searcher == nil {

internal/logic/systemCron/systemCron.go

@@ -2,6 +2,9 @@ package systemCron
 
 import (
 	"context"
+	"sync"
+	"time"
+
 	"github.com/ayflying/utility_go/api/system/v1"
 	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/frame/g"
@@ -9,8 +12,6 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/os/gtimer"
-	"sync"
-	"time"
 )
 
 var (
@@ -59,7 +60,7 @@ type sSystemCron struct {
 func New() *sSystemCron {
 	return &sSystemCron{
 		taskChan:    make(chan func(context.Context) error, 2),
-		TaskTimeout: time.Minute * 30,
+		TaskTimeout: time.Minute * 60,
 	}
 }
 
@@ -80,7 +81,8 @@ func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
 	var _func2 = func(ctx context.Context) error {
 		return _func()
 	}
-	s.AddCronV2(typ, _func2)
+	// 老版本计划任务全都是主服务器唯一执行
+	s.AddCronV2(typ, _func2, true)
 }
 
 // AddCronV2  添加一个定时任务到相应的调度列表中。
@@ -89,7 +91,16 @@ func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
 // @receiver s: sSystemCron的实例，代表一个调度系统。
 // @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
 // @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
-func (s *sSystemCron) AddCronV2(typ v1.CronType, _func func(context.Context) error) {
+// @param _onlyMain: 是否只在主服务器上执行一次,true 唯一执行，false 全局执行不判断唯一
+func (s *sSystemCron) AddCronV2(typ v1.CronType, _func func(context.Context) error, _onlyMain ...bool) {
+	//如果传过来的任务是需要主服务器执行一次
+	if len(_onlyMain) > 0 && _onlyMain[0] {
+		//判断当前是否为主服务器
+		if !g.Cfg().MustGet(gctx.New(), "game.cron_main").Bool() {
+			return
+		}
+	}
+
 	//加锁
 	s.Lock.Lock()
 	defer s.Lock.Unlock()
@@ -136,6 +147,10 @@ func (s *sSystemCron) AddCronV2(typ v1.CronType, _func func(context.Context) err
 //	@receiver s
 //	@return err
 func (s *sSystemCron) StartCron() (err error) {
+	//如果没有数据库配置，跳过计划任务执行
+	if g.Cfg().MustGet(gctx.New(), "database") == nil {
+		return
+	}
 	//预防重复启动
 	if startTime != nil {
 		return
@@ -318,7 +333,7 @@ func (s *sSystemCron) RunFuncChan() {
 			//ctx := gctx.New()
 			func() {
 				//超时释放资源
-				ctx, cancel := context.WithTimeout(context.Background(), s.TaskTimeout)
+				ctx, cancel := context.WithTimeout(gctx.New(), s.TaskTimeout)
 				defer cancel()
 
 				// 使用匿名函数包裹来捕获 panic

modules/websocket/go.mod

@@ -0,0 +1,5 @@
+module github.com/ayflying/utility_go/modules/websocket
+
+go 1.24.0
+
+require github.com/ayflying/utility_go v1.2.26

modules/websocket/go.sum

@@ -0,0 +1,2 @@
+github.com/ayflying/utility_go v1.2.26/go.mod h1:y6qwRUmYk73cH/dTRSzj2mnaQdtrAfFNH4wRFewxlIc=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=

modules/websocket/socket_new.go

@@ -308,8 +308,8 @@ func (s *SocketV1) LeaveGroup(conn *WebsocketData, group string) {
 }
 
 //群组广播
-func (s *SocketV1) SendGroup(cmd int32, group string, req proto.Message) {
+func (s *SocketV1) SendGroup(cmd int32, roomId string, req proto.Message) {
-	cacheKey := "websocket:group:" + group
+	cacheKey := "websocket:group:" + roomId
 	get, _ := cache.Get(gctx.New(), cacheKey)
 	var list = make(map[int64]string)
 	if !get.IsNil() {

package/gamelog/sdk.go

@@ -0,0 +1,399 @@
+package gamelog
+
+import (
+	"bytes"
+	"compress/gzip"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/gclient"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gtime"
+)
+
+type sendBody struct {
+	Pid  string  `json:"pid"`
+	Data [][]any `json:"data"`
+}
+
+// todo 游戏日志对象
+type GameLog struct {
+	Uid          string         // 唯一uid
+	Event        string         // 事件名
+	Property     map[string]any // 事件属性
+	EventTimems  int64          // 时间戳毫秒级别
+	EventTimeLoc string         // 带时区的本地时间字符串
+}
+
+type SDKConfig struct {
+	// 配置变量
+	Pid           string // 项目id
+	BaseUrl       string // 日志服务器地址
+	ReportSk      string // 上报解密key
+	FlushInterval int    // 刷新间隔
+	DiskBakPath   string // 磁盘备份路径
+	RetryN        int    // 每N次重试
+	ChanSize      int    // 信道大小, 默认1000
+
+	reportN int
+}
+
+type SDK struct {
+	// 控制变量
+	wg         sync.WaitGroup
+	shutdown   chan struct{}
+	mu         sync.Mutex
+	sdkConfig  *SDKConfig
+	bufferChan chan GameLog // 日志队列
+	buffer     []GameLog    // 日志队列
+}
+
+var (
+	ctx           = context.Background()
+	gamelogClient *gclient.Client
+
+	// location map
+	// locationMap map[string]*time.Location = map[string]*time.Location{}
+	locationMap sync.Map // 声明一个线程安全的Map
+
+)
+
+func getLocationMapValue(key string) *time.Location {
+	// 1. 先尝试读
+	value, loaded := locationMap.Load(key)
+	if loaded {
+		return value.(*time.Location) // 如果已经存在，直接返回
+	}
+	// 2. 不存在，就初始化一个该key对应的**固定的**新值
+	location, err := time.LoadLocation(key)
+	if err != nil {
+		g.Log().Warningf(ctx, "[GameLog]load location error, try use local timezone: %v", err)
+		return nil
+	}
+	// 3. 核心：原子性地存储，如果key已存在则返回已存在的值
+	actualValue, loaded := locationMap.LoadOrStore(key, location)
+	if loaded {
+		// 如果loaded为true，说明其他goroutine抢先存了
+		// 我们可以丢弃刚创建的newValue（如果有需要的话），返回已存在的actualValue
+		return actualValue.(*time.Location)
+	}
+	// 如果loaded为false，说明是我们存成功的，返回我们刚创建的newValue
+	return actualValue.(*time.Location)
+}
+
+func (sdk *SDK) varinit() error {
+	sdk.sdkConfig = &SDKConfig{}
+
+	_pid, err := g.Config().Get(ctx, "angergs.bisdk.pid")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.Pid = _pid.String()
+
+	_baseUrl, err := g.Config().Get(ctx, "angergs.bisdk.recodeServerBaseUrl")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.BaseUrl = _baseUrl.String()
+
+	_sk, err := g.Config().Get(ctx, "angergs.bisdk.reportSk")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.ReportSk = _sk.String()
+
+	_flushInterval, err := g.Config().Get(ctx, "angergs.bisdk.flushInterval")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.FlushInterval = _flushInterval.Int()
+
+	_diskBakPath, err := g.Config().Get(ctx, "angergs.bisdk.diskBakPath")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.DiskBakPath = _diskBakPath.String()
+
+	_retryN, err := g.Config().Get(ctx, "angergs.bisdk.retryN")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.RetryN = _retryN.Int()
+
+	_chanSize, err := g.Config().Get(ctx, "angergs.bisdk.chanSize")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.ChanSize = _chanSize.Int()
+
+	g.Log().Infof(ctx, "[GameLog]client init success, config: %v", sdk.sdkConfig)
+	return nil
+}
+
+func (sdk *SDK) checkConfig() error {
+	config := sdk.sdkConfig
+	if config.Pid == "" {
+		return fmt.Errorf("pid is empty")
+	}
+	if config.BaseUrl == "" {
+		return fmt.Errorf("baseUrl is empty")
+	}
+	if config.ReportSk == "" {
+		return fmt.Errorf("reportSk is empty")
+	}
+	if config.FlushInterval <= 0 {
+		return fmt.Errorf("flushInterval is invalid")
+	}
+	if config.DiskBakPath == "" {
+		return fmt.Errorf("diskBakPath is empty")
+	}
+	if config.RetryN == 0 {
+		config.RetryN = 10
+	}
+	if config.ChanSize == 0 {
+		config.ChanSize = 1000
+	}
+	config.DiskBakPath = strings.TrimSuffix(config.DiskBakPath, "/")
+
+	return nil
+}
+
+func INIT(config *SDKConfig) (*SDK, error) {
+	// 加载并检查配置
+	sdk := &SDK{}
+	if config != nil {
+		sdk.sdkConfig = config
+	} else if err := sdk.varinit(); err != nil { // 可以读goframe的配置
+		return nil, err
+	}
+	if err := sdk.checkConfig(); err != nil {
+		return nil, err
+	}
+	gamelogClient = g.Client()
+
+	// 初始化队列
+	sdk.shutdown = make(chan struct{})
+	sdk.bufferChan = make(chan GameLog, 1000)
+	sdk.buffer = make([]GameLog, 0, 100)
+	// 加载失败日志
+	failLogs, err := sdk.loadFailLogs4disk()
+	if err != nil {
+		g.Log().Errorf(ctx, "[GameLog]load fail logs error: %v", err)
+	} else if len(failLogs) > 0 {
+		sdk.buffer = append(sdk.buffer, failLogs...)
+	}
+
+	// 开启协程进行日志发送
+	sdk.wg = sync.WaitGroup{}
+	sdk.wg.Add(1)
+	go func() {
+		defer sdk.wg.Done()
+		ticker := time.NewTicker(time.Duration(sdk.sdkConfig.FlushInterval) * time.Second)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-sdk.shutdown:
+				// 关闭时, 上传一次并备份失败数据
+				g.Log().Infof(ctx, "[GameLog]begin shutdown and flush last")
+				sdk.flush()
+				return
+			case log := <-sdk.bufferChan:
+				sdk.buffer = append(sdk.buffer, log)
+			case <-ticker.C:
+				sdk.flush()
+
+			}
+		}
+	}()
+	return sdk, nil
+}
+
+// 从磁盘加载失败日志
+func (sdk *SDK) loadFailLogs4disk() (logs []GameLog, err error) {
+	if !gfile.Exists(sdk.sdkConfig.DiskBakPath) {
+		return
+	}
+	// 遍历diskBakPath下所有failBufferxxx.bak.log文件， 读取到log中
+	files, err := gfile.ScanDir(sdk.sdkConfig.DiskBakPath, "failBuffer*.bak.log")
+	logs = []GameLog{}
+	if err != nil {
+		return
+	}
+	// 读取每个备份文件
+	for _, fp := range files {
+		// 每一行都是一次失败的记录
+		gfile.ReadLines(fp, func(line string) error {
+			_logs := []GameLog{}
+			err := json.Unmarshal([]byte(line), &_logs)
+			if err != nil {
+				return err
+			}
+			// 合并到总日志列表
+			logs = append(logs, _logs...)
+			return nil
+		})
+		g.Log().Infof(ctx, "[GameLog]load %d faillogs from %s", len(logs), fp)
+		gfile.Remove(fp)
+	}
+	return
+
+}
+
+// 备份失败日志追加到磁盘
+func (sdk *SDK) bakFailLogs2disk(failLogs []GameLog) {
+	bakPath := fmt.Sprintf("%s/failBuffer%s.bak.log", sdk.sdkConfig.DiskBakPath, gtime.Now().Format("YmdH"))
+	content, err := json.Marshal(failLogs)
+	if err != nil {
+		g.Log().Errorf(ctx, "[GameLog]marshal fail logs error: %v", err)
+		return
+	}
+	gfile.PutContentsAppend(bakPath, string(content)+"\n")
+	g.Log().Infof(ctx, "[GameLog]backup fail buffer to %s", bakPath)
+}
+
+// 优雅关闭
+func (sdk *SDK) Shutdown() {
+	close(sdk.shutdown)
+	sdk.wg.Wait()
+}
+
+// 日志时间格式
+const datetimeFmt = time.DateOnly + " " + time.TimeOnly
+
+// 记录日志
+func (sdk *SDK) Log(uid, event string, property map[string]any, timezone string) {
+	loc := time.Local
+	if _loc := getLocationMapValue(timezone); _loc != nil {
+		loc = _loc
+	}
+	log := GameLog{
+		Uid:          uid,
+		Event:        event,
+		Property:     property,
+		EventTimems:  gtime.Now().TimestampMilli(),
+		EventTimeLoc: gtime.Now().In(loc).Format(datetimeFmt),
+	}
+	// 线程安全
+	sdk.bufferChan <- log
+}
+
+// 按服务器时区记录日志
+func (sdk *SDK) LogLtz(uid, event string, property map[string]any) {
+	sdk.Log(uid, event, property, time.Local.String())
+}
+
+// 这个方法只会在内部协程调用
+func (sdk *SDK) flush() {
+	sdk.mu.Lock()
+	defer sdk.mu.Unlock()
+	if len(sdk.buffer) == 0 {
+		return
+	}
+
+	batch := make([]GameLog, len(sdk.buffer))
+	copy(batch, sdk.buffer)
+	sdk.buffer = sdk.buffer[:0]
+
+	// 第N次的时候加载失败数据进行尝试
+	if sdk.sdkConfig.reportN != 0 && sdk.sdkConfig.reportN%sdk.sdkConfig.RetryN == 0 {
+		faillogs, err := sdk.loadFailLogs4disk()
+		if err != nil {
+			g.Log().Errorf(ctx, "[GameLog]load fail logs error: %v", err)
+		}
+		// 如果有失败日志则加入到批量数组中
+		if len(faillogs) > 0 {
+			batch = append(batch, faillogs...)
+		}
+	}
+	sdk.send(batch)
+}
+
+// 发送消息
+func (sdk *SDK) send(logs []GameLog) {
+	waitSecond := time.Duration(sdk.sdkConfig.FlushInterval/4) * time.Second
+	timeoutCtx, cancel := context.WithTimeout(context.Background(), waitSecond)
+	defer cancel()
+	data := make([][]any, 0, len(logs))
+	// logs 拆分成二维数组
+	for _, log := range logs {
+		propertyJson, err := json.Marshal(log.Property)
+		if err != nil {
+			g.Log().Errorf(ctx, "[GameLog]skip log parse, marshal property error: %v", err)
+			continue
+		}
+		data = append(data, []any{
+			log.Uid,
+			log.Event,
+			string(propertyJson),
+			log.EventTimems,
+			log.EventTimeLoc,
+		})
+	}
+	// json化
+	sbody := sendBody{
+		Pid:  sdk.sdkConfig.Pid,
+		Data: data,
+	}
+	jsonBody, err := json.Marshal(sbody)
+	if err != nil {
+		g.Log().Errorf(ctx, "[GameLog]marshal send body error: %v", err)
+		return
+	}
+
+	// giz压缩
+	gzBody := bytes.NewBuffer([]byte{})
+	gz := gzip.NewWriter(gzBody)
+	gz.Write(jsonBody)
+	gz.Close()
+
+	// XOR 加密
+	xorBody := bytesXOR(gzBody.Bytes(), []byte(sdk.sdkConfig.ReportSk))
+
+	sdk.sdkConfig.reportN += 1
+	res, err := gamelogClient.Post(timeoutCtx, sdk.sdkConfig.BaseUrl+"/report/event", xorBody)
+	// 失败重新加入缓冲区
+	if err != nil {
+		sdk.bakFailLogs2disk(logs)
+		g.Log().Warningf(ctx, "[GameLog]send log error, bak to fail buffer(%d): %v", len(logs), err)
+		return
+	}
+	defer func() {
+		cerr := res.Close()
+		if cerr != nil {
+			g.Log().Errorf(ctx, "[GameLog]close response error: %v", cerr)
+		}
+	}()
+	httpcode := res.StatusCode
+	resBody := res.ReadAllString()
+	// 收集器拦截, 重新加入缓冲区
+	if httpcode != http.StatusOK {
+		sdk.bakFailLogs2disk(logs)
+		g.Log().Warningf(ctx, "[GameLog]send log error, bak to fail buffer(%d): %v", len(logs), resBody)
+	}
+}
+
+// 混淆
+func bytesXOR(data []byte, key []byte) []byte {
+	obfuscated := make([]byte, len(data))
+	keyLen := len(key)
+	if keyLen == 0 {
+		return data
+	}
+
+	for i := range data {
+		obfuscated[i] = data[i] ^ key[i%keyLen]
+	}
+	return obfuscated
+
+	// // 使用示例
+	// key := []byte{0x12, 0x34, 0x56, 0x78}
+	// obfuscated := multiXorObfuscate(original, key)
+	// deobfuscated := multiXorObfuscate(obfuscated, key) // 解密
+}

package/gamelog/test/gamelog_test.go

@@ -0,0 +1,52 @@
+package test
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/ayflying/utility_go/package/gamelog"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/grand"
+	"github.com/google/uuid"
+)
+
+func TestGamelog(t *testing.T) {
+	glsdk, err := gamelog.INIT(&gamelog.SDKConfig{
+		// 必填
+		Pid:     "test5",                     // 项目ID
+		BaseUrl: "http://47.76.178.47:10101", // 香港测试服上报地址
+		// BaseUrl:       "http://127.0.0.1:10101", // 本次测试上报地址
+		ReportSk:      "sngame2025", // xor混淆key
+		FlushInterval: 5,            // 上报间隔
+		DiskBakPath:   "gamelog",    // 本地磁盘备份, 用于意外情况下临时保存日志, 请确保该目录持久化(容器内要挂载). 每次启动时或每N次上报时加载到失败队列
+		// 可填
+		RetryN:   2,   // 默认每10次, 上传检查一次磁盘的失败数据
+		ChanSize: 500, // 默认1000, 信道size
+	})
+
+	// 随机测试事件和属性
+	events := []string{"e1", "e2", "e3", "e4"}
+	pms := []map[string]any{
+		{"a": "1"},
+		{"a": "2"},
+		{"a": "3"},
+		{"a": "4"},
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	gtest.C(t, func(t *gtest.T) {
+		go func() {
+			for {
+				uuidval, _ := uuid.NewUUID()
+				randUid := strings.ReplaceAll(uuidval.String(), "-", "")
+				glsdk.LogLtz(randUid, events[grand.Intn(len(events))], pms[grand.Intn(len(pms))])
+				time.Sleep(time.Millisecond * 100)
+			}
+		}()
+		time.Sleep(time.Second * 14)
+		// 模拟等待信号后优雅关闭
+		glsdk.Shutdown()
+	})
+}

package/pay/chongchong/chongchong.go

@@ -0,0 +1,32 @@
+package chongchong
+
+import (
+	"fmt"
+	"github.com/ayflying/utility_go/package/pay/common"
+	"github.com/gogf/gf/v2/crypto/gmd5"
+)
+
+//验单
+func (p *Pay) Verify(req *CallbackData, sign string) (isOk bool, err error) {
+	//req := g.RequestFromCtx(ctx).Request
+	//data, err := common.ParseNotifyToBodyMap(req)
+
+	var data = map[string]interface{}{
+		"orderPrice":           req.OrderPrice,
+		"packageId":            req.PackageId,
+		"partnerTransactionNo": req.PartnerTransactionNo,
+		"productId":            req.ProductId,
+		"statusCode":           req.StatusCode,
+		"transactionNo":        req.TransactionNo,
+	}
+
+	dataStr, err := common.BuildSignStr(data)
+
+	var SingStr = fmt.Sprintf("%v&%v", dataStr, p.ApiKey)
+	sign2, err := gmd5.EncryptString(SingStr)
+
+	if sign == sign2 {
+		isOk = true
+	}
+	return
+}

package/pay/chongchong/model.go

@@ -0,0 +1,25 @@
+package chongchong
+
+type Pay struct {
+	ApiKey string `json:"api_key"`
+}
+
+func New(pay *Pay) *Pay {
+	return &Pay{
+		ApiKey: pay.ApiKey,
+	}
+}
+
+// CallbackData 用于处理回调数据的结构体
+type CallbackData struct {
+	TransactionNo        string  `json:"transactionNo" dc:"平台交易单号，唯一标识一笔交易"`
+	PartnerTransactionNo string  `json:"partnerTransactionNo" dc:"合作方交易单号，由合作方生成"`
+	StatusCode           string  `json:"statusCode" dc:"交易状态码，SUCCESS表示成功，FAIL表示失败"`
+	ProductId            int     `json:"productId" dc:"产品ID，对应后台配置的商品"`
+	OrderPrice           float64 `json:"orderPrice" dc:"订单金额，单位为元"`
+	PackageId            int     `json:"packageId" dc:"套餐ID，可选字段，部分商品有套餐区分"`
+	ProductName          string  `json:"productName" dc:"产品名称，展示用"`
+	ExtParam             string  `json:"extParam" dc:"扩展参数，回调时原样返回"`
+	UserId               int     `json:"userId" dc:"用户ID，标识购买者"`
+	Sign                 string  `json:"sign" dc:"签名，用于验证请求合法性"`
+}

package/pay/common/func.go

@@ -0,0 +1,105 @@
+package common
+
+import (
+	"errors"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+	"net/http"
+	"sort"
+	"strings"
+)
+
+// FormatPublicKey 将原始公钥字符串格式化为标准PEM格式的公钥
+// 功能：为原始公钥添加PEM头部和尾部，并按64字符长度拆分换行，符合PKCS#8标准格式要求
+// 参数 publicKey: 原始未格式化的公钥字符串（通常为Base64编码且无换行）
+// 返回值: 格式化后的PEM格式公钥字符串
+func FormatPublicKey(publicKey string) (pKey string) {
+	var buffer strings.Builder
+	// 写入PEM格式头部
+	buffer.WriteString("-----BEGIN PUBLIC KEY-----\n")
+
+	// 定义每行公钥的标准长度（PEM格式要求64字符/行）
+	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 {
+			// 最后一行取剩余所有字符（处理不足64字符的情况）
+			buffer.WriteString(publicKey[start:])
+		} else {
+			// 非最后行取固定64字符
+			buffer.WriteString(publicKey[start:end])
+		}
+		buffer.WriteByte('\n') // 每行结束添加换行符
+		start += rawLen
+		end = start + rawLen
+	}
+
+	// 写入PEM格式尾部
+	buffer.WriteString("-----END PUBLIC KEY-----\n")
+	pKey = buffer.String()
+	return
+}
+
+// ParseNotifyToBodyMap 将HTTP请求中的表单数据解析为键值对映射
+// 功能：解析请求表单数据，提取单值字段并转换为map[string]interface{}格式
+// 参数 req: 包含表单数据的HTTP请求对象
+// 返回值: 解析后的键值对映射(bm)和可能的错误(err)
+func ParseNotifyToBodyMap(req *http.Request) (bm map[string]interface{}, err error) {
+	// 解析请求表单数据，若失败则返回错误
+	if err = req.ParseForm(); err != nil {
+		return nil, err
+	}
+	// 获取解析后的表单数据（key为字段名，value为字符串切片形式的字段值）
+	var form map[string][]string = req.Form
+	// 初始化结果映射，预分配容量（表单字段数+1，预留扩展空间）
+	bm = make(map[string]interface{}, len(form)+1)
+	// 遍历表单字段，仅保留单值字段（忽略多值字段）
+	for k, v := range form {
+		if len(v) == 1 {
+			bm[k] = v[0]
+		}
+	}
+	return
+}
+
+// BuildSignStr 根据传入的g.Map构建签名字符串
+// 规则：对所有非空值的键进行字母排序后，按"key=value&"格式拼接，最后去除末尾的"&"
+// 参数 bm: 包含键值对的g.Map
+// 返回值: 构建好的签名字符串和可能的错误
+func 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
+}

package/pay/honor/const.go

@@ -0,0 +1,5 @@
+package honor
+
+const (
+	Host = "https://iap-api.cloud.honor.com"
+)

package/pay/honor/honor.go

@@ -0,0 +1,70 @@
+package honor
+
+import (
+	"context"
+	"crypto"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/pem"
+	"errors"
+	"github.com/ayflying/utility_go/package/pay/common"
+)
+
+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(ctx context.Context, data []byte, sign string) (bool, error) {
+	//req := g.RequestFromCtx(ctx).Request
+	//post, err := common.ParseNotifyToBodyMap(req)
+	//var data = gjson.MustEncode(post)
+
+	// 解码Base64格式的签名
+	signBytes, err := base64.StdEncoding.DecodeString(sign)
+	if err != nil {
+		return false, errors.New("签名解码失败: " + err.Error())
+	}
+
+	pubkey := common.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
+}

package/pay/honor/model.go

@@ -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:"订阅取消时间"`
+}

package/pay/honor/notification.go

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

package/pay/huawei/consts.go

@@ -0,0 +1,25 @@
+package huawei
+
+import (
+	"net/http"
+	"time"
+)
+
+const (
+	TokenUrl = "https://oauth-login.cloud.huawei.com/oauth2/v3/token"
+)
+
+func getOrderUrl(accountFlag int) string {
+	if accountFlag == 1 {
+		// site for telecom carrier
+		//return "https://orders-at-dre.iap.dbankcloud.com"
+		return "https://orders-drcn.iap.cloud.huawei.com.cn"
+	} else {
+		// TODO: replace the (ip:port) to the real one
+		return "http://exampleserver/_mockserver_"
+	}
+
+}
+
+// default http client with 5 seconds timeout
+var RequestHttpClient = http.Client{Timeout: time.Second * 5}

package/pay/huawei/huawei.go

@@ -0,0 +1,166 @@
+package huawei
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"io"
+	"log"
+	"net/http"
+	"net/url"
+)
+
+type Pay struct {
+	ClientSecret string `json:"client_secret"`
+	ClientId     string `json:"client_id"`
+	//TokenUrl             string `json:"token_url"`
+	ApplicationPublicKey string `json:"application_public_key"`
+}
+
+func New(cfg *Pay) *Pay {
+	return cfg
+}
+
+// ConfirmPurchase 发货后确认购买接口（华为支付）消耗商品
+// 功能：通知华为支付平台当前订单已完成发货，触发支付完成流程（需在商品实际发货后调用）
+// 参数说明：
+//   purchaseToken: 华为支付返回的购买令牌（唯一标识一笔具体的购买交易，由客户端支付成功后返回）
+//   productId: 应用内商品的唯一标识（需与客户端发起支付时使用的productId一致）
+//   accountFlag: 账户标识（用于区分不同账户体系/环境，如0-普通用户、1-企业用户，具体值由业务定义）
+func (p *Pay) ConfirmPurchase(purchaseToken, productId string, accountFlag int) {
+	// 构造请求体参数（包含购买令牌和产品ID）
+	bodyMap := map[string]string{
+		"purchaseToken": purchaseToken, // 华为支付返回的购买凭证
+		"productId":     productId,     // 对应应用内商品的唯一标识
+	}
+	url := getOrderUrl(accountFlag) + "/applications/v2/purchases/confirm"
+	bodyBytes, err := p.SendRequest(url, bodyMap)
+	if err != nil {
+		// 请求失败时记录错误日志（实际业务中建议增加重试或异常处理逻辑）
+		log.Printf("err is %s", err)
+	}
+	// 打印响应结果（实际业务中需替换为具体处理逻辑，如更新订单状态、校验响应数据等）
+	// TODO:  建议根据华为支付文档解析响应数据（如检查responseCode是否为0表示成功）
+	log.Printf("%s", bodyBytes)
+}
+
+// VerifyToken 验证回调订单
+//您可以调用本接口向华为应用内支付服务器校验支付结果中的购买令牌，确认支付结果的准确性。
+func (p *Pay) VerifyToken(purchaseToken, productId string, accountFlag int) (res *PurchaseTokenData, err error) {
+	bodyMap := map[string]string{"purchaseToken": purchaseToken, "productId": productId}
+	url := getOrderUrl(accountFlag) + "/applications/purchases/tokens/verify"
+	bodyBytes, err := p.SendRequest(url, bodyMap)
+	if err != nil {
+		g.Log().Error(gctx.New(), "err is %s", err)
+	}
+	var data *VerifyTokenRes
+	err = gjson.DecodeTo(bodyBytes, &data)
+	err = gjson.DecodeTo(data.PurchaseTokenData, &res)
+
+	return
+}
+
+func (p *Pay) SendRequest(url string, bodyMap map[string]string) (string, error) {
+	authHeaderString, err := p.BuildAuthorization()
+	if err != nil {
+		return "", err
+	}
+	bodyString, err := json.Marshal(bodyMap)
+	if err != nil {
+		return "", err
+	}
+
+	req, err := http.NewRequest("POST", url, bytes.NewReader(bodyString))
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("Content-Type", "application/json; charset=UTF-8")
+	req.Header.Set("Authorization", authHeaderString)
+	response, err := RequestHttpClient.Do(req)
+	defer response.Body.Close()
+	bodyBytes, err := io.ReadAll(response.Body)
+
+	//req, err := g.Client().Header(g.MapStrStr{
+	//	"Content-Type":  "application/json; charset=UTF-8",
+	//	"Authorization": authHeaderString,
+	//}).Post(gctx.New(), url, bodyString)
+	//defer req.Close()
+	//var bodyBytes = req.ReadAll()
+
+	if err != nil {
+		return "", err
+	}
+	return string(bodyBytes), nil
+}
+
+func (p *Pay) VerifyRsaSign(content string, sign string, publicKey string) error {
+	//publicKey = common.FormatPublicKey(publicKey)
+	publicKeyByte, err := base64.StdEncoding.DecodeString(publicKey)
+	if err != nil {
+		return err
+	}
+	pub, err := x509.ParsePKIXPublicKey(publicKeyByte)
+	if err != nil {
+		return err
+	}
+	hashed := sha256.Sum256([]byte(content))
+	signature, err := base64.StdEncoding.DecodeString(sign)
+	if err != nil {
+		return err
+	}
+	return rsa.VerifyPKCS1v15(pub.(*rsa.PublicKey), crypto.SHA256, hashed[:], signature)
+}
+
+func (p *Pay) GetAppAt() (string, error) {
+	//demoConfig := GetDefaultConfig()
+	urlValue := url.Values{
+		"grant_type":    {"client_credentials"},
+		"client_secret": {p.ClientSecret},
+		"client_id":     {p.ClientId},
+	}
+	resp, err := RequestHttpClient.PostForm(TokenUrl, urlValue)
+	defer resp.Body.Close()
+	bodyBytes, err := io.ReadAll(resp.Body)
+
+	//post := g.MapStrStr{
+	//	"grant_type":    "client_credentials",
+	//	"client_secret": p.ClientSecret,
+	//	"client_id":     p.ClientId,
+	//}
+	//resp, err := g.Client().PostForm(gctx.New(), p.TokenUrl, post)
+	//if err != nil {
+	//	return "", err
+	//}
+	//resp.Close()
+	//bodyBytes := resp.ReadAll()
+	if err != nil {
+		return "", err
+	}
+	var atResponse AtResponse
+	json.Unmarshal(bodyBytes, &atResponse)
+	if atResponse.AccessToken != "" {
+		return atResponse.AccessToken, nil
+	} else {
+		return "", errors.New("Get token fail, " + string(bodyBytes))
+	}
+}
+
+func (p *Pay) BuildAuthorization() (string, error) {
+	appAt, err := p.GetAppAt()
+	if err != nil {
+		return "", err
+	}
+	oriString := fmt.Sprintf("APPAT:%s", appAt)
+	var authString = base64.StdEncoding.EncodeToString([]byte(oriString))
+	var authHeaderString = fmt.Sprintf("Basic %s", authString)
+	return authHeaderString, nil
+}

package/pay/huawei/model.go

@@ -0,0 +1,82 @@
+package huawei
+
+type CallbackType struct {
+	Version           string             `json:"version"`
+	NotifyTime        int64              `json:"notifyTime"`
+	EventType         string             `json:"eventType"`
+	ApplicationId     string             `json:"applicationId"`
+	OrderNotification *OrderNotification `json:"orderNotification"`
+	SubNotification   *SubNotification   `json:"subNotification"`
+}
+
+type OrderNotification struct {
+	Version          string `json:"version" dc:"通知版本：v2"`
+	NotificationType int    `json:"notificationType" dc:"通知事件的类型，取值如下：1：支付成功 2：退款成功"`
+	PurchaseToken    string `json:"purchaseToken" dc:"待下发商品的购买Token"`
+	ProductId        string `json:"productId" dc:"商品ID"`
+}
+
+type SubNotification struct {
+	StatusUpdateNotification *StatusUpdateNotification `json:"statusUpdateNotification" dc:"通知消息"`
+	NotificationSignature    string                    `json:"notificationSignature" dc:"对statusUpdateNotification字段的签名字符串，签名算法为signatureAlgorithm表示的签名算法。"`
+	Version                  string                    `json:"version" dc:"通知版本：v2"`
+	SignatureAlgorithm       string                    `json:"signatureAlgorithm" dc:"签名算法。"`
+}
+
+// StatusUpdateNotification 订阅状态更新通知
+type StatusUpdateNotification struct {
+	Environment                       string `json:"environment" dc:"发送通知的环境。PROD：正式环境；Sandbox：沙盒测试"`
+	NotificationType                  int    `json:"notificationType" dc:"通知事件的类型，具体定义需参考相关文档说明"`
+	SubscriptionID                    string `json:"subscriptionId" dc:"订阅ID"`
+	CancellationDate                  int64  `json:"cancellationDate" dc:"撤销订阅时间或退款时间，UTC时间戳，以毫秒为单位，仅在notificationType取值为CANCEL的场景下会传入"`
+	OrderID                           string `json:"orderId" dc:"订单ID，唯一标识一笔需要收费的收据，由华为应用内支付服务器在创建订单以及订阅型商品续费时生成。每一笔新的收据都会使用不同的orderId。通知类型为NEW_RENEWAL_PREF时不存在"`
+	LatestReceipt                     string `json:"latestReceipt" dc:"最近的一笔收据的token，仅在notificationType取值为INITIAL_BUY 、RENEWAL或INTERACTIVE_RENEWAL并且续期成功情况下传入"`
+	LatestReceiptInfo                 string `json:"latestReceiptInfo" dc:"最近的一笔收据，JSON字符串格式，包含的参数请参见InappPurchaseDetails，在notificationType取值为CANCEL时无值"`
+	LatestReceiptInfoSignature        string `json:"latestReceiptInfoSignature" dc:"对latestReceiptInfo的签名字符串，签名算法为statusUpdateNotification中的signatureAlgorithm。服务器在收到签名字符串后，需要参见对返回结果验签使用IAP公钥对latestReceiptInfo的JSON字符串进行验签。公钥获取请参见查询支付服务信息"`
+	LatestExpiredReceipt              string `json:"latestExpiredReceipt" dc:"最近的一笔过期收据的token"`
+	LatestExpiredReceiptInfo          string `json:"latestExpiredReceiptInfo" dc:"最近的一笔过期收据，JSON字符串格式，在notificationType取值为RENEWAL或INTERACTIVE_RENEWAL时有值"`
+	LatestExpiredReceiptInfoSignature string `json:"latestExpiredReceiptInfoSignature" dc:"对latestExpiredReceiptInfo的签名字符串，签名算法为statusUpdateNotification中的signatureAlgorithm。服务器在收到签名字符串后，需要参见对返回结果验签使用IAP公钥对latestExpiredReceiptInfo的JSON字符串进行验签。公钥获取请参见查询支付服务信息"`
+	AutoRenewStatus                   int    `json:"autoRenewStatus" dc:"续期状态。取值说明：1：当前周期到期后正常续期；0：用户已终止续期"`
+	RefundPayOrderId                  string `json:"refundPayOrderId" dc:"退款交易号，在notificationType取值为CANCEL时有值"`
+	ProductID                         string `json:"productId" dc:"订阅型商品ID"`
+	ApplicationID                     string `json:"applicationId" dc:"应用ID"`
+	ExpirationIntent                  int    `json:"expirationIntent" dc:"超期原因，仅在notificationType为RENEWAL或INTERACTIVE_RENEWAL时并且续期失败情况下有值"`
+	PurchaseToken                     string `json:"purchaseToken" dc:"订阅token，与上述订阅ID字段subscriptionId对应。"`
+}
+
+type AtResponse struct {
+	AccessToken string `json:"access_token"`
+}
+
+type VerifyTokenRes struct {
+	ResponseCode       string `json:"responseCode"`
+	PurchaseTokenData  string `json:"purchaseTokenData"`
+	DataSignature      string `json:"dataSignature"`
+	SignatureAlgorithm string `json:"signatureAlgorithm"`
+}
+
+type PurchaseTokenData struct {
+	AutoRenewing        bool   `json:"autoRenewing" dc:"表示订阅是否自动续费"`
+	OrderId             string `json:"orderId" dc:"订单ID，唯一标识一笔订单"`
+	PackageName         string `json:"packageName" dc:"应用的包名"`
+	ApplicationId       int    `json:"applicationId" dc:"应用ID，以整数形式表示"`
+	ApplicationIdString string `json:"applicationIdString" dc:"应用ID的字符串形式"`
+	Kind                int    `json:"kind" dc:"购买类型的某种标识，具体含义可能取决于业务逻辑"`
+	ProductId           string `json:"productId" dc:"商品ID，用于标识购买的商品"`
+	ProductName         string `json:"productName" dc:"商品名称"`
+	PurchaseTime        int64  `json:"purchaseTime" dc:"购买时间，可能是某种特定格式的时间表示"`
+	PurchaseTimeMillis  int64  `json:"purchaseTimeMillis" dc:"购买时间，以毫秒为单位的时间戳"`
+	PurchaseState       int    `json:"purchaseState" dc:"购买状态，不同的整数值代表不同的状态，具体含义取决于业务逻辑"`
+	DeveloperPayload    string `json:"developerPayload" dc:"开发者自定义负载数据"`
+	PurchaseToken       string `json:"purchaseToken" dc:"购买令牌"`
+	ResponseCode        string `json:"responseCode" dc:"响应代码，用于表示购买操作的响应结果"`
+	ConsumptionState    int    `json:"consumptionState" dc:"消费状态，不同的整数值代表不同的消费状态，具体含义取决于业务逻辑"`
+	Confirmed           int    `json:"confirmed" dc:"确认状态，不同的整数值代表不同的确认情况，具体含义取决于业务逻辑"`
+	PurchaseType        int    `json:"purchaseType" dc:"购买类型，不同的整数值代表不同的购买类型，具体含义取决于业务逻辑"`
+	Currency            string `json:"currency" dc:"货币类型"`
+	Price               int    `json:"price" dc:"商品价格"`
+	Country             string `json:"country" dc:"购买所在国家"`
+	PayOrderId          string `json:"payOrderId" dc:"支付订单ID"`
+	PayType             string `json:"payType" dc:"支付类型"`
+	SdkChannel          string `json:"sdkChannel" dc:"SDK渠道"`
+}

package/pay/huawei/notification.go

@@ -0,0 +1,107 @@
+package huawei
+
+/*
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+//import "encoding/json"
+
+const (
+	INITIAL_BUY            = 0
+	CANCEL                 = 1
+	RENEWAL                = 2
+	INTERACTIVE_RENEWAL    = 3
+	NEW_RENEWAL_PREF       = 4
+	RENEWAL_STOPPED        = 5
+	RENEWAL_RESTORED       = 6
+	RENEWAL_RECURRING      = 7
+	ON_HOLD                = 9
+	PAUSED                 = 10
+	PAUSE_PLAN_CHANGED     = 11
+	PRICE_CHANGE_CONFIRMED = 12
+	DEFERRED               = 13
+)
+
+//type NotificationServer struct {
+//}
+//
+//var NotificationDemo = &NotificationServer{}
+
+//type NotificationRequest struct {
+//	StatusUpdateNotification string `json:"statusUpdateNotification"`
+//	NotificationSignature    string `json:"notifycationSignature"`
+//}
+
+//
+//type NotificationResponse struct {
+//	ErrorCode string `json:"errorCode"`
+//	ErrorMsg  string `json:"errorMsg"`
+//}
+
+//type StatusUpdateNotification struct {
+//	Environment                       string `json:"environment"`
+//	NotificationType                  int    `json:"notificationType"`
+//	SubscriptionID                    string `json:"subscriptionId"`
+//	CancellationDate                  int64  `json:"cancellationDate"`
+//	OrderID                           string `json:"orderId"`
+//	LatestReceipt                     string `json:"latestReceipt"`
+//	LatestReceiptInfo                 string `json:"latestReceiptInfo"`
+//	LatestReceiptInfoSignature        string `json:"latestReceiptInfoSignature"`
+//	LatestExpiredReceipt              string `json:"latestExpiredReceipt"`
+//	LatestExpiredReceiptInfo          string `json:"latestExpiredReceiptInfo"`
+//	LatestExpiredReceiptInfoSignature string `json:"latestExpiredReceiptInfoSignature"`
+//	AutoRenewStatus                   int    `json:"autoRenewStatus"`
+//	RefundPayOrderId                  string `json:"refundPayOrderId"`
+//	ProductID                         string `json:"productId"`
+//	ApplicationID                     string `json:"applicationId"`
+//	ExpirationIntent                  int    `json:"expirationIntent"`
+//}
+
+func (p *Pay) DealNotification(information string) (err error) {
+	//var request PayCallback
+	//err = json.Unmarshal([]byte(information), &request)
+	//if err != nil {
+	//	return
+	//}
+	//err = p.VerifyRsaSign(request.StatusUpdateNotification, request.NotificationSignature, DefaultConfig.ApplicationPublicKey)
+	//if err != nil {
+	//	return
+	//}
+	//
+	//var info = request.StatusUpdateNotification
+	////json.Unmarshal([]byte(request.StatusUpdateNotification), &info)
+	//switch notificationType := info.NotificationType; notificationType {
+	//case INITIAL_BUY:
+	//case CANCEL:
+	//case RENEWAL:
+	//case INTERACTIVE_RENEWAL:
+	//case NEW_RENEWAL_PREF:
+	//case RENEWAL_STOPPED:
+	//case RENEWAL_RESTORED:
+	//case RENEWAL_RECURRING:
+	//case ON_HOLD:
+	//case PAUSED:
+	//case PAUSE_PLAN_CHANGED:
+	//case PRICE_CHANGE_CONFIRMED:
+	//case DEFERRED:
+	//default:
+	//}
+	//
+	////response := NotificationResponse{ErrorCode: "0"}
+	////return &response, nil
+	//return
+	return
+}

package/pay/oppo/const.go

@@ -0,0 +1,9 @@
+package oppo
+
+const (
+	LoginUrl = "https://iopen.game.oppomobile.com/sdkopen/user/fileIdInfo?fileId=%s&token=%s"
+	LocationShanghai          = "Asia/Shanghai"
+
+	RSA                       = "RSA"
+	RSA2                      = "RSA2"
+)

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

@@ -0,0 +1,32 @@
+package oppo
+
+import (
+	"net/http"
+	"net/url"
+)
+
+func (p *OppoType) ParseNotifyToBodyMap(req *http.Request) (bm map[string]interface{}, err error) {
+	if err = req.ParseForm(); err != nil {
+		return nil, err
+	}
+	var form map[string][]string = req.Form
+	bm = make(map[string]interface{}, len(form)+1)
+	for k, v := range form {
+		if len(v) == 1 {
+			bm[k] = v[0]
+			//bm.Set(k, v[0])
+		}
+	}
+	return
+}
+
+func (p *OppoType) ParseNotifyByURLValues(value url.Values) (bm map[string]interface{}, err error) {
+	bm = make(map[string]interface{}, len(value)+1)
+	for k, v := range value {
+		if len(v) == 1 {
+			bm[k] = v[0]
+			//bm.Set(k, v[0])
+		}
+	}
+	return
+}

package/pay/oppo/oppo.go

@@ -0,0 +1,40 @@
+package oppo
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// 跟充值平台通信的加密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 := p.ParseNotifyToBodyMap(g.RequestFromCtx(ctx).Request)
+	if err != nil {
+		// 解析失败, 处理错误逻辑
+		return
+	}
+
+	err = p.VerifySign(oppoPublicKey, bodyMap)
+	return
+}

package/pay/oppo/sign.go

@@ -0,0 +1,80 @@
+package oppo
+
+import (
+	"crypto"
+	"crypto/hmac"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"github.com/ayflying/utility_go/package/pay/common"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hash"
+	"math/rand"
+	"net/url"
+	"time"
+)
+
+func (p *OppoType) GenLoginBaseStr(bm map[string]interface{}, appKey, appSecret string) (string, string) {
+	baseStr := fmt.Sprintf("oauthConsumerKey=%s&oauthToken=%s&oauthSignatureMethod=HMAC-SHA1&oauthTimestamp=%d&oauthNonce=%d&oauthVersion=1.0&",
+		appKey, url.QueryEscape(gconv.String(bm["token"])), time.Now().Unix(), rand.Int31n(100000000))
+
+	var h hash.Hash
+	h = hmac.New(sha1.New, []byte(appSecret+"&"))
+	h.Write([]byte(baseStr))
+
+	sign := url.QueryEscape(base64.StdEncoding.EncodeToString(h.Sum(nil)))
+	return baseStr, sign
+}
+
+func (p *OppoType) VerifySign(oppoPayPublicKey string, bm map[string]interface{}) (err error) {
+	if oppoPayPublicKey == "" || bm == nil {
+		return errors.New("oppoPayPublicKey or bm is nil")
+	}
+
+	bodySign := bm["sign"].(string)
+	bodySignType := RSA
+	signData := fmt.Sprintf("notifyId=%s&partnerOrder=%s&productName=%s&productDesc=%s&price=%s&count=%s&attach=%s",
+		bm["notifyId"], bm["partnerOrder"], bm["productName"],
+		bm["productDesc"], bm["price"], bm["count"], bm["attach"])
+	pKey := common.FormatPublicKey(oppoPayPublicKey)
+	if err = p.verifySign(signData, bodySign, bodySignType, pKey); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (p *OppoType) verifySign(signData, sign, signType, oppoPayPublicKey string) (err error) {
+	var (
+		h         hash.Hash
+		hashs     crypto.Hash
+		block     *pem.Block
+		pubKey    interface{}
+		publicKey *rsa.PublicKey
+		ok        bool
+	)
+	signBytes, _ := base64.StdEncoding.DecodeString(sign)
+	if block, _ = pem.Decode([]byte(oppoPayPublicKey)); block == nil {
+		return errors.New("OPPO公钥Decode错误")
+	}
+	if pubKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
+		return fmt.Errorf("x509.ParsePKIXPublicKey：%w", err)
+	}
+	if publicKey, ok = pubKey.(*rsa.PublicKey); !ok {
+		return errors.New("OPPO公钥转换错误")
+	}
+	switch signType {
+	case RSA:
+		hashs = crypto.SHA1
+	case RSA2:
+		hashs = crypto.SHA256
+	default:
+		hashs = crypto.SHA256
+	}
+	h = hashs.New()
+	h.Write([]byte(signData))
+	return rsa.VerifyPKCS1v15(publicKey, hashs, h.Sum(nil), signBytes)
+}

package/pay/taptap/sign.go

@@ -0,0 +1,103 @@
+package taptap
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"net/http"
+	"sort"
+	"strings"
+)
+
+type pTapTap struct {
+	Secret string `json:"secret" dc:"秘钥"`
+	//OrderId  string `json:"order_id" dc:"订单唯一 ID"`
+	ClientId string `json:"client_id" dc:"应用的 Client ID"`
+}
+
+func New(clientId string, secret string) *pTapTap {
+	return &pTapTap{
+		Secret:   secret,
+		ClientId: clientId,
+		//OrderId:  orderId,
+	}
+}
+
+// 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
+	urlPathAndQueryPart := req.URL.RequestURI()
+	headersPart, err := getHeadersPart(req.Header)
+	if err != nil {
+		return "", err
+	}
+	bodyPart, err := io.ReadAll(req.Body)
+	if err != nil {
+		return "", err
+	}
+	signParts := methodPart + "\n" + urlPathAndQueryPart + "\n" + headersPart + "\n" + string(bodyPart) + "\n"
+	fmt.Println(signParts)
+	h := hmac.New(sha256.New, []byte(secret))
+	h.Write([]byte(signParts))
+	rawSign := h.Sum(nil)
+	sign := base64.StdEncoding.EncodeToString(rawSign)
+	return sign, nil
+}
+
+// getHeadersPart returns the headers part of the request.
+func getHeadersPart(header http.Header) (string, error) {
+	var headerKeys []string
+	for k, v := range header {
+		k = strings.ToLower(k)
+		if !strings.HasPrefix(k, "x-tap-") {
+			continue
+		}
+		if k == "x-tap-sign" {
+			continue
+		}
+		if len(v) > 1 {
+			return "", fmt.Errorf("invalid header, %q has multiple values", k)
+		}
+		headerKeys = append(headerKeys, k)
+	}
+	sort.Strings(headerKeys)
+	headers := make([]string, 0, len(headerKeys))
+	for _, k := range headerKeys {
+		headers = append(headers, fmt.Sprintf("%s:%s", k, header.Get(k)))
+	}
+	return strings.Join(headers, "\n"), nil
+}

package/pay/taptap/taptap.go

@@ -0,0 +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"
+	"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"`
+}
+
+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
+
+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) 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
+
+	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 {
+		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
+	}
+	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/vivo/client.go

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

package/pay/vivo/const.go

@@ -0,0 +1,9 @@
+package vivo
+
+const (
+	AuthTokenUrl = "https://joint-account.vivo.com.cn/cp/user/auth"
+	LocationShanghai          = "Asia/Shanghai"
+
+	RSA                       = "RSA"
+	RSA2                      = "RSA2"
+)

package/pay/vivo/model.go

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

package/pay/vivo/payment_api.go

@@ -0,0 +1,3 @@
+package vivo
+
+

package/pay/vivo/sign.go

@@ -0,0 +1,51 @@
+package vivo
+
+import (
+	"context"
+	"errors"
+	"github.com/ayflying/utility_go/package/pay/common"
+	"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(ctx context.Context, key string) bool {
+	bm, _ := common.ParseNotifyToBodyMap(g.RequestFromCtx(ctx).Request)
+	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
+}

package/pay/vivo/sign_test.go

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

package/pay/vivo/user_api.go

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

package/pay/vivo/user_api_test.go

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

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/aycache/cache.go

@@ -1,6 +1,9 @@
 package aycache
 
 import (
+	"context"
+	"math"
+
 	v1 "github.com/ayflying/utility_go/api/system/v1"
 	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/ayflying/utility_go/pkg/aycache/drive"
@@ -9,7 +12,6 @@ import (
 	"github.com/gogf/gf/v2/os/gcache"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"math"
 )
 
 // Mod 定义缓存模块结构体，包含一个 gcache.Cache 客户端实例
@@ -19,6 +21,7 @@ type Mod struct {
 
 // QPSCount 记录缓存的 QPS 计数
 var QPSCount int
+
 // QPS 是一个 Prometheus 指标，用于记录当前缓存的 QPS 数量
 var QPS = promauto.NewGauge(
 	prometheus.GaugeOpts{
@@ -31,7 +34,7 @@ var QPS = promauto.NewGauge(
 func init() {
 	boot.AddFunc(func() {
 		// 初始化指标，每分钟计算一次平均 QPS 并重置计数器
-		service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
+		service.SystemCron().AddCronV2(v1.CronType_MINUTE, func(context.Context) error {
 			QPS.Set(math.Round(float64(QPSCount) / 60))
 			QPSCount = 0
 			return nil
@@ -53,8 +56,13 @@ func New(_name ...string) gcache.Adapter {
 		// 创建内存缓存适配器
 		cacheAdapterObj = drive2.NewAdapterMemory()
 	case "redis":
+		//第二个参数为配置名称，默认为default
+		var typ = "default"
+		if len(_name) >= 2 {
+			typ = _name[1]
+		}
 		// 创建 Redis 缓存适配器
-		cacheAdapterObj = drive2.NewAdapterRedis()
+		cacheAdapterObj = drive2.NewAdapterRedis(typ)
 	case "file":
 		// 创建文件缓存适配器，指定缓存目录为 "runtime/cache"
 		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")

pkg/aycache/drive/file.go

@@ -3,121 +3,270 @@ package drive
 import (
 	"context"
 	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/crypto/gmd5"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/gconv"
 	"path"
+	"strconv"
 	"strings"
+	"sync"
 	"time"
 )
 
+var (
+	fileIndex = "index.txt"
+)
+
+type FileIndex struct {
+	File     string        `json:"file"`
+	Duration time.Duration `json:"duration"`
+}
+type FileData struct {
+	Data interface{} `json:"data"`
+	Time int64       `json:"time"`
+}
+
 type AdapterFile struct {
 	FilePath string
+	Lock     sync.Mutex
 }
 
-func (a AdapterFile) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
+func (a *AdapterFile) Key2Name(key interface{}) string {
-	arr := strings.Split(":", gconv.String(key))
+	md5Str, _ := gmd5.Encrypt(key)
-	fileName := path.Join(arr...)
+	fileName := path.Join(md5Str[0:2], md5Str[2:4], md5Str[4:6], md5Str[16:])
-	return gfile.PutBytes(fileName, gconv.Bytes(value))
+	fileNameAll := path.Join(a.FilePath, fileName)
+
+	return fileNameAll
 }
 
-func (a AdapterFile) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {
+func (a *AdapterFile) AddIndex(FileName interface{}, duration time.Duration) {
+	var isEdit bool
+
+	var setTime int64
+	if duration == 0 {
+		setTime = 0
+	} else {
+		setTime = gtime.Now().Add(duration).Unix()
+	}
+	saveArr := []string{
+		gconv.String(FileName),
+		strconv.FormatInt(setTime, 10),
+	}
+	saveStr := strings.Join(saveArr, "|")
+
+	gfile.ReadLines(fileIndex, func(text string) (err error) {
+		arr := strings.Split(text, "|")
+		if arr[0] == FileName {
+			isEdit = true
+			gfile.ReplaceFile(text, saveStr, fileIndex)
+			return
+		}
+		return
+	})
+
+	if isEdit {
+		return
+	}
+
+	gfile.PutContentsAppend(fileIndex, saveStr+"\n")
+}
+
+func (a *AdapterFile) DelIndex(FileName interface{}) {
+	//var save bool
+	gfile.ReadLines(fileIndex, func(text string) (err error) {
+		arr := strings.Split(text, "|")
+		if arr[0] == FileName {
+			//save = true
+			err = gfile.ReplaceFile(text+"\n", "", fileIndex)
+			return
+		}
+
+		return
+	})
+
+}
+
+func (a *AdapterFile) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (err error) {
+	fileNameAll := a.Key2Name(key)
+	var send = &FileData{
+		Data: value,
+		Time: gtime.Now().Add(duration).Unix(),
+	}
+	err = gfile.PutBytes(fileNameAll, gjson.MustEncode(send))
+
+	if err != nil {
+		return
+	}
+	a.AddIndex(key, duration)
+	return
+}
+
+func (a *AdapterFile) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) (err error) {
+	for k, v := range data {
+		//fileNameAll := a.Key2Name(k)
+		//var send = &FileData{
+		//	Data: v,
+		//	Time: gtime.Now().Add(duration).Unix(),
+		//}
+		//
+		//err = gfile.PutBytes(fileNameAll, gconv.Bytes(send))
+		a.Set(ctx, k, v, duration)
+	}
+	return
+}
+
+func (a *AdapterFile) SetIfNotExist(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (ok bool, err error) {
+	err = a.Set(ctx, key, value, duration)
+	return
+}
+
+func (a *AdapterFile) SetIfNotExistFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (a AdapterFile) SetIfNotExist(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (ok bool, err error) {
+func (a *AdapterFile) SetIfNotExistFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (a AdapterFile) SetIfNotExistFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
+func (a *AdapterFile) Get(ctx context.Context, key interface{}) (res *gvar.Var, err error) {
+	var data *FileData
+	name := a.Key2Name(key)
+	if !gfile.IsFile(name) {
+		return
+	}
+	file := gfile.GetBytes(name)
+	gjson.DecodeTo(file, &data)
+	if data.Time < time.Now().Unix() {
+		a.Remove(ctx, key)
+		return
+	}
+	res = gvar.New(data.Data)
+	return
+}
+
+func (a *AdapterFile) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
+	a.Set(ctx, key, value, duration)
+	result, err = a.Get(ctx, key)
+	return
+}
+
+func (a *AdapterFile) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+	value := f
+	a.Set(ctx, key, value, duration)
+	result, err = a.Get(ctx, key)
+	return
+}
+
+func (a *AdapterFile) GetOrSetFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+	a.Lock.Lock()
+	defer a.Lock.Unlock()
+	result, err = a.GetOrSetFunc(ctx, key, f, duration)
+	return
+}
+
+func (a *AdapterFile) Contains(ctx context.Context, key interface{}) (bool, error) {
+	return gfile.IsFile(a.FilePath), nil
+}
+
+func (a *AdapterFile) Size(ctx context.Context) (size int, err error) {
+	size = int(gfile.Size(a.FilePath))
+	return
+}
+
+func (a *AdapterFile) Data(ctx context.Context) (data map[interface{}]interface{}, err error) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (a AdapterFile) SetIfNotExistFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
+func (a *AdapterFile) Keys(ctx context.Context) (keys []interface{}, err error) {
+	keys = make([]interface{}, 0)
+	gfile.ReadLines(fileIndex, func(text string) (err error) {
+		arr := strings.Split(text, "|")
+		keys = append(keys, arr[0])
+		return
+	})
+	return
+}
+
+func (a *AdapterFile) Values(ctx context.Context) (values []interface{}, err error) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (a AdapterFile) Get(ctx context.Context, key interface{}) (*gvar.Var, error) {
+func (a *AdapterFile) Update(ctx context.Context, key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
+	fileNameAll := a.Key2Name(key)
+	getFile := gfile.GetBytes(fileNameAll)
+	var data *FileData
+	gconv.Scan(getFile, &data)
+	oldValue.Set(data.Data)
+
+	var send = &FileData{
+		Data: value,
+		Time: data.Time,
+	}
+
+	err = gfile.PutBytes(fileNameAll, gconv.Bytes(send))
+	if err != nil {
+		return
+	}
+	a.AddIndex(key, time.Duration(data.Time-gtime.Now().Unix()))
+	return
+}
+
+func (a *AdapterFile) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (a AdapterFile) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
+func (a *AdapterFile) GetExpire(ctx context.Context, key interface{}) (time.Duration, error) {
 	//TODO implement me
 	panic("implement me")
 }
 
-func (a AdapterFile) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+func (a *AdapterFile) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
-	//TODO implement me
+	for _, v := range keys {
-	panic("implement me")
+		fileNameAll := a.Key2Name(v)
+		lastValue, err = a.Get(ctx, fileNameAll)
+		err = gfile.RemoveFile(fileNameAll)
+		//删除索引文件
+		a.DelIndex(v)
+	}
+	return nil, nil
 }
 
-func (a AdapterFile) GetOrSetFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+func (a *AdapterFile) Clear(ctx context.Context) error {
-	//TODO implement me
+	return gfile.RemoveAll(a.FilePath)
-	panic("implement me")
 }
 
-func (a AdapterFile) Contains(ctx context.Context, key interface{}) (bool, error) {
+func (a *AdapterFile) Close(ctx context.Context) error {
-	//TODO implement me
+	return nil
-	panic("implement me")
-}
-
-func (a AdapterFile) Size(ctx context.Context) (size int, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Data(ctx context.Context) (data map[interface{}]interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Keys(ctx context.Context) (keys []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Values(ctx context.Context) (values []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Update(ctx context.Context, key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetExpire(ctx context.Context, key interface{}) (time.Duration, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Clear(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Close(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
 }
 
 func NewAdapterFile(filePath string) gcache.Adapter {
-	return &AdapterFile{
+	fileIndex = path.Join(filePath, fileIndex)
+
+	//清空过期文件目录
+	delKeys := make([]interface{}, 0)
+	gfile.ReadLines(fileIndex, func(text string) error {
+		arr := strings.Split(text, "|")
+		if gtime.Now().Unix() > gconv.Int64(arr[1]) {
+			delKeys = append(delKeys, arr[0])
+		}
+		return nil
+	})
+
+	obj := &AdapterFile{
 		FilePath: filePath,
 	}
+	if len(delKeys) > 0 {
+		obj.Remove(gctx.New(), delKeys...)
+	}
+
+	return obj
 }

pkg/aycache/drive/redis.go

@@ -7,19 +7,22 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 )
 
-var adapterRedisClient gcache.Adapter
+var adapterRedisClient = make(map[string]gcache.Adapter)
-var adapterRedisCache = gcache.New()
+var adapterRedisCache = make(map[string]*gcache.Cache)
 
-func NewAdapterRedis() gcache.Adapter {
+func NewAdapterRedis(name string) gcache.Adapter {
-
+	if adapterRedisClient[name] == nil {
-	if adapterRedisClient == nil {
+		_cfg, err := g.Cfg().Get(gctx.New(), "redis."+name)
-		_cfg, _ := g.Cfg().Get(gctx.New(), "redis.default")
+		if err != nil {
+			panic("当前redis配置不存在")
+		}
 		var cfg *gredis.Config
 		_cfg.Scan(&cfg)
 		redisObj, _ := gredis.New(cfg)
-		//adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default"))
+		//adapterRedisClient[name] = gcache.NewAdapterRedis(g.Redis(name))
-		adapterRedisClient = gcache.NewAdapterRedis(redisObj)
+		adapterRedisClient[name] = gcache.NewAdapterRedis(redisObj)
-		adapterRedisCache.SetAdapter(adapterRedisClient)
+		adapterRedisCache[name] = gcache.New()
+		adapterRedisCache[name].SetAdapter(adapterRedisClient[name])
 	}
-	return adapterRedisCache
+	return adapterRedisCache[name]
 }

pkg/config/config.go

@@ -9,6 +9,7 @@ import (
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gres"
 	"github.com/gogf/gf/v2/text/gstr"
@@ -86,6 +87,22 @@ func (c *Cfg) GetFile(filename string, _pathStr ...string) (jsonObj *gjson.Json,
 		bytes = gres.GetContent(filePath) // 从打包资源中获取内容
 	}
 
+	for range 5 {
+		//如果还是没有读取到配置，从当前目录返回上级读取
+		if bytes == nil {
+			// 上级拼接完整的文件路径
+			filePath = "../" + filePath
+			if gfile.IsFile(filePath) {
+				bytes = gfile.GetBytes(filePath) // 读取物理文件内容
+				//找到配置了，跳过
+				break
+			}
+		}
+	}
+	if bytes == nil {
+		g.Log().Errorf(gctx.New(), "未读取到配置文件：%v", filePath)
+	}
+
 	// 解析 JSON 内容并返回结果
 	jsonObj, err = gjson.DecodeToJson(bytes)
 	return

pkg/elasticsearch/elasticsearch.go

@@ -3,7 +3,9 @@ package elasticsearch
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
+
 	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/core/bulk"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/core/delete"
@@ -12,6 +14,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 +26,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 +62,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 +71,43 @@ 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
+	var save bulk.Request
-	save = &bulk.Request{
+	save = make(bulk.Request, 0)
-		data,
+	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)
+	}
+	//save = data
+	response, err2 := s.client.Bulk().Index(s.name).Request(&save).Do(ctx)
+	if err2 != nil {
+		err = err2
+		return
+	}
+	//需要接收返回信息，判断是否全部执行成功
+	if response.Errors { //未全部完成
+		//是否需要删除已成功导入的部分数据
+		for _, item := range response.Items {
+			for _, v := range item {
+				if v.Error != nil { //失败
+					g.Log().Errorf(ctx, "导入数据出错 err: %v", *v.Error.Reason)
+
+				} else {
+					//删除已导入成功的数据
+					_, err = s.Delete(ctx, *v.Id_)
+					if err != nil {
+						g.Log().Errorf(ctx, "删除数据错误, err:%v\n", err)
+					}
+				}
+			}
+		}
+		return errors.New("部分数据导入失败")
 	}
-	s.client.Bulk().Index(s.name).Request(save).Do(ctx)
 	return
 }
 

pkg/pkg.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ayflying/utility_go/pkg/notice"
 	"github.com/ayflying/utility_go/pkg/rank"
 	"github.com/ayflying/utility_go/pkg/s3"
-	"github.com/ayflying/utility_go/pkg/websocket"
+	//"github.com/ayflying/utility_go/pkg/websocket"
 	"github.com/gogf/gf/v2/os/gcache"
 )
 
@@ -32,9 +32,9 @@ func Rank() *rank.Mod {
 	return rank.New()
 }
 
-func Websocket() *websocket.SocketV1 {
+//func Websocket() *websocket.SocketV1 {
-	return websocket.NewV1()
+//	return websocket.NewV1()
-}
+//}
 
 func Config() *config.Cfg {
 	return config.NewV1()

pkg/s3/s3.go

@@ -31,6 +31,7 @@ type DataType struct {
 	Url           string `json:"url"`             // S3 服务的访问 URL
 	BucketName    string `json:"bucket_name"`     // 默认存储桶名称
 	BucketNameCdn string `json:"bucket_name_cdn"` // CDN 存储桶名称
+	//Provider      string `json:"provider"`        // S3 服务的提供方
 }
 
 // Mod 定义了 S3 模块的结构体，包含一个 S3 客户端实例和配置信息
@@ -64,6 +65,7 @@ func New(_name ...string) *Mod {
 		&minio.Options{
 			Creds:  credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
 			Secure: cfg.Ssl,
+			//BucketLookup: minio.BucketLookupPath,
 		},
 	)
 	if err != nil {
@@ -133,11 +135,13 @@ 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 {
+	//if len(_size) > 0 {
-		size = _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"})
+	res, err = s.client.PutObject(ctx, bucketName, name, f, size, minio.PutObjectOptions{
+		//ContentType: "application/octet-stream",
+	})
 	if err != nil {
 		// 记录上传错误日志
 		g.Log().Error(ctx, err)
@@ -146,8 +150,22 @@ 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,
+		//GovernanceBypass: true,
+		//VersionID:        "myversionid",
+	}
+	// 调用 S3 客户端删除文件
+	err = s.client.RemoveObject(ctx, bucketName, name, opts)
+	return
+}
+
+// RemoveObjectV2 从指定存储桶中删除指定名称的文件
+func (s *Mod) RemoveObjectV2(bucketName string, name string) (err error) {
+	opts := minio.RemoveObjectOptions{
+		ForceDelete: true,
 		//GovernanceBypass: true,
 		//VersionID:        "myversionid",
 	}
@@ -166,6 +184,12 @@ func (s *Mod) ListObjects(bucketName string, prefix string) (res <-chan minio.Ob
 	return
 }
 
+// StatObject 获取指定存储桶中指定文件的元数据信息
+func (s *Mod) StatObject(bucketName string, objectName string) (res minio.ObjectInfo, err error) {
+	res, err = s.client.StatObject(ctx, bucketName, objectName, minio.StatObjectOptions{})
+	return
+}
+
 // SetBucketPolicy 设置指定存储桶或对象前缀的访问策略
 // 目前使用固定的策略，可根据需求修改
 func (s *Mod) SetBucketPolicy(bucketName string, prefix string) (err error) {
@@ -187,9 +211,15 @@ func (s *Mod) GetUrl(filePath string, defaultFile ...string) (url string) {
 		filePath = defaultFile[0]
 	}
 
-	if s.cfg.Ssl {
+	//switch s.cfg.Provider {
+	//case "qiniu":
+	//	url = get + path.Join(bucketName, filePath)
+	//default:
+	//	url = get + filePath
+	//}
 	url = get + filePath
-	} else {
+
+	if !s.cfg.Ssl {
 		url = get + path.Join(bucketName, filePath)
 	}
 
@@ -205,21 +235,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
+}

service/game_act.go

@@ -8,6 +8,7 @@ package service
 import (
 	"context"
 
+	"github.com/ayflying/utility_go/internal/model/entity"
 	"github.com/gogf/gf/v2/frame/g"
 )
 
@@ -31,8 +32,48 @@ type (
 		// @param data interface{}: 要存储的活动信息数据。
 		// @return err error: 返回错误信息，如果操作成功，则返回nil。
 		Set(uid int64, actId int, data interface{}) (err error)
-		Saves(ctx context.Context) (err error)
+		// Saves 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @return err error: 返回错误信息
+		// Deprecated: 该方法已被弃用，建议使用SavesV2方法
+		Saves() (err error)
+		// Save 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @param ctx context.Context: 上下文对象
+		// @param actId int: 活动ID
+		// @return err error: 返回错误信息
+		// deprecated: 该方法已被弃用，建议使用SaveV2方法
 		Save(ctx context.Context, actId int) (err error)
+		// SavesV2 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @return err error: 返回错误信息
+		SavesV2() (err error)
+		// SaveV2 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @param ctx context.Context: 上下文对象
+		// @param cacheKey string: 缓存键
+		// @param add []*entity.GameAct: 添加数据
+		// @param update []*entity.GameAct: 更新数据
+		// @return err error: 返回错误信息
+		SaveV2(ctx context.Context, cacheKey string) (err error)
+		// Cache2Sql 缓存持久化到数据库
+		// @Description: 缓存持久化到数据库
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @param ctx context.Context: 上下文对象
+		// @param add []*entity.GameAct: 添加数据
+		// @param update []*entity.GameAct: 更新数据
+		// @return err error: 返回错误信息
+		Cache2Sql(ctx context.Context, add []*entity.GameAct, update []*entity.GameAct)
+		// 删除缓存key
+		DelCacheKey(ctx context.Context, aid int, uid int64)
 		// 清空GetRedDot缓存
 		RefreshGetRedDotCache(uid int64)
 		Del(uid int64, actId int)

service/game_kv.go

@@ -5,6 +5,10 @@
 
 package service
 
+import (
+	"context"
+)
+
 type (
 	IGameKv interface {
 		// SavesV1 方法
@@ -13,6 +17,8 @@ type (
 		// @receiver s: sGameKv的实例。
 		// @return err: 错误信息，如果操作成功，则为nil。
 		SavesV1() (err error)
+		// 删除缓存key
+		DelCacheKey(ctx context.Context, uid int64)
 	}
 )
 

service/ip_2_region.go

@@ -7,9 +7,6 @@ package service
 
 type (
 	IIp2Region interface {
-		// Load 加载到内存中
-		//
-		//	@Description: 加载ip2region数据库到内存中。
 		//	@receiver s *sIp2region: sIp2region的实例。
 		Load()
 		GetIp(ip string) (res []string)

service/system_cron.go

@@ -38,7 +38,8 @@ type (
 		// @receiver s: sSystemCron的实例，代表一个调度系统。
 		// @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
 		// @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
-		AddCronV2(typ v1.CronType, _func func(context.Context) error)
+		// @param _onlyMain: 是否只在主服务器上执行一次,true 唯一执行，false 全局执行不判断唯一
+		AddCronV2(typ v1.CronType, _func func(context.Context) error, _onlyMain ...bool)
 		// StartCron 开始计划任务执行
 		//
 		//	@Description:

tools/redis.go

@@ -48,7 +48,6 @@ func (r *redis) RedisScan(cacheKey string, _key ...string) (keys []string, err e
 
 // redis 批量获取大量数据
 func (r *redis) RedisScanV2(cacheKey string, _func func([]string) error, _key ...string) error {
-
 	//var keys []string
 	var err error
 
@@ -67,9 +66,11 @@ func (r *redis) RedisScanV2(cacheKey string, _func func([]string) error, _key ..
 			g.Log().Errorf(ctx, "Scan failed: %v", err)
 			break
 		}
-
 		if len(newKeys) > 0 {
 			err = _func(newKeys)
+			if err != nil {
+				return err
+			}
 		}
 
 		//这个要放在最后

utility.go

@@ -1,11 +1,15 @@
 package utility_go
 
 import (
+	"context"
+	"time"
+
 	"github.com/ayflying/utility_go/config"
 	"github.com/ayflying/utility_go/internal/boot"
 	_ "github.com/ayflying/utility_go/internal/logic"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtimer"
 )
 
 var (
@@ -14,9 +18,12 @@ var (
 )
 
 func init() {
+	var err error
 	g.Log().Debug(ctx, "utility_go init启动完成")
 	// 初始化配置
-	var err = boot.Boot()
+	gtimer.SetTimeout(ctx, time.Second*5, func(ctx context.Context) {
+		err = boot.Boot()
+	})
 
 	if err != nil {
 		panic(err)