增加计划任务的打断机制

计划任务定时器修改，改为通道顺序执行
完善weboscket的启动
2025-04-22 12:15:53 +08:00 · 2025-04-22 11:15:51 +08:00 · 2025-04-21 14:35:24 +08:00 · 2025-04-21 14:16:58 +08:00 · 2025-04-18 18:36:50 +08:00 · 2025-04-14 17:05:08 +08:00
50 changed files with 1824 additions and 1199 deletions
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # utility_go：强大的Go语言工具类库

 ## 一、项目概述
-`utility_go` 是一个功能丰富的Go语言工具类库，旨在帮助开发者更高效地开发Go应用程序。它提供了一系列实用的功能模块，涵盖了数据库操作、缓存处理、支付接口集成、排名算法实现等多个方面，可广泛应用于各种类型的Go项目中。
+`utility_go` 是一个功能丰富的Go语言工具类库，旨在助力开发者更高效地开发Go应用程序。它提供了一系列实用的功能模块，广泛涵盖数据库操作、缓存处理、支付接口集成、排名算法实现等多个方面，适用于各类Go项目。

 ## 二、安装方式
-要使用 `utility_go` 工具类库，你可以使用 `go get` 命令进行安装。请确保你的Go环境已经正确配置，并且可以访问互联网。
+要使用 `utility_go` 工具类库，可使用 `go get` 命令进行安装。请确保你的Go环境已正确配置，且可访问互联网。

 ### 安装命令
 ```sh
@@ -12,7 +12,7 @@ go get github.com/ayflying/utility_go
 ```

 ### 安装验证
-安装完成后，你可以在你的Go代码中导入 `utility_go` 相关的包，检查是否能够正常使用。例如：
+安装完成后，你可以在Go代码中导入 `utility_go` 相关的包，检查是否能够正常使用。示例如下：
 ```go
 package main

@@ -29,39 +29,45 @@ func main() {
 ```

 ## 三、项目结构
-`utility_go` 的项目结构设计清晰，各个模块分工明确，方便开发者使用和扩展。以下是项目的主要目录结构：
+`utility_go` 的项目结构设计清晰，各模块分工明确，便于开发者使用和扩展。以下是项目的主要目录结构及说明：

 ### 主要目录说明
