时间函数使用utc时间计算，预防切换夏令时bug

act/act.go

@@ -0,0 +1,29 @@
+package act
+
+import (
+	"github.com/gogf/gf/v2/os/gtime"
+)
+
+type act struct {
+}
+
+type Sql struct {
+	UID       uint64      `gorm:"primaryKey;comment:玩家编号"`
+	ActID     int         `gorm:"primaryKey;comment:活动编号"`
+	Action    string      `gorm:"type:text;comment:活动配置"`
+	UpdatedAt *gtime.Time `gorm:"index;comment:更新时间"`
+}
+
+func New() *act {
+
+	return &act{}
+}
+
+func (s *act) CreateTable(name string) {
+
+	//prefix := g.DB().GetPrefix()
+	//
+	//g.DB()
+	//g.DB().Exec(gctx.New())
+
+}

act/act.sql

@@ -0,0 +1,13 @@
+create table shiningu_game_act
+(
+    uid        bigint   not null comment '玩家编号',
+    act_id     int      not null comment '活动编号',
+    action     text     null comment '活动配置',
+    updated_at datetime null comment '更新时间',
+    primary key (uid, act_id)
+)
+    comment '玩家活动数据' charset = utf8mb4;
+
+create index shiningu_game_act_uid_index
+    on shiningu_game_act (uid);
+

act/save.go

@@ -0,0 +1,19 @@
+package act
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+// 查询表格时候存在
+func (s *act) TableExists(name string) bool {
+	Prefix := g.DB().GetPrefix()
+	get, err := g.DB().TableFields(gctx.New(), Prefix+name)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+	}
+	if get != nil {
+		return true
+	}
+	return false
+}

aycache/cache.go

@@ -1,6 +1,7 @@
 package aycache
 
 import (
+	"github.com/ayflying/utility_go/aycache/drive"
 	"github.com/gogf/gf/v2/os/gcache"
 )
 
@@ -24,6 +25,10 @@ func New(_name ...string) gcache.Adapter {
 		cacheAdapterObj = NewAdapterMemory()
 	case "redis":
 		cacheAdapterObj = NewAdapterRedis()
+	case "file":
+		cacheAdapterObj = NewAdapterFile("runtime/cache")
+	case "es":
+		cacheAdapterObj = drive.NewAdapterElasticsearch([]string{"http://127.0.0.1:9200"})
 	}
 
 	//var client = gcache.New()

aycache/drive/elasticsearch.go

