修改导表工具，修改websocket协议的钩子

README.md

@@ -1,10 +1,10 @@
 # utility_go：强大的Go语言工具类库
 
 ## 一、项目概述
-`utility_go` 是一个功能丰富的Go语言工具类库，旨在帮助开发者更高效地开发Go应用程序。它提供了一系列实用的功能模块，涵盖了数据库操作、缓存处理、支付接口集成、排名算法实现等多个方面，可广泛应用于各种类型的Go项目中。
+`utility_go` 是一个功能丰富的Go语言工具类库，旨在助力开发者更高效地开发Go应用程序。它提供了一系列实用的功能模块，广泛涵盖数据库操作、缓存处理、支付接口集成、排名算法实现等多个方面，适用于各类Go项目。
 
 ## 二、安装方式
-要使用 `utility_go` 工具类库，你可以使用 `go get` 命令进行安装。请确保你的Go环境已经正确配置，并且可以访问互联网。
+要使用 `utility_go` 工具类库，可使用 `go get` 命令进行安装。请确保你的Go环境已正确配置，且可访问互联网。
 
 ### 安装命令
 ```sh
@@ -12,7 +12,7 @@ go get github.com/ayflying/utility_go
 ```
 
 ### 安装验证
-安装完成后，你可以在你的Go代码中导入 `utility_go` 相关的包，检查是否能够正常使用。例如：
+安装完成后，你可以在Go代码中导入 `utility_go` 相关的包，检查是否能够正常使用。示例如下：
 ```go
 package main
 
@@ -29,39 +29,45 @@ func main() {
 ```
 
 ## 三、项目结构
-`utility_go` 的项目结构设计清晰，各个模块分工明确，方便开发者使用和扩展。以下是项目的主要目录结构：
+`utility_go` 的项目结构设计清晰，各模块分工明确，便于开发者使用和扩展。以下是项目的主要目录结构及说明：
 
 ### 主要目录说明