- **`api/`**：存放与API相关的代码，包含不同模块的API接口定义，如 `admin`、`callback`、`system` 等。这些API接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
- **`service/`**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
- **`controller/`**：控制器层代码，主要用于处理HTTP请求和响应。控制器接收客户端的请求，调用相应的服务层方法进行处理，并将处理结果返回给客户端。
- **`internal/`**：内部包，包含项目的核心业务逻辑，如 `game`、`logic`、`model` 等模块。其中，`model` 模块定义了项目中使用的数据模型，如数据库表对应的结构体；`logic` 模块实现了各种业务逻辑的处理函数。
- **`package/`**：包含各种功能包，提供了丰富的工具和功能，具体如下：
-    - **`aycache`**：缓存相关的功能包，提供了缓存操作的接口和实现，帮助开发者更方便地使用缓存技术，提高应用程序的性能。
-    - **`elasticsearch`**：Elasticsearch相关的功能包，用于与Elasticsearch搜索引擎进行交互，实现数据的存储、检索和分析等功能。
-    - **`excel`**：Excel处理相关的功能包，提供了Excel文件的读写操作接口，方便开发者处理Excel文件中的数据。
-    - **`pay`**：支付相关的功能包，包含了与各种支付平台的接口集成，如 `apple`（苹果支付）、`playstore`（Google Play Store支付）等，支持应用内购买等支付功能。
-    - **`rand`**：随机数相关的功能包，提供了生成各种随机数的函数，可用于测试、加密等场景。
-    - **`rank`**：排名相关的功能包，实现了各种排名算法，如基于Redis的排行榜功能，可用于游戏排名、活动排名等场景。
-    - **`s3`**：S3存储相关的功能包，用于与Amazon S3等云存储服务进行交互，实现文件的上传、下载、删除等操作。
- **`tools/`**：工具类代码，包含了一些常用的工具函数，如 `redis.go`（Redis操作相关）、`time.go`（时间处理相关）、`tools.go`（通用工具函数）等，方便开发者在项目中使用。
+- **api/**：存放与API相关的代码，包含不同模块的API接口定义，如 `admin`、`callback`、`system` 等。这些API接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
+- **service/**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
+- **controller/**：控制器层代码，主要用于处理HTTP请求和响应。控制器接收客户端的请求，调用相应的服务层方法进行处理，并将处理结果返回给客户端。
+- **internal/**：内部包，包含项目的核心业务逻辑，如 `game`、`logic`、`model` 等模块。其中，`model` 模块定义了项目中使用的数据模型，如数据库表对应的结构体；`logic` 模块实现了各种业务逻辑的处理函数。
+- **package/**：包含各种功能包，提供了丰富的工具和功能，具体如下：
+  - **aycache**：缓存相关的功能包，提供了缓存操作的接口和实现，帮助开发者更方便地使用缓存技术，提高应用程序的性能。
+  - **elasticsearch**：Elasticsearch相关的功能包，用于与Elasticsearch搜索引擎进行交互，实现数据的存储、检索和分析等功能。
+  - **excel**：Excel处理相关的功能包，提供了Excel文件的读写操作接口，方便开发者处理Excel文件中的数据。
+  - **pay**：支付相关的功能包，包含了与各种支付平台的接口集成，如 `apple`（苹果支付）、`playstore`（Google Play Store支付）等，支持应用内购买等支付功能。
+  - **rand**：随机数相关的功能包，提供了生成各种随机数的函数，可用于测试、加密等场景。
+  - **rank**：排名相关的功能包，实现了各种排名算法，如基于Redis的排行榜功能，可用于游戏排名、活动排名等场景。
+  - **s3**：S3存储相关的功能包，用于与Amazon S3等云存储服务进行交互，实现文件的上传、下载、删除等操作。
+- **tools/**：工具类代码，包含了一些常用的工具函数，如 `redis.go`（Redis操作相关）、`time.go`（时间处理相关）、`tools.go`（通用工具函数）等，方便开发者在项目中使用。

 ## 四、主要模块功能

-### 4.1 `pay/playstore`
-该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作。它提供了以下主要功能：
- **创建客户端**：通过 `New` 函数创建并返回一个包含访问androidpublisher API所需凭证的http客户端，方便开发者与Google Play Store API进行通信。
- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的http客户端创建并返回一个包含访问androidpublisher API所需凭证的http客户端，增加了客户端的灵活性。
+### 4.1 pay/playstore
+该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作，提供以下主要功能：
+- **创建客户端**：通过 `New` 函数创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，方便开发者与Google Play Store API进行通信。
+- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的HTTP客户端创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，增加了客户端的灵活性。
 - **验证签名**：`VerifySignature` 函数用于验证应用内购买的签名，确保支付信息的安全性和合法性。

-### 4.2 `s3`
-`s3` 模块主要用于与S3存储服务进行交互，提供了文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。
+### 4.2 s3
+`s3` 模块主要用于与S3存储服务进行交互，提供文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。

-### 4.3 `model`
+### 4.3 model
 `model` 模块定义了项目中使用的数据模型，这些数据模型通常与数据库表相对应，用于数据的存储和操作。例如：
- **`GameMailMass`**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
- **`GameBag`**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
- **`MemberSave`**：（根据具体代码中的定义）可能表示用户会员信息的数据模型，用于存储用户的会员相关数据。
+- **GameMailMass**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
+- **GameBag**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
+- **MemberSave**：（根据具体代码中的定义）可能表示用户会员信息的数据模型，用于存储用户的会员相关数据。
+
+### 4.4 tools
+`tools` 模块提供了一系列通用工具函数，涵盖时间处理、Redis操作、道具数据处理等功能：
+- **时间处理**：`time.go` 文件中的函数可以进行时间计算，如获取本周开始时间、计算两个时间间隔天数等。
+- **Redis操作**：`redis.go` 文件中的函数可以进行Redis的扫描操作，支持批量获取大量数据。
+- **通用工具**：`tools.go` 文件中的函数提供了字符串处理、切片操作、道具数据合并等功能。

 ## 五、使用示例

@@ -115,6 +121,33 @@ func main() {
 }
 ```

+### 5.3 工具模块示例
+以下是一个使用 `tools` 模块处理道具数据的示例代码：
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/ayflying/utility_go/tools"
+)
+
+func main() {
+    // 字符串转道具类型
+    str := "1|10|2|20"
+    result := tools.Tools.Spilt2Item(str)
+    fmt.Println("Spilt2Item result:", result)
+
+    // 切片换道具类型
+    slice := []int64{1, 10, 2, 20}
+    res := tools.Tools.Slice2Item(slice)
+    fmt.Println("Slice2Item result:", res)
+
+    // 道具格式转map
+    list := tools.Tools.Items2Map(result)
+    fmt.Println("Items2Map result:", list)
+}
+```
+
 ## 六、注意事项
 - **自动生成文件**：项目中有部分代码文件是由GoFrame CLI工具生成并维护的，这些文件通常会标注有 `// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.` 注释。请不要手动修改这些文件，以免造成不必要的问题。
 - **版本兼容性**：在使用 `utility_go` 工具类库时，请确保你的Go语言版本与工具类库的要求版本兼容。建议使用最新的Go语言版本，以获得更好的性能和稳定性。
@@ -123,5 +156,4 @@ func main() {
 `utility_go` 工具类库会定期进行更新和维护，以修复已知的问题、添加新的功能和优化性能。你可以关注项目的GitHub仓库（https://github.com/ayflying/utility_go）获取最新的更新信息。如果你在使用过程中遇到任何问题或有任何建议，欢迎提交Issue或Pull Request。

 ## 八、许可证信息
-`utility_go` 工具类库遵循 MIT许可证，你可以在项目的 `LICENSE` 文件中查看详细的许可证条款。请确保在使用该工具类库时遵守相关的许可证规定。
-```
+`utility_go` 工具类库遵循MIT许可证，你可以在项目的 `LICENSE` 文件中查看详细的许可证条款。请确保在使用该工具类库时遵守相关的许可证规定。
--- a/api/pkg/v1/pkg.pb.go
+++ b/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{
-	0x0a, 0x10, 0x70, 0x67, 0x6b, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x67, 0x6b, 0x2e, 0x70, 0x72, 0x6f,
+var file_pkg_v1_pkg_proto_rawDesc = []byte{
+	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_pgk_v1_pgk_proto_rawDescData = file_pgk_v1_pgk_proto_rawDesc
+	file_pkg_v1_pkg_proto_rawDescOnce sync.Once
+	file_pkg_v1_pkg_proto_rawDescData = file_pkg_v1_pkg_proto_rawDesc
 )

-func file_pgk_v1_pgk_proto_rawDescGZIP() []byte {
-	file_pgk_v1_pgk_proto_rawDescOnce.Do(func() {
-		file_pgk_v1_pgk_proto_rawDescData = protoimpl.X.CompressGZIP(file_pgk_v1_pgk_proto_rawDescData)
+func file_pkg_v1_pkg_proto_rawDescGZIP() []byte {
+	file_pkg_v1_pkg_proto_rawDescOnce.Do(func() {
+		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_pgk_v1_pgk_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pgk_v1_pgk_proto_goTypes = []interface{}{
+var file_pkg_v1_pkg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_pkg_v1_pkg_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+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 file_pgk_v1_pgk_proto_init() {
-	if File_pgk_v1_pgk_proto != nil {
+func init() { file_pkg_v1_pkg_proto_init() }
+func file_pkg_v1_pkg_proto_init() {
+	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,
-		DependencyIndexes: file_pgk_v1_pgk_proto_depIdxs,
-		EnumInfos:         file_pgk_v1_pgk_proto_enumTypes,
-		MessageInfos:      file_pgk_v1_pgk_proto_msgTypes,
+		GoTypes:           file_pkg_v1_pkg_proto_goTypes,
+		DependencyIndexes: file_pkg_v1_pkg_proto_depIdxs,
+		EnumInfos:         file_pkg_v1_pkg_proto_enumTypes,
+		MessageInfos:      file_pkg_v1_pkg_proto_msgTypes,
 	}.Build()
-	File_pgk_v1_pgk_proto = out.File
-	file_pgk_v1_pgk_proto_rawDesc = nil
-	file_pgk_v1_pgk_proto_goTypes = nil
-	file_pgk_v1_pgk_proto_depIdxs = nil
+	File_pkg_v1_pkg_proto = out.File
+	file_pkg_v1_pkg_proto_rawDesc = nil
+	file_pkg_v1_pkg_proto_goTypes = nil
+	file_pkg_v1_pkg_proto_depIdxs = nil
 }
--- a/aycache/aycache.go
+++ b/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...)
+}
--- a/cmd/load.go
+++ b/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
+}
--- a/cmd/make.go
+++ b/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
+}
--- a/cmd/make/socket
+++ b/cmd/make/socket
@@ -0,0 +1,10 @@
+package {name}
+
+type {name} struct {
+}
+
+func New() *{name} {
+	return &{name}{}
+}
+
+func init() {}
--- a/cmd/make/socket2
+++ b/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
+}
--- a/cmd/update.go
+++ b/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,14 +97,28 @@ 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
+					}
+				}
 				g.Log().Debugf(ctx, "准备同步服务器:%v,url=%v", v.Name, address+"/callback/update")
 				get, err := client.Post(ctx, address+"/callback/update", &UpdateReq{
 					FileUrl: url[v.S3],
@@ -107,9 +145,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 {
--- a/drivers/db/elasticsearch/elasticsearch.go
+++ b/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)
+//}
--- a/drivers/db/elasticsearch/es_open.go
+++ b/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
+}
--- a/drivers/db/elasticsearch/load.go
+++ b/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
+}
--- a/drivers/db/found/found.go
+++ b/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
+}
--- a/go.mod
+++ b/go.mod
@@ -10,14 +10,16 @@ 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/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0
+	github.com/gogf/gf/v2 v2.9.0
+	github.com/gorilla/websocket v1.5.3
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230
 	github.com/minio/minio-go/v7 v7.0.85
+	github.com/prometheus/client_golang v1.21.1
 	github.com/xuri/excelize/v2 v2.9.0
-	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
+	golang.org/x/oauth2 v0.24.0
 	google.golang.org/api v0.44.0
-	google.golang.org/protobuf v1.26.0
+	google.golang.org/protobuf v1.36.1
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )

@@ -25,10 +27,11 @@ require (
 	cloud.google.com/go v0.81.0 // indirect
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect
-	github.com/emersion/go-imap/v2 v2.0.0-beta.5 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -43,7 +46,6 @@ require (
 	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
@@ -55,8 +57,12 @@ 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/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
@@ -70,10 +76,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/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
--- a/go.sum
+++ b/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=
@@ -77,8 +81,6 @@ github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4b
 github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
 github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q=
 github.com/elastic/go-elasticsearch/v8 v8.17.1/go.mod h1:MVJCtL+gJJ7x5jFeUmA20O7rvipX8GcQmo5iBcmaJn4=
-github.com/emersion/go-imap/v2 v2.0.0-beta.5 h1:H3858DNmBuXyMK1++YrQIRdpKE1MwBc+ywBtg3n+0wA=
-github.com/emersion/go-imap/v2 v2.0.0-beta.5/go.mod h1:BZTFHsS1hmgBkFlHqbxGLXk2hnRqTItUgwjSSCsYNAk=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -124,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.8.3/go.mod h1:Uo6f/Pr6zVHSbdP2Lj9iToEMuh/TzU/bE2E5SJlquEk=
-github.com/gogf/gf/v2 v2.8.3 h1:h9Px3lqJnnH6It0AqHRz4/1hx0JmvaSf1IvUir5x1rA=
-github.com/gogf/gf/v2 v2.8.3/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0 h1:BewnDc3gq2iqYzPH56FtOelmT9F9WcAm6nnlOVgw3J8=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0/go.mod h1:uNjaJcnMvMl7bkcoL0amxwcrOM+Q5XGADKKwKTY+8MY=
+github.com/gogf/gf/v2 v2.9.0 h1:semN5Q5qGjDQEv4620VzxcJzJlSD07gmyJ9Sy9zfbHk=
+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=
@@ -247,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=
@@ -281,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=
@@ -291,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=
@@ -302,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.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+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=
@@ -331,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.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+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=
@@ -359,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.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
-go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
-go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
-go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
-go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
+go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
 go.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=
@@ -465,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=
@@ -696,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=
--- a/internal/boot/boot.go
+++ b/internal/boot/boot.go
@@ -0,0 +1,33 @@
+package boot
+
+import (
+	"context"
+	v1 "github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/service"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+var (
+	ctx   = gctx.GetInitCtx()
+	_func = []func(){}
+)
+
+func Boot() (err error) {
+	err = service.SystemCron().StartCron()
+
+	//用户活动持久化
+	service.SystemCron().AddCronV2(v1.CronType_DAILY, func(ctx context.Context) error {
+		return service.GameAct().Saves(ctx)
+	})
+
+	//初始化自启动方法
+	for _, v := range _func {
+		v()
+	}
+	return nil
+}
+
+// AddFunc 注册方法，在启动时执行
+func AddFunc(f func()) {
+	_func = append(_func, f)
+}
--- a/internal/logic/gameAct/gameAct.go
+++ b/internal/logic/gameAct/gameAct.go
@@ -1,10 +1,10 @@
 package gameAct

 import (
+	"context"
 	"fmt"
 	"github.com/ayflying/utility_go/internal/model/do"
 	"github.com/ayflying/utility_go/internal/model/entity"
-	"github.com/ayflying/utility_go/pgk"
 	"github.com/ayflying/utility_go/pkg"
 	service2 "github.com/ayflying/utility_go/service"
 	"github.com/ayflying/utility_go/tools"
@@ -12,6 +12,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
 	"strconv"
 	"strings"
 	"time"
@@ -105,16 +106,16 @@ func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
 	return
 }

-func (s *sGameAct) Saves() (err error) {
+func (s *sGameAct) Saves(ctx context.Context) (err error) {
 	//遍历执行
 	ActList.Iterator(func(i interface{}) bool {
-		err = s.Save(i.(int))
+		err = s.Save(ctx, i.(int))
 		return true
 	})
 	return
 }

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

 	cacheKey := fmt.Sprintf("act:%v:*", actId)
 	//获取当前用户的key值
@@ -131,7 +132,8 @@ func (s *sGameAct) Save(actId int) (err error) {
 			result := strings.Split(cacheKey, ":")
 			actId, err = strconv.Atoi(result[1])
 			var uid int64
-			uid, err = strconv.ParseInt(result[2], 10, 64)
+			uid = gconv.Int64(result[2])
+			//uid, err = strconv.ParseInt(result[2], 10, 64)
 			if err != nil {
 				continue
 			}
@@ -148,8 +150,8 @@ func (s *sGameAct) Save(actId int) (err error) {
 			}

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

@@ -216,9 +218,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()
+
+}
--- a/internal/logic/ip2region/ip2region.go
+++ b/internal/logic/ip2region/ip2region.go
@@ -11,7 +11,8 @@ import (
 )

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

 type sIp2region struct {
@@ -19,13 +20,16 @@ type sIp2region struct {
 }

 func New() *sIp2region {
-	s := &sIp2region{}
-	s.Load()
-	return s
+
+	return &sIp2region{}
 }

 func init() {
 	service.RegisterIp2Region(New())
+
+	//boot.AddFunc(func() {
+	//	service.Ip2Region().Load()
+	//})
 }

 // Load 加载到内存中
@@ -34,13 +38,20 @@ 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 dbPath = "runtime/library/ip2region.xdb"
+	var url = "https://github.com/ayflying/resource/raw/refs/heads/main/attachment/ip2region.xdb"
+	if wait {
+		return
+	}
 	if gfile.IsEmpty(dbPath) {
+		wait = true
+		defer func() {
+			wait = false
+		}()
+		g.Log().Debug(ctx, "等待下载ip库文件")
 		//下载文件
-		putData, err2 := g.Client().Discovery(nil).
-			Get(ctx, "https://resource.luoe.cn/pgk/ip2region.xdb")
+		putData, err2 := g.Client().Discovery(nil).Get(ctx, url)
 		if err2 != nil {
 			return
 		}
@@ -66,6 +77,9 @@ func (s *sIp2region) Load() {
 }

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

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

 		defer get.Close()
 		if err != nil {
--- a/internal/logic/systemCron/systemCron.go
+++ b/internal/logic/systemCron/systemCron.go
@@ -7,53 +7,60 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcron"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/os/gtimer"
 	"sync"
 	"time"
 )

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

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

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

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

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

 	switch typ {
 	case v1.CronType_SECOND:
@@ -110,140 +136,129 @@ func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
 //	@receiver s
 //	@return err
 func (s *sSystemCron) StartCron() (err error) {
-	g.Log().Debug(ctx, "启动计划任务定时器详情")
+	//预防重复启动
+	if startTime != nil {
+		return
+	}
+	startTime = gtime.Now()
+
+	g.Log().Debug(gctx.New(), "启动计划任务定时器详情")
 	//每秒任务
-	gtimer.SetInterval(ctx, time.Second, func(ctx context.Context) {
+	gtimer.SetInterval(gctx.New(), time.Second, func(ctx context.Context) {
 		//g.Log().Debug(ctx, "每秒定时器")
-		err = s.secondlyTask()
+		s.secondlyTask()
 	})

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

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

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

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

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

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

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

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

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

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

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

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

 // 每月任务
-func (s *sSystemCron) monthlyTask() (err error) {
+func (s *sSystemCron) monthlyTask() {
 	if len(s.MonthlyTask) == 0 {
 		return
 	}
-	for _, _func := range s.MonthlyTask {
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
+	s.AddFuncChan(s.MonthlyTask)
+	return
+}
+
+//每年任务
+func (s *sSystemCron) yearlyTask() {
+	if len(s.YearlyTask) == 0 {
+		return
+	}
+	s.AddFuncChan(s.YearlyTask)
+
+}
+
+// AddFuncChan 添加方法到通道
+func (s *sSystemCron) AddFuncChan(list []func(context.Context) error) {
+	for _, v := range list {
+		s.taskChan <- v
+	}
+}
+
+// RunFuncChan 统一执行方法
+func (s *sSystemCron) RunFuncChan() {
+	go func() {
+		for task := range s.taskChan {
+			//ctx := gctx.New()
+			func() {
+				//超时释放资源
+				ctx, cancel := context.WithTimeout(context.Background(), s.TaskTimeout)
+				defer cancel()
+
+				// 使用匿名函数包裹来捕获 panic
+				defer func() {
+					if r := recover(); r != nil {
+						g.Log().Errorf(gctx.New(), "执行函数时发生 panic: %v", r)
+					}
+				}()
+
+				done := make(chan error)
+				go func() {
+					done <- task(ctx)
+				}()
+				//err := task()
+				//if err != nil {
+				//	g.Log().Error(ctx, err)
+				//}
+				select {
+				case taskErr := <-done:
+					if taskErr != nil {
+						// 使用新上下文记录错误
+						g.Log().Error(gctx.New(), taskErr)
+					}
+				case <-ctx.Done(): // 监听上下文取消（包括超时）
+					g.Log().Errorf(gctx.New(), "task timeout:%v", ctx.Err())
+				}
+			}()
 		}
+	}()
+}
+
+// RunFunc 统一执行方法
+// deprecated: 弃用，会造成周期任务并发执行，to service.SystemCron().AddFuncChan
+func (s *sSystemCron) RunFunc(list []func() error) {
+	for _, _func := range list {
+		ctx := gctx.New()
+		func() {
+			// 使用匿名函数包裹来捕获 panic
+			defer func() {
+				if r := recover(); r != nil {
+					g.Log().Errorf(ctx, "执行函数时发生 panic: %v", r)
+				}
+			}()
+			err := _func()
+			if err != nil {
+				g.Log().Error(ctx, err)
+			}
+		}()
 	}
 	return
 }
--- a/manifest/protobuf/pkg/v1/pkg.proto
+++ b/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 枚举
--- a/package/aycache/cache.go
+++ b/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
-}
--- a/package/aycache/drive/elasticsearch.go
+++ b/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,
-	}
-}
--- a/package/aycache/file.go
+++ b/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,
-	}
-}
--- a/package/aycache/memory.go
+++ b/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
-}
--- a/package/aycache/mencached.go
+++ b/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{}
-}
--- a/package/aycache/redis.go
+++ b/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
-}
--- a/package/excel/excel.go
+++ b/package/excel/excel.go
@@ -111,8 +111,12 @@ func (s *Excel) RemoveComments(list []interface{}, json []string) []interface{}
 		// 遍历当前元素的每个键值对
 		for _, v3 := range v2.(g.Map) {
 			// 如果字符串中存在//则跳过不写入temp
-			if gstr.Contains(gconv.String(v3), "//") {
-				//delKey = append(delKey, k2)
+			//if gstr.Contains(gconv.String(v3), "//") {
+			//	//delKey = append(delKey, k2)
+			//	add = false
+			//	break
+			//}
+			if strings.HasPrefix(gconv.String(v3), "//") {
 				add = false
 				break
 			}
--- a/package/pay/wechat.go
+++ b/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
--- a/package/rank/rank.go
+++ b/package/rank/rank.go
@@ -1,395 +0,0 @@
-package rank
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/gogf/gf/v2/database/gredis"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
-)
-
-var (
-	ctx = gctx.New()
-)
-
-type Mod struct {
-}
-
-type F64CountRank struct {
-	name     string // 排行榜名
-	updateTs string // 更新时间key
-}
-
-type RankData struct {
-	Id       int64
-	Score    int64
-	Rank     int32
-	UpdateTs int64
-}
-
-// Deprecated:Use pgk.Rank()
-func New() *Mod {
-	return &Mod{}
-}
-
-func (s *Mod) Load() {
-
-}
-
-// CreateF64CountRank 创建一个排行榜实例
-// 参数:
-//
-//	name: 排行榜的名称，通常代表一个赛季
-//
-// 返回值:
-//
-//	*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"
-	// updateTs字段用于标识排行榜的更新时间，格式为"rank:<name>:updateTs"
-	return &F64CountRank{
-		name:     fmt.Sprintf("rank:%s:score", name),
-		updateTs: fmt.Sprintf("rank:%s:updateTs", name),
-	}
-}
-
-// IncrScore 对指定ID的分数进行增加，并返回增加后的当前分数。
-// 该方法首先更新成员的更新时间戳，然后增加成员的分数。
-//
-// 参数:
-//
-//	id - 要操作的成员ID。
-//	score - 要增加的分数。
-//
-// 返回值:
-//
-//	curScore - 增加分数后的当前分数。
-//	err - 操作过程中可能发生的错误。
-//
-// IncrScore 先改redis再改cache
-//
-//	@Description:
-//	@receiver r
-//	@param id
-//	@param score
-//	@return curScore
-//	@return err
-func (r *F64CountRank) IncrScore(id int64, score int64) (curScore float64, err error) {
-	// 记录当前时间戳，用于更新成员的最新活动时间。
-	now := time.Now().UnixMilli()
-
-	// 将成员的更新时间戳加入到Redis的有序集合中，确保成员的排序依据是最新的活动时间。
-	_, err = g.Redis().ZAdd(ctx, r.updateTs, &gredis.ZAddOption{}, gredis.ZAddMember{
-		Score:  float64(now),
-		Member: id,
-	})
-
-	// 增加成员的分数，并返回增加后的当前分数。
-	curScore, err = g.Redis().ZIncrBy(ctx, r.name, float64(score), id)
-
-	//如果分数小于0，则删除
-	if curScore <= 0 {
-		err = r.DelScore(id)
-	}
-
-	return
-}
-
-// todo暂时未使用
-func (r *F64CountRank) GetCount() {
-	count, _ := g.Redis().ZCard(ctx, r.name)
-	if count > 9999 {
-		//删除超过9999的数据
-		g.Redis().ZRemRangeByRank(ctx, r.name, 0, -9999)
-	}
-}
-
-// Delete 删除当前排行榜
-// 该方法通过删除Redis中与排行榜相关的键来清除排行榜信息
-func (r *F64CountRank) Delete() {
-	// 删除排行榜数据键
-	_, err := g.Redis().Del(ctx, r.name)
-	if err != nil {
-		// 如果删除失败，记录错误日志
-		g.Log().Error(ctx, "排行榜删除失败:%v", err)
-	}
-	// 删除排行榜更新时间键
-	_, err = g.Redis().Del(ctx, r.updateTs)
-	if err != nil {
-		// 如果删除失败，记录错误日志
-		g.Log().Error(ctx, "排行榜删除失败:%v", err)
-	}
-}
-
-// DelScore 删除当前分数
-//
-// 该方法从更新时间有序集合和排名有序集合中移除指定的id。
-// 这通常用于从排行榜中删除一个条目，同时确保其在更新时间集合中的对应记录也被清除。
-//
-//	@Description: 从更新时间和排名集合中移除指定id
-//	@receiver r 接收者为F64CountRank类型的实例
-//	@param id 要从集合中移除的条目的ID
-//	@return err 可能发生的错误，如果操作成功，err为nil
-func (r *F64CountRank) DelScore(id int64) (err error) {
-	// 从更新时间集合中移除id
-	_, err = g.Redis().ZRem(ctx, r.updateTs, id)
-	// 从排名集合中移除id
-	_, err = g.Redis().ZRem(ctx, r.name, id)
-	return
-}
-
-// DelByRank 根据排名范围删除元素。
-// 该方法使用了Redis的有序集合数据结构，通过ZRange和ZRemRangeByRank命令来实现。
-// 参数start和stop定义了要删除的排名范围，从start到stop（包括start和stop）。
-// 返回可能的错误。
-func (r *F64CountRank) DelByRank(start int64, stop int64) (err error) {
-	// 初始化一个空的int64切片，用于存储指定排名范围内的元素。
-	var members []int64
-
-	// 使用Redis的ZRange命令获取指定排名范围内的元素。
-	// 选项Rev设置为true，表示按照分数从高到低的顺序返回元素。
-	get, err := g.Redis().ZRange(ctx, r.name, start, stop,
-		gredis.ZRangeOption{
-			Rev: true,
-		})
-
-	// 使用Scan方法将获取到的元素扫描到members切片中。
-	err = get.Scan(&members)
-	// 如果扫描过程中出现错误，直接返回错误。
-	if err != nil {
-		return
-	}
-
-	// 遍历members切片，对于每个元素，使用ZRem命令从更新时间集合中删除对应的成员。
-	for _, member := range members {
-		_, err = g.Redis().ZRem(ctx, r.updateTs, member)
-		// 忽略ZRem操作的错误，因为即使元素不存在，ZRem也不会返回错误。
-	}
-
-	// 使用ZRemRangeByRank命令从有序集合中删除指定排名范围内的元素。
-	_, err = g.Redis().ZRemRangeByRank(ctx, r.name, start, stop)
-	// 返回可能的错误。
-	return
-}
-
-// updateScore 更新给定ID的分数值。
-//
-// 参数:
-//
-//	id - 需要更新分数的实体ID。
-//	score - 新的分数值。
-//
-// 返回值:
-//
-//	error - 更新过程中可能出现的错误。
-//
-// 该方法首先记录当前时间作为更新时间戳，然后将新的分数值添加到排名系统中。
-// 使用Redis的ZAdd方法来确保操作的原子性和一致性。
-// UpdateScore 更新分数
-//
-//	@Description:
-//	@receiver r
-//	@param id
-//	@param score
-//	@return err
-func (r *F64CountRank) UpdateScore(id int64, score int64) (err error) {
-	// 获取当前时间戳，以毫秒为单位。
-	now := time.Now().UnixMilli()
-
-	// 向更新时间戳的有序集合中添加新的成员和分数，成员为id，分数为当前时间戳。
-	_, err = g.Redis().ZAdd(ctx, r.updateTs, &gredis.ZAddOption{}, gredis.ZAddMember{
-		Score:  float64(now),
-		Member: id,
-	})
-
-	// 向排名的有序集合中添加新的成员和分数，成员为id，分数为传入的score。
-	_, err = g.Redis().ZAdd(ctx, r.name, &gredis.ZAddOption{}, gredis.ZAddMember{
-		Score:  float64(score),
-		Member: id,
-	})
-	return
-}
-
-//// GetRankInfosV1 获取0~count跳记录
-//func (r *F64CountRank) getRankInfosV1(offset, count int) (list []*RankInfo, err error) {
-//	/*
-//		找到maxRank的玩家的分数
-//		根据分数拿到所有分数大于等于minScore玩家
-//		将这些玩家进行排序
-//		返回maxRank条目
-//	*/
-//	var (
-//		minScore int64 // 最低分
-//		maxScore int64
-//		//zl       []redis2.Z
-//		zl     []gredis.ZAddMember
-//		length int
-//	)
-//	// 拉取所有玩家的更新时间戳
-//	zl, err = g.Redis().ZRemRangeByScore(ctx,r.updateTs, strconv.Itoa(0), strconv.Itoa(-1))//ZRemRangeByScore(ctx, r.updateTs, strconv.Itoa(0), strconv.Itoa(-1))
-//	//zl, err = rdbV1.ZRangeWithScores(ctx, r.updateTs, 0, -1).Result()
-//	if err != nil {
-//		g.Log().Errorf(ctx, "redis err:%v", err)
-//		return
-//	}
-//	if len(zl) == 0 {
-//		//logs.Infof("empty list")
-//		return
-//	}
-//	tsl := make(map[int64]int64, len(zl))
-//	for _, z := range zl {
-//		id := gconv.Int64(z.Member) //pgk.InterfaceToNumber[uint64](z.Member)
-//		tsl[id] = int64(z.Score)
-//	}
-//
-//	// 找到maxRank的玩家的分数
-//	zl, err = rdbV1.ZRevRangeByScoreWithScores(ctx, r.name, &redis2.ZRangeBy{
-//		Min:    "0",
-//		Max:    strconv.Itoa(math.MaxInt),
-//		Offset: 0,
-//		Count:  int64(count),
-//	}).Result()
-//	if err != nil {
-//		g.Log().Errorf(ctx, "redis err:%v", err)
-//		return
-//	}
-//	if len(zl) == 0 {
-//		g.Log().Info(ctx, "empty list")
-//		return
-//	}
-//	minScore = int64(zl[len(zl)-1].Score)
-//	maxScore = int64(zl[0].Score)
-//	// 根据分数拿到所有分数大于等于minScore玩家
-//	zl, err = rdbV1.ZRevRangeByScoreWithScores(ctx, r.name, &redis2.ZRangeBy{
-//		Min: fmt.Sprintf("%v", minScore),
-//		Max: fmt.Sprintf("%v", maxScore),
-//	}).Result()
-//	if err != nil {
-//		g.Log().Errorf(ctx, "redis err:%v", err)
-//		return
-//	}
-//	if len(zl) == 0 {
-//		g.Log().Info(ctx, "empty list")
-//		return
-//	}
-//	//如果开始已经大于等于总长度,就返回空
-//	if offset >= len(zl) {
-//		return
-//	}
-//	list = make([]*RankInfo, len(zl))
-//	for i, z := range zl {
-//		id := gconv.Int64(z.Member)
-//		list[i] = &RankInfo{
-//			Id:       id,
-//			Score:    int64(z.Score),
-//			UpdateTs: tsl[id],
-//		}
-//	}
-//	// 将这些玩家进行排序
-//	sort.Slice(list, func(i, j int) bool {
-//		if list[i].Score != list[j].Score {
-//			return list[i].Score > list[j].Score
-//		} else {
-//			return list[i].UpdateTs < list[j].UpdateTs
-//		}
-//	})
-//	length = len(list)
-//	if length > count {
-//		length = count
-//	}
-//	for i := range list {
-//		info := list[i]
-//		info.Rank = i + 1
-//	}
-//
-//	list = list[offset:length]
-//	return
-//}
-
-// GetRankInfosNotTs 获取0~count跳记录 不根据更新时间来
-// 该方法使用ZRange命令从Redis中获取指定范围的排名信息，不考虑更新时间
-// 参数:
-//
-//	offset - 获取记录的起始偏移量
-//	count - 获取记录的数量
-//
-// 返回值:
-//
-//	list - 排名信息列表
-//	err - 错误信息，如果执行过程中遇到错误
-func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*RankData, err error) {
-	// 初始化存储成员ID的切片
-	var members []int64
-
-	// 使用Redis的ZRange命令获取指定范围的成员ID
-	// 参数Rev设为true以从高分到低分获取成员
-	get, err := g.Redis().ZRange(ctx, r.name, int64(offset), int64(count),
-		gredis.ZRangeOption{
-			Rev: true,
-		}) //.ScanSlice(&members)
-
-	// 将获取的结果扫描到members切片中
-	err = get.Scan(&members)
-	// 如果发生错误，记录日志并返回
-	if err != nil {
-		//logs.Withf("redis err:%v", err)
-		return
-	}
-
-	// 根据获取的成员ID数量初始化排名信息列表
-	list = make([]*RankData, len(members))
-	for i := range members {
-		// 获取当前成员ID
-		id := members[i]
-		// 使用成员ID获取排名信息，不考虑更新时间
-		list[i] = r.GetIdRankNotTs(id)
-	}
-	// 返回排名信息列表和可能的错误
-	return
-}
-
-// GetIdRankNotTs 获取指定id的当前排名
-// 该方法从Redis的有序集合中查询指定id的分数和排名信息，不考虑时间戳
-// 参数:
-//
-//	id - 需要查询排名的id
-//
-// 返回值:
-//
-//	rankInfo - 包含id的分数和排名信息的指针，如果没有找到，则返回nil
-func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *RankData) {
-	// 初始化rankInfo结构体，设置id，其他字段将通过查询填充
-	rankInfo = &RankData{Id: id}
-
-	// 查询有序集合中指定id的分数
-	score, err := g.Redis().ZScore(ctx, r.name, id)
-	if err != nil {
-		// 如果发生错误，直接返回，rankInfo为初始化状态，Id已设置，其他字段为零值
-		return
-	}
-
-	// 将分数转换为int64类型并更新rankInfo
-	rankInfo.Score = int64(score)
-
-	// 如果分数为0，直接返回，表示该id的分数为0，没有进一步查询排名的必要
-	if score == 0 {
-		return
-	}
-
-	// 查询有序集合中指定id的排名
-	rank, err := g.Redis().ZRevRank(ctx, r.name, id)
-	if err != nil {
-		// 如果发生错误，直接返回，rankInfo中仅分数有效，排名信息未更新
-		return
-	}
-
-	// 更新rankInfo中的排名信息，排名从0开始，所以需要加1以符合人类的计数习惯
-	rankInfo.Rank = int32(rank) + 1
-
-	// 返回包含完整排名信息的rankInfo指针
-	return rankInfo
-}
--- a/pgk/pgk.go
+++ b/pgk/pgk.go
@@ -1,7 +1,7 @@
 package pgk

 import (
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"github.com/ayflying/utility_go/pkg/aycache"
 	"github.com/ayflying/utility_go/pkg/notice"
 	"github.com/ayflying/utility_go/pkg/rank"
--- a/pgk/rank/rank.go
+++ b/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"
--- a/pkg/aycache/cache.go
+++ b/pkg/aycache/cache.go
@@ -1,18 +1,42 @@
 package aycache

 import (
-	"github.com/ayflying/utility_go/package/aycache/drive"
+	v1 "github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/internal/boot"
+	"github.com/ayflying/utility_go/pkg/aycache/drive"
 	drive2 "github.com/ayflying/utility_go/pkg/aycache/drive"
+	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+	"math"
 )

 type Mod struct {
 	client *gcache.Cache
 }

-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.Cache
-//}
+var (
+	QPSCount int
+	QPS      = promauto.NewGauge(
+		prometheus.GaugeOpts{
+			Name: "Cache_QPS",
+			Help: "当前缓存QPS数量",
+		},
+	)
+)
+
+func init() {
+	boot.AddFunc(func() {
+		//初始化指标
+		service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
+			QPS.Set(math.Round(float64(QPSCount) / 60))
+			QPSCount = 0
+			return nil
+		})
+	})
+
+}

 func New(_name ...string) gcache.Adapter {

@@ -29,10 +53,12 @@ func New(_name ...string) gcache.Adapter {
 	case "file":
 		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")
 	case "es":
-		cacheAdapterObj = drive.NewAdapterElasticsearch([]string{"http://127.0.0.1:9200"})
+		cacheAdapterObj = drive.NewAdapterElasticsearch(_name[1])
 	}

 	//var client = gcache.New()
 	//client.SetAdapter(cacheAdapterObj)
+
+	QPSCount++
 	return cacheAdapterObj
 }