@@ -0,0 +1,119 @@
+package drive
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/os/gcache"
+	"time"
+)
+
+type AdapterElasticsearch struct {
+	//FilePath string
+	Addresses []string
+}
+
+func (a AdapterElasticsearch) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) SetIfNotExist(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (ok bool, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) SetIfNotExistFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) SetIfNotExistFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Get(ctx context.Context, key interface{}) (*gvar.Var, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) GetOrSetFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Contains(ctx context.Context, key interface{}) (bool, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Size(ctx context.Context) (size int, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Data(ctx context.Context) (data map[interface{}]interface{}, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Keys(ctx context.Context) (keys []interface{}, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Values(ctx context.Context) (values []interface{}, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Update(ctx context.Context, key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) GetExpire(ctx context.Context, key interface{}) (time.Duration, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Clear(ctx context.Context) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (a AdapterElasticsearch) Close(ctx context.Context) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func NewAdapterElasticsearch(addresses []string) gcache.Adapter {
+	return &AdapterElasticsearch{
+		Addresses: addresses,
+	}
+}

aycache/file.go

@@ -4,6 +4,10 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/util/gconv"
+	"path"
+	"strings"
 	"time"
 )
 
@@ -12,8 +16,20 @@ type AdapterFile struct {
 }
 
 func (a AdapterFile) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
-	//TODO implement me
-	panic("implement me")
+	//defer a.handleLruKey(ctx, key)
+	//expireTime := a.getInternalExpire(duration)
+	//a.data.Set(key, memoryDataItem{
+	//	a: value,
+	//	a: expireTime,
+	//})
+	//c.eventList.PushBack(&adapterMemoryEvent{
+	//	k: key,
+	//	e: expireTime,
+	//})
+
+	arr := strings.Split(":", gconv.String(key))
+	fileName := path.Join(arr...)
+	return gfile.PutBytes(fileName, gconv.Bytes(value))
 }
 
 func (a AdapterFile) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {

aycache/redis.go

@@ -11,7 +11,7 @@ var adapterRedisCache = gcache.New()
 func NewAdapterRedis() gcache.Adapter {
 
 	if adapterRedisClient == nil {
-		adapterRedisClient = gcache.NewAdapterRedis(g.Redis("cache"))
+		adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default"))
 		adapterRedisCache.SetAdapter(adapterRedisClient)
 	}
 	return adapterRedisCache

cmd/make.go

@@ -0,0 +1,95 @@
+package cmd
+
+import (
+	"context"
+	"embed"
+	"fmt"
+	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
+	"io/fs"
+)
+
+//go:embed make/*
+var ConfigFiles embed.FS
+
+var (
+	Make = gcmd.Command{
+		Name:  "make",
+		Usage: "make",
+		Brief: "创建模块文件",
+		Arguments: []gcmd.Argument{
+			{Name: "model", Short: "m", Brief: "模块名"},
+			{Name: "id", Short: "i", Brief: "活动id"},
+			{Name: "name", Short: "n", Brief: "服务文件名"},
+		},
+		Examples: "make -m act -i 1:     创建活动1的接口与服务文件 \n" +
+			"make -m logic -n test: 创建test的服务文件",
+		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
+
+			//g.Dump(parser.GetOptAll(), parser.GetArgAll())
+			//return
+			var model = parser.GetOpt("model").String()
+			//var name = parser.GetOpt("n").String()
+			this := cMake{}
+			switch model {
+			case "act":
+				var id = parser.GetOpt("id").Int()
+				if id == 0 {
+					return
+				}
+				err = this.Act(id)
+			case "logic":
+				var name = parser.GetOpt("name").String()
+				if name == "" {
+					return
+				}
+				err = this.Logic(name)
+			}
+
+			return
+		},
+	}
+)
+
+type cMake struct{}
+
+func (c *cMake) Api() {
+
+}
+
+func (c *cMake) Act(id int) (err error) {
+	filePath := fmt.Sprintf("api/act/v1/act%v.go", id)
+	//生成文件不覆盖
+	if !gfile.Exists(filePath) {
+		err = gfile.PutContents(filePath, "package v1\n")
+	}
+
+	filePath = fmt.Sprintf("internal/game/act/act%d/act%d.go", id, id)
+	//生成文件不覆盖
+	if !gfile.Exists(filePath) {
+		//fileStr := gfile.GetContents(getFilePath)
+		get, _ := fs.ReadFile(ConfigFiles, "make/act")
+		fileStr := string(get)
+		fileStr = gstr.Replace(fileStr, "{id}", gconv.String(id))
+		err = gfile.PutContents(filePath, fileStr)
+	}
+
+	return
+}
+
+func (c *cMake) Logic(name string) (err error) {
+	var filePath = fmt.Sprintf("internal/logic/%s/%s.go", name, name)
+	//生成文件不覆盖
+	if !gfile.Exists(filePath) {
+		//fileStr := gfile.GetContents("./make/logic")
+		get, _ := fs.ReadFile(ConfigFiles, "make/act")
+		fileStr := string(get)
+		fileStr = gstr.Replace(fileStr, "{package}", name)
+		fileStr = gstr.Replace(fileStr, "{name}", gstr.CaseCamel(name))
+		err = gfile.PutContents(filePath, fileStr)
+	}
+
+	return
+}

cmd/make/act

@@ -0,0 +1,39 @@
+package act{id}
+
+import (
+	"game_server/internal/service"
+    "github.com/gogf/gf/v2/os/gctx"
+)
+
+type sAct{id} struct {
+}
+
+func New() *sAct{id} {
+	return &sAct{id}{}
+}
+
+var (
+	ActId = {id}
+	ctx   = gctx.New()
+)
+
+type Data struct {
+}
+
+func init() {
+
+}
+
+func (s *sAct{id}) GetData(uid int64) (data *Data) {
+	get, _ := service.GameAct().Info(uid, ActId)
+	get.Scan(&data)
+	if get.IsEmpty() || get.IsNil() || data == nil {
+		data = &Data{
+		}
+	}
+	return
+}
+
+func (s *sAct{id}) SetData(uid int64, data interface{}) {
+	service.GameAct().Set(uid, ActId, data)
+}

cmd/make/logic

@@ -0,0 +1,25 @@
+package {package}
+
+import (
+	"game_server/internal/service"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+type s{name} struct {
+}
+
+var (
+	ctx    = gctx.New()
+)
+
+func New() *s{name} {
+	return &s{name}{}
+}
+
+func init() {
+	service.Register{name}(New())
+}
+
+func (s *s{name}) Info() {
+
+}

cmd/update.go

@@ -0,0 +1,124 @@
+package cmd
+
+import (
+	"context"
+	"github.com/ayflying/utility_go/s3"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/os/gcfg"
+	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/os/gctx"
+	"os"
+	"time"
+)
+
+type serverCfg struct {
+	Name    string `json:"name" dc:"服务名"`
+	Address string `json:"address" dc:"服务地址"`
+	Prod    bool   `json:"prod" dc:"是否生产环境"`
+	S3      string `json:"s3" dc:"使用哪个对象储存中转"`
+}
+
+type UpdateReq struct {
+	File    *ghttp.UploadFile `json:"file" binding:"required" dc:"文件"`
+	FileUrl string            `json:"file_url" dc:"文件地址"`
+}
+
+var s3Mod *s3.Mod
+
+var (
+	Update = gcmd.Command{
+		Name:  "update",
+		Usage: "update",
+		Brief: "更新系统",
+		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
+
+			g.Log().Info(ctx, "准备上传更新文件")
+			//加载编辑配置文件
+			g.Cfg("hack").GetAdapter().(*gcfg.AdapterFile).SetFileName("hack/config.yaml")
+			getFileName, err := g.Cfg("hack").Get(ctx, "gfcli.build.name")
+			Filename := getFileName.String()
+
+			var list []*serverCfg
+			serverList := g.Cfg().MustGet(ctx, "server_list")
+			serverList.Scan(&list)
+
+			//如果有p或者prod参数，则删除prod字段为true的服务
+			if parser.GetOpt("a").IsNil() {
+				var temp []*serverCfg
+				for _, v := range list {
+					if v.Prod == false {
+						temp = append(temp, v)
+					}
+				}
+				list = temp
+			} else {
+				g.Dump("升级", parser.GetOpt("a"))
+			}
+
+			g.Dump("需要更新的服务器", list)
+			//获取上传链接
+			var url = make(map[string]string)
+			filename := "linux_amd64/" + Filename
+
+			client := g.Client()
+			client.SetTimeout(time.Minute)
+			client.SetDiscovery(nil)
+
+			//循环服务器，推送更新
+			for _, v := range list {
+				address := v.Address
+				if v.S3 == "" {
+					v.S3 = "default"
+				}
+
+				//查询当前上传地址是否存在
+				if _, ok := url[v.S3]; !ok {
+					url[v.S3], err = UploadS3(v.S3, filename)
+					if err != nil {
+						g.Log().Error(ctx, err)
+						return
+					}
+				}
+
+				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],
+				})
+				if err != nil {
+					g.Log().Debugf(ctx, "切换代理进行上传:err=%v", err)
+					get, err = client.Proxy("http://192.168.50.114:10808").
+						Post(ctx, address+"/callback/update", &UpdateReq{
+							FileUrl: url[v.S3],
+						})
+				}
+				if err != nil {
+					g.Log().Error(ctx, err)
+				}
+				defer get.Close()
+				g.Log().Debugf(ctx, "同步服务器:%v,完成=%v", v.Name, address)
+			}
+
+			return
+		},
+	}
+)
+
+func UploadS3(typ string, filename string) (res string, err error) {
+	//updateServerS3Name, _ := g.Config().Get(ctx, "update_server_s3_name")
+
+	s3Mod = s3.New(typ)
+	bucketName := s3Mod.GetCfg().BucketName
+	obj, err := os.Open(filename)
+	ff, err := obj.Stat()
+	_, err = s3Mod.PutObject(obj, filename, bucketName, ff.Size())
+	if err != nil {
+		return
+	}
+	//上传当前文件
+	get, err := s3Mod.GetFileUrl(filename, bucketName)
+	g.Log().Debugf(gctx.New(), "下载地址:%s", get)
+
+	res = get.String()
+	return
+}

elasticsearch/elasticsearch.go

@@ -0,0 +1,101 @@
+package elasticsearch
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"github.com/elastic/go-elasticsearch/v8"
+)
+
+var (
+	es *elasticsearch.TypedClient
+)
+
+type elastic struct {
+	client *elasticsearch.TypedClient
+}
+
+func New(name ...string) *elastic {
+	// ES 配置
+	cfg := elasticsearch.Config{
+		Addresses: []string{
+			"http://ay.cname.com:9200",
+		},
+	}
+	if es == nil {
+		var err error
+		es, err = elasticsearch.NewTypedClient(cfg)
+		if err != nil {
+			fmt.Printf("elasticsearch.NewTypedClient failed, err:%v\n", err)
+			return &elastic{}
+		}
+	}
+	return &elastic{
+		client: es,
+	}
+
+}
+
+// createIndex 创建索引
+func (s *elastic) CreateIndex(name string) {
+	resp, err := s.client.Indices.
+		Create(name).
+		Do(context.Background())
+	if err != nil {
+		fmt.Printf("create index failed, err:%v\n", err)
+		return
+	}
+	fmt.Printf("index:%#v\n", resp.Index)
+}
+
+// indexDocument 索引文档
+func (s *elastic) IndexDocument(name string, key string, data interface{}) {
+
+	// 添加文档
+	resp, err := s.client.Index(name).
+		Id(key).
+		Document(data).
+		Do(context.Background())
+	if err != nil {
+		fmt.Printf("indexing document failed, err:%v\n", err)
+		return
+	}
+	fmt.Printf("result:%#v\n", resp.Result)
+}
+
+// getDocument 获取文档
+func (s *elastic) GetDocument(name string, id string) (res json.RawMessage) {
+	resp, err := s.client.Get(name, id).
+		Do(context.Background())
+	if err != nil {
+		fmt.Printf("get document by id failed, err:%v\n", err)
+		return
+	}
+	fmt.Printf("fileds:%s\n", resp.Source_)
+	res = resp.Source_
+	return
+}
+
+// updateDocument 更新文档
+func (s *elastic) UpdateDocument(name string, key string, data interface{}) {
+
+	resp, err := s.client.Update(name, key).
+		Doc(data). // 使用结构体变量更新
+		Do(context.Background())
+	if err != nil {
+		fmt.Printf("update document failed, err:%v\n", err)
+		return
+	}
+	fmt.Printf("result:%v\n", resp.Result)
+}
+
+// deleteDocument 删除 document
+func (s *elastic) DeleteDocument(name string, key string) {
+	resp, err := s.client.Delete(name, key).
+		Do(context.Background())
+	if err != nil {
+		fmt.Printf("delete document failed, err:%v\n", err)
+		return
+	}
+	fmt.Printf("result:%v\n", resp.Result)
+}

excel/excel.go

@@ -93,7 +93,7 @@ func (s *Excel) itemsFormat(list []interface{}, Items []string) []interface{} {
 		for k3, v3 := range v2.(g.Map) {
 			if gstr.InArray(Items, k3) {
 				if _, ok := v3.(string); ok {
-					list[k2].(g.Map)[k3] = s.Spilt2Item(v3.(string))
+					list[k2].(g.Map)[k3] = Spilt2Item(v3.(string))
 				} else {
 					g.Log().Errorf(gctx.New(), "当前类型断言失败:%v,list=%v", v3, v2)
 				}
@@ -108,7 +108,7 @@ func (s *Excel) itemsMapFormat(list []interface{}, Items []string) []interface{}
 		for k3, v3 := range v2.(g.Map) {
 			if gstr.InArray(Items, k3) {
 				if _, ok := v3.(string); ok {
-					get := s.Spilt2Item(v3.(string))
+					get := Spilt2Item(v3.(string))
 					list[k2].(g.Map)[k3] = s.Items2Map(get)
 				} else {
 					g.Log().Errorf(gctx.New(), "当前类型断言失败:%v,list=%v", v3, v2)

excel/tools.go

@@ -26,19 +26,17 @@ func Excel2Slice(filePath string, _sheet ...string) [][]string {
 }
 
 // 字符串转道具类型
-func (s *Excel) Spilt2Item(str string) (result [][]int64) {
-	var parts []string
-	parts1 := strings.Split(str, "|") // 分割字符串
-	if parts1 == nil {
-		parts1 = []string{str}
+func Spilt2Item(str string) (result [][]int64) {
+	var shadiao = []string{","}
+	for _, v := range shadiao {
+		str = strings.ReplaceAll(str, v, "|")
+		//parts = append(parts, strings.Split(str, v)...) // 分割字符串
 	}
-	for _, v := range parts1 {
-		parts2 := strings.Split(v, ",") // 分割字符串
-		if parts2 == nil {
-			parts = append(parts, v)
-		} else {
-			parts = append(parts, parts2...)
-		}
+
+	//var parts []string
+	parts := strings.Split(str, "|") // 分割字符串
+	if parts == nil {
+		parts = []string{str}
 	}
 
 	for i := 0; i < len(parts)-1; i += 2 {

go.mod

@@ -5,9 +5,10 @@ go 1.23.0
 require (
 	github.com/apolloconfig/agollo/v4 v4.4.0
 	github.com/ayflying/excel2json v1.1.2
+	github.com/elastic/go-elasticsearch/v8 v8.17.0
 	github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3
 	github.com/gogf/gf/v2 v2.8.3
-	github.com/minio/minio-go/v7 v7.0.82
+	github.com/minio/minio-go/v7 v7.0.85
 	github.com/xuri/excelize/v2 v2.9.0
 )
 
@@ -16,19 +17,20 @@ require (
 	github.com/BurntSushi/toml v1.4.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.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
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/goccy/go-json v0.10.4 // indirect
 	github.com/google/uuid v1.6.0 // 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/cpuid/v2 v2.2.8 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // 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
@@ -50,12 +52,12 @@ require (
 	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
-	go.opentelemetry.io/otel v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.30.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect

go.sum

@@ -72,6 +72,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.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
+github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
+github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0=
+github.com/elastic/go-elasticsearch/v8 v8.17.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
 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=
@@ -98,9 +102,10 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+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/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3 h1:KU51l3uaU7Mxq+FSoLjROyDERUGKCMo4qExxPEgA7KQ=
 github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3/go.mod h1:Uo6f/Pr6zVHSbdP2Lj9iToEMuh/TzU/bE2E5SJlquEk=
 github.com/gogf/gf/v2 v2.8.3 h1:h9Px3lqJnnH6It0AqHRz4/1hx0JmvaSf1IvUir5x1rA=
 github.com/gogf/gf/v2 v2.8.3/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY=
@@ -210,8 +215,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 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/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+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/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -234,8 +239,10 @@ github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 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.82 h1:tWfICLhmp2aFPXL8Tli0XDTHj2VB/fNf0PC1f/i1gRo=
-github.com/minio/minio-go/v7 v7.0.82/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
+github.com/minio/minio-go/v7 v7.0.84 h1:D1HVmAF8JF8Bpi6IU4V9vIEj+8pc+xU88EWMs2yed0E=
+github.com/minio/minio-go/v7 v7.0.84/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY=
+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/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=
@@ -324,14 +331,14 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
-go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
-go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
-go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
+go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
+go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
+go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
 go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
 go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
-go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
-go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
+go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
+go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
 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=
@@ -342,8 +349,8 @@ 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.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 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=
@@ -417,8 +424,8 @@ 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.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+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/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=
@@ -484,7 +491,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

rank/rank.go

@@ -36,8 +36,18 @@ func (s *Mod) Load() {
 
 }
 
-// CreateF64CountRank 创建一个排行榜实例 name: [name:赛季]
+// CreateF64CountRank 创建一个排行榜实例
+// 参数:
+//
+//	name: 排行榜的名称，通常代表一个赛季
+//
+// 返回值:
+//
+//	*F64CountRank: 返回一个指向新创建的F64CountRank实例的指针
 func (s *Mod) CreateF64CountRank(name string) *F64CountRank {
+	// 初始化F64CountRank实例的name和updateTs字段
+	// name字段用于标识排行榜的名称，格式为"rank:<name>:score"
+	// updateTs字段用于标识排行榜的更新时间，格式为"rank:<name>:updateTs"
 	return &F64CountRank{
 		name:     fmt.Sprintf("rank:%s:score", name),
 		updateTs: fmt.Sprintf("rank:%s:updateTs", name),
@@ -86,51 +96,80 @@ func (r *F64CountRank) IncrScore(id int64, score int64) (curScore float64, err e
 	return
 }
 
-// 删除当前排行榜
+// todo暂时未使用
+func (r *F64CountRank) GetCount() {
+	count, _ := g.Redis().ZCard(ctx, r.name)
+	if count > 9999 {
+		//删除超过9999的数据
+		g.Redis().ZRemRangeByRank(ctx, r.name, 0, -9999)
+	}
+}
+
+// Delete 删除当前排行榜
+// 该方法通过删除Redis中与排行榜相关的键来清除排行榜信息
 func (r *F64CountRank) Delete() {
+	// 删除排行榜数据键
 	_, err := g.Redis().Del(ctx, r.name)
 	if err != nil {
+		// 如果删除失败，记录错误日志
 		g.Log().Error(ctx, "排行榜删除失败:%v", err)
 	}
+	// 删除排行榜更新时间键
 	_, err = g.Redis().Del(ctx, r.updateTs)
 	if err != nil {
+		// 如果删除失败，记录错误日志
 		g.Log().Error(ctx, "排行榜删除失败:%v", err)
 	}
 }
 
 // DelScore 删除当前分数
 //
-//	@Description:
-//	@receiver r
-//	@param id
-//	@return err
+// 该方法从更新时间有序集合和排名有序集合中移除指定的id。
+// 这通常用于从排行榜中删除一个条目，同时确保其在更新时间集合中的对应记录也被清除。
+//
+//	@Description: 从更新时间和排名集合中移除指定id
+//	@receiver r 接收者为F64CountRank类型的实例
+//	@param id 要从集合中移除的条目的ID
+//	@return err 可能发生的错误，如果操作成功，err为nil
 func (r *F64CountRank) DelScore(id int64) (err error) {
+	// 从更新时间集合中移除id
 	_, err = g.Redis().ZRem(ctx, r.updateTs, id)
+	// 从排名集合中移除id
 	_, err = g.Redis().ZRem(ctx, r.name, id)
 	return
 }
 
-// DelScore 删除当前分数
-//
-//	@Description:
-//	@receiver r
-//	@param id
-//	@return err
+// DelByRank 根据排名范围删除元素。
+// 该方法使用了Redis的有序集合数据结构，通过ZRange和ZRemRangeByRank命令来实现。
+// 参数start和stop定义了要删除的排名范围，从start到stop（包括start和stop）。
+// 返回可能的错误。
 func (r *F64CountRank) DelByRank(start int64, stop int64) (err error) {
+	// 初始化一个空的int64切片，用于存储指定排名范围内的元素。
 	var members []int64
+
+	// 使用Redis的ZRange命令获取指定排名范围内的元素。
+	// 选项Rev设置为true，表示按照分数从高到低的顺序返回元素。
 	get, err := g.Redis().ZRange(ctx, r.name, start, stop,
 		gredis.ZRangeOption{
 			Rev: true,
 		})
+
+	// 使用Scan方法将获取到的元素扫描到members切片中。
 	err = get.Scan(&members)
+	// 如果扫描过程中出现错误，直接返回错误。
 	if err != nil {
 		return
 	}
 
+	// 遍历members切片，对于每个元素，使用ZRem命令从更新时间集合中删除对应的成员。
 	for _, member := range members {
 		_, err = g.Redis().ZRem(ctx, r.updateTs, member)
+		// 忽略ZRem操作的错误，因为即使元素不存在，ZRem也不会返回错误。
 	}
+
+	// 使用ZRemRangeByRank命令从有序集合中删除指定排名范围内的元素。
 	_, err = g.Redis().ZRemRangeByRank(ctx, r.name, start, stop)
+	// 返回可能的错误。
 	return
 }
 
@@ -269,44 +308,85 @@ func (r *F64CountRank) UpdateScore(id int64, score int64) (err error) {
 //}
 
 // GetRankInfosNotTs 获取0~count跳记录 不根据更新时间来
+// 该方法使用ZRange命令从Redis中获取指定范围的排名信息，不考虑更新时间
+// 参数:
+//
+//	offset - 获取记录的起始偏移量
+//	count - 获取记录的数量
+//
+// 返回值:
+//
+//	list - 排名信息列表
+//	err - 错误信息，如果执行过程中遇到错误
 func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*Data, err error) {
+	// 初始化存储成员ID的切片
 	var members []int64
+
+	// 使用Redis的ZRange命令获取指定范围的成员ID
+	// 参数Rev设为true以从高分到低分获取成员
 	get, err := g.Redis().ZRange(ctx, r.name, int64(offset), int64(count),
 		gredis.ZRangeOption{
 			Rev: true,
 		}) //.ScanSlice(&members)
+
+	// 将获取的结果扫描到members切片中
 	err = get.Scan(&members)
+	// 如果发生错误，记录日志并返回
 	if err != nil {
 		//logs.Withf("redis err:%v", err)
 		return
 	}
 
+	// 根据获取的成员ID数量初始化排名信息列表
 	list = make([]*Data, len(members))
 	for i := range members {
+		// 获取当前成员ID
 		id := members[i]
-		//id := pgk.InterfaceToNumber[uint64](members[i])
+		// 使用成员ID获取排名信息，不考虑更新时间
 		list[i] = r.GetIdRankNotTs(id)
 	}
+	// 返回排名信息列表和可能的错误
 	return
 }
 
-// 获取指定id的当前排名
+// GetIdRankNotTs 获取指定id的当前排名
+// 该方法从Redis的有序集合中查询指定id的分数和排名信息，不考虑时间戳
+// 参数:
+//
+//	id - 需要查询排名的id
+//
+// 返回值:
+//
+//	rankInfo - 包含id的分数和排名信息的指针，如果没有找到，则返回nil
 func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *Data) {
+	// 初始化rankInfo结构体，设置id，其他字段将通过查询填充
 	rankInfo = &Data{Id: id}
+
+	// 查询有序集合中指定id的分数
 	score, err := g.Redis().ZScore(ctx, r.name, id)
 	if err != nil {
+		// 如果发生错误，直接返回，rankInfo为初始化状态，Id已设置，其他字段为零值
 		return
 	}
+
+	// 将分数转换为int64类型并更新rankInfo
 	rankInfo.Score = int64(score)
+
+	// 如果分数为0，直接返回，表示该id的分数为0，没有进一步查询排名的必要
 	if score == 0 {
 		return
 	}
 
+	// 查询有序集合中指定id的排名
 	rank, err := g.Redis().ZRevRank(ctx, r.name, id)
 	if err != nil {
+		// 如果发生错误，直接返回，rankInfo中仅分数有效，排名信息未更新
 		return
 	}
+
+	// 更新rankInfo中的排名信息，排名从0开始，所以需要加1以符合人类的计数习惯
 	rankInfo.Rank = int32(rank) + 1
 
+	// 返回包含完整排名信息的rankInfo指针
 	return rankInfo
 }

s3/s3.go

@@ -45,8 +45,6 @@ func New(_name ...string) *Mod {
 		name = getName.String()
 	}
 
-	get2, err := g.Cfg().Get(ctx, "s3")
-	g.Dump(get2)
 	get, err := g.Cfg().Get(ctx, "s3."+name)
 	if err != nil {
 		panic(err.Error())
@@ -276,14 +274,14 @@ func (s *Mod) CopyObject(bucketName string, dstStr string, srcStr string) (err e
 
 	// 原始文件
 	var dst = minio.CopyDestOptions{
-		Bucket: dstStr,
-		Object: bucketName,
+		Bucket: bucketName,
+		Object: dstStr,
 	}
 
 	// 新文件
 	var src = minio.CopySrcOptions{
-		Bucket: srcStr,
-		Object: bucketName,
+		Bucket: bucketName,
+		Object: srcStr,
 	}
 
 	_, err = s.client.CopyObject(ctx, dst, src)

tools/time.go

@@ -19,13 +19,13 @@ func (m *timeMod) Load() {
 // 获取本周的开始时间
 func (m *timeMod) StartOfWeek(t time.Time) time.Time {
 	start := gtime.New().AddDate(0, 0, -int(t.Weekday()-1)).Time
-	start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, start.Location())
+	start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, start.UTC().Location())
 	return start
 }
 
 func (m *timeMod) StartOfWeekV2(t time.Time) time.Time {
 	start := t.AddDate(0, 0, -int(t.Weekday()-1))
-	start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, start.Location())
+	start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, start.UTC().Location())
 	return start
 }
 
@@ -59,7 +59,7 @@ func (m *timeMod) GetDayPass(startTime time.Time, t ...time.Time) int {
 	month := startTime.Month()
 	day := startTime.Day()
 	// 构建一天的开始时间
-	startTime = time.Date(year, month, day, 0, 0, 0, 0, startTime.Location())
+	startTime = time.Date(year, month, day, 0, 0, 0, 0, startTime.UTC().Location())
 
 	//如果为空，使用当前时间
 	endTime := time.Now()
@@ -89,7 +89,7 @@ func (m *timeMod) GetDayZeroTime(currentTime time.Time, day int) time.Time {
 	// 加上指定天数的时间
 	threeDaysLater := currentTime.AddDate(0, 0, day)
 	// 调整时间为0点
-	zeroTime := time.Date(threeDaysLater.Year(), threeDaysLater.Month(), threeDaysLater.Day(), 0, 0, 0, 0, threeDaysLater.Location())
+	zeroTime := time.Date(threeDaysLater.Year(), threeDaysLater.Month(), threeDaysLater.Day(), 0, 0, 0, 0, threeDaysLater.UTC().Location())
 	return zeroTime
 }
 
@@ -108,7 +108,7 @@ func (m *timeMod) GetEndTime(startTime time.Time, _day ...int) time.Time {
 	// 加上指定天数的时间
 	threeDaysLater := startTime.AddDate(0, 0, day)
 	// 调整时间为0点
-	zeroTime := time.Date(threeDaysLater.Year(), threeDaysLater.Month(), threeDaysLater.Day(), 23, 59, 59, 0, threeDaysLater.Location())
+	zeroTime := time.Date(threeDaysLater.Year(), threeDaysLater.Month(), threeDaysLater.Day(), 23, 59, 59, 0, threeDaysLater.UTC().Location())
 	return zeroTime
 }
 

tools/tools.go

@@ -55,9 +55,32 @@ func (m *tools) GetDay(t1 *gtime.Time, t2 *gtime.Time) int {
 	return int(t1.Sub(t2).Hours() / 24)
 }
 
+//// 字符串转道具类型
+//func (m *tools) Spilt2Item(str string) (result [][]int64) {
+//	parts := strings.Split(str, "|") // 分割字符串
+//
+//	for i := 0; i < len(parts)-1; i += 2 {
+//		num1, _ := strconv.ParseInt(parts[i], 10, 64)
+//		num2, _ := strconv.ParseInt(parts[i+1], 10, 64)
+//
+//		pair := []int64{num1, num2}
+//		result = append(result, pair)
+//	}
+//	return
+//}
+
 // 字符串转道具类型
 func (m *tools) Spilt2Item(str string) (result [][]int64) {
+	var shadiao = []string{","}
+	for _, v := range shadiao {
+		str = strings.ReplaceAll(str, v, "|")
+	}
+
+	//var parts []string
 	parts := strings.Split(str, "|") // 分割字符串
+	if parts == nil {
+		parts = []string{str}
+	}
 
 	for i := 0; i < len(parts)-1; i += 2 {
 		num1, _ := strconv.ParseInt(parts[i], 10, 64)