调整长连接库

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接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
+- **api/**：存放与API相关的代码，包含不同模块的API接口定义，如 `admin`、`callback`、`system` 等。这些API接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
-- **`service/`**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
+- **service/**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
-- **`controller/`**：控制器层代码，主要用于处理HTTP请求和响应。控制器接收客户端的请求，调用相应的服务层方法进行处理，并将处理结果返回给客户端。
+- **controller/**：控制器层代码，主要用于处理HTTP请求和响应。控制器接收客户端的请求，调用相应的服务层方法进行处理，并将处理结果返回给客户端。
-- **`internal/`**：内部包，包含项目的核心业务逻辑，如 `game`、`logic`、`model` 等模块。其中，`model` 模块定义了项目中使用的数据模型，如数据库表对应的结构体；`logic` 模块实现了各种业务逻辑的处理函数。
+- **internal/**：内部包，包含项目的核心业务逻辑，如 `game`、`logic`、`model` 等模块。其中，`model` 模块定义了项目中使用的数据模型，如数据库表对应的结构体；`logic` 模块实现了各种业务逻辑的处理函数。
-- **`package/`**：包含各种功能包，提供了丰富的工具和功能，具体如下：
+- **package/**：包含各种功能包，提供了丰富的工具和功能，具体如下：
-    - **`aycache`**：缓存相关的功能包，提供了缓存操作的接口和实现，帮助开发者更方便地使用缓存技术，提高应用程序的性能。
+  - **aycache**：缓存相关的功能包，提供了缓存操作的接口和实现，帮助开发者更方便地使用缓存技术，提高应用程序的性能。
-    - **`elasticsearch`**：Elasticsearch相关的功能包，用于与Elasticsearch搜索引擎进行交互，实现数据的存储、检索和分析等功能。
+  - **elasticsearch**：Elasticsearch相关的功能包，用于与Elasticsearch搜索引擎进行交互，实现数据的存储、检索和分析等功能。
-    - **`excel`**：Excel处理相关的功能包，提供了Excel文件的读写操作接口，方便开发者处理Excel文件中的数据。
+  - **excel**：Excel处理相关的功能包，提供了Excel文件的读写操作接口，方便开发者处理Excel文件中的数据。
-    - **`pay`**：支付相关的功能包，包含了与各种支付平台的接口集成，如 `apple`（苹果支付）、`playstore`（Google Play Store支付）等，支持应用内购买等支付功能。
+  - **pay**：支付相关的功能包，包含了与各种支付平台的接口集成，如 `apple`（苹果支付）、`playstore`（Google Play Store支付）等，支持应用内购买等支付功能。
-    - **`rand`**：随机数相关的功能包，提供了生成各种随机数的函数，可用于测试、加密等场景。
+  - **rand**：随机数相关的功能包，提供了生成各种随机数的函数，可用于测试、加密等场景。
-    - **`rank`**：排名相关的功能包，实现了各种排名算法，如基于Redis的排行榜功能，可用于游戏排名、活动排名等场景。
+  - **rank**：排名相关的功能包，实现了各种排名算法，如基于Redis的排行榜功能，可用于游戏排名、活动排名等场景。
-    - **`s3`**：S3存储相关的功能包，用于与Amazon S3等云存储服务进行交互，实现文件的上传、下载、删除等操作。
+  - **s3**：S3存储相关的功能包，用于与Amazon S3等云存储服务进行交互，实现文件的上传、下载、删除等操作。
-- **`tools/`**：工具类代码，包含了一些常用的工具函数，如 `redis.go`（Redis操作相关）、`time.go`（时间处理相关）、`tools.go`（通用工具函数）等，方便开发者在项目中使用。
+- **tools/**：工具类代码，包含了一些常用的工具函数，如 `redis.go`（Redis操作相关）、`time.go`（时间处理相关）、`tools.go`（通用工具函数）等，方便开发者在项目中使用。
 
 ## 四、主要模块功能
 
-### 4.1 `pay/playstore`
+### 4.1 pay/playstore
-该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作。它提供了以下主要功能：
+该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作，提供以下主要功能：
-- **创建客户端**：通过 `New` 函数创建并返回一个包含访问androidpublisher API所需凭证的http客户端，方便开发者与Google Play Store API进行通信。
+- **创建客户端**：通过 `New` 函数创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，方便开发者与Google Play Store API进行通信。
-- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的http客户端创建并返回一个包含访问androidpublisher API所需凭证的http客户端，增加了客户端的灵活性。
+- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的HTTP客户端创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，增加了客户端的灵活性。
 - **验证签名**：`VerifySignature` 函数用于验证应用内购买的签名，确保支付信息的安全性和合法性。
 
-### 4.2 `s3`
+### 4.2 s3
-`s3` 模块主要用于与S3存储服务进行交互，提供了文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。
+`s3` 模块主要用于与S3存储服务进行交互，提供文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。
 
-### 4.3 `model`
+### 4.3 model
 `model` 模块定义了项目中使用的数据模型，这些数据模型通常与数据库表相对应，用于数据的存储和操作。例如：
-- **`GameMailMass`**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
+- **GameMailMass**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
-- **`GameBag`**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
+- **GameBag**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
-- **`MemberSave`**：（根据具体代码中的定义）可能表示用户会员信息的数据模型，用于存储用户的会员相关数据。
+- **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/pkg/v1/pkg.pb.go

@@ -2,7 +2,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v3.20.0
-// source: pgk/v1/pgk.proto
+// source: pkg/v1/pkg.proto
 
 package v1
 
@@ -61,11 +61,11 @@ func (x NoticeType) String() string {
 }
 
 func (NoticeType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pgk_v1_pgk_proto_enumTypes[0].Descriptor()
+	return file_pkg_v1_pkg_proto_enumTypes[0].Descriptor()
 }
 
 func (NoticeType) Type() protoreflect.EnumType {
-	return &file_pgk_v1_pgk_proto_enumTypes[0]
+	return &file_pkg_v1_pkg_proto_enumTypes[0]
 }
 
 func (x NoticeType) Number() protoreflect.EnumNumber {
@@ -74,7 +74,7 @@ func (x NoticeType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use NoticeType.Descriptor instead.
 func (NoticeType) EnumDescriptor() ([]byte, []int) {
-	return file_pgk_v1_pgk_proto_rawDescGZIP(), []int{0}
+	return file_pkg_v1_pkg_proto_rawDescGZIP(), []int{0}
 }
 
 // 排行榜数据
@@ -92,7 +92,7 @@ type RankData struct {
 func (x *RankData) Reset() {
 	*x = RankData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pgk_v1_pgk_proto_msgTypes[0]
+		mi := &file_pkg_v1_pkg_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -105,7 +105,7 @@ func (x *RankData) String() string {
 func (*RankData) ProtoMessage() {}
 
 func (x *RankData) ProtoReflect() protoreflect.Message {
-	mi := &file_pgk_v1_pgk_proto_msgTypes[0]
+	mi := &file_pkg_v1_pkg_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -118,7 +118,7 @@ func (x *RankData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RankData.ProtoReflect.Descriptor instead.
 func (*RankData) Descriptor() ([]byte, []int) {
-	return file_pgk_v1_pgk_proto_rawDescGZIP(), []int{0}
+	return file_pkg_v1_pkg_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *RankData) GetId() int64 {
@@ -149,10 +149,10 @@ func (x *RankData) GetUpdateTs() int64 {
 	return 0
 }
 
-var File_pgk_v1_pgk_proto protoreflect.FileDescriptor
+var File_pkg_v1_pkg_proto protoreflect.FileDescriptor
 
-var file_pgk_v1_pgk_proto_rawDesc = []byte{
+var file_pkg_v1_pkg_proto_rawDesc = []byte{
-	0x0a, 0x10, 0x70, 0x67, 0x6b, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x67, 0x6b, 0x2e, 0x70, 0x72, 0x6f,
+	0x0a, 0x10, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6b, 0x67, 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,
@@ -166,29 +166,29 @@ var file_pgk_v1_pgk_proto_rawDesc = []byte{
 	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,
+	0x6c, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x6b, 0x67, 0x2f,
 	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_pgk_v1_pgk_proto_rawDescOnce sync.Once
+	file_pkg_v1_pkg_proto_rawDescOnce sync.Once
-	file_pgk_v1_pgk_proto_rawDescData = file_pgk_v1_pgk_proto_rawDesc
+	file_pkg_v1_pkg_proto_rawDescData = file_pkg_v1_pkg_proto_rawDesc
 )
 
-func file_pgk_v1_pgk_proto_rawDescGZIP() []byte {
+func file_pkg_v1_pkg_proto_rawDescGZIP() []byte {
-	file_pgk_v1_pgk_proto_rawDescOnce.Do(func() {
+	file_pkg_v1_pkg_proto_rawDescOnce.Do(func() {
-		file_pgk_v1_pgk_proto_rawDescData = protoimpl.X.CompressGZIP(file_pgk_v1_pgk_proto_rawDescData)
+		file_pkg_v1_pkg_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_v1_pkg_proto_rawDescData)
 	})
-	return file_pgk_v1_pgk_proto_rawDescData
+	return file_pkg_v1_pkg_proto_rawDescData
 }
 
-var file_pgk_v1_pgk_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_pkg_v1_pkg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pgk_v1_pgk_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_v1_pkg_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pgk_v1_pgk_proto_goTypes = []interface{}{
+var file_pkg_v1_pkg_proto_goTypes = []interface{}{
 	(NoticeType)(0),  // 0: package.NoticeType
 	(*RankData)(nil), // 1: package.RankData
 }
-var file_pgk_v1_pgk_proto_depIdxs = []int32{
+var file_pkg_v1_pkg_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
@@ -196,13 +196,13 @@ var file_pgk_v1_pgk_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_pgk_v1_pgk_proto_init() }
+func init() { file_pkg_v1_pkg_proto_init() }
-func file_pgk_v1_pgk_proto_init() {
+func file_pkg_v1_pkg_proto_init() {
-	if File_pgk_v1_pgk_proto != nil {
+	if File_pkg_v1_pkg_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_pgk_v1_pgk_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_v1_pkg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RankData); i {
 			case 0:
 				return &v.state
@@ -219,19 +219,19 @@ func file_pgk_v1_pgk_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pgk_v1_pgk_proto_rawDesc,
+			RawDescriptor: file_pkg_v1_pkg_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_pgk_v1_pgk_proto_goTypes,
+		GoTypes:           file_pkg_v1_pkg_proto_goTypes,
-		DependencyIndexes: file_pgk_v1_pgk_proto_depIdxs,
+		DependencyIndexes: file_pkg_v1_pkg_proto_depIdxs,
-		EnumInfos:         file_pgk_v1_pgk_proto_enumTypes,
+		EnumInfos:         file_pkg_v1_pkg_proto_enumTypes,
-		MessageInfos:      file_pgk_v1_pgk_proto_msgTypes,
+		MessageInfos:      file_pkg_v1_pkg_proto_msgTypes,
 	}.Build()
-	File_pgk_v1_pgk_proto = out.File
+	File_pkg_v1_pkg_proto = out.File
-	file_pgk_v1_pgk_proto_rawDesc = nil
+	file_pkg_v1_pkg_proto_rawDesc = nil
-	file_pgk_v1_pgk_proto_goTypes = nil
+	file_pkg_v1_pkg_proto_goTypes = nil
-	file_pgk_v1_pgk_proto_depIdxs = nil
+	file_pkg_v1_pkg_proto_depIdxs = nil
 }

aycache/aycache.go

@@ -0,0 +1,15 @@
+package aycache
+
+import (
+	"github.com/ayflying/utility_go/pkg"
+	"github.com/gogf/gf/v2/os/gcache"
+)
+
+type Mod struct {
+	client *gcache.Cache
+}
+
+// Deprecated:弃用，改用 pkg.Cache()
+func New(_name ...string) gcache.Adapter {
+	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
+}

cmd/make.go

@@ -26,7 +26,8 @@ var (
 		},
 		Examples: "make -m act -i 1:    创建活动1的接口与服务文件 \n" +
 			"make -m logic -n test: 	创建test的服务文件 \n" +
-			"make -m config -n test:    创建配置文件",
+			"make -m config -n test:    创建配置文件 \n" +
+			"make -m socket -n test:    创建socket文件 \n",
 		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
 
 			//g.Dump(parser.GetOptAll(), parser.GetArgAll())
@@ -53,6 +54,12 @@ var (
 					return
 				}
 				err = this.Config(name)
+			case "socket":
+				var name = parser.GetOpt("name").String()
+				if name == "" {
+					return
+				}
+				err = this.Socket(name)
 			}
 
 			return
@@ -116,3 +123,25 @@ func (c *cMake) Config(name string) (err error) {
 
 	return
 }
+
+func (c *cMake) Socket(name string) (err error) {
+	var filePath = fmt.Sprintf("internal/socket/%s/%s_new.go", name, gstr.CaseSnake(name))
+	//生成文件不覆盖
+	if !gfile.Exists(filePath) {
+		// 生成目录文件
+		get, _ := fs.ReadFile(ConfigFiles, "make/socket")
+		fileStr := string(get)
+		fileStr = gstr.Replace(fileStr, "{name}", name)
+		err = gfile.PutContents(filePath, fileStr)
+
+		//生成方法文件
+		var filePath2 = fmt.Sprintf("internal/socket/%s/%s.go", name, gstr.CaseSnake(name))
+		get, _ = fs.ReadFile(ConfigFiles, "make/socket2")
+		fileStr = string(get)
+		fileStr = gstr.Replace(fileStr, "{name}", name)
+		fileStr = gstr.Replace(fileStr, "{func}", gstr.CaseCamel(name))
+		err = gfile.PutContents(filePath2, fileStr)
+	}
+
+	return
+}

cmd/make/act

@@ -2,7 +2,6 @@ package act{id}
 
 import (
 	service2 "github.com/ayflying/utility_go/service"
-    "github.com/gogf/gf/v2/os/gctx"
 )
 
 type sAct{id} struct {
@@ -14,7 +13,7 @@ func New() *sAct{id} {
 
 var (
 	ActId = {id}
-	ctx   = gctx.New()
+	Name = ""
 )
 
 type Data struct {

cmd/make/logic

@@ -9,7 +9,7 @@ type s{name} struct {
 }
 
 var (
-	ctx    = gctx.New()
+
 )
 
 func New() *s{name} {

cmd/make/socket

@@ -0,0 +1,10 @@
+package {name}
+
+type {name} struct {
+}
+
+func New() *{name} {
+	return &{name}{}
+}
+
+func init() {}

cmd/make/socket2

@@ -0,0 +1,19 @@
+package {name}
+
+import (
+	"github.com/ayflying/utility_go/pkg"
+	"github.com/ayflying/utility_go/pkg/websocket"
+	"google.golang.org/protobuf/proto"
+)
+
+func (s *{name}) {func}Handler(conn *websocket.WebsocketData, req any) (err error) {
+	var data = &v1.{func}2S{}
+	err = proto.Unmarshal(req.([]byte), data)
+
+	var res = &v1.{func}2C{}
+
+	resp, err := proto.Marshal(res)
+	pkg.Websocket().Send(000000, conn.Uid, resp)
+
+	return
+}

cmd/middleware.go

@@ -62,9 +62,9 @@ func MiddlewareAdmin(r *ghttp.Request) {
 	ip := r.GetClientIp()
 	r.SetCtxVar("ip", ip)
 
-	get := r.Cookie.Get("uid")
+	getUid := r.Cookie.Get("uid")
 
-	if get == nil {
+	if getUid == nil {
 		//调试模式允许不验证用户名
 		debug, _ := g.Cfg().GetWithEnv(nil, "debug")
 		if !debug.Bool() {
@@ -82,7 +82,13 @@ func MiddlewareAdmin(r *ghttp.Request) {
 
 	}
 
-	uid := get.Int()
+	uid := getUid.Int()
+
+	//获取所有请求的信息
+	get := r.GetRequestMapStrStr()
+	if _, ok := get["uid"]; ok {
+		r.SetCtxVar("uid", get["uid"])
+	}
 
 	r.Middleware.Next()
 

cmd/update.go

@@ -2,13 +2,14 @@ package cmd
 
 import (
 	"context"
-	"github.com/ayflying/utility_go/package/s3"
+	"github.com/ayflying/utility_go/pkg"
 	"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"
+	"path"
 	"time"
 )
 
@@ -17,6 +18,8 @@ type serverCfg struct {
 	Address string `json:"address" dc:"服务地址"`
 	Prod    bool   `json:"prod" dc:"是否生产环境"`
 	S3      string `json:"s3" dc:"使用哪个对象储存中转"`
+	Arch    string `json:"arch" dc:"架构"`
+	System  string `json:"system" dc:"系统"`
 }
 
 type UpdateReq struct {
@@ -24,8 +27,6 @@ type UpdateReq struct {
 	FileUrl string            `json:"file_url" dc:"文件地址"`
 }
 
-var s3Mod *s3.Mod
-
 var (
 	Update = gcmd.Command{
 		Name:  "update",
@@ -36,9 +37,30 @@ var (
 			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()
 
+			////获取架构
+			//getArch, err := g.Cfg("hack").Get(ctx, "gfcli.build.arch")
+			//Arch := getArch.String()
+			//if Arch == "" {
+			//	Arch = "amd64"
+			//}
+			//
+			////获取操作系统
+			//getSystem, err := g.Cfg("hack").Get(ctx, "gfcli.build.system")
+			//System := getSystem.String()
+			//
+			//if System == "" {
+			//	System = "linux"
+			//}
+			//var systemName = System + "_" + Arch
+
+			//获取版本号
+			getVersion, err := g.Cfg("hack").Get(ctx, "gfcli.build.version")
+			Version := getVersion.String()
+
 			var list []*serverCfg
 			serverList := g.Cfg().MustGet(ctx, "server_list")
 			serverList.Scan(&list)
@@ -59,7 +81,9 @@ var (
 			g.Dump("需要更新的服务器", list)
 			//获取上传链接
 			var url = make(map[string]string)
-			filename := "linux_amd64/" + Filename
+			var system = make(map[string]string)
+			//filename := "linux_amd64/" + Filename
+			//filename := path.Join(Version, "linux_amd64", Filename)
 
 			client := g.Client()
 			client.SetTimeout(time.Minute)
@@ -73,13 +97,29 @@ var (
 				}
 
 				//查询当前上传地址是否存在
-				if _, ok := url[v.S3]; !ok {
+				_, ok2 := system[v.System+v.Arch]
+				if _, ok := url[v.S3]; !ok || !ok2 {
+
+					var systemName = "linux_amd64"
+					if v.Arch != "" && v.System != "" {
+						systemName = v.System + "_" + v.Arch
+					}
+					var filename = path.Join(Version, systemName, Filename)
+					g.Log().Debugf(ctx, "当前上传文件："+filename)
+
 					url[v.S3], err = UploadS3(v.S3, filename)
 					if err != nil {
 						g.Log().Error(ctx, err)
 						return
 					}
+					system[v.System+v.Arch] = filename
+
+					if err != nil {
+						g.Log().Error(ctx, err)
+						return
 					}
+				}
+				continue
 
 				g.Log().Debugf(ctx, "准备同步服务器:%v,url=%v", v.Name, address+"/callback/update")
 				get, err := client.Post(ctx, address+"/callback/update", &UpdateReq{
@@ -107,9 +147,13 @@ var (
 func UploadS3(typ string, filename string) (res string, err error) {
 	//updateServerS3Name, _ := g.Config().Get(ctx, "update_server_s3_name")
 
-	s3Mod = s3.New(typ)
+	var s3Mod = pkg.S3(typ)
 	bucketName := s3Mod.GetCfg().BucketName
 	obj, err := os.Open(filename)
+	if err != nil {
+		return
+	}
+	defer obj.Close()
 	ff, err := obj.Stat()
 	_, err = s3Mod.PutObject(obj, filename, bucketName, ff.Size())
 	if err != nil {

drivers/db/elasticsearch/elasticsearch.go

@@ -0,0 +1,83 @@
+package elasticsearch
+
+import (
+	"github.com/elastic/go-elasticsearch/v8"
+)
+
+var (
+	es *elasticsearch.TypedClient
+)
+
+type elastic struct {
+	client *elasticsearch.TypedClient
+}
+
+//func (d *Driver) Insert(ctx context.Context, table string, data interface{}, batch ...int) (res sql.Result, err error) {
+//
+//	return
+//}
+//
+//// createIndex 创建索引
+//func (d *Driver) CreateIndex(name string) {
+//
+//	resp, err := d.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 (d *Driver) IndexDocument(name string, key string, data interface{}) {
+//
+//	// 添加文档
+//	resp, err := d.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 (d *Driver) Get(name string, id string) (res json.RawMessage) {
+//	resp, err := d.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:%d\n", resp.Source_)
+//	res = resp.Source_
+//	return
+//}
+//
+//// updateDocument 更新文档
+//func (d *Driver) UpdateDocument(name string, key string, data interface{}) {
+//
+//	resp, err := d.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 (d *Driver) DeleteDocument(name string, key string) {
+//	resp, err := d.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)
+//}

drivers/db/elasticsearch/es_open.go

@@ -0,0 +1,39 @@
+package elasticsearch
+
+import (
+	"database/sql"
+	"github.com/elastic/go-elasticsearch/v8"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+)
+
+func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {
+	var (
+		source               string
+		underlyingDriverName = "elasticsearch"
+	)
+	source = config.Host
+
+	cfg := elasticsearch.Config{
+		Addresses: []string{
+			config.Host,
+		},
+	}
+
+	es, err = elasticsearch.NewTypedClient(cfg)
+	//if err != nil {
+	//	fmt.Printf("elasticsearch.NewTypedClient failed, err:%v\n", err)
+	//	return
+	//}
+
+	if db, err = sql.Open(underlyingDriverName, source); err != nil {
+		err = gerror.WrapCodef(
+			gcode.CodeDbOperationError, err,
+			`sql.Open failed for driver "%s" by source "%s"`, underlyingDriverName, source,
+		)
+		return nil, err
+	}
+
+	return
+}

drivers/db/elasticsearch/load.go

@@ -0,0 +1,51 @@
+package elasticsearch
+
+import (
+	"github.com/ayflying/utility_go/internal/boot"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// Driver is the driver for mysql database.
+type Driver struct {
+	*gdb.Core
+}
+
+const (
+	quoteChar = "`"
+)
+
+func init() {
+	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.
+func New() gdb.Driver {
+	return &Driver{}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *Driver) New(core *gdb.Core, node *gdb.ConfigNode) (res gdb.DB, err error) {
+	res = &Driver{
+		Core: core,
+	}
+	return
+}
+
+// GetChars returns the security char for this type of database.
+func (d *Driver) GetChars() (charLeft string, charRight string) {
+	return quoteChar, quoteChar
+}

drivers/db/found/found.go

@@ -0,0 +1,56 @@
+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"
+)
+
+// Driver is the driver for mysql database.
+type Driver struct {
+	*gdb.Core
+}
+
+func (d *Driver) Open(config *gdb.ConfigNode) (*sql.DB, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+const (
+	quoteChar = "`"
+)
+
+func init() {
+	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.
+func New() gdb.Driver {
+	return &Driver{}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *Driver) New(core *gdb.Core, node *gdb.ConfigNode) (res gdb.DB, err error) {
+	res = &Driver{
+		Core: core,
+	}
+	return
+}
+
+// GetChars returns the security char for this type of database.
+func (d *Driver) GetChars() (charLeft string, charRight string) {
+	return quoteChar, quoteChar
+}

go.mod

@@ -10,21 +10,29 @@ require (
 	github.com/go-pay/gopay v1.5.109
 	github.com/go-pay/util v0.0.4
 	github.com/goccy/go-json v0.10.4
-	github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0
-	github.com/gogf/gf/v2 v2.8.3
+	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
 )
 
 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
@@ -39,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
@@ -53,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
@@ -68,10 +79,10 @@ require (
 	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
 	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
@@ -80,7 +91,6 @@ require (
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
 	google.golang.org/grpc v1.38.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // 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=
@@ -122,10 +126,10 @@ github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcU
 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.9.0 h1:BewnDc3gq2iqYzPH56FtOelmT9F9WcAm6nnlOVgw3J8=
-github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3/go.mod h1:Uo6f/Pr6zVHSbdP2Lj9iToEMuh/TzU/bE2E5SJlquEk=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0/go.mod h1:uNjaJcnMvMl7bkcoL0amxwcrOM+Q5XGADKKwKTY+8MY=
-github.com/gogf/gf/v2 v2.8.3 h1:h9Px3lqJnnH6It0AqHRz4/1hx0JmvaSf1IvUir5x1rA=
+github.com/gogf/gf/v2 v2.9.0 h1:semN5Q5qGjDQEv4620VzxcJzJlSD07gmyJ9Sy9zfbHk=
-github.com/gogf/gf/v2 v2.8.3/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY=
+github.com/gogf/gf/v2 v2.9.0/go.mod h1:sWGQw+pLILtuHmbOxoe0D+0DdaXxbleT57axOLH2vKI=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -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=
@@ -300,8 +316,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -329,8 +345,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU0=
@@ -357,14 +373,14 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
+go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
-go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
-go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
-go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
-go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
 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=
@@ -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,13 +711,15 @@ 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=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=

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,14 +4,14 @@ import (
 	"fmt"
 	"github.com/ayflying/utility_go/internal/model/do"
 	"github.com/ayflying/utility_go/internal/model/entity"
-	"github.com/ayflying/utility_go/package/aycache"
+	"github.com/ayflying/utility_go/pkg"
-	"github.com/ayflying/utility_go/pgk"
 	service2 "github.com/ayflying/utility_go/service"
 	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/container/gset"
 	"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"
@@ -70,8 +70,8 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
 	// 将查询到的活动信息保存到Redis缓存中
 	_, err = g.Redis().Set(ctx, keyCache, data)
 
-	var ActUidUpdateTimeCacheKey = fmt.Sprintf("act:update:%d", uid)
+	var CacheKey = fmt.Sprintf("act:update:%d", uid)
-	aycache.New("redis").Set(ctx, ActUidUpdateTimeCacheKey, uid, time.Hour*24*3)
+	pkg.Cache("redis").Set(ctx, CacheKey, uid, time.Hour*24*1)
 
 	return
 }
@@ -131,35 +131,29 @@ 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
 			}
 
 			cacheGet, _ := g.Redis().Get(ctx, cacheKey)
-			//最后删除key
+
-			delKey = append(delKey, cacheKey)
 			if uid == 0 {
 				//跳过为空的用户缓存
 				continue
 			}
 			if cacheGet.IsEmpty() {
-				//空数据也不巴保存
+				//空数据也不保存
 				continue
 			}
 
-			var ActUidUpdateTimeCacheKey = fmt.Sprintf("act:update:%d", uid)
 			//如果有活跃，跳过持久化
-			if getBool, _ := aycache.New("redis").Contains(ctx, ActUidUpdateTimeCacheKey); getBool {
+			if getBool, _ := pkg.Cache("redis").Contains(ctx,
+				fmt.Sprintf("act:update:%d", uid)); getBool {
 				continue
 			}
 
-			////如果1天没有活跃，跳过
-			//user, _ := service.MemberUser().Info(uid)
-			//if user.UpdatedAt.Seconds < gtime.Now().Add(consts.ActSaveTime).Unix() {
-			//	continue
-			//}
-
 			//获取数据库数据
 			var data *entity.GameAct
 			// 从数据库中查询活动信息
@@ -184,7 +178,8 @@ func (s *sGameAct) Save(actId int) (err error) {
 				data.Action = actionData
 				add = append(add, data)
 			}
-
+			//最后删除key
+			delKey = append(delKey, cacheKey)
 		}
 
 		//批量写入数据库
@@ -222,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/gameKv/gameKv.go

@@ -0,0 +1,125 @@
+package gameKv
+
+import (
+	"github.com/ayflying/utility_go/service"
+	"github.com/ayflying/utility_go/tools"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+var (
+	ctx  = gctx.New()
+	Name = "game_kv"
+)
+
+type sGameKv struct {
+	Lock sync.Mutex
+}
+
+func New() *sGameKv {
+	return &sGameKv{}
+}
+
+func init() {
+	service.RegisterGameKv(New())
+
+	//支付钩子
+	//task.Task.Trigger(tasks.TaskType_PAY, service.GameKv().HookPay)
+	//task.Task.Trigger(tasks.TaskType_WARDROBE_LEVEL, service.GameKv().HookLevelRwd)
+}
+
+// SavesV1 方法
+//
+// @Description: 保存用户KV数据列表。
+// @receiver s: sGameKv的实例。
+// @return err: 错误信息，如果操作成功，则为nil。
+func (s *sGameKv) SavesV1() (err error) {
+	// 从Redis列表中获取所有用户KV索引的键
+	//keys, err := utils.RedisScan("user:kv:*")
+	err = tools.Redis.RedisScanV2("user:kv:*", func(keys []string) (err error) {
+		// 定义用于存储用户数据的结构体
+		type ListData struct {
+			Uid int64       `json:"uid"`
+			Kv  interface{} `json:"kv"`
+		}
+		var list []*ListData
+		// 初始化列表，长度与keys数组一致
+		list = make([]*ListData, 0)
+		//需要删除的key
+		var delKey []string
+		// 遍历keys，获取每个用户的数据并填充到list中
+		for _, cacheKey := range keys {
+			//g.Log().Infof(ctx, "保存用户kv数据%v", v)
+			//uid := v.Int64()
+			//cacheKey = "user:kv:" + strconv.FormatInt(uid, 10)
+			result := strings.Split(cacheKey, ":")
+			var uid int64
+			uid, err = strconv.ParseInt(result[2], 10, 64)
+			if err != nil {
+				g.Log().Error(ctx, err)
+				g.Redis().Del(ctx, cacheKey)
+				continue
+			}
+
+			////如果1天没有活跃，跳过
+			//user, _ := service.MemberUser().Info(uid)
+			//if user.UpdatedAt.Seconds < gtime.Now().Add(consts.ActSaveTime).Unix() {
+			//	continue
+			//}
+
+			get, _ := g.Redis().Get(ctx, cacheKey)
+			var data interface{}
+			get.Scan(&data)
+			list = append(list, &ListData{
+				Uid: int64(uid),
+				Kv:  data,
+			})
+
+			delKey = append(delKey, cacheKey)
+		}
+
+		// 将列表数据保存到数据库
+		if len(list) > 0 {
+			_, err2 := g.Model("game_kv").Batch(30).Data(list).Save()
+			list = make([]*ListData, 0)
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				return
+			}
+
+			//批量删除key
+			for _, v := range delKey {
+				_, err2 = g.Redis().Del(ctx, v)
+				if err2 != nil {
+					g.Log().Errorf(ctx, "删除存档错误：%v,err=%v", v, err2)
+					return
+				}
+			}
+
+			delKey = make([]string, 0)
+
+		}
+		if err != nil {
+			g.Log().Error(ctx, "当前kv数据入库失败: %v", err)
+		}
+
+		return
+	})
+
+	//if err != nil {
+	//	return err
+	//}
+	////跳过
+	//if len(keys) == 0 {
+	//	return
+	//}
+	////一次最多处理10w条
+	//if len(keys) > 10000 {
+	//	keys = keys[:10000]
+	//}
+
+	return
+}

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 &sIp2region{}
-	return s
 }
 
 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).
+		putData, err2 := g.Client().Discovery(nil).Get(ctx, url)
-			Get(ctx, "https://resource.luoe.cn/pgk/ip2region.xdb")
 		if err2 != nil {
 			return
 		}

internal/logic/logic.go

@@ -6,6 +6,7 @@ package logic
 
 import (
 	_ "github.com/ayflying/utility_go/internal/logic/gameAct"
+	_ "github.com/ayflying/utility_go/internal/logic/gameKv"
 	_ "github.com/ayflying/utility_go/internal/logic/ip2region"
 	_ "github.com/ayflying/utility_go/internal/logic/logData"
 	_ "github.com/ayflying/utility_go/internal/logic/systemCron"

internal/logic/systemCron/listener.go

@@ -3,8 +3,8 @@ 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/pgk/notice"
+	"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,6 +7,7 @@ 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"
@@ -14,6 +15,7 @@ import (
 
 var (
 	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) {

manifest/protobuf/pkg/v1/pkg.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package package;
 
-option go_package = "github.com/ayflying/utility_go/api/pgk/v1";
+option go_package = "github.com/ayflying/utility_go/api/pkg/v1";
 
 
 // 定义 NoticeType 枚举

package/aycache/cache.go

@@ -1,38 +0,0 @@
-package aycache
-
-import (
-	"github.com/ayflying/utility_go/package/aycache/drive"
-	"github.com/gogf/gf/v2/os/gcache"
-)
-
-type Mod struct {
-	client *gcache.Cache
-}
-
-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.Cache
-//}
-
-// Deprecated: Use pgk.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 = 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()
-	//client.SetAdapter(cacheAdapterObj)
-	return cacheAdapterObj
-}

package/aycache/drive/elasticsearch.go

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

package/aycache/file.go

@@ -1,134 +0,0 @@
-package aycache
-
-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"
-)
-
-type AdapterFile struct {
-	FilePath string
-}
-
-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))
-}
-
-func (a AdapterFile) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) SetIfNotExist(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) SetIfNotExistFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) SetIfNotExistFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Get(ctx context.Context, key interface{}) (*gvar.Var, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) 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 AdapterFile) Contains(ctx context.Context, key interface{}) (bool, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Size(ctx context.Context) (size int, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Data(ctx context.Context) (data map[interface{}]interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Keys(ctx context.Context) (keys []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Values(ctx context.Context) (values []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Update(ctx context.Context, key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetExpire(ctx context.Context, key interface{}) (time.Duration, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Clear(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Close(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func NewAdapterFile(filePath string) gcache.Adapter {
-	return &AdapterFile{
-		FilePath: filePath,
-	}
-}

package/aycache/memory.go

@@ -1,15 +0,0 @@
-package aycache
-
-import (
-	"github.com/gogf/gf/v2/os/gcache"
-)
-
-var adapterMemoryClient = gcache.New()
-
-// NewAdapterMemory 创建并返回一个新的内存缓存对象。
-func NewAdapterMemory() gcache.Adapter {
-	//if adapterMemoryClient == nil {
-	//	adapterMemoryClient = gcache.New()
-	//}
-	return adapterMemoryClient
-}

package/aycache/mencached.go

@@ -1,120 +0,0 @@
-package aycache
-
-import (
-	"context"
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/database/gredis"
-	"github.com/gogf/gf/v2/os/gcache"
-	"time"
-)
-
-// AdapterRedis is the gcache adapter implements using Redis server.
-type AdapterMemcached struct {
-	//redis *gredis.Redis
-	//client
-}
-
-func (a AdapterMemcached) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) SetIfNotExist(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) SetIfNotExistFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) SetIfNotExistFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Get(ctx context.Context, key interface{}) (*gvar.Var, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) 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 AdapterMemcached) 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 AdapterMemcached) Contains(ctx context.Context, key interface{}) (bool, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Size(ctx context.Context) (size int, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Data(ctx context.Context) (data map[interface{}]interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Keys(ctx context.Context) (keys []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Values(ctx context.Context) (values []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Update(ctx context.Context, key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) GetExpire(ctx context.Context, key interface{}) (time.Duration, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Clear(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterMemcached) Close(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-// NewAdapterRedis creates and returns a new memory cache object.
-func NewAdapterMemcached(redis *gredis.Redis) gcache.Adapter {
-	return &AdapterMemcached{}
-}

package/aycache/redis.go

@@ -1,18 +0,0 @@
-package aycache
-
-import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcache"
-)
-
-var adapterRedisClient gcache.Adapter
-var adapterRedisCache = gcache.New()
-
-func NewAdapterRedis() gcache.Adapter {
-
-	if adapterRedisClient == nil {
-		adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default"))
-		adapterRedisCache.SetAdapter(adapterRedisClient)
-	}
-	return adapterRedisCache
-}

package/excel/excel.go

@@ -69,6 +69,10 @@ func (s *Excel) ExcelLoad(ctx context.Context, fileItem *FileItem, mainPath stri
 		fileBytes := gfile.GetBytes(filepath)
 		arr, _ := gjson.DecodeToJson(fileBytes)
 		list := arr.Array()
+
+		//排除注释行
+		list = s.RemoveComments(list, fileItem.Json)
+
 		//格式化item格式
 		if len(fileItem.Items) > 0 {
 			list = s.itemsFormat(list, fileItem.Items)
@@ -98,105 +102,197 @@ func (s *Excel) ExcelLoad(ctx context.Context, fileItem *FileItem, mainPath stri
 	return
 }
 
+//排除配置中注释行
+func (s *Excel) RemoveComments(list []interface{}, json []string) []interface{} {
+	var temp = make([]interface{}, 0)
+	// 遍历列表中的每个元素
+	for _, v2 := range list {
+		var add = true
+		// 遍历当前元素的每个键值对
+		for _, v3 := range v2.(g.Map) {
+			// 如果字符串中存在//则跳过不写入temp
+			//if gstr.Contains(gconv.String(v3), "//") {
+			//	//delKey = append(delKey, k2)
+			//	add = false
+			//	break
+			//}
+			if strings.HasPrefix(gconv.String(v3), "//") {
+				add = false
+				break
+			}
+		}
+		if add {
+			temp = append(temp, v2)
+		}
+
+	}
+	return temp
+}
+
+// itemsFormat 格式化列表中的道具字段
+// 参数:
+//   - list: 待处理的列表，包含多个元素，每个元素是一个 g.Map 类型
+//   - Items: 包含需要处理的道具字段名称的切片
+// 返回值:
+//   - 处理后的列表
 func (s *Excel) itemsFormat(list []interface{}, Items []string) []interface{} {
+	// 遍历列表中的每个元素
 	for k2, v2 := range list {
+		// 遍历当前元素的每个键值对
 		for k3, v3 := range v2.(g.Map) {
+			// 检查当前键是否在需要处理的道具字段列表中
 			if gstr.InArray(Items, k3) {
+				// 检查当前值是否为字符串类型
 				if _, ok := v3.(string); ok {
+					// 如果是字符串类型，调用 Spilt2Item 函数将其转换为 [][]int64 类型，并更新到列表中
 					list[k2].(g.Map)[k3] = Spilt2Item(v3.(string))
 				} else {
+					// 如果不是字符串类型，记录错误日志
 					g.Log().Errorf(gctx.New(), "当前类型断言失败:%v,list=%v", v3, v2)
 				}
 			}
 		}
 	}
+	// 返回处理后的列表
 	return list
 }
 
+// itemsMapFormat 将列表中指定字段的道具信息转换为映射格式
+// 参数:
+//   - list: 待处理的列表，包含多个元素，每个元素是一个 g.Map 类型
+//   - Items: 包含需要处理的道具字段名称的切片
+// 返回值:
+//   - 处理后的列表
 func (s *Excel) itemsMapFormat(list []interface{}, Items []string) []interface{} {
+	// 遍历列表中的每个元素
 	for k2, v2 := range list {
+		// 遍历当前元素的每个键值对
 		for k3, v3 := range v2.(g.Map) {
+			// 检查当前键是否在需要处理的道具字段列表中
 			if gstr.InArray(Items, k3) {
+				// 检查当前值是否为字符串类型
 				if _, ok := v3.(string); ok {
+					// 如果是字符串类型，调用 Spilt2Item 函数将其转换为 [][]int64 类型
 					get := Spilt2Item(v3.(string))
+					// 调用 Items2Map 函数将 [][]int64 类型的数据转换为映射格式，并更新到列表中
 					list[k2].(g.Map)[k3] = s.Items2Map(get)
 				} else {
+					// 如果不是字符串类型，记录错误日志
 					g.Log().Errorf(gctx.New(), "当前类型断言失败:%v,list=%v", v3, v2)
 				}
 			}
 		}
 	}
+	// 返回处理后的列表
 	return list
 }
 
+// sliceFormat 格式化列表中指定字段为切片格式
+// 参数:
+//   - list: 待处理的列表，包含多个元素，每个元素是一个 g.Map 类型
+//   - Slice: 一个映射，键为需要处理的字段名，值为目标类型（如 "int", "int64", "float64"）
+// 返回值:
+//   - 处理后的列表
 func (s *Excel) sliceFormat(list []interface{}, Slice map[string]string) []interface{} {
+	// 遍历 Slice 映射中的每个键值对
 	for s1, s2 := range Slice {
+		// 遍历列表中的每个元素
 		for k2, v2 := range list {
+			// 遍历当前元素的每个键值对
 			for k3, v3 := range v2.(g.Map) {
-				//判断是否存在
+				// 判断当前键是否与 Slice 中的键匹配
 				if s1 != k3 {
+					// 不匹配则跳过当前循环
 					continue
 				}
+				// 检查当前值是否为空字符串
 				if gconv.String(v3) == "" {
+					// 若为空，则将该字段设置为空字符串切片
 					list[k2].(g.Map)[k3] = []string{}
+					// 跳过当前循环
 					continue
 				}
+				// 用于存储分割后的字符串切片
 				var parts []string
-				//断言是否成功
+				// 断言当前值是否为字符串类型
 				if get, ok := v3.(string); !ok {
-					//g.Log().Errorf(gctx.New(), "当前类型断言失败:%v", v3)
+					// 若断言失败，将当前值转换为字符串并作为唯一元素存入 parts
 					parts = []string{gconv.String(v3)}
-
 				} else {
+					// 若为字符串类型，将字符串中的特殊字符替换为 "|"
 					for _, v := range shadiao {
 						get = strings.ReplaceAll(get, v, "|")
 					}
-					parts = strings.Split(get, "|") // 分割字符串
+					// 按 "|" 分割字符串
+					parts = strings.Split(get, "|")
 				}
 
+				// 根据 Slice 映射中的值进行类型转换
 				switch s2 {
 				case "int":
+					// 创建一个长度为 parts 的 int 切片
 					var temp = make([]int, len(parts))
+					// 遍历 parts 切片，将每个元素转换为 int 类型
 					for k, v := range parts {
 						temp[k], _ = strconv.Atoi(v)
 					}
+					// 将转换后的切片存入列表中
 					list[k2].(g.Map)[k3] = temp
 				case "int64":
+					// 创建一个长度为 parts 的 int64 切片
 					var temp = make([]int64, len(parts))
+					// 遍历 parts 切片，将每个元素转换为 int64 类型
 					for k, v := range parts {
 						temp[k], _ = strconv.ParseInt(v, 10, 64)
 					}
 				case "float64":
+					// 创建一个长度为 parts 的 float64 切片
 					var temp = make([]float64, len(parts))
+					// 遍历 parts 切片，将每个元素转换为 float64 类型
 					for k, v := range parts {
 						temp[k], _ = strconv.ParseFloat(v, 64)
 					}
+					// 将转换后的切片存入列表中
 					list[k2].(g.Map)[k3] = temp
 				default:
+					// 若未匹配到指定类型，直接将 parts 存入列表中
 					list[k2].(g.Map)[k3] = parts
 				}
-
-			}
-
 			}
 		}
-
+	}
+	// 返回处理后的列表
 	return list
 }
 
+// jsonFormat 将列表中指定字段的 JSON 字符串解析为 Go 数据结构
+// 参数:
+//   - list: 待处理的列表，包含多个元素，每个元素是一个 g.Map 类型
+//   - Items: 包含需要处理的 JSON 字段名称的切片
+// 返回值:
+//   - 处理后的列表
 func (s *Excel) jsonFormat(list []interface{}, Items []string) []interface{} {
+	// 遍历列表中的每个元素
 	for k2, v2 := range list {
+		// 遍历当前元素的每个键值对
 		for k3, v3 := range v2.(g.Map) {
+			// 检查当前键是否在需要处理的 JSON 字段列表中
 			if gstr.InArray(Items, k3) {
+				// 检查当前值是否为字符串类型
 				if _, ok := v3.(string); ok {
+					// 用于存储解析后的 JSON 数据
 					var get interface{}
+					// 将字符串解析为 JSON 数据
 					json.Unmarshal([]byte(v3.(string)), &get)
+					// 将解析后的 JSON 数据更新到列表中
 					list[k2].(g.Map)[k3] = get
 				} else {
+					// 如果不是字符串类型，记录错误日志
 					g.Log().Errorf(gctx.New(), "当前类型断言失败:%v,list=%v", v3, v2)
 				}
 			}
 		}
 	}
+	// 返回处理后的列表
 	return list
 }

package/pay/wechat.go

@@ -1,3 +1,4 @@
+//Deprecated: 使用新的 pkg.Pay()
 package pay
 
 import (
@@ -27,6 +28,7 @@ type WechatPay struct {
 	PrivateKey string
 }
 
+// Deprecated: pkg.Pay().Wechat()
 func Wechat() *WechatPay {
 	var pay = &WechatPay{}
 	var err error

pgk/aycache/cache.go

@@ -1,38 +0,0 @@
-package aycache
-
-import (
-	"github.com/ayflying/utility_go/package/aycache/drive"
-	drive2 "github.com/ayflying/utility_go/pgk/aycache/drive"
-	"github.com/gogf/gf/v2/os/gcache"
-)
-
-type Mod struct {
-	client *gcache.Cache
-}
-
-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.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
-}

pgk/elasticsearch/elasticsearch.go

@@ -1,101 +0,0 @@
-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)
-}

pgk/pgk.go

@@ -1,30 +1,34 @@
 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/pgk/aycache"
+	"github.com/ayflying/utility_go/pkg/aycache"
-	"github.com/ayflying/utility_go/pgk/notice"
+	"github.com/ayflying/utility_go/pkg/notice"
-	"github.com/ayflying/utility_go/pgk/rank"
+	"github.com/ayflying/utility_go/pkg/rank"
-	"github.com/ayflying/utility_go/pgk/s3"
+	"github.com/ayflying/utility_go/pkg/s3"
 	"github.com/gogf/gf/v2/os/gcache"
 )
 
 var ()
 
 // 统一调用
+// Deprecated: 请使用 pkg.Notice() 方法替代。
 func Notice(typ v1.NoticeType, host string) notice.MessageV1 {
 	return notice.New(typ, host)
 }
 
 // 统一调用cache
+// Deprecated: 请使用 pkg.Cache() 方法替代。
 func Cache(_name ...string) gcache.Adapter {
 	return aycache.New(_name...)
 }
 
+// Deprecated: 请使用 pkg.S3() 方法替代。
 func S3(_name ...string) *s3.Mod {
 	return s3.New(_name...)
 }
 
+// Deprecated: 请使用 pkg.Rank() 方法替代。
 func Rank() *rank.Mod {
 	return rank.New()
 }

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"
@@ -46,6 +46,8 @@ func (s *Mod) Load() {
 // 返回值:
 //
 //	*F64CountRank: 返回一个指向新创建的F64CountRank实例的指针
+
+// Deprecated: pgk.Rnak().CreateF64CountRank("赛季")
 func (s *Mod) CreateF64CountRank(name string) *F64CountRank {
 	// 初始化F64CountRank实例的name和updateTs字段
 	// name字段用于标识排行榜的名称，格式为"rank:<name>:score"

pkg/aycache/cache.go

@@ -0,0 +1,64 @@
+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
+}
+
+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 {
+
+	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(_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
+	client *elasticsearch.TypedClient
-	Addresses []string
+	name   string
 }
 
-func (a AdapterElasticsearch) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
+func (a AdapterElasticsearch) Set(ctx context.Context, _key interface{}, value interface{}, duration time.Duration) (err error) {
-	//TODO implement me
+	key := gconv.String(_key)
-	panic("implement me")
+	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) {
+func (a AdapterElasticsearch) Get(ctx context.Context, key interface{}) (res *gvar.Var, err error) {
-	//TODO implement me
+	_key := gconv.String(key)
-	panic("implement me")
+	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) {
+func (a AdapterElasticsearch) Update(ctx context.Context, _key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
-	//TODO implement me
+	key := gconv.String(_key)
-	panic("implement me")
+	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
+	//获取keys最后一个
-	panic("implement me")
+	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 {
+func NewAdapterElasticsearch(name string) gcache.Adapter {
-	return &AdapterElasticsearch{
+
-		Addresses: addresses,
+	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/config/config.go

@@ -0,0 +1,189 @@
+package config
+
+import (
+	"fmt"
+	"github.com/apolloconfig/agollo/v4"
+	apolloConfig "github.com/apolloconfig/agollo/v4/env/config"
+	"github.com/apolloconfig/agollo/v4/storage"
+	"github.com/gogf/gf/contrib/config/apollo/v2"
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gres"
+	"github.com/gogf/gf/v2/text/gstr"
+	"sync"
+)
+
+var (
+	//ApolloCfg      *apolloConfig.AppConfig
+	ApolloCfg      *apollo.Config
+	ApolloListener []string
+	Item2Obj       = map[string]Load{}
+)
+
+// load接口定义了Load方法，用于加载数据
+type Load interface {
+	Load(cfg ...string)
+}
+
+func NewV1() *Cfg {
+	return &Cfg{}
+}
+
+type Cfg struct {
+	Lock sync.Mutex
+}
+
+func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
+	get2, err := g.Model("game_config").
+		Where("name", name).Master().Value("data")
+	err = get2.Scan(&res)
+	if res == nil {
+		res = &gvar.Var{}
+	}
+	return
+}
+
+func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
+	pathStr := "manifest/game/"
+	filePath := pathStr + filename + ".json"
+	//err := gres.Load(pathStr + filename)
+
+	//载入静态资源到文件对象
+	err = gres.Load(filePath)
+	var bytes []byte
+
+	if gfile.IsFile(filePath) {
+		bytes = gfile.GetBytes(filePath)
+	} else {
+		bytes = gres.GetContent(filePath)
+	}
+
+	jsonObj, err = gjson.DecodeToJson(bytes)
+	//g.Dump(filePath, jsonObj)
+	return
+}
+
+// getUrlFile 获取远程配置
+func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
+	urlStr := fmt.Sprintf("http://sdf.sdfs.sdf/%s.json", name)
+	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
+	bytes := getUrl.ReadAll()
+	jsonObj, err = gjson.DecodeToJson(bytes)
+	return
+}
+
+// 获取阿波罗
+//func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
+//	jsonObj, err = c.GetApolloV2(name, obj)
+//	return
+//
+//	//c.Lock.Lock()
+//	//defer c.Lock.Unlock()
+//	//
+//	//Item2Obj[name+".json"] = obj
+//	//var cfg = apolloConfig.AppConfig{
+//	//	AppID:             ApolloCfg.AppID,
+//	//	Cluster:           ApolloCfg.Cluster,
+//	//	IP:                ApolloCfg.IP,
+//	//	NamespaceName:     name + ".json",
+//	//	Secret:            ApolloCfg.Secret,
+//	//	IsBackupConfig:    ApolloCfg.IsBackupConfig,
+//	//	BackupConfigPath:  ApolloCfg.BackupConfigPath,
+//	//	SyncServerTimeout: 60,
+//	//	MustStart:         true,
+//	//}
+//	////cfg.NamespaceName = name + ".json"
+//	//
+//	//client, err := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
+//	//	return ApolloCfg, nil
+//	//})
+//	//if client == nil {
+//	//	return
+//	//}
+//	//var getStr string
+//	//var getApollo *storage.Config
+//	//for range 5 {
+//	//	getApollo = client.GetConfig(cfg.NamespaceName)
+//	//	if getApollo != nil {
+//	//		break
+//	//	}
+//	//	time.Sleep(time.Second * 5)
+//	//}
+//	//
+//	//if getApollo != nil {
+//	//	getStr = getApollo.GetValue("content")
+//	//	if getStr != "" {
+//	//		//写入配置
+//	//		gfile.PutContents(path.Join("manifest", "game", name+".json"), getStr)
+//	//	}
+//	//} else {
+//	//	jsonObj, err = c.GetFile(name)
+//	//}
+//	//jsonObj, err = gjson.DecodeToJson(getStr)
+//	////首次运行加入监听器
+//	//if !gstr.InArray(ApolloListener, name) {
+//	//	c2 := &CustomChangeListener{}
+//	//	client.AddChangeListener(c2)
+//	//	ApolloListener = append(ApolloListener, name)
+//	//}
+//	//return
+//}
+
+func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
+	Item2Obj[name+".json"] = obj
+
+	// 接入阿波罗配置
+	ApolloCfg.NamespaceName = name + ".json"
+	adapter, err := apollo.New(nil, *ApolloCfg)
+	if err != nil {
+		g.Log().Fatalf(nil, `%+v`, err)
+	}
+	// Change the adapter of default configuration instance.
+	g.Cfg(name).SetAdapter(adapter)
+
+	//首次运行加入监听器
+	if !gstr.InArray(ApolloListener, name+".json") {
+		//放置监听器
+		client, _ := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
+			return &apolloConfig.AppConfig{
+				AppID:             ApolloCfg.AppID,
+				Cluster:           ApolloCfg.Cluster,
+				NamespaceName:     ApolloCfg.NamespaceName,
+				IP:                ApolloCfg.IP,
+				IsBackupConfig:    ApolloCfg.IsBackupConfig,
+				BackupConfigPath:  ApolloCfg.BackupConfigPath,
+				Secret:            ApolloCfg.Secret,
+				SyncServerTimeout: ApolloCfg.SyncServerTimeout,
+				MustStart:         ApolloCfg.MustStart,
+			}, nil
+		})
+		c2 := &CustomChangeListener{}
+		client.AddChangeListener(c2)
+		ApolloListener = append(ApolloListener, name+".json")
+	}
+
+	cfg, err := g.Cfg(name).Get(nil, "content")
+	cfg.Scan(&jsonObj)
+	return
+}
+
+// 阿波罗监听器
+type CustomChangeListener struct {
+	wg sync.WaitGroup
+}
+
+func (c *CustomChangeListener) OnChange(changeEvent *storage.ChangeEvent) {
+	g.Log().Debugf(nil, "当前Namespace变化了：%v", changeEvent.Namespace)
+	filename := changeEvent.Namespace
+	if obj, ok := Item2Obj[filename]; ok {
+		//重载配置文件
+		obj.Load(changeEvent.Changes["content"].NewValue.(string))
+	}
+}
+
+func (c *CustomChangeListener) OnNewestChange(event *storage.FullChangeEvent) {
+	//write your code here
+
+}

pkg/elasticsearch/elasticsearch.go

@@ -0,0 +1,106 @@
+package elasticsearch
+
+import (
+	"context"
+	"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 {
+	client *elasticsearch.TypedClient
+	name   string
+}
+
+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{
+		client: es,
+		name:   name,
+	}
+}
+
+//// 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) {
+	// 添加文档
+	_, err = s.client.Index(s.name).Id(key).Document(data).Do(ctx)
+	return
+}
+
+// SetBulk 批量添加文档
+func (s *Elastic) SetBulk(ctx context.Context, data []any) (err error) {
+	var save *bulk.Request
+	save = &bulk.Request{
+		data,
+	}
+	s.client.Bulk().Index(s.name).Request(save).Do(ctx)
+	return
+}
+
+// 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 {
+		return
+	}
+	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,8 +1,8 @@
 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/pgk/notice/drive"
+	"github.com/ayflying/utility_go/pkg/notice/drive"
 )
 
 type MessageV1 interface {

pkg/pkg.go

@@ -0,0 +1,45 @@
+package pkg
+
+import (
+	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"
+	"github.com/ayflying/utility_go/pkg/websocket"
+	"github.com/gogf/gf/v2/os/gcache"
+)
+
+var ()
+
+// 统一调用
+func Notice(typ v1.NoticeType, host string) notice.MessageV1 {
+	return notice.New(typ, host)
+}
+
+// 统一调用cache
+func Cache(_name ...string) gcache.Adapter {
+	return aycache.New(_name...)
+}
+
+func S3(_name ...string) *s3.Mod {
+	return s3.New(_name...)
+}
+
+func Rank() *rank.Mod {
+	return rank.New()
+}
+
+func Websocket() *websocket.SocketV1 {
+	return websocket.NewV1()
+}
+
+func Config() *config.Cfg {
+	return config.NewV1()
+}
+
+func Elastic(name string) *elasticsearch.Elastic {
+	return elasticsearch.NewV1(name)
+}

pkg/rank/rank.go

@@ -2,6 +2,7 @@ package rank
 
 import (
 	"fmt"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"time"
 
 	"github.com/gogf/gf/v2/database/gredis"
@@ -21,14 +22,14 @@ type F64CountRank struct {
 	updateTs string // 更新时间key
 }
 
-type RankData struct {
+//
-	Id       int64
+//type RankData struct {
-	Score    int64
+//	Id       int64
-	Rank     int32
+//	Score    int64
-	UpdateTs int64
+//	Rank     int32
-}
+//	UpdateTs int64
+//}
 
-// Deprecated:Use pgk.Rank()
 func New() *Mod {
 	return &Mod{}
 }
@@ -45,8 +46,6 @@ func (s *Mod) Load() {
 // 返回值:
 //
 //	*F64CountRank: 返回一个指向新创建的F64CountRank实例的指针
-//
-// Deprecated:Use pgk.Rank().CreateF64CountRank(fmt.Sprintf("rank:%v", 1))
 func (s *Mod) CreateF64CountRank(name string) *F64CountRank {
 	// 初始化F64CountRank实例的name和updateTs字段
 	// name字段用于标识排行榜的名称，格式为"rank:<name>:score"
@@ -321,7 +320,7 @@ func (r *F64CountRank) UpdateScore(id int64, score int64) (err error) {
 //
 //	list - 排名信息列表
 //	err - 错误信息，如果执行过程中遇到错误
-func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*RankData, err error) {
+func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*v1.RankData, err error) {
 	// 初始化存储成员ID的切片
 	var members []int64
 
@@ -341,7 +340,7 @@ func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*RankData, e
 	}
 
 	// 根据获取的成员ID数量初始化排名信息列表
-	list = make([]*RankData, len(members))
+	list = make([]*v1.RankData, len(members))
 	for i := range members {
 		// 获取当前成员ID
 		id := members[i]
@@ -361,9 +360,9 @@ func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*RankData, e
 // 返回值:
 //
 //	rankInfo - 包含id的分数和排名信息的指针，如果没有找到，则返回nil
-func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *RankData) {
+func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *v1.RankData) {
 	// 初始化rankInfo结构体，设置id，其他字段将通过查询填充
-	rankInfo = &RankData{Id: id}
+	rankInfo = &v1.RankData{Id: id}
 
 	// 查询有序集合中指定id的分数
 	score, err := g.Redis().ZScore(ctx, r.name, id)

pkg/websocket/registerer.go

@@ -0,0 +1,49 @@
+package websocket
+
+import "google.golang.org/protobuf/proto"
+
+// 定义一个处理方法的类型
+type Handler func(conn *WebsocketData, req any) (err error)
+type Handler2 func(conn *WebsocketData)
+
+type HandlerMessage func(conn *WebsocketData, req any)
+
+type PbType func(cmd int32, data []byte, code int32, msg string) proto.Message
+type PbType2 func(data []byte) (int, []byte)
+
+// 路由器的处理映射
+var (
+	handlers          = make(map[int]Handler)
+	OnConnectHandlers = make([]Handler2, 0)
+	OnCloseHandlers   = make([]Handler2, 0)
+	onMessageHandlers = make([]HandlerMessage, 0)
+	Byte2Pb           = make([]PbType, 0)
+	Pb2Bytes          = make([]PbType2, 0)
+)
+
+// 注册方法，将某个消息路由器ID和对应的处理方法关联起来
+func (s *SocketV1) RegisterRouter(cmd int, handler Handler) {
+	handlers[cmd] = handler
+}
+
+//注册方法，讲长连接登陆方法进行注册
+func (s *SocketV1) RegisterOnConnect(_func Handler2) {
+	OnConnectHandlers = append(OnConnectHandlers, _func)
+}
+
+func (s *SocketV1) RegisterOnClose(_func Handler2) {
+	OnCloseHandlers = append(OnCloseHandlers, _func)
+}
+
+//注册方法长连接消息体
+func (s *SocketV1) RegisterMessage(_func HandlerMessage) {
+	onMessageHandlers = append(onMessageHandlers, _func)
+}
+
+func (s *SocketV1) RegisterByte2Pb(_func PbType) {
+	Byte2Pb = append(Byte2Pb, _func)
+}
+
+func (s *SocketV1) RegisterPb2Byte(_func PbType2) {
+	Pb2Bytes = append(Pb2Bytes, _func)
+}

pkg/websocket/socket_new.go

@@ -0,0 +1,323 @@
+package websocket
+
+import (
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/glog"
+	"github.com/gogf/gf/v2/util/guid"
+	"github.com/google/uuid"
+	"github.com/gorilla/websocket"
+	"google.golang.org/protobuf/proto"
+	"sync"
+)
+
+type SocketV1 struct {
+	Type int `json:"type"`
+}
+
+var (
+	//ctx = gctx.New()
+	//Conn map[uuid.UUID]*WebsocketData
+	lock sync.Mutex
+
+	m = gmap.NewHashMap(true)
+)
+
+type WebsocketData struct {
+	Ws     *websocket.Conn
+	Uuid   string
+	Uid    int64
+	Ctx    context.Context
+	RoomId int
+}
+
+func NewV1() *SocketV1 {
+	return &SocketV1{
+		Type: 2,
+	}
+}
+
+type SocketInterface interface {
+	Load(serv *ghttp.Server, prefix string)
+	OnConnect(ctx context.Context, conn *websocket.Conn)
+	OnMessage(conn *WebsocketData, req []byte, msgType int)
+	Send(cmd int32, uid int64, req proto.Message)
+	SendAll(cmd int32, req proto.Message)
+	OnClose(conn *WebsocketData)
+}
+
+func (s *SocketV1) Load(serv *ghttp.Server, prefix string) {
+	//websocket服务启动
+	serv.Group(prefix, func(group *ghttp.RouterGroup) {
+
+		var websocketCfg = websocket.Upgrader{
+			ReadBufferSize:  1024,
+			WriteBufferSize: 1024,
+		}
+		group.Bind(
+			func(r *ghttp.Request) {
+				ctx := r.Context()
+				ws, err := websocketCfg.Upgrade(r.Response.Writer, r.Request, nil)
+				if err != nil {
+					glog.Error(ctx, err)
+					r.Exit()
+				}
+
+				//ws联机触发器
+				NewV1().OnConnect(ctx, ws)
+			},
+		)
+
+	})
+}
+
+// OnConnect
+//
+//	@Description:
+//	@receiver s
+//	@param conn
+func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
+
+	defer conn.Close()
+	id := guid.S()
+	ip := conn.RemoteAddr().String()
+	data := &WebsocketData{
+		Uuid: id,
+		Ws:   conn,
+		Ctx:  ctx,
+	}
+	m.Set(id, data)
+
+	//defer delete(Conn, id)
+
+	to := fmt.Sprintf("创建连接：%v,ip=%v", id, ip)
+	g.Log().Debugf(ctx, to)
+	//s.Send(id, []byte(to))
+
+	//用户登录钩子执行
+	for _, connect := range OnConnectHandlers {
+		connect(data)
+	}
+
+	for {
+		//进入当前连接线程拥堵
+		msgType, msg, err := conn.ReadMessage()
+		s.Type = msgType
+		if err != nil {
+			//客户端断开返回错误，断开当前连接
+			//g.Log().Error(ctx, err)
+			break
+		}
+		s.OnMessage(m.Get(id).(*WebsocketData), msg, msgType)
+	}
+	//关闭连接触发
+	s.OnClose(data)
+	g.Log().Debugf(ctx, "断开连接:uuid=%v,ip=%v", id, ip)
+}
+
+// OnMessage
+//
+//	@Description:
+//	@receiver s
+//	@param msg
+//	@param msgType
+func (s *SocketV1) OnMessage(conn *WebsocketData, req []byte, msgType int) {
+	s.Type = 2
+	var cmd int
+	var msg []byte
+	//uid := conn.Uid
+	for _, v := range Pb2Bytes {
+		cmd, msg = v(req)
+	}
+	g.Log("cmd").Debugf(gctx.New(), fmt.Sprintf("from|%d|%d|%v", cmd, conn.Uid, gjson.MustEncodeString(req)))
+
+	//msgStr := string(req)
+	//cmd = gconv.Int(msgStr[:8])
+	//msg = []byte(msgStr[8:])
+
+	handler, exist := handlers[cmd]
+	if exist {
+		//匹配上路由器
+		err := handler(conn, msg)
+		if err != nil {
+			g.Log().Error(conn.Ctx, err)
+		}
+	} else {
+		//fmt.Println("未注册的路由器ID:", cmd)
+		//s.Send(20000000, conn.Uid, []byte("未注册的协议号:"+strconv.Itoa(cmd)))
+		s.OnClose(conn)
+		return
+	}
+
+}
+
+//绑定用户编号
+func (s *SocketV1) BindUid(conn *WebsocketData, uid int64) {
+	lock.Lock()
+	defer lock.Unlock()
+
+	cacheKey := fmt.Sprintf("socket:uid:%d", uid)
+	g.Redis().Set(nil, cacheKey, conn.Uuid)
+
+	if conn.Uid == 0 {
+		conn.Uid = uid
+	}
+
+}
+
+//解绑用户
+func (s *SocketV1) UnBindUid(uid int64) {
+	lock.Lock()
+	defer lock.Unlock()
+
+	cacheKey := fmt.Sprintf("socket:uid:%d", uid)
+	g.Redis().Del(nil, cacheKey)
+}
+
+// Uid2Uuid 用户编号转uuid唯一标识
+func (s *SocketV1) Uid2Uuid(uid int64) (uuid string) {
+	cacheKey := fmt.Sprintf("socket:uid:%d", uid)
+	get, _ := g.Redis().Get(nil, cacheKey)
+	if get.IsNil() {
+		return
+	}
+
+	uuid = get.String()
+
+	//如果不在线了
+	if !m.Contains(uuid) {
+		// 解绑用户编号
+		s.UnBindUid(uid)
+		return
+	}
+
+	return
+}
+
+// SendUuid
+//
+//	@Description:
+//	@receiver s
+//	@param uid
+//	@param data
+func (s *SocketV1) SendUuid(cmd int32, id uuid.UUID, req proto.Message) {
+	if !m.Contains(id) {
+		return
+	}
+	var data, err = proto.Marshal(req)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+		return
+	}
+
+	conn := m.Get(id).(*WebsocketData)
+
+	//前置方法
+
+	for _, v := range Byte2Pb {
+		temp := v(cmd, data, 0, "")
+		data, _ = proto.Marshal(temp)
+	}
+
+	conn.Ws.WriteMessage(s.Type, data)
+
+	return
+}
+
+// Send
+//
+//	@Description:
+//	@receiver s
+//	@param uid
+//	@param data
+func (s *SocketV1) Send(cmd int32, uid int64, req proto.Message) {
+	g.Log("cmd").Debugf(gctx.New(), fmt.Sprintf("to|%d|%d|%v", cmd, uid, gjson.MustEncodeString(req)))
+
+	uuid := s.Uid2Uuid(uid)
+	if uuid == "" {
+		return
+	}
+	if !m.Contains(uuid) {
+		return
+	}
+
+	//格式化数据
+	var data, err = proto.Marshal(req)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+		return
+	}
+
+	conn := m.Get(uuid).(*WebsocketData)
+
+	//前置方法
+
+	for _, v := range Byte2Pb {
+		temp := v(cmd, data, 0, "")
+		data, _ = proto.Marshal(temp)
+	}
+	conn.Ws.WriteMessage(s.Type, data)
+	return
+}
+
+// 批量发送
+func (s *SocketV1) SendAll(cmd int32, req proto.Message) {
+	g.Log("cmd").Debugf(gctx.New(), fmt.Sprintf("all:%d|-1|%v", cmd, gjson.MustEncodeString(req)))
+
+	//格式化数据
+	var data, err = proto.Marshal(req)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+		return
+	}
+
+	for _, v := range Byte2Pb {
+		temp := v(cmd, data, 0, "")
+		data, _ = proto.Marshal(temp)
+	}
+	m.Iterator(func(k interface{}, v interface{}) bool {
+		conn := v.(*WebsocketData)
+		conn.Ws.WriteMessage(s.Type, data)
+		return true
+	})
+}
+
+// OnClose
+//
+//	@Description:
+//	@receiver s
+//	@param conn
+func (s *SocketV1) OnClose(conn *WebsocketData) {
+	// 在此处编写断开连接后的处理逻辑
+	//g.Log().Debugf(gctx.New(), "WebSocket connection from %s has been closed.", conn.RemoteAddr())
+
+	//用户登录钩子执行
+	for _, connect := range OnCloseHandlers {
+		connect(conn)
+	}
+	uid := conn.Uid
+	if uid > 0 {
+		s.UnBindUid(uid)
+	}
+
+	// 可能的后续操作：
+	// 1. 更新连接状态或从连接池移除
+	// 2. 发送通知或清理关联资源
+	// 3. 执行特定于业务的断开处理
+	m.Remove(conn.Uuid)
+	conn.Ws.Close()
+}
+
+// 是否在线
+func (s *SocketV1) IsOnline(uid int64) bool {
+	uuid := s.Uid2Uuid(uid)
+	if m.Contains(uuid) {
+		return true
+	}
+	return false
+}

service/game_act.go

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

service/game_kv.go

@@ -0,0 +1,32 @@
+// ================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// You can delete these comments if you wish manually maintain this interface file.
+// ================================================================================
+
+package service
+
+type (
+	IGameKv interface {
+		// SavesV1 方法
+		//
+		// @Description: 保存用户KV数据列表。
+		// @receiver s: sGameKv的实例。
+		// @return err: 错误信息，如果操作成功，则为nil。
+		SavesV1() (err error)
+	}
+)
+
+var (
+	localGameKv IGameKv
+)
+
+func GameKv() IGameKv {
+	if localGameKv == nil {
+		panic("implement not found for interface IGameKv, forgot register?")
+	}
+	return localGameKv
+}
+
+func RegisterGameKv(i IGameKv) {
+	localGameKv = i
+}

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"
 )
@@ -15,7 +17,7 @@ type randMod struct {
 // RandomAll 按权重随机选取 N 个不重复的元素
 func (m *randMod) RandomAll(data map[int]int, n int) []int {
 	if n > len(data) {
-		return nil
+		n = len(data)
 	}
 	rand.Seed(time.Now().UnixNano())
 	// 复制权重映射，避免修改原始数据
@@ -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 {
+type Any interface {
-//	interface{} | string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
+	string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
-//}
+}
 
 type toolsInterface interface {
 	Load()
@@ -30,7 +32,8 @@ type tools struct {
 }
 
 func init() {
-	g.Log().Debugf(gctx.New(), "初始化工具类")
+	boot.AddFunc(func() {
+		g.Log().Debugf(gctx.New(), "初始化tools工具类")
 
 		names := []toolsInterface{
 			Tools,
@@ -39,6 +42,7 @@ func init() {
 			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
@@ -223,3 +227,63 @@ func ReverseSlice[T comparable](s []T) []T {
 	}
 	return s
 }
+
+// 道具数量合并
+func (m *tools) ItemsMerge(_items ...[][]int64) [][]int64 {
+	var items [][]int64
+	for _, v := range _items {
+		items = append(items, v...)
+	}
+	if len(items) == 0 {
+		return [][]int64{}
+	}
+	var temp = make(map[int64]int64)
+	for _, v := range items {
+		if len(v) < 2 {
+			g.Log().Errorf(ctx, "分解的物品格式不对:%v", v)
+			continue
+		}
+		if _, ok := temp[v[0]]; !ok {
+			temp[v[0]] = 0
+		}
+		temp[v[0]] += v[1]
+	}
+
+	items = make([][]int64, len(temp))
+	i := 0
+	for k, v := range temp {
+		items[i] = []int64{k, v}
+		i++
+	}
+	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()
+	g.Log().Debug(ctx, "utility_go init启动完成")
-
+	// 初始化配置
-	//用户活动持久化
+	var err = boot.Boot()
-	gtimer.SetTimeout(ctx, time.Minute, func(ctx context.Context) {
+	if err != nil {
-		service.SystemCron().AddCron(v1.CronType_DAILY, func() error {
+		panic(err)
-			service.GameAct().Saves()
+	}
-			return nil
-		})
-	})
 
 }

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