--- a/pkg/aycache/drive/elasticsearch.go
+++ b/pkg/aycache/drive/elasticsearch.go
@@ -2,23 +2,51 @@ package drive

 import (
 	"context"
+	"fmt"
+	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/util/gconv"
 	"time"
 )

+var (
+	adapterElasticsearchClient gcache.Adapter
+)
+
 type AdapterElasticsearch struct {
-	//FilePath string
-	Addresses []string
+	client *elasticsearch.TypedClient
+	name   string
 }

-func (a AdapterElasticsearch) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
-	//TODO implement me
-	panic("implement me")
+func (a AdapterElasticsearch) Set(ctx context.Context, _key interface{}, value interface{}, duration time.Duration) (err error) {
+	key := gconv.String(_key)
+	data := gconv.Map(value)
+	if duration > 0 {
+		data["delete_time"] = time.Now().Add(duration)
+	}
+	_, err = a.client.Index(a.name).Id(key).
+		Document(data).Do(ctx)
+	if err != nil {
+		fmt.Printf("indexing document failed, err:%v\n", err)
+		return
+	}
+	return
 }

 func (a AdapterElasticsearch) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {
-	//TODO implement me
+	for k, v := range data {
+		save := gconv.Map(v)
+		if duration > 0 {
+			save["delete_time"] = time.Now().Add(duration)
+		}
+		key := gconv.String(k)
+		a.client.Index(a.name).Id(key).
+			Document(save).Do(ctx)
+	}
+
 	panic("implement me")
 }

