进行主机查找配置文件，最高5级目录

更新路径拼接
2025-05-14 16:22:07 +08:00 · 2025-05-14 16:17:00 +08:00 · 2025-05-14 16:13:49 +08:00 · 2025-05-07 12:17:52 +08:00 · 2025-04-30 10:48:42 +08:00 · 2025-04-30 10:27:07 +08:00
17 changed files with 527 additions and 554 deletions
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -119,8 +119,6 @@ var (
 						return
 					}
 				}
-				continue
-
 				g.Log().Debugf(ctx, "准备同步服务器:%v,url=%v", v.Name, address+"/callback/update")
 				get, err := client.Post(ctx, address+"/callback/update", &UpdateReq{
 					FileUrl: url[v.S3],
--- a/config/config.go
+++ b/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").
-		Where("name", name).Master().Value("data")
-	err = get2.Scan(&res)
-	if res == nil {
-		res = &gvar.Var{}
-	}
+	pkg.Config().GetDbFile(name)
 	return
 }

+// Deprecated : pkg.Config().GetFile(name, obj...)
 func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
-	pathStr := "manifest/game/"
-	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)
+	pkg.Config().GetFile(filename)
 	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)
-	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
-	bytes := getUrl.ReadAll()
-	jsonObj, err = gjson.DecodeToJson(bytes)
+	pkg.Config().GetUrlFile(name)
 	return
 }

-// 获取阿波罗
-//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
-//}
-
+// Deprecated : pkg.Config().GetApollo(name, obj)
 func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
-	Item2Obj[name+".json"] = 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)
+	pkg.Config().GetApollo(name, obj)
 	return
 }

--- a/go.mod
+++ b/go.mod
@@ -4,37 +4,33 @@ go 1.24.0

 require (
 	github.com/apolloconfig/agollo/v4 v4.4.0
-	github.com/ayflying/excel2json v1.1.3
-	github.com/elastic/go-elasticsearch/v8 v8.17.1
+	github.com/ayflying/excel2json v1.1.7
+	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/google/uuid v1.6.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/prometheus/client_golang v1.21.1
-	github.com/stretchr/testify v1.10.0
+	github.com/minio/minio-go/v7 v7.0.91
+	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/davecgh/go-spew v1.1.1 // 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
@@ -46,23 +42,24 @@ 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/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/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/magiconair/properties v1.8.9 // indirect
 	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
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml v1.9.3 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
@@ -76,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/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
+	github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79 // 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/otel/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
-	go.opentelemetry.io/otel/trace v1.32.0 // indirect
-	golang.org/x/crypto v0.33.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	golang.org/x/crypto v0.37.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sys v0.32.0 // 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
 )