-- **`api/`**：存放与API相关的代码，包含不同模块的API接口定义，如 `admin`、`callback`、`system` 等。这些API接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
-- **`service/`**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
-- **`controller/`**：控制器层代码，主要用于处理HTTP请求和响应。控制器接收客户端的请求，调用相应的服务层方法进行处理，并将处理结果返回给客户端。
-- **`internal/`**：内部包，包含项目的核心业务逻辑，如 `game`、`logic`、`model` 等模块。其中，`model` 模块定义了项目中使用的数据模型，如数据库表对应的结构体；`logic` 模块实现了各种业务逻辑的处理函数。
-- **`package/`**：包含各种功能包，提供了丰富的工具和功能，具体如下：
-    - **`aycache`**：缓存相关的功能包，提供了缓存操作的接口和实现，帮助开发者更方便地使用缓存技术，提高应用程序的性能。
-    - **`elasticsearch`**：Elasticsearch相关的功能包，用于与Elasticsearch搜索引擎进行交互，实现数据的存储、检索和分析等功能。
-    - **`excel`**：Excel处理相关的功能包，提供了Excel文件的读写操作接口，方便开发者处理Excel文件中的数据。
-    - **`pay`**：支付相关的功能包，包含了与各种支付平台的接口集成，如 `apple`（苹果支付）、`playstore`（Google Play Store支付）等，支持应用内购买等支付功能。
-    - **`rand`**：随机数相关的功能包，提供了生成各种随机数的函数，可用于测试、加密等场景。
-    - **`rank`**：排名相关的功能包，实现了各种排名算法，如基于Redis的排行榜功能，可用于游戏排名、活动排名等场景。
-    - **`s3`**：S3存储相关的功能包，用于与Amazon S3等云存储服务进行交互，实现文件的上传、下载、删除等操作。
-- **`tools/`**：工具类代码，包含了一些常用的工具函数，如 `redis.go`（Redis操作相关）、`time.go`（时间处理相关）、`tools.go`（通用工具函数）等，方便开发者在项目中使用。
+- **api/**：存放与API相关的代码，包含不同模块的API接口定义，如 `admin`、`callback`、`system` 等。这些API接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
+- **service/**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
+- **controller/**：控制器层代码，主要用于处理HTTP请求和响应。控制器接收客户端的请求，调用相应的服务层方法进行处理，并将处理结果返回给客户端。
+- **internal/**：内部包，包含项目的核心业务逻辑，如 `game`、`logic`、`model` 等模块。其中，`model` 模块定义了项目中使用的数据模型，如数据库表对应的结构体；`logic` 模块实现了各种业务逻辑的处理函数。
+- **package/**：包含各种功能包，提供了丰富的工具和功能，具体如下：
+  - **aycache**：缓存相关的功能包，提供了缓存操作的接口和实现，帮助开发者更方便地使用缓存技术，提高应用程序的性能。
+  - **elasticsearch**：Elasticsearch相关的功能包，用于与Elasticsearch搜索引擎进行交互，实现数据的存储、检索和分析等功能。
+  - **excel**：Excel处理相关的功能包，提供了Excel文件的读写操作接口，方便开发者处理Excel文件中的数据。
+  - **pay**：支付相关的功能包，包含了与各种支付平台的接口集成，如 `apple`（苹果支付）、`playstore`（Google Play Store支付）等，支持应用内购买等支付功能。
+  - **rand**：随机数相关的功能包，提供了生成各种随机数的函数，可用于测试、加密等场景。
+  - **rank**：排名相关的功能包，实现了各种排名算法，如基于Redis的排行榜功能，可用于游戏排名、活动排名等场景。
+  - **s3**：S3存储相关的功能包，用于与Amazon S3等云存储服务进行交互，实现文件的上传、下载、删除等操作。
+- **tools/**：工具类代码，包含了一些常用的工具函数，如 `redis.go`（Redis操作相关）、`time.go`（时间处理相关）、`tools.go`（通用工具函数）等，方便开发者在项目中使用。
 
 ## 四、主要模块功能
 
-### 4.1 `pay/playstore`
-该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作。它提供了以下主要功能：
-- **创建客户端**：通过 `New` 函数创建并返回一个包含访问androidpublisher API所需凭证的http客户端，方便开发者与Google Play Store API进行通信。
-- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的http客户端创建并返回一个包含访问androidpublisher API所需凭证的http客户端，增加了客户端的灵活性。
+### 4.1 pay/playstore
+该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作，提供以下主要功能：
+- **创建客户端**：通过 `New` 函数创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，方便开发者与Google Play Store API进行通信。
+- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的HTTP客户端创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，增加了客户端的灵活性。
 - **验证签名**：`VerifySignature` 函数用于验证应用内购买的签名，确保支付信息的安全性和合法性。
 
-### 4.2 `s3`
-`s3` 模块主要用于与S3存储服务进行交互，提供了文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。
+### 4.2 s3
+`s3` 模块主要用于与S3存储服务进行交互，提供文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。
 
-### 4.3 `model`
+### 4.3 model
 `model` 模块定义了项目中使用的数据模型，这些数据模型通常与数据库表相对应，用于数据的存储和操作。例如：
-- **`GameMailMass`**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
-- **`GameBag`**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
-- **`MemberSave`**：（根据具体代码中的定义）可能表示用户会员信息的数据模型，用于存储用户的会员相关数据。
+- **GameMailMass**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
+- **GameBag**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
+- **MemberSave**：（根据具体代码中的定义）可能表示用户会员信息的数据模型，用于存储用户的会员相关数据。
+
+### 4.4 tools
+`tools` 模块提供了一系列通用工具函数，涵盖时间处理、Redis操作、道具数据处理等功能：
+- **时间处理**：`time.go` 文件中的函数可以进行时间计算，如获取本周开始时间、计算两个时间间隔天数等。
+- **Redis操作**：`redis.go` 文件中的函数可以进行Redis的扫描操作，支持批量获取大量数据。
+- **通用工具**：`tools.go` 文件中的函数提供了字符串处理、切片操作、道具数据合并等功能。
 
 ## 五、使用示例
 
@@ -115,6 +121,33 @@ func main() {
 }
 ```
 
+### 5.3 工具模块示例
+以下是一个使用 `tools` 模块处理道具数据的示例代码：
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/ayflying/utility_go/tools"
+)
+
+func main() {
+    // 字符串转道具类型
+    str := "1|10|2|20"
+    result := tools.Tools.Spilt2Item(str)
+    fmt.Println("Spilt2Item result:", result)
+
+    // 切片换道具类型
+    slice := []int64{1, 10, 2, 20}
+    res := tools.Tools.Slice2Item(slice)
+    fmt.Println("Slice2Item result:", res)
+
+    // 道具格式转map
+    list := tools.Tools.Items2Map(result)
+    fmt.Println("Items2Map result:", list)
+}
+```
+
 ## 六、注意事项
 - **自动生成文件**：项目中有部分代码文件是由GoFrame CLI工具生成并维护的，这些文件通常会标注有 `// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.` 注释。请不要手动修改这些文件，以免造成不必要的问题。
 - **版本兼容性**：在使用 `utility_go` 工具类库时，请确保你的Go语言版本与工具类库的要求版本兼容。建议使用最新的Go语言版本，以获得更好的性能和稳定性。
@@ -123,5 +156,4 @@ func main() {
 `utility_go` 工具类库会定期进行更新和维护，以修复已知的问题、添加新的功能和优化性能。你可以关注项目的GitHub仓库（https://github.com/ayflying/utility_go）获取最新的更新信息。如果你在使用过程中遇到任何问题或有任何建议，欢迎提交Issue或Pull Request。
 
 ## 八、许可证信息
-`utility_go` 工具类库遵循 MIT许可证，你可以在项目的 `LICENSE` 文件中查看详细的许可证条款。请确保在使用该工具类库时遵守相关的许可证规定。
-```
+`utility_go` 工具类库遵循MIT许可证，你可以在项目的 `LICENSE` 文件中查看详细的许可证条款。请确保在使用该工具类库时遵守相关的许可证规定。

api/pgk/v1/pgk.pb.go

@@ -1,237 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.20.0
-// source: pgk/v1/pgk.proto
-
-package v1
-
-import (
-	reflect "reflect"
-	sync "sync"
-
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// 定义 NoticeType 枚举
-type NoticeType int32
-
-const (
-	NoticeType_DINGTALK NoticeType = 0
-	NoticeType_WECHAT   NoticeType = 1
-	NoticeType_EMAIL    NoticeType = 2
-	NoticeType_SMS      NoticeType = 3
-	NoticeType_VOICE    NoticeType = 4
-)
-
-// Enum value maps for NoticeType.
-var (
-	NoticeType_name = map[int32]string{
-		0: "DINGTALK",
-		1: "WECHAT",
-		2: "EMAIL",
-		3: "SMS",
-		4: "VOICE",
-	}
-	NoticeType_value = map[string]int32{
-		"DINGTALK": 0,
-		"WECHAT":   1,
-		"EMAIL":    2,
-		"SMS":      3,
-		"VOICE":    4,
-	}
-)
-
-func (x NoticeType) Enum() *NoticeType {
-	p := new(NoticeType)
-	*p = x
-	return p
-}
-
-func (x NoticeType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (NoticeType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pgk_v1_pgk_proto_enumTypes[0].Descriptor()
-}
-
-func (NoticeType) Type() protoreflect.EnumType {
-	return &file_pgk_v1_pgk_proto_enumTypes[0]
-}
-
-func (x NoticeType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use NoticeType.Descriptor instead.
-func (NoticeType) EnumDescriptor() ([]byte, []int) {
-	return file_pgk_v1_pgk_proto_rawDescGZIP(), []int{0}
-}
-
-// 排行榜数据
-type RankData struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id       int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Score    int64 `protobuf:"varint,2,opt,name=score,proto3" json:"score,omitempty"`
-	Rank     int32 `protobuf:"varint,3,opt,name=rank,proto3" json:"rank,omitempty"`
-	UpdateTs int64 `protobuf:"varint,4,opt,name=update_ts,json=updateTs,proto3" json:"update_ts,omitempty"`
-}
-
-func (x *RankData) Reset() {
-	*x = RankData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pgk_v1_pgk_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RankData) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RankData) ProtoMessage() {}
-
-func (x *RankData) ProtoReflect() protoreflect.Message {
-	mi := &file_pgk_v1_pgk_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RankData.ProtoReflect.Descriptor instead.
-func (*RankData) Descriptor() ([]byte, []int) {
-	return file_pgk_v1_pgk_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *RankData) GetId() int64 {
-	if x != nil {
-		return x.Id
-	}
-	return 0
-}
-
-func (x *RankData) GetScore() int64 {
-	if x != nil {
-		return x.Score
-	}
-	return 0
-}
-
-func (x *RankData) GetRank() int32 {
-	if x != nil {
-		return x.Rank
-	}
-	return 0
-}
-
-func (x *RankData) GetUpdateTs() int64 {
-	if x != nil {
-		return x.UpdateTs
-	}
-	return 0
-}
-
-var File_pgk_v1_pgk_proto protoreflect.FileDescriptor
-
-var file_pgk_v1_pgk_proto_rawDesc = []byte{
-	0x0a, 0x10, 0x70, 0x67, 0x6b, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x67, 0x6b, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0x61, 0x0a, 0x08, 0x52,
-	0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e,
-	0x6b, 0x12, 0x1b, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x73, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x73, 0x2a, 0x45,
-	0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08,
-	0x44, 0x49, 0x4e, 0x47, 0x54, 0x41, 0x4c, 0x4b, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x57, 0x45,
-	0x43, 0x48, 0x41, 0x54, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x4d, 0x41, 0x49, 0x4c, 0x10,
-	0x02, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x4d, 0x53, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x56, 0x4f,
-	0x49, 0x43, 0x45, 0x10, 0x04, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x79, 0x66, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x2f, 0x75, 0x74, 0x69,
-	0x6c, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x67, 0x6b, 0x2f,
-	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pgk_v1_pgk_proto_rawDescOnce sync.Once
-	file_pgk_v1_pgk_proto_rawDescData = file_pgk_v1_pgk_proto_rawDesc
-)
-
-func file_pgk_v1_pgk_proto_rawDescGZIP() []byte {
-	file_pgk_v1_pgk_proto_rawDescOnce.Do(func() {
-		file_pgk_v1_pgk_proto_rawDescData = protoimpl.X.CompressGZIP(file_pgk_v1_pgk_proto_rawDescData)
-	})
-	return file_pgk_v1_pgk_proto_rawDescData
-}
-
-var file_pgk_v1_pgk_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pgk_v1_pgk_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pgk_v1_pgk_proto_goTypes = []interface{}{
-	(NoticeType)(0),  // 0: package.NoticeType
-	(*RankData)(nil), // 1: package.RankData
-}
-var file_pgk_v1_pgk_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pgk_v1_pgk_proto_init() }
-func file_pgk_v1_pgk_proto_init() {
-	if File_pgk_v1_pgk_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pgk_v1_pgk_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RankData); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pgk_v1_pgk_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pgk_v1_pgk_proto_goTypes,
-		DependencyIndexes: file_pgk_v1_pgk_proto_depIdxs,
-		EnumInfos:         file_pgk_v1_pgk_proto_enumTypes,
-		MessageInfos:      file_pgk_v1_pgk_proto_msgTypes,
-	}.Build()
-	File_pgk_v1_pgk_proto = out.File
-	file_pgk_v1_pgk_proto_rawDesc = nil
-	file_pgk_v1_pgk_proto_goTypes = nil
-	file_pgk_v1_pgk_proto_depIdxs = nil
-}

aycache/aycache.go

@@ -1,8 +1,7 @@
 package aycache
 
 import (
-	"github.com/ayflying/utility_go/pkg/aycache/drive"
-	drive2 "github.com/ayflying/utility_go/pkg/aycache/drive"
+	"github.com/ayflying/utility_go/pkg"
 	"github.com/gogf/gf/v2/os/gcache"
 )
 
@@ -10,30 +9,7 @@ type Mod struct {
 	client *gcache.Cache
 }
 
-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.Cache
-//}
-
-// Deprecated:弃用，改用 pgk.Cache()
+// Deprecated:弃用，改用 pkg.Cache()
 func New(_name ...string) gcache.Adapter {
-
-	var cacheAdapterObj gcache.Adapter
-	var name = "cache"
-	if len(_name) > 0 {
-		name = _name[0]
-	}
-	switch name {
-	case "cache":
-		cacheAdapterObj = drive2.NewAdapterMemory()
-	case "redis":
-		cacheAdapterObj = drive2.NewAdapterRedis()
-	case "file":
-		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")
-	case "es":
-		cacheAdapterObj = drive.NewAdapterElasticsearch([]string{"http://127.0.0.1:9200"})
-	}
-
-	//var client = gcache.New()
-	//client.SetAdapter(cacheAdapterObj)
-	return cacheAdapterObj
+	return pkg.Cache(_name...)
 }

cmd/load.go

@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"github.com/ayflying/utility_go/controller/callback"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+)
+
+func Load(s *ghttp.Server) {
+
+	//开启prometheus监控
+	s.Group("/metrics", func(group *ghttp.RouterGroup) {
+		group.Bind(
+			ghttp.WrapH(promhttp.Handler()),
+		)
+	})
+}
+
+// 注册游客方法
+func RegistrationAnonymous(group *ghttp.RouterGroup) (res []interface{}) {
+	group.Bind(
+		callback.NewV1(),
+	)
+	return
+
+}
+
+// 注册用户方法
+func RegistrationUser(group *ghttp.RouterGroup) (res []interface{}) {
+	group.Bind()
+	return
+}

drivers/db/elasticsearch/elasticsearch.go

@@ -46,7 +46,7 @@ type elastic struct {
 //}
 //
 //// getDocument 获取文档
-//func (d *Driver) GetDocument(name string, id string) (res json.RawMessage) {
+//func (d *Driver) Get(name string, id string) (res json.RawMessage) {
 //	resp, err := d.client.Get(name, id).
 //		Do(context.Background())
 //	if err != nil {

drivers/db/elasticsearch/load.go

@@ -1,6 +1,7 @@
 package elasticsearch
 
 import (
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 )
@@ -15,16 +16,19 @@ const (
 )
 
 func init() {
-	var (
-		err         error
-		driverObj   = New()
-		driverNames = g.SliceStr{"es", "elasticsearch"}
-	)
-	for _, driverName := range driverNames {
-		if err = gdb.Register(driverName, driverObj); err != nil {
-			panic(err)
+	boot.AddFunc(func() {
+		var (
+			err         error
+			driverObj   = New()
+			driverNames = g.SliceStr{"es", "elasticsearch"}
+		)
+		for _, driverName := range driverNames {
+			if err = gdb.Register(driverName, driverObj); err != nil {
+				panic(err)
+			}
 		}
-	}
+	})
+
 }
 
 // New create and returns a driver that implements gdb.Driver, which supports operations for MySQL.

drivers/db/found/found.go

@@ -2,6 +2,7 @@ package found
 
 import (
 	"database/sql"
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 )
@@ -21,16 +22,18 @@ const (
 )
 
 func init() {
-	var (
-		err         error
-		driverObj   = New()
-		driverNames = g.SliceStr{"es", "found"}
-	)
-	for _, driverName := range driverNames {
-		if err = gdb.Register(driverName, driverObj); err != nil {
-			panic(err)
+	boot.AddFunc(func() {
+		var (
+			err         error
+			driverObj   = New()
+			driverNames = g.SliceStr{"es", "found"}
+		)
+		for _, driverName := range driverNames {
+			if err = gdb.Register(driverName, driverObj); err != nil {
+				panic(err)
+			}
 		}
-	}
+	})
 }
 
 // New create and returns a driver that implements gdb.Driver, which supports operations for MySQL.

go.mod

@@ -12,12 +12,16 @@ require (
 	github.com/goccy/go-json v0.10.4
 	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/xuri/excelize/v2 v2.9.0
-	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
+	golang.org/x/oauth2 v0.24.0
 	google.golang.org/api v0.44.0
-	google.golang.org/protobuf v1.26.0
+	google.golang.org/protobuf v1.36.1
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )
 
@@ -25,7 +29,10 @@ 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/emirpasic/gods v1.18.1 // indirect
@@ -40,9 +47,7 @@ require (
 	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/google/uuid v1.6.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
@@ -54,8 +59,13 @@ require (
 	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
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect

go.sum

@@ -54,9 +54,13 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 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/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=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -245,6 +249,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230 h1:B0oaMTAQKDZd8cwYT0qsAI7+c3KbFeBNA8GhgoBMXWw=
 github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230/go.mod h1:C5LA5UO2ZXJrLaPLYtE1wUJMiyd/nwWaCO5cw/2pSHs=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -279,6 +285,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -289,7 +297,15 @@ 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_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=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
@@ -463,8 +479,9 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 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 h1:0Ja1LBD+yisY6RWM/BH7TJVXWsSjs2VwBSmvSX4HdBc=
 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/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=
@@ -694,8 +711,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 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 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 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=
 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=

internal/boot/boot.go

@@ -0,0 +1,33 @@
+package boot
+
+import (
+	v1 "github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/service"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+var (
+	ctx   = gctx.GetInitCtx()
+	_func = []func(){}
+)
+
+func Boot() (err error) {
+	err = service.SystemCron().StartCron()
+
+	//用户活动持久化
+	service.SystemCron().AddCron(v1.CronType_DAILY, func() error {
+		return service.GameAct().Saves()
+	})
+
+	//初始化自启动方法
+	for _, v := range _func {
+		v()
+	}
+
+	return nil
+}
+
+// AddFunc 注册方法，在启动时执行
+func AddFunc(f func()) {
+	_func = append(_func, f)
+}

internal/logic/gameAct/gameAct.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/ayflying/utility_go/internal/model/do"
 	"github.com/ayflying/utility_go/internal/model/entity"
-	"github.com/ayflying/utility_go/pgk"
 	"github.com/ayflying/utility_go/pkg"
 	service2 "github.com/ayflying/utility_go/service"
 	"github.com/ayflying/utility_go/tools"
@@ -12,6 +11,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
 	"strconv"
 	"strings"
 	"time"
@@ -131,7 +131,8 @@ func (s *sGameAct) Save(actId int) (err error) {
 			result := strings.Split(cacheKey, ":")
 			actId, err = strconv.Atoi(result[1])
 			var uid int64
-			uid, err = strconv.ParseInt(result[2], 10, 64)
+			uid = gconv.Int64(result[2])
+			//uid, err = strconv.ParseInt(result[2], 10, 64)
 			if err != nil {
 				continue
 			}
@@ -216,9 +217,28 @@ func (s *sGameAct) Save(actId int) (err error) {
 // 清空GetRedDot缓存
 func (s *sGameAct) RefreshGetRedDotCache(uid int64) {
 	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("d"), uid)
-	_, err := pgk.Cache("redis").Remove(gctx.New(), cacheKey)
+	_, err := pkg.Cache("redis").Remove(gctx.New(), cacheKey)
 	if err != nil {
 		g.Log().Error(ctx, err)
 		g.Dump(err)
 	}
 }
+
+func (s *sGameAct) Del(uid int64, actId int) {
+	if uid == 0 || actId == 0 {
+		g.Log().Error(ctx, "当前参数为空")
+		return
+	}
+	// 构造缓存键名
+	keyCache := fmt.Sprintf("act:%v:%v", actId, uid)
+
+	//删除活动缓存
+	g.Redis().Del(ctx, keyCache)
+
+	//删除当前活动储存
+	g.Model(Name).Where(do.GameAct{
+		Uid:   uid,
+		ActId: actId,
+	}).Delete()
+
+}

internal/logic/ip2region/ip2region.go

@@ -1,6 +1,7 @@
 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"
@@ -19,13 +20,16 @@ type sIp2region struct {
 }
 
 func New() *sIp2region {
-	s := &sIp2region{}
-	s.Load()
-	return s
+
+	return &sIp2region{}
 }
 
 func init() {
 	service.RegisterIp2Region(New())
+
+	boot.AddFunc(func() {
+		service.Ip2Region().Load()
+	})
 }
 
 // Load 加载到内存中
@@ -34,13 +38,14 @@ func init() {
 //	@receiver s *sIp2region: sIp2region的实例。
 func (s *sIp2region) Load() {
 	var err error
-	//var dbPath = "/mnt/s3/ip2region.xdb"
-	var dbPath = "lib/ip2region.xdb"
+
+	var url = "https://github.com/ayflying/resource/raw/refs/heads/main/attachment/ip2region.xdb"
+	var dbPath = "runtime/library/ip2region.xdb"
 
 	if gfile.IsEmpty(dbPath) {
+		g.Log().Debug(ctx, "等待下载ip库文件")
 		//下载文件
-		putData, err2 := g.Client().Discovery(nil).
-			Get(ctx, "https://resource.luoe.cn/pgk/ip2region.xdb")
+		putData, err2 := g.Client().Discovery(nil).Get(ctx, url)
 		if err2 != nil {
 			return
 		}

internal/logic/systemCron/listener.go

@@ -3,7 +3,7 @@ package systemCron
 import (
 	"encoding/json"
 	"fmt"
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"github.com/ayflying/utility_go/pkg/notice"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gclient"

internal/logic/systemCron/systemCron.go

@@ -7,13 +7,15 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcron"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/os/gtimer"
 	"sync"
 	"time"
 )
 
 var (
-	ctx = gctx.New()
+	ctx       = gctx.New()
+	startTime *gtime.Time
 )
 
 // sSystemCron 结构体定义了系统定时任务的秒计时器。
@@ -110,6 +112,12 @@ func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
 //	@receiver s
 //	@return err
 func (s *sSystemCron) StartCron() (err error) {
+	//预防重复启动
+	if startTime != nil {
+		return
+	}
+	startTime = gtime.Now()
+
 	g.Log().Debug(ctx, "启动计划任务定时器详情")
 	//每秒任务
 	gtimer.SetInterval(ctx, time.Second, func(ctx context.Context) {

package/excel/excel.go

@@ -111,8 +111,12 @@ func (s *Excel) RemoveComments(list []interface{}, json []string) []interface{}
 		// 遍历当前元素的每个键值对
 		for _, v3 := range v2.(g.Map) {
 			// 如果字符串中存在//则跳过不写入temp
-			if gstr.Contains(gconv.String(v3), "//") {
-				//delKey = append(delKey, k2)
+			//if gstr.Contains(gconv.String(v3), "//") {
+			//	//delKey = append(delKey, k2)
+			//	add = false
+			//	break
+			//}
+			if strings.HasPrefix(gconv.String(v3), "//") {
 				add = false
 				break
 			}

pgk/pgk.go

@@ -1,7 +1,7 @@
 package pgk
 
 import (
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"github.com/ayflying/utility_go/pkg/aycache"
 	"github.com/ayflying/utility_go/pkg/notice"
 	"github.com/ayflying/utility_go/pkg/rank"

pgk/rank/rank.go

@@ -2,7 +2,7 @@ package rank
 
 import (
 	"fmt"
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"time"
 
 	"github.com/gogf/gf/v2/database/gredis"

pkg/aycache/cache.go

@@ -1,18 +1,42 @@
 package aycache
 
 import (
+	v1 "github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/ayflying/utility_go/pkg/aycache/drive"
 	drive2 "github.com/ayflying/utility_go/pkg/aycache/drive"
+	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+	"math"
 )
 
 type Mod struct {
 	client *gcache.Cache
 }
 
-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.Cache
-//}
+var (
+	QPSCount int
+	QPS      = promauto.NewGauge(
+		prometheus.GaugeOpts{
+			Name: "Cache_QPS",
+			Help: "当前缓存QPS数量",
+		},
+	)
+)
+
+func init() {
+	boot.AddFunc(func() {
+		//初始化指标
+		service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
+			QPS.Set(math.Round(float64(QPSCount) / 60))
+			QPSCount = 0
+			return nil
+		})
+	})
+
+}
 
 func New(_name ...string) gcache.Adapter {
 
@@ -29,10 +53,12 @@ func New(_name ...string) gcache.Adapter {
 	case "file":
 		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")
 	case "es":
-		cacheAdapterObj = drive.NewAdapterElasticsearch([]string{"http://127.0.0.1:9200"})
+		cacheAdapterObj = drive.NewAdapterElasticsearch(_name[1])
 	}
 
 	//var client = gcache.New()
 	//client.SetAdapter(cacheAdapterObj)
+
+	QPSCount++
 	return cacheAdapterObj
 }

pkg/aycache/drive/elasticsearch.go

@@ -2,23 +2,51 @@ package drive
 
 import (
 	"context"
+	"fmt"
+	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/util/gconv"
 	"time"
 )
 
+var (
+	adapterElasticsearchClient gcache.Adapter
+)
+
 type AdapterElasticsearch struct {
-	//FilePath string
-	Addresses []string
+	client *elasticsearch.TypedClient
+	name   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) Set(ctx context.Context, _key interface{}, value interface{}, duration time.Duration) (err error) {
+	key := gconv.String(_key)
+	data := gconv.Map(value)
+	if duration > 0 {
+		data["delete_time"] = time.Now().Add(duration)
+	}
+	_, err = a.client.Index(a.name).Id(key).
+		Document(data).Do(ctx)
+	if err != nil {
+		fmt.Printf("indexing document failed, err:%v\n", err)
+		return
+	}
+	return
 }
 
 func (a AdapterElasticsearch) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {
-	//TODO implement me
+	for k, v := range data {
+		save := gconv.Map(v)
+		if duration > 0 {
+			save["delete_time"] = time.Now().Add(duration)
+		}
+		key := gconv.String(k)
+		a.client.Index(a.name).Id(key).
+			Document(save).Do(ctx)
+	}
+
 	panic("implement me")
 }
 
@@ -37,9 +65,17 @@ func (a AdapterElasticsearch) SetIfNotExistFuncLock(ctx context.Context, key int
 	panic("implement me")
 }
 
-func (a AdapterElasticsearch) Get(ctx context.Context, key interface{}) (*gvar.Var, error) {
-	//TODO implement me
-	panic("implement me")
+func (a AdapterElasticsearch) Get(ctx context.Context, key interface{}) (res *gvar.Var, err error) {
+	_key := gconv.String(key)
+	resp, err := a.client.Get(a.name, _key).
+		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 = gvar.New(resp.Source_)
+	return
 }
 
 func (a AdapterElasticsearch) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
@@ -82,9 +118,26 @@ func (a AdapterElasticsearch) Values(ctx context.Context) (values []interface{},
 	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) Update(ctx context.Context, _key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
+	key := gconv.String(_key)
+	data := gconv.Map(value)
+	oldValue, err = a.Get(ctx, key)
+	if err != nil {
+		exist = false
+	} else {
+		for k, v := range oldValue.Map() {
+			if _, ok := data[k]; !ok {
+				data[k] = v
+			}
+		}
+	}
+
+	_, err = a.client.Update(a.name, key).
+		Doc(data).Do(context.Background())
+	if err != nil {
+		return
+	}
+	return
 }
 
 func (a AdapterElasticsearch) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
@@ -98,8 +151,15 @@ func (a AdapterElasticsearch) GetExpire(ctx context.Context, key interface{}) (t
 }
 
 func (a AdapterElasticsearch) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
+	//获取keys最后一个
+	lastKey := keys[len(keys)-1]
+	lastValue, _ = a.Get(ctx, lastKey)
+
+	for k := range keys {
+		key := gconv.String(k)
+		a.client.Delete(a.name, key).Do(ctx)
+	}
+	return
 }
 
 func (a AdapterElasticsearch) Clear(ctx context.Context) error {
@@ -112,8 +172,17 @@ func (a AdapterElasticsearch) Close(ctx context.Context) error {
 	panic("implement me")
 }
 
-func NewAdapterElasticsearch(addresses []string) gcache.Adapter {
-	return &AdapterElasticsearch{
-		Addresses: addresses,
+func NewAdapterElasticsearch(name string) gcache.Adapter {
+
+	if adapterElasticsearchClient == nil {
+		_cfg, _ := g.Cfg().Get(gctx.New(), "elasticsearch")
+		var cfg elasticsearch.Config
+		_cfg.Scan(&cfg)
+		es, _ := elasticsearch.NewTypedClient(cfg)
+		adapterElasticsearchClient = &AdapterElasticsearch{
+			client: es,
+			name:   name,
+		}
 	}
+	return adapterElasticsearchClient
 }

pkg/aycache/drive/file.go

@@ -16,17 +16,6 @@ type AdapterFile struct {
 }
 
 func (a AdapterFile) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
-	//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))

pkg/aycache/drive/redis.go

@@ -19,7 +19,6 @@ func NewAdapterRedis() gcache.Adapter {
 		redisObj, _ := gredis.New(cfg)
 		//adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default"))
 		adapterRedisClient = gcache.NewAdapterRedis(redisObj)
-
 		adapterRedisCache.SetAdapter(adapterRedisClient)
 	}
 	return adapterRedisCache

pkg/elasticsearch/elasticsearch.go

@@ -5,96 +5,102 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/elastic/go-elasticsearch/v8"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/bulk"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/delete"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/search"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/update"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 var (
 	es *elasticsearch.TypedClient
 )
 
-type elastic struct {
+type Elastic struct {
 	client *elasticsearch.TypedClient
+	name   string
 }
 
-func New(name ...string) *elastic {
-	// ES 配置
-	cfg := elasticsearch.Config{
-		Addresses: []string{
-			"http://ay.cname.com:9200",
-		},
-	}
+func NewV1(name string) *Elastic {
+	var cfg elasticsearch.Config
+	_cfg := g.Cfg().MustGetWithEnv(gctx.New(), "elasticsearch")
+	_cfg.Scan(&cfg)
 	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{}
 		}
 	}
-	return &elastic{
+	return &Elastic{
 		client: es,
+		name:   name,
 	}
 }
 
-// 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{}) {
+//// Create 创建索引
+//func (s *Elastic) Create(ctx context.Context) {
+//	resp, err := s.client.Indices.
+//		Create(s.name).Do(ctx)
+//	if err != nil {
+//		fmt.Printf("create index failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("index:%#v\n", resp.Index)
+//}
 
+// Set 索引文档
+func (s *Elastic) Set(ctx context.Context, key string, data interface{}) (err error) {
 	// 添加文档
-	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_
+	_, err = s.client.Index(s.name).Id(key).Document(data).Do(ctx)
 	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
+// SetBulk 批量添加文档
+func (s *Elastic) SetBulk(ctx context.Context, data []any) (err error) {
+	var save *bulk.Request
+	save = &bulk.Request{
+		data,
 	}
-	fmt.Printf("result:%v\n", resp.Result)
+	s.client.Bulk().Index(s.name).Request(save).Do(ctx)
+	return
 }
 
-// deleteDocument 删除 document
-func (s *elastic) DeleteDocument(name string, key string) {
-	resp, err := s.client.Delete(name, key).
-		Do(context.Background())
+// Get 获取文档
+func (s *Elastic) Get(ctx context.Context, id string) (res json.RawMessage, err error) {
+	get, err := s.client.Get(s.name, id).Do(ctx)
 	if err != nil {
-		fmt.Printf("delete document failed, err:%v\n", err)
 		return
 	}
-	fmt.Printf("result:%v\n", resp.Result)
+	res = get.Source_
+	return
+}
+
+// Update 更新文档
+func (s *Elastic) Update(ctx context.Context, key string, data interface{}) (res *update.Response, err error) {
+	res, err = s.client.Update(s.name, key).Doc(data).Do(ctx)
+	return
+}
+
+// Delete 删除 document
+func (s *Elastic) Delete(ctx context.Context, key string) (res *delete.Response, err error) {
+	res, err = s.client.Delete(s.name, key).Do(ctx)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// Select 查询
+func (s *Elastic) Select(ctx context.Context, query *types.MatchAllQuery) (res *search.Response, err error) {
+	res, err = s.client.Search(). //Index("my_index").
+		Request(&search.Request{
+			Query: &types.Query{
+				MatchAll: &types.MatchAllQuery{},
+			},
+		}).Do(ctx)
+	return
 }

pkg/notice/notice.go

@@ -1,7 +1,7 @@
 package notice
 
 import (
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"github.com/ayflying/utility_go/pkg/notice/drive"
 )
 

pkg/pkg.go

@@ -1,9 +1,10 @@
 package pkg
 
 import (
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"github.com/ayflying/utility_go/pkg/aycache"
 	"github.com/ayflying/utility_go/pkg/config"
+	"github.com/ayflying/utility_go/pkg/elasticsearch"
 	"github.com/ayflying/utility_go/pkg/notice"
 	"github.com/ayflying/utility_go/pkg/rank"
 	"github.com/ayflying/utility_go/pkg/s3"
@@ -38,3 +39,7 @@ func Websocket() *websocket.SocketV1 {
 func Config() *config.Cfg {
 	return config.NewV1()
 }
+
+func Elastic(name string) *elasticsearch.Elastic {
+	return elasticsearch.NewV1(name)
+}

pkg/rank/rank.go

@@ -2,7 +2,7 @@ package rank
 
 import (
 	"fmt"
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"time"
 
 	"github.com/gogf/gf/v2/database/gredis"

pkg/websocket/registerer.go

@@ -1,16 +1,26 @@
 package websocket
 
-import "context"
-
 // 定义一个处理方法的类型
-type Handler func(ctx context.Context, req any) (err error)
+type Handler func(conn *WebsocketData, req any) (err error)
+type OnConnectHandler func(conn *WebsocketData)
 
 // 路由器的处理映射
 var (
-	handlers = make(map[int]Handler)
+	handlers          = make(map[int]Handler)
+	OnConnectHandlers = make([]OnConnectHandler, 0)
+	OnCloseHandlers   = make([]OnConnectHandler, 0)
 )
 
 // 注册方法，将某个消息路由器ID和对应的处理方法关联起来
 func (s *SocketV1) RegisterRouter(cmd int, handler Handler) {
 	handlers[cmd] = handler
 }
+
+//注册方法，讲长连接登陆方法进行注册
+func (s *SocketV1) RegisterOnConnect(_func OnConnectHandler) {
+	OnConnectHandlers = append(OnConnectHandlers, _func)
+}
+
+func (s *SocketV1) RegisterOnClose(_func OnConnectHandler) {
+	OnCloseHandlers = append(OnCloseHandlers, _func)
+}

pkg/websocket/socket_new.go

@@ -4,16 +4,18 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
+	"strconv"
 	"sync"
-	"github.com/gogf/gf/v2/net/ghttp"
 )
 
-type SocketV1 struct{}
+type SocketV1 struct {
+	Type int `json:"type"`
+}
 
 var (
 	//ctx = gctx.New()
@@ -31,7 +33,9 @@ type WebsocketData struct {
 }
 
 func NewV1() *SocketV1 {
-	return &SocketV1{}
+	return &SocketV1{
+		Type: 1,
+	}
 }
 
 type SocketInterface interface {
@@ -79,7 +83,6 @@ func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
 	defer conn.Close()
 	id, _ := uuid.NewUUID()
 	ip := conn.RemoteAddr().String()
-
 	data := &WebsocketData{
 		Uuid: id,
 		Ws:   conn,
@@ -92,6 +95,11 @@ func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
 	//to := fmt.Sprintf("创建连接：%v,ip=%v", id, ip)
 	//s.Send(id, []byte(to))
 
+	//用户登录钩子执行
+	for _, connect := range OnConnectHandlers {
+		connect(data)
+	}
+
 	for {
 		//进入当前连接线程拥堵
 		msgType, msg, err := conn.ReadMessage()
@@ -102,7 +110,7 @@ func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
 		s.OnMessage(m.Get(id).(*WebsocketData), msg, msgType)
 	}
 	//关闭连接触发
-	s.OnClose(id, conn)
+	s.OnClose(data)
 	g.Log().Debugf(ctx, "断开连接:uuid=%v,ip=%v", id, ip)
 }
 
@@ -113,21 +121,23 @@ func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
 //	@param msg
 //	@param msgType
 func (s *SocketV1) OnMessage(conn *WebsocketData, req []byte, msgType int) {
+	s.Type = msgType
 	//g.Log().Debugf(ctx, "收到消息：%v,type=%v,conn=%v", string(req), msgType, conn)
 	//s.Send(conn.Uuid, msg)
 	//s.SendAll(msg)
-	msgStr := string(req)
-	msg := msgStr[8:]
-	cmd := gconv.Int(msgStr[:8])
+	//msgStr := string(req)
+	msg := req[8:]
+	cmd := gconv.Int(req[:8])
 	//GetRouter(cmd, conn.Uid, msg)
 	handler, exist := handlers[cmd]
 	if exist {
 		//匹配上路由器
-		handler(conn.Ctx, msg)
+		err := handler(conn, msg)
+		g.Log().Error(conn.Ctx, err)
 	} else {
 		//fmt.Println("未注册的路由器ID:", cmd)
-		s.Send(conn.Uuid, []byte("未注册的协议号:"+msgStr[:8]))
-		s.OnClose(conn.Uuid, conn.Ws)
+		s.Send(conn.Uuid, []byte("未注册的协议号:"+strconv.Itoa(cmd)))
+		s.OnClose(conn)
 		return
 	}
 
@@ -146,7 +156,7 @@ func (s *SocketV1) Send(id uuid.UUID, data []byte) (err error) {
 	}
 
 	conn := m.Get(id).(*WebsocketData)
-	conn.Ws.WriteMessage(1, data)
+	conn.Ws.WriteMessage(s.Type, data)
 
 	return
 }
@@ -156,7 +166,8 @@ func (s *SocketV1) SendAll(data []byte) {
 	m.Iterator(func(k interface{}, v interface{}) bool {
 		//fmt.Printf("%v:%v ", k, v)
 		conn := v.(*WebsocketData)
-		conn.Ws.WriteMessage(1, data)
+		conn.Ws.WriteMessage(s.Type, data)
+
 		return true
 	})
 }
@@ -166,14 +177,19 @@ func (s *SocketV1) SendAll(data []byte) {
 //	@Description:
 //	@receiver s
 //	@param conn
-func (s *SocketV1) OnClose(id uuid.UUID, conn *websocket.Conn) {
+func (s *SocketV1) OnClose(conn *WebsocketData) {
 	// 在此处编写断开连接后的处理逻辑
-	g.Log().Debugf(gctx.New(), "WebSocket connection from %s has been closed.", conn.RemoteAddr())
+	//g.Log().Debugf(gctx.New(), "WebSocket connection from %s has been closed.", conn.RemoteAddr())
+
+	//用户登录钩子执行
+	for _, connect := range OnCloseHandlers {
+		connect(conn)
+	}
 
 	// 可能的后续操作：
 	// 1. 更新连接状态或从连接池移除
 	// 2. 发送通知或清理关联资源
 	// 3. 执行特定于业务的断开处理
-	m.Remove(id)
-	conn.Close()
+	m.Remove(conn.Uuid)
+	conn.Ws.Close()
 }

service/game_act.go

@@ -33,6 +33,7 @@ type (
 		Save(actId int) (err error)
 		// 清空GetRedDot缓存
 		RefreshGetRedDotCache(uid int64)
+		Del(uid int64, actId int)
 	}
 )
 

tools/random.go

@@ -1,6 +1,8 @@
 package tools
 
 import (
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/grand"
 	"math/rand"
 	"time"
 )
@@ -50,3 +52,73 @@ func (m *randMod) RandomAll(data map[int]int, n int) []int {
 	}
 	return result
 }
+
+func RandomAll[t Any](data map[t]int, n int) []t {
+	if n > len(data) {
+		n = len(data)
+	}
+	rand.Seed(time.Now().UnixNano())
+	// 复制权重映射，避免修改原始数据
+	remainingWeights := make(map[t]int)
+	for k, v := range data {
+		remainingWeights[k] = v
+	}
+	result := make([]t, 0, n)
+
+	for i := 0; i < n; i++ {
+		totalWeight := 0
+		// 计算剩余元素的总权重
+		for _, weight := range remainingWeights {
+			totalWeight += weight
+		}
+		if totalWeight == 0 {
+			break
+		}
+		// 生成一个 0 到总权重之间的随机数
+		randomNum := rand.Intn(totalWeight)
+		currentWeight := 0
+		for key, weight := range remainingWeights {
+			currentWeight += weight
+			if randomNum < currentWeight {
+				// 将选中的元素添加到结果切片中
+				result = append(result, key)
+				// 从剩余权重映射中移除选中的元素
+				delete(remainingWeights, key)
+				break
+			}
+		}
+	}
+	return result
+}
+
+// RandByArrInt 根据传入的 interface 切片中的整数值按权重随机返回一个索引
+// 参数 s: 一个包含整数的 interface 切片，切片中的每个元素代表一个权重
+// 返回值: 随机选中的元素的索引
+func (m *randMod) RandByArrInt(_s interface{}) int {
+	// 初始化总权重为 0
+	sv := 0
+	s := gconv.Ints(_s)
+
+	// 遍历切片，累加每个元素的权重
+	for i := range s {
+		sv += gconv.Int(s[i])
+	}
+	if sv < 1 {
+		return 0
+	}
+
+	// 使用 grand.Intn 生成一个 0 到总权重之间的随机数
+	r := grand.Intn(sv)
+	// 初始化当前累加的权重为 0
+	var all int
+	// 再次遍历切片，累加权重
+	for i := range s {
+		all += s[i]
+		// 如果当前累加的权重大于随机数，则返回当前索引
+		if all > r {
+			return i
+		}
+	}
+	// 如果没有找到符合条件的索引，返回 0
+	return 0
+}

tools/redis.go

@@ -14,7 +14,7 @@ type redis struct {
 }
 
 func (r *redis) Load() {
-	g.Log().Debugf(gctx.New(), "初始化工具类")
+	g.Log().Debugf(gctx.New(), "初始化redis工具类")
 	if Redis == nil {
 		Redis = &redis{}
 	}

tools/time.go

@@ -121,3 +121,10 @@ func (m *timeMod) GetDailyTimeList(time1 time.Time, time2 time.Time) (timeList [
 	}
 	return
 }
+
+// ExcelTime2Time excel时间转时间 (12/10/24 02:03转为时间)
+func (m *timeMod) ExcelTime2Time(excelTime string) time.Time {
+	layout := "1/2/06 15:04" // 月/日/年(最后两位) 小时:分钟 (24小时制)
+	timeNew, _ := time.ParseInLocation(layout, excelTime, time.Local)
+	return timeNew
+}

tools/tools.go

@@ -1,6 +1,8 @@
 package tools
 
 import (
+	"encoding/json"
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
@@ -18,9 +20,9 @@ type Number interface {
 	int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
 }
 
-//type Any interface {
-//	interface{} | string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
-//}
+type Any interface {
+	string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
+}
 
 type toolsInterface interface {
 	Load()
@@ -30,15 +32,17 @@ type tools struct {
 }
 
 func init() {
-	g.Log().Debugf(gctx.New(), "初始化工具类")
+	boot.AddFunc(func() {
+		g.Log().Debugf(gctx.New(), "初始化tools工具类")
 
-	names := []toolsInterface{
-		Tools,
-	}
-	for _, v := range names {
-		v.Load()
-	}
+		names := []toolsInterface{
+			Tools,
+		}
+		for _, v := range names {
+			v.Load()
+		}
 
+	})
 }
 
 func (m *tools) Load() {
@@ -128,7 +132,7 @@ func RemoveSlice[t Number](slice []t, value ...t) []t {
 	// 从后向前遍历切片
 	for i := len(slice) - 1; i >= 0; i-- {
 		// 检查当前元素是否等于需要移除的值
-		if InArray(slice[i], value) {
+		if InArray[t](value, slice[i]) {
 			// 如果相等，移除该元素
 			// 使用append和切片操作符来实现移除操作，将i之前和i之后的元素合并到一起
 			slice = append(slice[:i], slice[i+1:]...)
@@ -145,7 +149,7 @@ func RemoveSlice[t Number](slice []t, value ...t) []t {
 //	@param value 需要查找的值
 //	@param array 进行查找的切片
 //	@return bool 返回是否存在
-func InArray[t Number](value t, array []t) bool {
+func InArray[t Number](array []t, value t) bool {
 	for _, v := range array {
 		if v == value {
 			return true
@@ -253,3 +257,33 @@ func (m *tools) ItemsMerge(_items ...[][]int64) [][]int64 {
 	}
 	return items
 }
+
+// ProcessingMap 处理map
+// 该函数用于递归处理一个键为字符串、值为int64的map。
+// 如果键是一个JSON字符串，会尝试将其解析为一个新的map，并递归处理这个新的map。
+// 最终返回一个处理后的map，其中所有键都是非JSON字符串。
+func (m *tools) ProcessingMap(data map[string]int64) map[string]int64 {
+	// 创建一个临时map，用于存储处理后的键值对
+	var temp = make(map[string]int64)
+	// 遍历输入的map
+	for k, v := range data {
+		// 创建一个新的map，用于存储解析后的JSON数据
+		data_k := make(map[string]int64)
+		// 尝试将键解析为JSON数据
+		err := json.Unmarshal([]byte(k), &data_k)
+		// 如果解析成功
+		if err == nil {
+			// 递归处理解析后的map
+			data_kmap := m.ProcessingMap(data_k)
+			// 返回处理后的map
+			// 如果解析失败，直接将原键值对添加到临时map中
+			// 将递归处理后的结果合并到临时map中
+			for k_k, k_v := range data_kmap {
+				temp[k_k] = k_v
+			}
+		} else {
+			temp[k] = v
+		}
+	}
+	return temp
+}

utility.go

@@ -1,17 +1,11 @@
 package utility_go
 
 import (
-	_ "github.com/ayflying/utility_go/internal/logic"
-
-	"context"
-	"time"
-
-	v1 "github.com/ayflying/utility_go/api/system/v1"
-	"github.com/ayflying/utility_go/service"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/os/gtimer"
-
 	"github.com/ayflying/utility_go/config"
+	"github.com/ayflying/utility_go/internal/boot"
+	_ "github.com/ayflying/utility_go/internal/logic"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 var (
@@ -20,14 +14,11 @@ var (
 )
 
 func init() {
-	service.SystemCron().StartCron()
-
-	//用户活动持久化
-	gtimer.SetTimeout(ctx, time.Minute, func(ctx context.Context) {
-		service.SystemCron().AddCron(v1.CronType_DAILY, func() error {
-			service.GameAct().Saves()
-			return nil
-		})
-	})
+	g.Log().Debug(ctx, "utility_go init启动完成")
+	// 初始化配置
+	var err = boot.Boot()
+	if err != nil {
+		panic(err)
+	}
 
 }

utility_test.go

@@ -0,0 +1,66 @@
+package utility_go_test
+
+import (
+	//_ "github.com/ayflying/utility_go/internal/logic"
+
+	"github.com/ayflying/utility_go/internal/boot"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"testing"
+)
+
+var (
+	ctx = gctx.GetInitCtx()
+)
+
+func TestInit(t *testing.T) {
+	g.Log().Debug(ctx, "开始调试了")
+	// 初始化配置
+	var err = boot.Boot()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+//
+//func TestLoadConfig(t *testing.T) {
+//
+//	tests := []struct {
+//		name     string
+//		filePath string
+//		wantErr  bool
+//	}{
+//		{
+//			name:     "valid config file",
+//			filePath: "testdata/valid_config.json",
+//			wantErr:  false,
+//		},
+//		{
+//			name:     "non-existent file",
+//			filePath: "nonexistent.json",
+//			wantErr:  true,
+//		},
+//		{
+//			name:     "invalid config format",
+//			filePath: "testdata/invalid_config.json",
+//			wantErr:  true,
+//		},
+//		{
+//			name:     "empty file path",
+//			filePath: "",
+//			wantErr:  true,
+//		},
+//	}
+//
+//	for _, tt := range tests {
+//		t.Run(tt.name, func(t *testing.T) {
+//
+//			_, err := config.Load(tt.filePath)
+//			if tt.wantErr {
+//				assert.Error(t, err)
+//			} else {
+//				assert.NoError(t, err)
+//			}
+//		})
+//	}
+//}