@@ -37,9 +65,17 @@ func (a AdapterElasticsearch) SetIfNotExistFuncLock(ctx context.Context, key int
 	panic("implement me")
 }

-func (a AdapterElasticsearch) Get(ctx context.Context, key interface{}) (*gvar.Var, error) {
-	//TODO implement me
-	panic("implement me")
+func (a AdapterElasticsearch) Get(ctx context.Context, key interface{}) (res *gvar.Var, err error) {
+	_key := gconv.String(key)
+	resp, err := a.client.Get(a.name, _key).
+		Do(context.Background())
+	if err != nil {
+		fmt.Printf("get document by id failed, err:%v\n", err)
+		return
+	}
+	fmt.Printf("fileds:%s\n", resp.Source_)
+	res = gvar.New(resp.Source_)
+	return
 }

 func (a AdapterElasticsearch) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
@@ -82,9 +118,26 @@ func (a AdapterElasticsearch) Values(ctx context.Context) (values []interface{},
 	panic("implement me")
 }

-func (a AdapterElasticsearch) Update(ctx context.Context, key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
-	//TODO implement me
-	panic("implement me")
+func (a AdapterElasticsearch) Update(ctx context.Context, _key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
+	key := gconv.String(_key)
+	data := gconv.Map(value)
+	oldValue, err = a.Get(ctx, key)
+	if err != nil {
+		exist = false
+	} else {
+		for k, v := range oldValue.Map() {
+			if _, ok := data[k]; !ok {
+				data[k] = v
+			}
+		}
+	}
+
+	_, err = a.client.Update(a.name, key).
+		Doc(data).Do(context.Background())
+	if err != nil {
+		return
+	}
+	return
 }

 func (a AdapterElasticsearch) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
@@ -98,8 +151,15 @@ func (a AdapterElasticsearch) GetExpire(ctx context.Context, key interface{}) (t
 }

 func (a AdapterElasticsearch) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
+	//获取keys最后一个
+	lastKey := keys[len(keys)-1]
+	lastValue, _ = a.Get(ctx, lastKey)
+
+	for k := range keys {
+		key := gconv.String(k)
+		a.client.Delete(a.name, key).Do(ctx)
+	}
+	return
 }

 func (a AdapterElasticsearch) Clear(ctx context.Context) error {
@@ -112,8 +172,17 @@ func (a AdapterElasticsearch) Close(ctx context.Context) error {
 	panic("implement me")
 }

-func NewAdapterElasticsearch(addresses []string) gcache.Adapter {
-	return &AdapterElasticsearch{
-		Addresses: addresses,
+func NewAdapterElasticsearch(name string) gcache.Adapter {
+
+	if adapterElasticsearchClient == nil {
+		_cfg, _ := g.Cfg().Get(gctx.New(), "elasticsearch")
+		var cfg elasticsearch.Config
+		_cfg.Scan(&cfg)
+		es, _ := elasticsearch.NewTypedClient(cfg)
+		adapterElasticsearchClient = &AdapterElasticsearch{
+			client: es,
+			name:   name,
+		}
 	}
+	return adapterElasticsearchClient
 }
--- a/pkg/aycache/drive/file.go
+++ b/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))
--- a/pkg/aycache/drive/redis.go
+++ b/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
--- a/pkg/config/config.go
+++ b/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
+
+}
--- a/pkg/elasticsearch/elasticsearch.go
+++ b/pkg/elasticsearch/elasticsearch.go
@@ -5,97 +5,102 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/elastic/go-elasticsearch/v8"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/bulk"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/delete"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/search"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/update"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 )

 var (
 	es *elasticsearch.TypedClient
 )

-type elastic struct {
+type Elastic struct {
 	client *elasticsearch.TypedClient
+	name   string
 }

-func New(name ...string) *elastic {
-	// ES 配置
-	cfg := elasticsearch.Config{
-		Addresses: []string{
-			"http://ay.cname.com:9200",
-		},
-	}
+func NewV1(name string) *Elastic {
+	var cfg elasticsearch.Config
+	_cfg := g.Cfg().MustGetWithEnv(gctx.New(), "elasticsearch")
+	_cfg.Scan(&cfg)
 	if es == nil {
 		var err error
 		es, err = elasticsearch.NewTypedClient(cfg)
 		if err != nil {
 			fmt.Printf("elasticsearch.NewTypedClient failed, err:%v\n", err)
-			return &elastic{}
+			return &Elastic{}
 		}
 	}
-	return &elastic{
+	return &Elastic{
 		client: es,
+		name:   name,
 	}
-
 }

-// createIndex 创建索引
-func (s *elastic) CreateIndex(name string) {
-	resp, err := s.client.Indices.
-		Create(name).
-		Do(context.Background())
-	if err != nil {
-		fmt.Printf("create index failed, err:%v\n", err)
-		return
-	}
-	fmt.Printf("index:%#v\n", resp.Index)
-}
-
-// indexDocument 索引文档
-func (s *elastic) IndexDocument(name string, key string, data interface{}) {
+//// Create 创建索引
+//func (s *Elastic) Create(ctx context.Context) {
+//	resp, err := s.client.Indices.
+//		Create(s.name).Do(ctx)
+//	if err != nil {
+//		fmt.Printf("create index failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("index:%#v\n", resp.Index)
+//}

+// Set 索引文档
+func (s *Elastic) Set(ctx context.Context, key string, data interface{}) (err error) {
 	// 添加文档
-	resp, err := s.client.Index(name).
-		Id(key).
-		Document(data).
-		Do(context.Background())
-	if err != nil {
-		fmt.Printf("indexing document failed, err:%v\n", err)
-		return
-	}
-	fmt.Printf("result:%#v\n", resp.Result)
-}
-
-// getDocument 获取文档
-func (s *elastic) GetDocument(name string, id string) (res json.RawMessage) {
-	resp, err := s.client.Get(name, id).
-		Do(context.Background())
-	if err != nil {
-		fmt.Printf("get document by id failed, err:%v\n", err)
-		return
-	}
-	fmt.Printf("fileds:%s\n", resp.Source_)
-	res = resp.Source_
+	_, err = s.client.Index(s.name).Id(key).Document(data).Do(ctx)
 	return
 }

-// updateDocument 更新文档
-func (s *elastic) UpdateDocument(name string, key string, data interface{}) {
-
-	resp, err := s.client.Update(name, key).
-		Doc(data). // 使用结构体变量更新
-		Do(context.Background())
-	if err != nil {
-		fmt.Printf("update document failed, err:%v\n", err)
-		return
+// SetBulk 批量添加文档
+func (s *Elastic) SetBulk(ctx context.Context, data []any) (err error) {
+	var save *bulk.Request
+	save = &bulk.Request{
+		data,
 	}
-	fmt.Printf("result:%v\n", resp.Result)
+	s.client.Bulk().Index(s.name).Request(save).Do(ctx)
+	return
 }

-// deleteDocument 删除 document
-func (s *elastic) DeleteDocument(name string, key string) {
-	resp, err := s.client.Delete(name, key).
-		Do(context.Background())
+// Get 获取文档
+func (s *Elastic) Get(ctx context.Context, id string) (res json.RawMessage, err error) {
+	get, err := s.client.Get(s.name, id).Do(ctx)
 	if err != nil {
-		fmt.Printf("delete document failed, err:%v\n", err)
 		return
 	}
-	fmt.Printf("result:%v\n", resp.Result)
+	res = get.Source_
+	return
+}
+
+// Update 更新文档
+func (s *Elastic) Update(ctx context.Context, key string, data interface{}) (res *update.Response, err error) {
+	res, err = s.client.Update(s.name, key).Doc(data).Do(ctx)
+	return
+}
+
+// Delete 删除 document
+func (s *Elastic) Delete(ctx context.Context, key string) (res *delete.Response, err error) {
+	res, err = s.client.Delete(s.name, key).Do(ctx)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// Select 查询
+func (s *Elastic) Select(ctx context.Context, query *types.MatchAllQuery) (res *search.Response, err error) {
+	res, err = s.client.Search(). //Index("my_index").
+		Request(&search.Request{
+			Query: &types.Query{
+				MatchAll: &types.MatchAllQuery{},
+			},
+		}).Do(ctx)
+	return
 }
--- a/pkg/notice/notice.go
+++ b/pkg/notice/notice.go
@@ -1,7 +1,7 @@
 package notice

 import (
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"github.com/ayflying/utility_go/pkg/notice/drive"
 )

--- a/pkg/pkg.go
+++ b/pkg/pkg.go
@@ -1,11 +1,14 @@
 package pkg

 import (
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"github.com/ayflying/utility_go/pkg/aycache"
+	"github.com/ayflying/utility_go/pkg/config"
+	"github.com/ayflying/utility_go/pkg/elasticsearch"
 	"github.com/ayflying/utility_go/pkg/notice"
 	"github.com/ayflying/utility_go/pkg/rank"
 	"github.com/ayflying/utility_go/pkg/s3"
+	"github.com/ayflying/utility_go/pkg/websocket"
 	"github.com/gogf/gf/v2/os/gcache"
 )

@@ -28,3 +31,15 @@ func S3(_name ...string) *s3.Mod {
 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)
+}
--- a/pkg/rank/rank.go
+++ b/pkg/rank/rank.go
@@ -2,7 +2,7 @@ package rank

 import (
 	"fmt"
-	v1 "github.com/ayflying/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"time"

 	"github.com/gogf/gf/v2/database/gredis"
--- a/pkg/websocket/registerer.go
+++ b/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)
+}
--- a/pkg/websocket/socket_new.go
+++ b/pkg/websocket/socket_new.go
@@ -0,0 +1,359 @@
+package websocket
+
+import (
+	"context"
+	"fmt"
+	"github.com/ayflying/utility_go/pkg/aycache"
+	"github.com/ayflying/utility_go/tools"
+	"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/gorilla/websocket"
+	"google.golang.org/protobuf/proto"
+	"net/http"
+	"sync"
+	"time"
+)
+
+type SocketV1 struct {
+	Type int `json:"type"`
+}
+
+var (
+	//ctx = gctx.New()
+	//Conn map[uuid.UUID]*WebsocketData
+	lock  sync.Mutex
+	cache = aycache.New("redis")
+	m     = gmap.NewHashMap(true)
+)
+
+type WebsocketData struct {
+	Ws     *websocket.Conn `json:"ws" dc:"websocket连接池"`
+	Uuid   string          `json:"uuid" dc:"用户唯一标识"`
+	Uid    int64           `json:"uid" dc:"用户编号"`
+	Groups []string        `json:"groups" dc:"群组"`
+	Ctx    context.Context `json:"ctx" dc:""`
+	RoomId int             `json:"roomId" dc:"房间编号"`
+}
+
+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,
+			CheckOrigin: func(r *http.Request) bool {
+				// In production, you should implement proper origin checking
+				return true
+			},
+			Error: func(w http.ResponseWriter, r *http.Request, status int, reason error) {
+				g.Log().Errorf(r.Context(), "WebSocket error: %v", reason)
+			},
+		}
+		group.Bind(
+			func(r *ghttp.Request) {
+				ctx := r.Context()
+
+				ws, err := websocketCfg.Upgrade(r.Response.Writer, r.Request, nil)
+				if err != nil {
+					glog.Error(ctx, err)
+					r.Exit()
+				}
+
+				//ws联机触发器
+				NewV1().OnConnect(ctx, ws)
+			},
+		)
+
+	})
+}
+
+// OnConnect
+//
+//	@Description:
+//	@receiver s
+//	@param conn
+func (s *SocketV1) OnConnect(ctx context.Context, ws *websocket.Conn) {
+	id := guid.S()
+	ip := ws.RemoteAddr().String()
+	conn := &WebsocketData{
+		Uuid:   id,
+		Ws:     ws,
+		Ctx:    ctx,
+		Groups: make([]string, 0),
+		RoomId: -1,
+	}
+	m.Set(id, conn)
+
+	//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(conn)
+	}
+
+	for {
+		//进入当前连接线程拥堵
+		msgType, msg, err := ws.ReadMessage()
+		s.Type = msgType
+		if err != nil {
+			//客户端断开返回错误，断开当前连接
+			//g.Log().Error(ctx, err)
+			break
+		}
+		s.OnMessage(conn, msg, msgType)
+	}
+	//关闭连接触发
+
+	s.OnClose(conn)
+	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, uuidStr string, req proto.Message) {
+	if !m.Contains(uuidStr) {
+		return
+	}
+	//格式化数据
+	var data, err = proto.Marshal(req)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+		return
+	}
+
+	conn := m.Get(uuidStr).(*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
+	}
+	s.SendUuid(cmd, uuid, req)
+	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
+	})
+}
+
+//加入群组
+func (s *SocketV1) JoinGroup(conn *WebsocketData, group string) {
+	conn.Groups = append(conn.Groups, group)
+	cacheKey := "websocket:group:" + group
+	get, _ := aycache.New("redis").Get(conn.Ctx, cacheKey)
+	var list = make(map[int64]string)
+	if !get.IsNil() {
+		get.Scan(&list)
+	}
+	list[conn.Uid] = conn.Uuid
+	cache.Set(conn.Ctx, cacheKey, list, time.Hour*24*7)
+}
+
+// 退出群组
+func (s *SocketV1) LeaveGroup(conn *WebsocketData, group string) {
+	conn.Groups = tools.RemoveSlice[string](conn.Groups, group)
+	cacheKey := "websocket:group:" + group
+	get, _ := cache.Get(conn.Ctx, cacheKey)
+	var list = make(map[int64]string)
+	if !get.IsNil() {
+		get.Scan(&list)
+	}
+	delete(list, conn.Uid)
+	cache.Set(conn.Ctx, cacheKey, list, time.Hour*24*7)
+}
+
+//群组广播
+func (s *SocketV1) SendGroup(cmd int32, group string, req proto.Message) {
+	cacheKey := "websocket:group:" + group
+	get, _ := cache.Get(gctx.New(), cacheKey)
+	var list = make(map[int64]string)
+	if !get.IsNil() {
+		get.Scan(&list)
+	}
+	for uid, v := range list {
+		if m.Contains(v) {
+			s.Send(cmd, uid, req)
+		}
+	}
+}
+
+// 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)
+		for _, v := range conn.Groups {
+			s.LeaveGroup(conn, v)
+		}
+	}
+
+	// 可能的后续操作：
+	// 1. 更新连接状态或从连接池移除
+	// 2. 发送通知或清理关联资源
+	// 3. 执行特定于业务的断开处理
+	conn.Ws.Close()
+	m.Remove(conn.Uuid)
+}
+
+// 是否在线
+func (s *SocketV1) IsOnline(uid int64) bool {
+	uuid := s.Uid2Uuid(uid)
+	if m.Contains(uuid) {
+		return true
+	}
+	return false
+}
--- a/service/game_act.go
+++ b/service/game_act.go
@@ -6,6 +6,8 @@
 package service

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

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