--- a/go.sum
+++ b/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.3/go.mod h1:aNzB271bUAuRq+P4J+S8a3NAltcghLIGR2HdM6akqFU=
+github.com/ayflying/excel2json v1.1.7 h1:gp4Ls6hNXd1EuT2MEiDQ6yPLaSKIFWkGyaNajMTc59c=
+github.com/ayflying/excel2json v1.1.7/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.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
-github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q=
-github.com/elastic/go-elasticsearch/v8 v8.17.1/go.mod h1:MVJCtL+gJJ7x5jFeUmA20O7rvipX8GcQmo5iBcmaJn4=
+github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
+github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
+github.com/elastic/go-elasticsearch/v8 v8.18.0 h1:ANNq1h7DEiPUaALb8+5w3baQzaS08WfHV0DNzp0VG4M=
+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.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+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.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+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.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+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.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+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.85/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY=
+github.com/minio/minio-go/v7 v7.0.91 h1:tWLZnEfo3OZl5PoXQwcwTAPNNrjyWwOh6cbZitW5JQc=
+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.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 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-20240408161823-9ad904a10d6d/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79 h1:78nKszZqigiBRBVcoe/AuPzyLTWW5B+ltBaUX1rlIXA=
+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-20240318013403-ab9948c2c4a7/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
+github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba h1:DhIu6n3qU0joqG9f4IO6a/Gkerd+flXrmlJ+0yX2W8U=
+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/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
-go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
-go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
-go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
-go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
-go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
-go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+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.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+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.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+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.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+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.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+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.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+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.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+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=
--- a/internal/boot/boot.go
+++ b/internal/boot/boot.go
@@ -1,6 +1,7 @@
 package boot

 import (
+	"context"
 	v1 "github.com/ayflying/utility_go/api/system/v1"
 	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -15,15 +16,16 @@ func Boot() (err error) {
 	err = service.SystemCron().StartCron()

 	//用户活动持久化
-	service.SystemCron().AddCron(v1.CronType_DAILY, func() error {
-		return service.GameAct().Saves()
+	service.SystemCron().AddCronV2(v1.CronType_DAILY, func(ctx context.Context) error {
+		err = service.GameKv().SavesV1()
+		err = service.GameAct().Saves(ctx)
+		return err
 	})

 	//初始化自启动方法
 	for _, v := range _func {
 		v()
 	}
-
 	return nil
 }

--- a/internal/logic/gameAct/gameAct.go
+++ b/internal/logic/gameAct/gameAct.go
@@ -1,6 +1,7 @@
 package gameAct

 import (
+	"context"
 	"fmt"
 	"github.com/ayflying/utility_go/internal/model/do"
 	"github.com/ayflying/utility_go/internal/model/entity"
@@ -105,16 +106,24 @@ func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
 	return
 }

-func (s *sGameAct) Saves() (err error) {
+func (s *sGameAct) Saves(ctx context.Context) (err error) {
+	getCache, _ := pkg.Cache("redis").Get(nil, "cron:game_act")
+	//如果没有执行过，设置时间戳
+	if getCache.Int64() > 0 {
+		return
+	} else {
+		pkg.Cache("redis").Set(nil, "cron:game_act", gtime.Now().Unix(), time.Hour)
+	}
+
 	//遍历执行
 	ActList.Iterator(func(i interface{}) bool {
-		err = s.Save(i.(int))
+		err = s.Save(ctx, i.(int))
 		return true
 	})
 	return
 }

-func (s *sGameAct) Save(actId int) (err error) {
+func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {

 	cacheKey := fmt.Sprintf("act:%v:*", actId)
 	//获取当前用户的key值
@@ -149,8 +158,8 @@ func (s *sGameAct) Save(actId int) (err error) {
 			}

 			//如果有活跃，跳过持久化
-			if getBool, _ := pkg.Cache("redis").Contains(ctx,
-				fmt.Sprintf("act:update:%d", uid)); getBool {
+			if getBool, _ := pkg.Cache("redis").
+				Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
 				continue
 			}

--- a/internal/logic/gameKv/gameKv.go
+++ b/internal/logic/gameKv/gameKv.go
@@ -1,13 +1,17 @@
 package gameKv

 import (
+	"fmt"
+	"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 (
@@ -25,10 +29,6 @@ func New() *sGameKv {

 func init() {
 	service.RegisterGameKv(New())
-
-	//支付钩子
-	//task.Task.Trigger(tasks.TaskType_PAY, service.GameKv().HookPay)
-	//task.Task.Trigger(tasks.TaskType_WARDROBE_LEVEL, service.GameKv().HookLevelRwd)
 }

 // SavesV1 方法
@@ -37,6 +37,14 @@ func init() {
 // @receiver s: sGameKv的实例。
 // @return err: 错误信息，如果操作成功，则为nil。
 func (s *sGameKv) SavesV1() (err error) {
+	getCache, err := pkg.Cache("redis").Get(nil, "cron:game_kv")
+	//如果没有执行过，设置时间戳
+	if getCache.Int64() > 0 {
+		return
+	} 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) {
@@ -69,12 +77,17 @@ func (s *sGameKv) SavesV1() (err error) {
 			//if user.UpdatedAt.Seconds < gtime.Now().Add(consts.ActSaveTime).Unix() {
 			//	continue
 			//}
+			//如果有活跃，跳过持久化
+			if getBool, _ := pkg.Cache("redis").
+				Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+				continue
+			}

 			get, _ := g.Redis().Get(ctx, cacheKey)
 			var data interface{}
 			get.Scan(&data)
 			list = append(list, &ListData{
-				Uid: int64(uid),
+				Uid: uid,
 				Kv:  data,
 			})

--- a/internal/logic/ip2region/ip2region.go
+++ b/internal/logic/ip2region/ip2region.go
@@ -1,7 +1,6 @@
 package ip2region

 import (
-	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -12,7 +11,8 @@ import (
 )

 var (
-	ctx = gctx.New()
+	ctx  = gctx.New()
+	wait = false
 )

 type sIp2region struct {
@@ -27,9 +27,9 @@ func New() *sIp2region {
 func init() {
 	service.RegisterIp2Region(New())

-	boot.AddFunc(func() {
-		service.Ip2Region().Load()
-	})
+	//boot.AddFunc(func() {
+	//	service.Ip2Region().Load()
+	//})
 }

 // Load 加载到内存中
@@ -39,10 +39,16 @@ func init() {
 func (s *sIp2region) Load() {
 	var err error

-	var url = "https://github.com/ayflying/resource/raw/refs/heads/main/attachment/ip2region.xdb"
 	var dbPath = "runtime/library/ip2region.xdb"
-
+	var url = "https://github.com/ayflying/resource/raw/refs/heads/main/attachment/ip2region.xdb"
+	if wait {
+		return
+	}
 	if gfile.IsEmpty(dbPath) {
+		wait = true
+		defer func() {
+			wait = false
+		}()
 		g.Log().Debug(ctx, "等待下载ip库文件")
 		//下载文件
 		putData, err2 := g.Client().Discovery(nil).Get(ctx, url)
@@ -71,6 +77,9 @@ func (s *sIp2region) Load() {
 }

 func (s *sIp2region) GetIp(ip string) (res []string) {
+	//初始化加载
+	s.Load()
+
 	res = make([]string, 5)
 	if s.searcher == nil {
 		return
--- a/internal/logic/systemCron/listener.go
+++ b/internal/logic/systemCron/listener.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ayflying/utility_go/pkg/notice"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gclient"
+	"github.com/gogf/gf/v2/os/gctx"
 )

 type Status struct {
@@ -22,10 +23,10 @@ func (s *sSystemCron) Guardian(DingTalkWebHook string) {
 		Name    string
 		Address string
 	}
-	cfg, _ := g.Cfg().Get(ctx, "serverList")
+	cfg, _ := g.Cfg().Get(gctx.New(), "serverList")
 	cfg.Scan(&list)
 	for _, v := range list {
-		get, err := g.Client().Discovery(nil).Get(ctx, v.Address+"/callback/status")
+		get, err := g.Client().Discovery(nil).Get(gctx.New(), v.Address+"/callback/status")

 		defer get.Close()
 		if err != nil {
--- a/internal/logic/systemCron/systemCron.go
+++ b/internal/logic/systemCron/systemCron.go
@@ -14,7 +14,7 @@ import (
 )

 var (
-	ctx       = gctx.New()
+	//ctx       = gctx.New()
 	startTime *gtime.Time
 )

@@ -22,40 +22,45 @@ var (
 // 它包含了不同时间周期的任务，如秒、分钟、小时、天、周、月、年以及特定的工作日任务。
 type sSystemCron struct {
 	//互斥锁
-	Lock sync.Mutex
+	Lock        sync.Mutex
+	taskChan    chan func(context.Context) error
+	TaskTimeout time.Duration

 	// 每秒执行的任务
-	SecondlyTask []func() error
+	SecondlyTask []func(context.Context) error
 	// 每分钟执行的任务
-	MinutelyTask []func() error
+	MinutelyTask []func(context.Context) error
 	// 每小时执行的任务
-	HourlyTask []func() error
+	HourlyTask []func(context.Context) error
 	// 每天执行的任务
-	DailyTask []func() error
+	DailyTask []func(context.Context) error
 	// 每周执行的任务
-	WeeklyTask []func() error
+	WeeklyTask []func(context.Context) error
 	// 每月执行的任务
-	MonthlyTask []func() error
+	MonthlyTask []func(context.Context) error
 	// 每年执行的任务
-	YearlyTask []func() error
+	YearlyTask []func(context.Context) error
 	// 每周一执行的任务
-	MondayTask []func() error
+	MondayTask []func(context.Context) error
 	// 每周二执行的任务
-	TuesdayTask []func() error
+	TuesdayTask []func(context.Context) error
 	// 每周三执行的任务
-	WednesdayTask []func() error
+	WednesdayTask []func(context.Context) error
 	// 每周四执行的任务
-	ThursdayTask []func() error
+	ThursdayTask []func(context.Context) error
 	// 每周五执行的任务
-	FridayTask []func() error
+	FridayTask []func(context.Context) error
 	// 每周六执行的任务
-	SaturdayTask []func() error
+	SaturdayTask []func(context.Context) error
 	// 每周日执行的任务
-	SundayTask []func() error
+	SundayTask []func(context.Context) error
 }

 func New() *sSystemCron {
-	return &sSystemCron{}
+	return &sSystemCron{
+		taskChan:    make(chan func(context.Context) error, 2),
+		TaskTimeout: time.Minute * 30,
+	}
 }

 func init() {
@@ -65,13 +70,32 @@ func init() {
 // AddCron 添加一个定时任务到相应的调度列表中。
 //
 // @Description: 根据指定的类型将函数添加到不同的任务列表中，以供后续执行。
+// 确保自定义任务正确处理上下文取消信号，即可充分发挥超时打断功能。
 // @receiver s: sSystemCron的实例，代表一个调度系统。
 // @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
 // @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
+// deprecated: 弃用，请使用 AddCronV2
 func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
+	//转换为带上下文的，提供打断
+	var _func2 = func(ctx context.Context) error {
+		return _func()
+	}
+	s.AddCronV2(typ, _func2)
+}
+
+// AddCronV2  添加一个定时任务到相应的调度列表中。
+//
+// @Description: 根据指定的类型将函数添加到不同的任务列表中，以供后续执行。
+// @receiver s: sSystemCron的实例，代表一个调度系统。
+// @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
+// @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
+func (s *sSystemCron) AddCronV2(typ v1.CronType, _func func(context.Context) error) {
 	//加锁
 	s.Lock.Lock()
 	defer s.Lock.Unlock()
+	//
+	//ctx := gctx.New()
+	//newFunc := func()

 	switch typ {
 	case v1.CronType_SECOND:
@@ -118,140 +142,123 @@ func (s *sSystemCron) StartCron() (err error) {
 	}
 	startTime = gtime.Now()

-	g.Log().Debug(ctx, "启动计划任务定时器详情")
+	g.Log().Debug(gctx.New(), "启动计划任务定时器详情")
 	//每秒任务
-	gtimer.SetInterval(ctx, time.Second, func(ctx context.Context) {
+	gtimer.SetInterval(gctx.New(), time.Second, func(ctx context.Context) {
 		//g.Log().Debug(ctx, "每秒定时器")
-		err = s.secondlyTask()
+		s.secondlyTask()
 	})

 	//每分钟任务
-	_, err = gcron.AddSingleton(ctx, "0 * * * * *", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 * * * * *", func(ctx context.Context) {
 		//g.Log().Debug(ctx, "每分钟定时器")
-		err = s.minutelyTask()
+		s.minutelyTask()
 	})

 	//每小时任务
-	_, err = gcron.AddSingleton(ctx, "0 0 * * * *", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 * * * *", func(ctx context.Context) {
 		g.Log().Debug(ctx, "每小时定时器")
-		err = s.hourlyTask()
+		s.hourlyTask()
 	})

 	//每天任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * *", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * *", func(ctx context.Context) {
 		g.Log().Debug(ctx, "每日定时器")
-		err = s.dailyTask()
+		s.dailyTask()
 	})

 	//每周任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * 1", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * 1", func(ctx context.Context) {
 		g.Log().Debug(ctx, "每周一定时器")
-		err = s.weeklyTask(1)
+		s.weeklyTask(1)
 	})
-	//每周二任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * 2", func(ctx context.Context) {
+	//每周二的任务
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * 2", func(ctx context.Context) {
 		g.Log().Debug(ctx, "每周二定时器")
-		err = s.weeklyTask(2)
+		s.weeklyTask(2)
 	})
 	//周三任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * 3", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * 3", func(ctx context.Context) {
 		g.Log().Debug(ctx, "周三定时器")
-		err = s.weeklyTask(3)
+		s.weeklyTask(3)
 	})
 	//周四任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * 4", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * 4", func(ctx context.Context) {
 		g.Log().Debug(ctx, "周四定时器")
-		err = s.weeklyTask(4)
+		s.weeklyTask(4)
 	})
 	//周五任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * 5", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * 5", func(ctx context.Context) {
 		g.Log().Debug(ctx, "周五定时器")
-		err = s.fridayTask()
+		s.weeklyTask(5)
 	})
 	//周六任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * 6", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * 6", func(ctx context.Context) {
 		g.Log().Debug(ctx, "周六定时器")
-		err = s.weeklyTask(6)
+		s.weeklyTask(6)
 	})
 	//周日任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 * * 0", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 * * 0", func(ctx context.Context) {
 		g.Log().Debug(ctx, "周日定时器")
-		err = s.weeklyTask(7)
+		s.weeklyTask(7)
 	})

 	//每月任务
-	_, err = gcron.AddSingleton(ctx, "0 0 0 1 * *", func(ctx context.Context) {
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 1 * *", func(ctx context.Context) {
 		g.Log().Debug(ctx, "每月定时器")
-		err = s.monthlyTask()
+		s.monthlyTask()
 	})

-	_, err = gcron.AddSingleton(ctx, "0 0 0 1 1 *", func(ctx context.Context) {
+	//每年任务
+	_, err = gcron.AddSingleton(gctx.New(), "0 0 0 1 1 *", func(ctx context.Context) {
 		g.Log().Debug(ctx, "每年定时器")
-		err = s.monthlyTask()
+		s.yearlyTask()
 	})

+	//统一执行方法
+	s.RunFuncChan()
 	return
 }

 // 每妙任务
-func (s *sSystemCron) secondlyTask() (err error) {
+func (s *sSystemCron) secondlyTask() {
 	if len(s.SecondlyTask) == 0 {
 		return
 	}
-	for _, _func := range s.SecondlyTask {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
+	s.AddFuncChan(s.SecondlyTask)
 	return
 }

 // 每分钟任务
-func (s *sSystemCron) minutelyTask() (err error) {
+func (s *sSystemCron) minutelyTask() {
 	if len(s.MinutelyTask) == 0 {
 		return
 	}
-	for _, _func := range s.MinutelyTask {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
+	s.AddFuncChan(s.MinutelyTask)
 	return
 }

 // 每小时任务
-func (s *sSystemCron) hourlyTask() (err error) {
+func (s *sSystemCron) hourlyTask() {
 	if len(s.HourlyTask) == 0 {
 		return
 	}
-	for _, _func := range s.HourlyTask {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
+	s.AddFuncChan(s.HourlyTask)
 	return
 }

 // 每天任务
-func (s *sSystemCron) dailyTask() (err error) {
+func (s *sSystemCron) dailyTask() {
 	if len(s.DailyTask) == 0 {
 		return
 	}
-	for _, _func := range s.DailyTask {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
+	s.AddFuncChan(s.DailyTask)
 	return
 }

 // 每周任务
-func (s *sSystemCron) weeklyTask(day int) (err error) {
-	var arr []func() error
+func (s *sSystemCron) weeklyTask(day int) {
+	var arr []func(context.Context) error
 	switch day {
 	case 1:
 		arr = s.MondayTask
@@ -275,39 +282,91 @@ func (s *sSystemCron) weeklyTask(day int) (err error) {
 	if len(arr) == 0 {
 		return
 	}
-	for _, _func := range arr {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
-	return
-}
-
-// 周五任务
-func (s *sSystemCron) fridayTask() (err error) {
-	if len(s.FridayTask) == 0 {
-		return
-	}
-	for _, _func := range s.FridayTask {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
+	s.AddFuncChan(arr)
 	return
 }

 // 每月任务
-func (s *sSystemCron) monthlyTask() (err error) {
+func (s *sSystemCron) monthlyTask() {
 	if len(s.MonthlyTask) == 0 {
 		return
 	}
-	for _, _func := range s.MonthlyTask {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
+	s.AddFuncChan(s.MonthlyTask)
+	return
+}
+
+//每年任务
+func (s *sSystemCron) yearlyTask() {
+	if len(s.YearlyTask) == 0 {
+		return
+	}
+	s.AddFuncChan(s.YearlyTask)
+
+}
+
+// AddFuncChan 添加方法到通道
+func (s *sSystemCron) AddFuncChan(list []func(context.Context) error) {
+	for _, v := range list {
+		s.taskChan <- v
+	}
+}
+
+// RunFuncChan 统一执行方法
+func (s *sSystemCron) RunFuncChan() {
+	go func() {
+		for task := range s.taskChan {
+			//ctx := gctx.New()
+			func() {
+				//超时释放资源
+				ctx, cancel := context.WithTimeout(context.Background(), s.TaskTimeout)
+				defer cancel()
+
+				// 使用匿名函数包裹来捕获 panic
+				defer func() {
+					if r := recover(); r != nil {
+						g.Log().Errorf(gctx.New(), "执行函数时发生 panic: %v", r)
+					}
+				}()
+
+				done := make(chan error)
+				go func() {
+					done <- task(ctx)
+				}()
+				//err := task()
+				//if err != nil {
+				//	g.Log().Error(ctx, err)
+				//}
+				select {
+				case taskErr := <-done:
+					if taskErr != nil {
+						// 使用新上下文记录错误
+						g.Log().Error(gctx.New(), taskErr)
+					}
+				case <-ctx.Done(): // 监听上下文取消（包括超时）
+					g.Log().Errorf(gctx.New(), "task timeout:%v", ctx.Err())
+				}
+			}()
 		}
+	}()
+}
+
+// RunFunc 统一执行方法
+// deprecated: 弃用，会造成周期任务并发执行，to service.SystemCron().AddFuncChan
+func (s *sSystemCron) RunFunc(list []func() error) {
+	for _, _func := range list {
+		ctx := gctx.New()
+		func() {
+			// 使用匿名函数包裹来捕获 panic
+			defer func() {
+				if r := recover(); r != nil {
+					g.Log().Errorf(ctx, "执行函数时发生 panic: %v", r)
+				}
+			}()
+			err := _func()
+			if err != nil {
+				g.Log().Error(ctx, err)
+			}
+		}()
 	}
 	return
 }
--- a/pkg/aycache/cache.go
+++ b/pkg/aycache/cache.go
@@ -12,34 +12,37 @@ import (
 	"math"
 )

+// Mod 定义缓存模块结构体，包含一个 gcache.Cache 客户端实例
 type Mod struct {
 	client *gcache.Cache
 }

-var (
-	QPSCount int
-	QPS      = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "Cache_QPS",
-			Help: "当前缓存QPS数量",
-		},
-	)
+// QPSCount 记录缓存的 QPS 计数
+var QPSCount int
+// QPS 是一个 Prometheus 指标，用于记录当前缓存的 QPS 数量
+var QPS = promauto.NewGauge(
+	prometheus.GaugeOpts{
+		Name: "Cache_QPS",
+		Help: "当前缓存QPS数量",
+	},
 )

+// init 函数在包被导入时执行，用于初始化定时任务以更新 QPS 指标
 func init() {
 	boot.AddFunc(func() {
-		//初始化指标
+		// 初始化指标，每分钟计算一次平均 QPS 并重置计数器
 		service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
 			QPS.Set(math.Round(float64(QPSCount) / 60))
 			QPSCount = 0
 			return nil
 		})
 	})
-
 }

+// New 根据传入的名称创建不同类型的缓存适配器
+// 如果未传入名称，默认使用 "cache" 类型
+// 支持的类型包括 "cache"（内存缓存）、"redis"（Redis 缓存）、"file"（文件缓存）和 "es"（Elasticsearch 缓存）
 func New(_name ...string) gcache.Adapter {
-
 	var cacheAdapterObj gcache.Adapter
 	var name = "cache"
 	if len(_name) > 0 {
@@ -47,18 +50,23 @@ func New(_name ...string) gcache.Adapter {
 	}
 	switch name {
 	case "cache":
+		// 创建内存缓存适配器
 		cacheAdapterObj = drive2.NewAdapterMemory()
 	case "redis":
+		// 创建 Redis 缓存适配器
 		cacheAdapterObj = drive2.NewAdapterRedis()
 	case "file":
+		// 创建文件缓存适配器，指定缓存目录为 "runtime/cache"
 		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")
 	case "es":
+		// 创建 Elasticsearch 缓存适配器，需要传入额外参数
 		cacheAdapterObj = drive.NewAdapterElasticsearch(_name[1])
 	}

 	//var client = gcache.New()
 	//client.SetAdapter(cacheAdapterObj)

+	// 每次创建适配器时，QPS 计数加 1
 	QPSCount++
 	return cacheAdapterObj
 }
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -17,27 +17,41 @@ import (

 var (
 	//ApolloCfg      *apolloConfig.AppConfig
-	ApolloCfg      *apollo.Config
+	ApolloCfg *apollo.Config
+	// ApolloListener 存储需要监听的 Apollo 配置项名称
 	ApolloListener []string
-	Item2Obj       = map[string]Load{}
+	// Item2Obj 存储配置项名称和对应的加载器对象的映射
+	Item2Obj = map[string]Load{}
 )

-// load接口定义了Load方法，用于加载数据
+// Load 接口定义了 Load 方法，用于加载数据
 type Load interface {
+	// Load 方法用于加载配置数据，支持传入可选的配置参数
 	Load(cfg ...string)
 }

+// NewV1 创建一个新的 Cfg 实例
 func NewV1() *Cfg {
 	return &Cfg{}
 }

+// Cfg 结构体包含配置操作的相关方法
 type Cfg struct {
+	// Lock 用于保证并发安全的互斥锁
 	Lock sync.Mutex
 }

+// GetDbFile 从数据库中获取指定名称的配置文件
+// 参数:
+//   name - 配置文件的名称
+// 返回值:
+//   *g.Var - 存储配置数据的变量
+//   error  - 操作过程中遇到的错误
 func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
+	// 从数据库的 game_config 表中查询指定名称的配置数据
 	get2, err := g.Model("game_config").
 		Where("name", name).Master().Value("data")
+	// 将查询结果扫描到 res 变量中
 	err = get2.Scan(&res)
 	if res == nil {
 		res = &gvar.Var{}
@@ -45,107 +59,94 @@ func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
 	return
 }

-func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
+// GetFile 从文件系统或资源文件中加载 JSON 配置
+// 参数:
+//   filename   - 需要加载的配置文件名（不带扩展名）
+//   _pathStr   - 可选参数，指定配置文件目录路径，默认"manifest/game/"
+// 返回值:
+//   *gjson.Json - 解析后的 JSON 对象
+//   error       - 文件加载或解析过程中遇到的错误
+func (c *Cfg) GetFile(filename string, _pathStr ...string) (jsonObj *gjson.Json, err error) {
+	// 处理路径参数，使用默认路径或传入参数
 	pathStr := "manifest/game/"
+	if len(_pathStr) > 0 {
+		pathStr = _pathStr[0]
+	}
+	// 拼接完整的文件路径
 	filePath := pathStr + filename + ".json"
-	//err := gres.Load(pathStr + filename)

-	//载入静态资源到文件对象
+	// 载入静态资源到文件对象
 	err = gres.Load(filePath)
 	var bytes []byte

+	// 优先从文件系统读取，不存在时从资源文件读取
 	if gfile.IsFile(filePath) {
-		bytes = gfile.GetBytes(filePath)
+		bytes = gfile.GetBytes(filePath) // 读取物理文件内容
 	} else {
-		bytes = gres.GetContent(filePath)
+		bytes = gres.GetContent(filePath) // 从打包资源中获取内容
 	}

+	for range 5 {
+		//如果还是没有读取到配置，从当前目录返回上级读取
+		if bytes == nil {
+			// 上级拼接完整的文件路径
+			filePath = "../" + filePath
+			if gfile.IsFile(filePath) {
+				bytes = gfile.GetBytes(filePath) // 读取物理文件内容
+				//找到配置了，跳过
+				break
+			}
+		}
+	}
+
+	// 解析 JSON 内容并返回结果
 	jsonObj, err = gjson.DecodeToJson(bytes)
-	//g.Dump(filePath, jsonObj)
 	return
 }

-// getUrlFile 获取远程配置
+// GetUrlFile 获取远程配置
+// 参数:
+//   name - 配置文件的名称
+// 返回值:
+//   *gjson.Json - 解析后的 JSON 对象
+//   error       - 请求或解析过程中遇到的错误
 func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
+	// 拼接远程配置文件的 URL
 	urlStr := fmt.Sprintf("http://sdf.sdfs.sdf/%s.json", name)
+	// 发送 HTTP 请求获取远程配置数据
 	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
+	// 读取响应内容
 	bytes := getUrl.ReadAll()
+	// 解析 JSON 内容并返回结果
 	jsonObj, err = gjson.DecodeToJson(bytes)
 	return
 }

-// 获取阿波罗
-//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
-//}
-
+// GetApollo 从 Apollo 配置中心获取指定名称的配置
+// 参数:
+//   name - 配置文件的名称
+//   obj  - 实现了 Load 接口的加载器对象
+// 返回值:
+//   *gjson.Json - 解析后的 JSON 对象
+//   error       - 操作过程中遇到的错误
 func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
+	// 将配置项名称和对应的加载器对象存入映射
 	Item2Obj[name+".json"] = obj

-	// 接入阿波罗配置
+	// 接入 Apollo 配置
 	ApolloCfg.NamespaceName = name + ".json"
+	// 创建 Apollo 配置适配器
 	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") {
-		//放置监听器
+		// 启动 Apollo 客户端
 		client, _ := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
 			return &apolloConfig.AppConfig{
 				AppID:             ApolloCfg.AppID,
@@ -159,31 +160,40 @@ func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error)
 				MustStart:         ApolloCfg.MustStart,
 			}, nil
 		})
+		// 创建自定义监听器实例
 		c2 := &CustomChangeListener{}
+		// 为 Apollo 客户端添加监听器
 		client.AddChangeListener(c2)
+		// 将配置项名称添加到监听器列表
 		ApolloListener = append(ApolloListener, name+".json")
 	}

+	// 从配置中心获取指定配置项的值
 	cfg, err := g.Cfg(name).Get(nil, "content")
+	// 将配置值扫描到 jsonObj 中
 	cfg.Scan(&jsonObj)
 	return
 }

-// 阿波罗监听器
+// CustomChangeListener 是 Apollo 配置变化的自定义监听器
 type CustomChangeListener struct {
+	// wg 用于等待所有处理任务完成
 	wg sync.WaitGroup
 }

+// OnChange 当 Apollo 配置发生变化时触发
 func (c *CustomChangeListener) OnChange(changeEvent *storage.ChangeEvent) {
+	// 记录配置变化的日志
 	g.Log().Debugf(nil, "当前Namespace变化了：%v", changeEvent.Namespace)
+	// 获取变化的配置项名称
 	filename := changeEvent.Namespace
 	if obj, ok := Item2Obj[filename]; ok {
-		//重载配置文件
+		// 重载配置文件
 		obj.Load(changeEvent.Changes["content"].NewValue.(string))
 	}
 }

+// OnNewestChange 当获取到最新配置时触发，当前为空实现
 func (c *CustomChangeListener) OnNewestChange(event *storage.FullChangeEvent) {
 	//write your code here
-
 }
--- a/pkg/s3/s3.go
+++ b/pkg/s3/s3.go
@@ -16,26 +16,32 @@ import (
 	"github.com/minio/minio-go/v7/pkg/credentials"
 )

+// ctx 全局上下文，用于在整个包中传递请求范围的数据
 var (
 	//client *minio.Client
 	ctx = gctx.New()
 )

+// DataType 定义了 S3 配置的数据结构，用于存储访问 S3 所需的各种信息
 type DataType struct {
-	AccessKey     string `json:"access_key"`
-	SecretKey     string `json:"secret_key"`
-	Address       string `json:"address"`
-	Ssl           bool   `json:"ssl"`
-	Url           string `json:"url"`
-	BucketName    string `json:"bucket_name"`
-	BucketNameCdn string `json:"bucket_name_cdn"`
+	AccessKey     string `json:"access_key"` // 访问 S3 的密钥 ID
+	SecretKey     string `json:"secret_key"` // 访问 S3 的密钥
+	Address       string `json:"address"`    // S3 服务的地址
+	Ssl           bool   `json:"ssl"`        // 是否使用 SSL 加密连接
+	Url           string `json:"url"`        // S3 服务的访问 URL
+	BucketName    string `json:"bucket_name"` // 默认存储桶名称
+	BucketNameCdn string `json:"bucket_name_cdn"` // CDN 存储桶名称
 }

+// Mod 定义了 S3 模块的结构体，包含一个 S3 客户端实例和配置信息
 type Mod struct {
-	client *minio.Client
-	cfg    DataType
+	client *minio.Client // Minio S3 客户端实例
+	cfg    DataType      // S3 配置信息
 }

+// New 根据配置创建一个新的 S3 模块实例
+// 如果未提供名称，则从配置中获取默认的 S3 类型
+// 配置错误时会触发 panic
 func New(_name ...string) *Mod {
 	var name string
 	if len(_name) > 0 {
@@ -52,7 +58,7 @@ func New(_name ...string) *Mod {
 	var cfg DataType
 	get.Scan(&cfg)

-	// 使用minio-go创建S3客户端
+	// 使用 minio-go 创建 S3 客户端
 	obj, err := minio.New(
 		cfg.Address,
 		&minio.Options{
@@ -72,183 +78,111 @@ func New(_name ...string) *Mod {
 	return mod
 }

-//func (s *Mod) Load() {
-//	//导入配置
-//	get, err := g.Cfg().Get(ctx, "s3.type")
-//	cfgType := get.String()
-//	if cfgType == "" {
-//		cfgType = "default"
-//	}
-//
-//	cfgData, err := g.Cfg().Get(ctx, "s3."+cfgType)
-//	if cfgData.IsEmpty() {
-//		panic("当前配置中未配置s3：" + cfgType)
-//	}
-//
-//	get, err = g.Cfg().Get(ctx, "s3."+cfgType)
-//	err = get.Scan(&Cfg)
-//
-//	// 使用minio-go创建S3客户端
-//	obj, err := minio.New(
-//		Cfg.Address,
-//		&minio.Options{
-//			Creds:  credentials.NewStaticV4(Cfg.AccessKey, Cfg.SecretKey, ""),
-//			Secure: Cfg.Ssl,
-//		},
-//	)
-//	if err != nil {
-//		log.Fatalln(err)
-//	}
-//
-//	client = obj
-//}
-//
-//func (s *Mod) S3(name string) {
-//	get, err := g.Cfg().Get(ctx, "s3."+name)
-//	if err != nil {
-//		panic(err)
-//	}
-//	get.Scan(&Cfg)
-//
-//	// 使用minio-go创建S3客户端
-//	obj, err := minio.New(
-//		Cfg.Address,
-//		&minio.Options{
-//			Creds:  credentials.NewStaticV4(Cfg.AccessKey, Cfg.SecretKey, ""),
-//			Secure: Cfg.Ssl,
-//		},
-//	)
-//	if err != nil {
-//		log.Fatalln(err)
-//	}
-//
-//	client = obj
-//
-//}
-
-// GetCfg 获取配置
+// GetCfg 获取当前 S3 模块的配置信息
 func (s *Mod) GetCfg() *DataType {
 	return &s.cfg
 }

-// GetFileUrl 生成指向S3存储桶中指定文件的预签名URL
-//
-// @Description: 生成一个具有有限有效期的预签名URL，可用于访问S3存储桶中的文件。
-// @receiver s: S3的实例，用于执行S3操作。
-// @param name: 要获取预签名URL的文件名。
-// @param bucketName: 文件所在的存储桶名称。
-// @return presignedURL: 生成的预签名URL，可用于访问文件。
-// @return err: 在获取预签名URL过程中遇到的任何错误。
+// GetFileUrl 生成指向 S3 存储桶中指定文件的预签名 URL
+// 预签名 URL 可用于在有限时间内访问 S3 存储桶中的文件
+// 支持从缓存中获取预签名 URL，以减少重复请求
 func (s *Mod) GetFileUrl(name string, bucketName string, _expires ...time.Duration) (presignedURL *url.URL, err error) {
-	// 设置预签名URL的有效期为1小时
+	// 设置预签名 URL 的有效期为 1 小时，可通过参数覆盖
 	expires := time.Hour * 1
 	if len(_expires) > 0 {
 		expires = _expires[0]
 	}
+	// 生成缓存键
 	cacheKey := fmt.Sprintf("s3:%v:%v", name, bucketName)
+	// 尝试从缓存中获取预签名 URL
 	get, _ := gcache.Get(ctx, cacheKey)
-	//g.Dump(get.Vars())
 	if !get.IsEmpty() {
+		// 将缓存中的值转换为 *url.URL 类型
 		err = gconv.Struct(get.Val(), &presignedURL)
-		//presignedURL =
 		return
 	}
-	//expires := time.Duration(604800)
-	// 调用s3().PresignedGetObject方法生成预签名URL
+	// 调用 S3 客户端生成预签名 URL
 	presignedURL, err = s.client.PresignedGetObject(ctx, bucketName, name, expires, nil)
+	// 将生成的预签名 URL 存入缓存
 	err = gcache.Set(ctx, cacheKey, presignedURL, expires)
 	return
 }

-// PutFileUrl 生成一个用于上传文件到指定bucket的预签名URL
-//
-//	@Description:
-//	@receiver s
-//	@param name 文件名
-//	@param bucketName 存储桶名称
-//	@return presignedURL 预签名的URL，用于上传文件
-//	@return err 错误信息，如果在生成预签名URL时发生错误
+// PutFileUrl 生成一个用于上传文件到指定存储桶的预签名 URL
+// 预签名 URL 的有效期默认为 10 分钟
 func (s *Mod) PutFileUrl(name string, bucketName string) (presignedURL *url.URL, err error) {
-	// 设置预签名URL的有效期
-	//expires := time.Now().Add(time.Minute * 30).Unix() // 例如：有效期30分钟
-	//expires2 := time.Duration(expires)
+	// 设置预签名 URL 的有效期为 10 分钟
 	expires := time.Minute * 10
-	// 生成预签名URL
+	// 调用 S3 客户端生成预签名 URL
 	presignedURL, err = s.client.PresignedPutObject(ctx, bucketName, name, expires)
-
 	return
 }

-// 获取储存桶列表
+// ListBuckets 获取当前 S3 客户端可访问的所有存储桶列表
+// 出错时返回 nil
 func (s *Mod) ListBuckets() []minio.BucketInfo {
 	buckets, err := s.client.ListBuckets(ctx)
-	//g.Dump(buckets)
 	if err != nil {
-		//fmt.Println(err)
 		return nil
 	}
 	return buckets
 }

-// PutObject 上传文件到指定的存储桶中。
-//
-// @Description: 上传一个文件到指定的存储桶。
-// @receiver s *Mod: 表示调用此方法的Mod实例。
-// @param f io.Reader: 文件的读取器，用于读取待上传的文件内容。
-// @param name string: 待上传文件的名称。
-// @param bucketName string: 存储桶的名称。
-// @param _size ...int64: 可选参数，指定上传文件的大小。如果未提供，则默认为-1，表示读取文件直到EOF。
-// @return res minio.UploadInfo: 上传成功后返回的上传信息。
-// @return err error: 如果上传过程中出现错误，则返回错误信息。
+// PutObject 上传文件到指定的存储桶中
+// 支持指定文件大小，未指定时将读取文件直到结束
 func (s *Mod) PutObject(f io.Reader, name string, bucketName string, _size ...int64) (res minio.UploadInfo, err error) {
-	// 初始化文件大小为-1，表示将读取文件至结束。
+	// 初始化文件大小为 -1，表示将读取文件至结束
 	var size = int64(-1)
-	// 如果提供了文件大小，则使用提供的大小值。
 	if len(_size) > 0 {
 		size = _size[0]
 	}
-
-	// 调用client的PutObject方法上传文件，并设置内容类型为"application/octet-stream"。
+	// 调用 S3 客户端上传文件，设置内容类型为 "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)
 	}
 	return
 }

-// RemoveObject 删除文件
+// RemoveObject 从指定存储桶中删除指定名称的文件
 func (s *Mod) RemoveObject(name string, bucketName string) (err error) {
 	opts := minio.RemoveObjectOptions{
 		//GovernanceBypass: true,
 		//VersionID:        "myversionid",
 	}
+	// 调用 S3 客户端删除文件
 	err = s.client.RemoveObject(ctx, bucketName, name, opts)
 	return
 }

-// ListObjects 文件列表
+// ListObjects 获取指定存储桶中指定前缀的文件列表
+// 返回一个包含文件信息的通道
 func (s *Mod) ListObjects(bucketName string, prefix string) (res <-chan minio.ObjectInfo, err error) {
+	// 调用 S3 客户端获取文件列表
 	res = s.client.ListObjects(ctx, bucketName, minio.ListObjectsOptions{
 		Prefix: prefix,
 	})
 	return
 }

-// SetBucketPolicy 设置bucket或对象前缀的访问权限
+// SetBucketPolicy 设置指定存储桶或对象前缀的访问策略
+// 目前使用固定的策略，可根据需求修改
 func (s *Mod) SetBucketPolicy(bucketName string, prefix string) (err error) {
-
+	// 定义访问策略
 	policy := `{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::my-bucketname/*"],"Sid": ""}]}`
-
+	// 调用 S3 客户端设置存储桶策略
 	err = s.client.SetBucketPolicy(ctx, bucketName, policy)
 	return
 }

-// GetUrl 获取文件访问地址
+// GetUrl 获取文件的访问地址
+// 支持返回默认文件地址，根据 SSL 配置生成不同格式的 URL
 func (s *Mod) GetUrl(filePath string, defaultFile ...string) (url string) {
 	bucketName := s.cfg.BucketNameCdn
 	get := s.cfg.Url

-	//如果没有图片，返回默认的图片地址
+	// 如果没有指定文件路径，且提供了默认文件路径，则使用默认路径
 	if filePath == "" && len(defaultFile) > 0 {
 		filePath = defaultFile[0]
 	}
@@ -262,6 +196,7 @@ func (s *Mod) GetUrl(filePath string, defaultFile ...string) (url string) {
 	return
 }

+// GetPath 从文件访问 URL 中提取文件路径
 func (s *Mod) GetPath(url string) (filePath string) {
 	bucketName := s.cfg.BucketNameCdn
 	get := s.cfg.Url
@@ -269,21 +204,22 @@ 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) {
-
-	// 原始文件
+	// 定义目标文件选项
 	var dst = minio.CopyDestOptions{
 		Bucket: bucketName,
 		Object: dstStr,
 	}

-	// 新文件
+	// 定义源文件选项
 	var src = minio.CopySrcOptions{
 		Bucket: bucketName,
 		Object: srcStr,
 	}

+	// 调用 S3 客户端复制文件
 	_, err = s.client.CopyObject(ctx, dst, src)
 	return
 }
--- a/pkg/websocket/socket_new.go
+++ b/pkg/websocket/socket_new.go
@@ -14,6 +14,7 @@ import (
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gorilla/websocket"
 	"google.golang.org/protobuf/proto"
+	"net/http"
 	"sync"
 	"time"
 )
@@ -34,9 +35,10 @@ type WebsocketData struct {
 	Ws     *websocket.Conn `json:"ws" dc:"websocket连接池"`
 	Uuid   string          `json:"uuid" dc:"用户唯一标识"`
 	Uid    int64           `json:"uid" dc:"用户编号"`
+	Guid   string          `json:"guid" dc:"用户凭证"`
 	Groups []string        `json:"groups" dc:"群组"`
 	Ctx    context.Context `json:"ctx" dc:""`
-	RoomId int             `json:"roomId" dc:"房间编号"`
+	RoomId string          `json:"roomId" dc:"房间编号"`
 }

 func NewV1() *SocketV1 {
@@ -57,14 +59,21 @@ type SocketInterface interface {
 func (s *SocketV1) Load(serv *ghttp.Server, prefix string) {
 	//websocket服务启动
 	serv.Group(prefix, func(group *ghttp.RouterGroup) {
-
 		var websocketCfg = websocket.Upgrader{
 			ReadBufferSize:  1024,
 			WriteBufferSize: 1024,
+			CheckOrigin: func(r *http.Request) bool {
+				// In production, you should implement proper origin checking
+				return true
+			},
+			Error: func(w http.ResponseWriter, r *http.Request, status int, reason error) {
+				g.Log().Errorf(r.Context(), "WebSocket error: %v", reason)
+			},
 		}
 		group.Bind(
 			func(r *ghttp.Request) {
 				ctx := r.Context()
+
 				ws, err := websocketCfg.Upgrade(r.Response.Writer, r.Request, nil)
 				if err != nil {
 					glog.Error(ctx, err)
@@ -84,19 +93,17 @@ func (s *SocketV1) Load(serv *ghttp.Server, prefix string) {
 //	@Description:
 //	@receiver s
 //	@param conn
-func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
-
-	defer conn.Close()
+func (s *SocketV1) OnConnect(ctx context.Context, ws *websocket.Conn) {
 	id := guid.S()
-	ip := conn.RemoteAddr().String()
-	data := &WebsocketData{
+	ip := ws.RemoteAddr().String()
+	conn := &WebsocketData{
 		Uuid:   id,
-		Ws:     conn,
+		Ws:     ws,
 		Ctx:    ctx,
 		Groups: make([]string, 0),
-		RoomId: -1,
+		RoomId: "",
 	}
-	m.Set(id, data)
+	m.Set(id, conn)

 	//defer delete(Conn, id)

@@ -106,22 +113,23 @@ func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {

 	//用户登录钩子执行
 	for _, connect := range OnConnectHandlers {
-		connect(data)
+		connect(conn)
 	}

 	for {
 		//进入当前连接线程拥堵
-		msgType, msg, err := conn.ReadMessage()
+		msgType, msg, err := ws.ReadMessage()
 		s.Type = msgType
 		if err != nil {
 			//客户端断开返回错误，断开当前连接
 			//g.Log().Error(ctx, err)
 			break
 		}
-		s.OnMessage(m.Get(id).(*WebsocketData), msg, msgType)
+		s.OnMessage(conn, msg, msgType)
 	}
 	//关闭连接触发
-	s.OnClose(data)
+
+	s.OnClose(conn)
 	g.Log().Debugf(ctx, "断开连接:uuid=%v,ip=%v", id, ip)
 }

@@ -162,7 +170,7 @@ func (s *SocketV1) OnMessage(conn *WebsocketData, req []byte, msgType int) {
 }

 //绑定用户编号
-func (s *SocketV1) BindUid(conn *WebsocketData, uid int64) {
+func (s *SocketV1) BindUid(conn *WebsocketData, uid int64, guid string) {
 	lock.Lock()
 	defer lock.Unlock()

@@ -172,6 +180,7 @@ func (s *SocketV1) BindUid(conn *WebsocketData, uid int64) {
 	if conn.Uid == 0 {
 		conn.Uid = uid
 	}
+	conn.Guid = guid

 }

@@ -299,8 +308,8 @@ func (s *SocketV1) LeaveGroup(conn *WebsocketData, group string) {
 }

 //群组广播
-func (s *SocketV1) SendGroup(cmd int32, group string, req proto.Message) {
-	cacheKey := "websocket:group:" + group
+func (s *SocketV1) SendGroup(cmd int32, roomId string, req proto.Message) {
+	cacheKey := "websocket:group:" + roomId
 	get, _ := cache.Get(gctx.New(), cacheKey)
 	var list = make(map[int64]string)
 	if !get.IsNil() {
@@ -338,8 +347,8 @@ func (s *SocketV1) OnClose(conn *WebsocketData) {
 	// 1. 更新连接状态或从连接池移除
 	// 2. 发送通知或清理关联资源
 	// 3. 执行特定于业务的断开处理
-	m.Remove(conn.Uuid)
 	conn.Ws.Close()
+	m.Remove(conn.Uuid)
 }

 // 是否在线
--- a/service/game_act.go
+++ b/service/game_act.go
@@ -6,6 +6,8 @@
 package service

 import (
+	"context"
+
 	"github.com/gogf/gf/v2/frame/g"
 )

@@ -29,8 +31,8 @@ type (
 		// @param data interface{}: 要存储的活动信息数据。
 		// @return err error: 返回错误信息，如果操作成功，则返回nil。
 		Set(uid int64, actId int, data interface{}) (err error)
-		Saves() (err error)
-		Save(actId int) (err error)
+		Saves(ctx context.Context) (err error)
+		Save(ctx context.Context, actId int) (err error)
 		// 清空GetRedDot缓存
 		RefreshGetRedDotCache(uid int64)
 		Del(uid int64, actId int)
--- a/service/system_cron.go
+++ b/service/system_cron.go
@@ -6,6 +6,8 @@
 package service

 import (
+	"context"
+
 	v1 "github.com/ayflying/utility_go/api/system/v1"
 	"github.com/gogf/gf/v2/net/gclient"
 )
@@ -24,16 +26,32 @@ type (
 		// AddCron 添加一个定时任务到相应的调度列表中。
 		//
 		// @Description: 根据指定的类型将函数添加到不同的任务列表中，以供后续执行。
+		// 确保自定义任务正确处理上下文取消信号，即可充分发挥超时打断功能。
 		// @receiver s: sSystemCron的实例，代表一个调度系统。
 		// @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
 		// @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
+		// deprecated: 弃用，请使用 AddCronV2
 		AddCron(typ v1.CronType, _func func() error)
+		// AddCronV2  添加一个定时任务到相应的调度列表中。
+		//
+		// @Description: 根据指定的类型将函数添加到不同的任务列表中，以供后续执行。
+		// @receiver s: sSystemCron的实例，代表一个调度系统。
+		// @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
+		// @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
+		AddCronV2(typ v1.CronType, _func func(context.Context) error)
 		// StartCron 开始计划任务执行
 		//
 		//	@Description:
 		//	@receiver s
 		//	@return err
 		StartCron() (err error)
+		// AddFuncChan 添加方法到通道
+		AddFuncChan(list []func(context.Context) error)
+		// RunFuncChan 统一执行方法
+		RunFuncChan()
+		// RunFunc 统一执行方法
+		// deprecated: 弃用，会造成周期任务并发执行，to service.SystemCron().AddFuncChan
+		RunFunc(list []func() error)
 	}
 )

--- a/utility.go
+++ b/utility.go
@@ -17,6 +17,7 @@ func init() {
 	g.Log().Debug(ctx, "utility_go init启动完成")
 	// 初始化配置
 	var err = boot.Boot()
+
 	if err != nil {
 		panic(err)
 	}
Author	SHA1	Message	Date
ayflying	374fdac477	进行主机查找配置文件，最高5级目录	2025-05-14 16:22:07 +08:00
ayflying	595ababfde	更新路径拼接	2025-05-14 16:17:00 +08:00
ayflying	a62c359fd7	支持从当前目录返回上级目录进行配置读取	2025-05-14 16:13:49 +08:00
ayflying	b45242dfeb	修改名字预防歧义	2025-05-07 12:17:52 +08:00
ayflying	a2763676b1	修复excel转格式的错误	2025-04-30 10:48:42 +08:00
ayflying	bd64ef06a9	更新excel库	2025-04-30 10:27:07 +08:00
ayflying	abc1adb916	更新库，支持更好的excel	2025-04-29 18:21:18 +08:00
ayflying	9ca1c43409	Revert "修改act数据取出的时候进行泛型复制而不是转格式" This reverts commit `e9962f1b74`.	2025-04-29 17:28:47 +08:00
ayflying	504836d165	绑定用户凭证	2025-04-29 10:16:25 +08:00
ayflying	e9962f1b74	修改act数据取出的时候进行泛型复制而不是转格式	2025-04-25 11:28:18 +08:00
ayflying	1153313384	修改计划任务的持久化，act与kv的缓存逻辑，预防多服务器重复持久化	2025-04-24 17:44:39 +08:00
ayflying	750d5c56ce	更新注释	2025-04-24 15:25:46 +08:00
ayflying	c24ac78b91	修改房间编号为string	2025-04-23 18:22:38 +08:00
ayflying	569937c67f	增加计划任务的打断机制	2025-04-22 12:15:53 +08:00
ayflying	d6bfe1c2fb	计划任务定时器修改，改为通道顺序执行	2025-04-22 11:15:51 +08:00
ayflying	16da554a60	完善weboscket的启动	2025-04-21 14:35:24 +08:00
ayflying	7f6635fb91	分离ip库的下载时机	2025-04-21 14:16:58 +08:00
ayflying	0605302db6	调整接口的逻辑	2025-04-18 18:36:50 +08:00