--- a/service/system_cron.go
+++ b/service/system_cron.go
@@ -6,6 +6,8 @@
 package service

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

--- a/tools/random.go
+++ b/tools/random.go
@@ -1,6 +1,8 @@
 package tools

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

 import (
+	"encoding/json"
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
@@ -18,9 +20,9 @@ type Number interface {
 	int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
 }

-//type Any interface {
-//	interface{} | string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
-//}
+type Any interface {
+	string | int | int64 | int32 | int16 | uint64 | uint32 | uint16 | float32 | float64
+}

 type toolsInterface interface {
 	Load()
@@ -30,15 +32,17 @@ type tools struct {
 }

 func init() {
-	g.Log().Debugf(gctx.New(), "初始化工具类")
+	boot.AddFunc(func() {
+		g.Log().Debugf(gctx.New(), "初始化tools工具类")

-	names := []toolsInterface{
-		Tools,
-	}
-	for _, v := range names {
-		v.Load()
-	}
+		names := []toolsInterface{
+			Tools,
+		}
+		for _, v := range names {
+			v.Load()
+		}

+	})
 }

 func (m *tools) Load() {
@@ -124,11 +128,11 @@ func (m *tools) Items2Map(items [][]int64) (list map[int64]int64) {
 // 该函数通过遍历切片，从后向前检查每个元素，如果找到与指定值相等的元素，则将其从切片中移除。
 // 这种从后向前的遍历方法可以避免因移除元素而导致的数组重新排列带来的额外计算。
 // RemoveSlice 删除切片中的某个值
-func RemoveSlice[t Number](slice []t, value ...t) []t {
+func RemoveSlice[t Any](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 Any](array []t, value t) bool {
 	for _, v := range array {
 		if v == value {
 			return true
@@ -253,3 +257,33 @@ func (m *tools) ItemsMerge(_items ...[][]int64) [][]int64 {
 	}
 	return items
 }
+
+// ProcessingMap 处理map
+// 该函数用于递归处理一个键为字符串、值为int64的map。
+// 如果键是一个JSON字符串，会尝试将其解析为一个新的map，并递归处理这个新的map。
+// 最终返回一个处理后的map，其中所有键都是非JSON字符串。
+func (m *tools) ProcessingMap(data map[string]int64) map[string]int64 {
+	// 创建一个临时map，用于存储处理后的键值对
+	var temp = make(map[string]int64)
+	// 遍历输入的map
+	for k, v := range data {
+		// 创建一个新的map，用于存储解析后的JSON数据
+		data_k := make(map[string]int64)
+		// 尝试将键解析为JSON数据
+		err := json.Unmarshal([]byte(k), &data_k)
+		// 如果解析成功
+		if err == nil {
+			// 递归处理解析后的map
+			data_kmap := m.ProcessingMap(data_k)
+			// 返回处理后的map
+			// 如果解析失败，直接将原键值对添加到临时map中
+			// 将递归处理后的结果合并到临时map中
+			for k_k, k_v := range data_kmap {
+				temp[k_k] = k_v
+			}
+		} else {
+			temp[k] = v
+		}
+	}
+	return temp
+}
--- a/utility.go
+++ b/utility.go
@@ -1,17 +1,11 @@
 package utility_go

 import (
-	_ "github.com/ayflying/utility_go/internal/logic"
-
-	"context"
-	"time"
-
-	v1 "github.com/ayflying/utility_go/api/system/v1"
-	"github.com/ayflying/utility_go/service"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/os/gtimer"
-
 	"github.com/ayflying/utility_go/config"
+	"github.com/ayflying/utility_go/internal/boot"
+	_ "github.com/ayflying/utility_go/internal/logic"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 )

 var (
@@ -20,14 +14,11 @@ var (
 )

 func init() {
-	service.SystemCron().StartCron()
-
-	//用户活动持久化
-	gtimer.SetTimeout(ctx, time.Minute, func(ctx context.Context) {
-		service.SystemCron().AddCron(v1.CronType_DAILY, func() error {
-			service.GameAct().Saves()
-			return nil
-		})
-	})
+	g.Log().Debug(ctx, "utility_go init启动完成")
+	// 初始化配置
+	var err = boot.Boot()
+	if err != nil {
+		panic(err)
+	}

 }
--- a/utility_test.go
+++ b/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)
+//			}
+//		})
+//	}
+//}
Author	SHA1	Message	Date
ayflying	569937c67f	增加计划任务的打断机制	2025-04-22 12:15:53 +08:00
ayflying	d6bfe1c2fb	计划任务定时器修改，改为通道顺序执行	2025-04-22 11:15:51 +08:00
ayflying	16da554a60	完善weboscket的启动	2025-04-21 14:35:24 +08:00
ayflying	7f6635fb91	分离ip库的下载时机	2025-04-21 14:16:58 +08:00
ayflying	0605302db6	调整接口的逻辑	2025-04-18 18:36:50 +08:00
ayflying	5f2fe5dcb2	增加群组广播	2025-04-14 17:05:08 +08:00
ayflying	452aefe3d0	调整长连接库	2025-04-14 11:17:33 +08:00
ayflying	97bf7fc390	修改上传版本呢目录	2025-04-14 11:17:19 +08:00
ayflying	08f2b2d9bc	长连接接口增加玩家信息绑定	2025-04-10 15:42:08 +08:00
ayflying	366ddb45ea	修改导表工具，修改websocket协议的钩子	2025-04-09 16:50:54 +08:00
ayflying	09a9f14a29	修改ExcelTime2Time方法	2025-04-09 11:47:07 +08:00
ayflying	e0afb55bb2	随机算法小修改	2025-04-08 18:43:37 +08:00
ayflying	a469692358	修改随机方法	2025-04-02 16:20:03 +08:00
ayflying	bce7131d9f	开启qps	2025-04-02 15:55:43 +08:00
ayflying	a53f7b718d	修改目录	2025-04-02 15:53:05 +08:00
ayflying	75624ff0b7	使用boot统一注册执行代码	2025-04-02 15:49:42 +08:00
ayflying	743d232c38	增加单元测试，统一初始化方法	2025-04-02 15:19:49 +08:00
ayflying	1d0661ae40	增加缺少的库	2025-04-02 12:12:13 +08:00
ayflying	69e72283dc	更新	2025-04-02 11:51:25 +08:00
ayflying	a9d84c2db9	增加新的路由器	2025-04-02 11:43:05 +08:00
ayflying	db3a2bf405	增加缓存qps	2025-04-02 11:32:54 +08:00
ayflying	5e18d67747	修改ip库的内容	2025-03-31 18:30:41 +08:00
ayflying	8be47af097	更新说明	2025-03-31 18:04:43 +08:00
ayflying	4c24c4274c	定时器只允许启动一次	2025-03-31 14:57:04 +08:00
ayflying	2a34ce6043	更新g.redis方法的传参	2025-03-27 11:53:19 +08:00
ayflying	e8f94c911c	修稿红点删除缓存清理方式	2025-03-27 11:25:31 +08:00
ayflying	f55b3bc609	更新缓存模块	2025-03-27 11:20:07 +08:00
ayflying	d05d865b0d	去掉重复注册	2025-03-25 16:04:50 +08:00
ayflying	6e19671d06	增加控制器的反向注册	2025-03-25 15:58:20 +08:00
ayflying	f349dca0f7	所有包同意改为pkg	2025-03-25 15:00:54 +08:00
ayflying	58f00b4f8e	跟新mod	2025-03-25 14:24:56 +08:00
ayflying	d9ab1be2e7	更新pb目录	2025-03-25 14:14:48 +08:00
ayflying	4b77cd140d	初始化驱动	2025-03-25 14:06:03 +08:00
ayflying	8d640be472	增加websocket库	2025-03-24 17:39:09 +08:00
ayflying	cc08e830d3	分离websocket	2025-03-21 16:33:44 +08:00