新增通用方法

修一个map的并发

See merge request public_project/utility_go!2

README.md

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

api/admin/v1/log.go

@@ -1,8 +1,8 @@
 package v1
 
 import (
+	"github.com/ayflying/utility_go/internal/model/entity"
 	"github.com/gogf/gf/v2/frame/g"
-	"new-gitlab.adesk.com/public_project/utility_go/internal/model/entity"
 )
 
 type SystemLog struct {

api/callback/callback.go

@@ -7,7 +7,7 @@ package callback
 import (
 	"context"
 
-	"new-gitlab.adesk.com/public_project/utility_go/api/callback/v1"
+	"github.com/ayflying/utility_go/api/callback/v1"
 )
 
 type ICallbackV1 interface {

api/pkg/v1/pkg.pb.go

@@ -2,7 +2,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v3.20.0
-// source: pgk/v1/pgk.proto
+// source: pkg/v1/pkg.proto
 
 package v1
 
@@ -61,11 +61,11 @@ func (x NoticeType) String() string {
 }
 
 func (NoticeType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pgk_v1_pgk_proto_enumTypes[0].Descriptor()
+	return file_pkg_v1_pkg_proto_enumTypes[0].Descriptor()
 }
 
 func (NoticeType) Type() protoreflect.EnumType {
-	return &file_pgk_v1_pgk_proto_enumTypes[0]
+	return &file_pkg_v1_pkg_proto_enumTypes[0]
 }
 
 func (x NoticeType) Number() protoreflect.EnumNumber {
@@ -74,7 +74,7 @@ func (x NoticeType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use NoticeType.Descriptor instead.
 func (NoticeType) EnumDescriptor() ([]byte, []int) {
-	return file_pgk_v1_pgk_proto_rawDescGZIP(), []int{0}
+	return file_pkg_v1_pkg_proto_rawDescGZIP(), []int{0}
 }
 
 // 排行榜数据
@@ -92,7 +92,7 @@ type RankData struct {
 func (x *RankData) Reset() {
 	*x = RankData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pgk_v1_pgk_proto_msgTypes[0]
+		mi := &file_pkg_v1_pkg_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -105,7 +105,7 @@ func (x *RankData) String() string {
 func (*RankData) ProtoMessage() {}
 
 func (x *RankData) ProtoReflect() protoreflect.Message {
-	mi := &file_pgk_v1_pgk_proto_msgTypes[0]
+	mi := &file_pkg_v1_pkg_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -118,7 +118,7 @@ func (x *RankData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RankData.ProtoReflect.Descriptor instead.
 func (*RankData) Descriptor() ([]byte, []int) {
-	return file_pgk_v1_pgk_proto_rawDescGZIP(), []int{0}
+	return file_pkg_v1_pkg_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *RankData) GetId() int64 {
@@ -149,10 +149,10 @@ func (x *RankData) GetUpdateTs() int64 {
 	return 0
 }
 
-var File_pgk_v1_pgk_proto protoreflect.FileDescriptor
+var File_pkg_v1_pkg_proto protoreflect.FileDescriptor
 
-var file_pgk_v1_pgk_proto_rawDesc = []byte{
+var file_pkg_v1_pkg_proto_rawDesc = []byte{
-	0x0a, 0x10, 0x70, 0x67, 0x6b, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x67, 0x6b, 0x2e, 0x70, 0x72, 0x6f,
+	0x0a, 0x10, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6b, 0x67, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x12, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0x61, 0x0a, 0x08, 0x52,
 	0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65,
@@ -166,29 +166,29 @@ var file_pgk_v1_pgk_proto_rawDesc = []byte{
 	0x02, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x4d, 0x53, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x56, 0x4f,
 	0x49, 0x43, 0x45, 0x10, 0x04, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
 	0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x79, 0x66, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x2f, 0x75, 0x74, 0x69,
-	0x6c, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x67, 0x6b, 0x2f,
+	0x6c, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x6b, 0x67, 0x2f,
 	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_pgk_v1_pgk_proto_rawDescOnce sync.Once
+	file_pkg_v1_pkg_proto_rawDescOnce sync.Once
-	file_pgk_v1_pgk_proto_rawDescData = file_pgk_v1_pgk_proto_rawDesc
+	file_pkg_v1_pkg_proto_rawDescData = file_pkg_v1_pkg_proto_rawDesc
 )
 
-func file_pgk_v1_pgk_proto_rawDescGZIP() []byte {
+func file_pkg_v1_pkg_proto_rawDescGZIP() []byte {
-	file_pgk_v1_pgk_proto_rawDescOnce.Do(func() {
+	file_pkg_v1_pkg_proto_rawDescOnce.Do(func() {
-		file_pgk_v1_pgk_proto_rawDescData = protoimpl.X.CompressGZIP(file_pgk_v1_pgk_proto_rawDescData)
+		file_pkg_v1_pkg_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_v1_pkg_proto_rawDescData)
 	})
-	return file_pgk_v1_pgk_proto_rawDescData
+	return file_pkg_v1_pkg_proto_rawDescData
 }
 
-var file_pgk_v1_pgk_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_pkg_v1_pkg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pgk_v1_pgk_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_v1_pkg_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pgk_v1_pgk_proto_goTypes = []interface{}{
+var file_pkg_v1_pkg_proto_goTypes = []interface{}{
 	(NoticeType)(0),  // 0: package.NoticeType
 	(*RankData)(nil), // 1: package.RankData
 }
-var file_pgk_v1_pgk_proto_depIdxs = []int32{
+var file_pkg_v1_pkg_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -196,13 +196,13 @@ var file_pgk_v1_pgk_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_pgk_v1_pgk_proto_init() }
+func init() { file_pkg_v1_pkg_proto_init() }
-func file_pgk_v1_pgk_proto_init() {
+func file_pkg_v1_pkg_proto_init() {
-	if File_pgk_v1_pgk_proto != nil {
+	if File_pkg_v1_pkg_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_pgk_v1_pgk_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_pkg_v1_pkg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RankData); i {
 			case 0:
 				return &v.state
@@ -219,19 +219,19 @@ func file_pgk_v1_pgk_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pgk_v1_pgk_proto_rawDesc,
+			RawDescriptor: file_pkg_v1_pkg_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_pgk_v1_pgk_proto_goTypes,
+		GoTypes:           file_pkg_v1_pkg_proto_goTypes,
-		DependencyIndexes: file_pgk_v1_pgk_proto_depIdxs,
+		DependencyIndexes: file_pkg_v1_pkg_proto_depIdxs,
-		EnumInfos:         file_pgk_v1_pgk_proto_enumTypes,
+		EnumInfos:         file_pkg_v1_pkg_proto_enumTypes,
-		MessageInfos:      file_pgk_v1_pgk_proto_msgTypes,
+		MessageInfos:      file_pkg_v1_pkg_proto_msgTypes,
 	}.Build()
-	File_pgk_v1_pgk_proto = out.File
+	File_pkg_v1_pkg_proto = out.File
-	file_pgk_v1_pgk_proto_rawDesc = nil
+	file_pkg_v1_pkg_proto_rawDesc = nil
-	file_pgk_v1_pgk_proto_goTypes = nil
+	file_pkg_v1_pkg_proto_goTypes = nil
-	file_pgk_v1_pgk_proto_depIdxs = nil
+	file_pkg_v1_pkg_proto_depIdxs = nil
 }

aycache/aycache.go

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

cmd/load.go

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

cmd/make.go

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

cmd/make/act

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

cmd/make/config

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/ayflying/utility_go"
+	"github.com/ayflying/utility_go/pkg"
     "github.com/gogf/gf/v2/util/gutil"
     "sync"
 )
@@ -23,7 +23,7 @@ func (c *{mod}Mod) Load(_cfg ...string) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 	c.cfgArr = make([]*{cfg}Cfg, 0)
-	data, err := utility_go.Config.GetFile("{file}")
+	data, err := pkg.Config().GetFile("{file}")
 	err = data.Scan(&c.cfgArr)
 	if err != nil {
 		panic(err)

cmd/make/logic

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

cmd/make/socket

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

cmd/make/socket2

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

cmd/middleware.go

@@ -1,12 +1,12 @@
 package cmd
 
 import (
+	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/text/gstr"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
 )
 
 //func MiddlewareAnonymous(r *ghttp.Request) {
@@ -62,9 +62,9 @@ func MiddlewareAdmin(r *ghttp.Request) {
 	ip := r.GetClientIp()
 	r.SetCtxVar("ip", ip)
 
-	get := r.Cookie.Get("uid")
+	getUid := r.Cookie.Get("uid")
 
-	if get == nil {
+	if getUid == nil {
 		//调试模式允许不验证用户名
 		debug, _ := g.Cfg().GetWithEnv(nil, "debug")
 		if !debug.Bool() {
@@ -82,7 +82,13 @@ func MiddlewareAdmin(r *ghttp.Request) {
 
 	}
 
-	uid := get.Int()
+	uid := getUid.Int()
+
+	//获取所有请求的信息
+	get := r.GetRequestMapStrStr()
+	if _, ok := get["uid"]; ok {
+		r.SetCtxVar("uid", get["uid"])
+	}
 
 	r.Middleware.Next()
 

cmd/update.go

@@ -2,14 +2,16 @@ package cmd
 
 import (
 	"context"
+	"os"
+	"path"
+	"time"
+
+	"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"
-	"new-gitlab.adesk.com/public_project/utility_go/package/s3"
-	"os"
-	"time"
 )
 
 type serverCfg struct {
@@ -17,6 +19,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 +28,6 @@ type UpdateReq struct {
 	FileUrl string            `json:"file_url" dc:"文件地址"`
 }
 
-var s3Mod *s3.Mod
-
 var (
 	Update = gcmd.Command{
 		Name:  "update",
@@ -36,9 +38,14 @@ 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()
 
+			//获取版本号
+			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 +66,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,22 +82,36 @@ 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],
 				})
 				if err != nil {
+					Proxy := g.Cfg().MustGet(ctx, "update_proxy", "http://192.168.50.170:10808").String()
 					g.Log().Debugf(ctx, "切换代理进行上传:err=%v", err)
-					get, err = client.Proxy("http://192.168.50.114:10808").
+					get, err = client.Proxy(Proxy).Post(ctx, address+"/callback/update", &UpdateReq{
-						Post(ctx, address+"/callback/update", &UpdateReq{
 						FileUrl: url[v.S3],
 					})
 				}
@@ -107,9 +130,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 {

config/config.go

@@ -1,17 +1,11 @@
 package config
 
 import (
-	"fmt"
-	"github.com/apolloconfig/agollo/v4"
-	apolloConfig "github.com/apolloconfig/agollo/v4/env/config"
 	"github.com/apolloconfig/agollo/v4/storage"
+	"github.com/ayflying/utility_go/pkg"
 	"github.com/gogf/gf/contrib/config/apollo/v2"
-	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gres"
-	"github.com/gogf/gf/v2/text/gstr"
 	"sync"
 )
 
@@ -31,137 +25,28 @@ type Cfg struct {
 	Lock sync.Mutex
 }
 
+// Deprecated : pkg.Config().GetDbFile(name)
 func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
-	get2, err := g.Model("game_config").
+	res, err = pkg.Config().GetDbFile(name)
-		Where("name", name).Master().Value("data")
-	err = get2.Scan(&res)
-	if res == nil {
-		res = &gvar.Var{}
-	}
 	return
 }
 
+// Deprecated : pkg.Config().GetFile(name, obj...)
 func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
-	pathStr := "manifest/game/"
+	jsonObj, err = pkg.Config().GetFile(filename)
-	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 获取远程配置
+// Deprecated : pkg.Config().GetUrlFile(name)
 func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
-	urlStr := fmt.Sprintf("http://sdf.sdfs.sdf/%s.json", name)
+	jsonObj, err = pkg.Config().GetUrlFile(name)
-	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
-	bytes := getUrl.ReadAll()
-	jsonObj, err = gjson.DecodeToJson(bytes)
 	return
 }
 
-// 获取阿波罗
+// Deprecated : pkg.Config().GetApollo(name, obj)
-//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
+	jsonObj, err = pkg.Config().GetApollo(name, 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
 }
 

controller/callback/callback_new.go

@@ -5,7 +5,7 @@
 package callback
 
 import (
-	"new-gitlab.adesk.com/public_project/utility_go/api/callback"
+	"github.com/ayflying/utility_go/api/callback"
 )
 
 type ControllerV1 struct{}

controller/callback/callback_v1_ip.go

@@ -2,9 +2,9 @@ package callback
 
 import (
 	"context"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
+	"github.com/ayflying/utility_go/service"
 
-	"new-gitlab.adesk.com/public_project/utility_go/api/callback/v1"
+	"github.com/ayflying/utility_go/api/callback/v1"
 )
 
 func (c *ControllerV1) Ip(ctx context.Context, req *v1.IpReq) (res *v1.IpRes, err error) {

drivers/db/elasticsearch/elasticsearch.go

@@ -0,0 +1,83 @@
+package elasticsearch
+
+import (
+	"github.com/elastic/go-elasticsearch/v8"
+)
+
+var (
+	es *elasticsearch.TypedClient
+)
+
+type elastic struct {
+	client *elasticsearch.TypedClient
+}
+
+//func (d *Driver) Insert(ctx context.Context, table string, data interface{}, batch ...int) (res sql.Result, err error) {
+//
+//	return
+//}
+//
+//// createIndex 创建索引
+//func (d *Driver) CreateIndex(name string) {
+//
+//	resp, err := d.client.Indices.
+//		Create(name).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("create index failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("index:%#v\n", resp.Index)
+//}
+//
+//// indexDocument 索引文档
+//func (d *Driver) IndexDocument(name string, key string, data interface{}) {
+//
+//	// 添加文档
+//	resp, err := d.client.Index(name).
+//		Id(key).
+//		Document(data).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("indexing document failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("result:%#v\n", resp.Result)
+//}
+//
+//// getDocument 获取文档
+//func (d *Driver) Get(name string, id string) (res json.RawMessage) {
+//	resp, err := d.client.Get(name, id).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("get document by id failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("fileds:%d\n", resp.Source_)
+//	res = resp.Source_
+//	return
+//}
+//
+//// updateDocument 更新文档
+//func (d *Driver) UpdateDocument(name string, key string, data interface{}) {
+//
+//	resp, err := d.client.Update(name, key).
+//		Doc(data). // 使用结构体变量更新
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("update document failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("result:%v\n", resp.Result)
+//}
+//
+//// deleteDocument 删除 document
+//func (d *Driver) DeleteDocument(name string, key string) {
+//	resp, err := d.client.Delete(name, key).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("delete document failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("result:%v\n", resp.Result)
+//}

drivers/db/elasticsearch/es_open.go

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

drivers/db/elasticsearch/load.go

@@ -0,0 +1,51 @@
+package elasticsearch
+
+import (
+	"github.com/ayflying/utility_go/internal/boot"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// Driver is the driver for mysql database.
+type Driver struct {
+	*gdb.Core
+}
+
+const (
+	quoteChar = "`"
+)
+
+func init() {
+	boot.AddFunc(func() {
+		var (
+			err         error
+			driverObj   = New()
+			driverNames = g.SliceStr{"es", "elasticsearch"}
+		)
+		for _, driverName := range driverNames {
+			if err = gdb.Register(driverName, driverObj); err != nil {
+				panic(err)
+			}
+		}
+	})
+
+}
+
+// New create and returns a driver that implements gdb.Driver, which supports operations for MySQL.
+func New() gdb.Driver {
+	return &Driver{}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *Driver) New(core *gdb.Core, node *gdb.ConfigNode) (res gdb.DB, err error) {
+	res = &Driver{
+		Core: core,
+	}
+	return
+}
+
+// GetChars returns the security char for this type of database.
+func (d *Driver) GetChars() (charLeft string, charRight string) {
+	return quoteChar, quoteChar
+}

drivers/db/found/found.go

@@ -0,0 +1,56 @@
+package found
+
+import (
+	"database/sql"
+	"github.com/ayflying/utility_go/internal/boot"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// Driver is the driver for mysql database.
+type Driver struct {
+	*gdb.Core
+}
+
+func (d *Driver) Open(config *gdb.ConfigNode) (*sql.DB, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+const (
+	quoteChar = "`"
+)
+
+func init() {
+	boot.AddFunc(func() {
+		var (
+			err         error
+			driverObj   = New()
+			driverNames = g.SliceStr{"es", "found"}
+		)
+		for _, driverName := range driverNames {
+			if err = gdb.Register(driverName, driverObj); err != nil {
+				panic(err)
+			}
+		}
+	})
+}
+
+// New create and returns a driver that implements gdb.Driver, which supports operations for MySQL.
+func New() gdb.Driver {
+	return &Driver{}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *Driver) New(core *gdb.Core, node *gdb.ConfigNode) (res gdb.DB, err error) {
+	res = &Driver{
+		Core: core,
+	}
+	return
+}
+
+// GetChars returns the security char for this type of database.
+func (d *Driver) GetChars() (charLeft string, charRight string) {
+	return quoteChar, quoteChar
+}

go.mod

@@ -1,85 +1,104 @@
-module new-gitlab.adesk.com/public_project/utility_go
+module github.com/ayflying/utility_go
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/apolloconfig/agollo/v4 v4.4.0
-	github.com/ayflying/excel2json v1.1.3
+	github.com/ayflying/excel2json v1.1.9
-	github.com/elastic/go-elasticsearch/v8 v8.17.1
+	github.com/casdoor/casdoor-go-sdk v1.20.0
+	github.com/elastic/go-elasticsearch/v8 v8.19.0
 	github.com/go-pay/crypto v0.0.1
-	github.com/go-pay/gopay v1.5.109
+	github.com/go-pay/gopay v1.5.114
 	github.com/go-pay/util v0.0.4
-	github.com/goccy/go-json v0.10.4
+	github.com/goccy/go-json v0.10.5
-	github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.3
-	github.com/gogf/gf/v2 v2.8.3
+	github.com/gogf/gf/v2 v2.9.3
-	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230
+	github.com/google/uuid v1.6.0
-	github.com/minio/minio-go/v7 v7.0.85
+	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20250916043522-9a14e3273609
-	github.com/xuri/excelize/v2 v2.9.0
+	github.com/minio/minio-go/v7 v7.0.95
-	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
+	github.com/prometheus/client_golang v1.23.2
-	google.golang.org/api v0.44.0
+	github.com/xuri/excelize/v2 v2.9.1
-	google.golang.org/protobuf v1.26.0
+	golang.org/x/oauth2 v0.31.0
+	google.golang.org/api v0.249.0
+	google.golang.org/protobuf v1.36.9
+	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )
 
 require (
-	cloud.google.com/go v0.81.0 // indirect
+	cloud.google.com/go/auth v0.16.5 // indirect
-	github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
-	github.com/BurntSushi/toml v1.4.0 // indirect
+	cloud.google.com/go/compute/metadata v0.8.3 // indirect
+	github.com/BurntSushi/toml v1.5.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/elastic/elastic-transport-go/v8 v8.7.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-pay/errgroup v0.0.3 // indirect
 	github.com/go-pay/smap v0.0.2 // indirect
 	github.com/go-pay/xlog v0.0.3 // indirect
 	github.com/go-pay/xtime v0.0.2 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
-	github.com/magiconair/properties v1.8.9 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/minio/crc64nvme v1.1.1 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/olekukonko/errors v1.1.0 // indirect
-	github.com/pelletier/go-toml v1.9.3 // indirect
+	github.com/olekukonko/ll v0.1.1 // indirect
+	github.com/olekukonko/tablewriter v1.0.9 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/philhofer/fwd v1.2.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.17.0 // 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
 	github.com/rs/xid v1.6.0 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
+	github.com/sagikazarmark/locafero v0.11.0 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
+	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
-	github.com/spf13/viper v1.8.1 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/spf13/viper v1.21.0 // indirect
-	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
+	github.com/tiendc/go-deepcopy v1.6.1 // indirect
-	go.opencensus.io v0.23.0 // indirect
+	github.com/tinylib/msgp v1.4.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
+	github.com/xuri/efp v0.0.1 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	github.com/xuri/nfp v0.0.1 // indirect
-	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	golang.org/x/crypto v0.33.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	google.golang.org/grpc v1.38.0 // indirect
+	golang.org/x/crypto v0.42.0 // indirect
-	gopkg.in/ini.v1 v1.62.0 // indirect
+	golang.org/x/net v0.44.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
+	google.golang.org/grpc v1.75.1 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -17,14 +17,19 @@ cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKP
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
 cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0 h1:at8Tk2zUz63cLPR0JPWm5vp77pEZmzxEQBEfRKn1VV8=
 cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go/auth v0.16.5 h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI=
+cloud.google.com/go/auth v0.16.5/go.mod h1:utzRfHMP+Vv0mpOkTRQoWD2q3BatTOoWbA7gCc2dUhQ=
+cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
+cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/compute/metadata v0.8.3 h1:1AzcHmzbrX8t3m0CVosfxCAwGvaAShtrnlNxDriLgIk=
+cloud.google.com/go/compute/metadata v0.8.3/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
@@ -38,11 +43,9 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks=
-github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/agiledragon/gomonkey/v2 v2.11.0 h1:5oxSgA+tC1xuGsrIorR+sYiziYltmJyEZ9qA25b6l5U=
 github.com/agiledragon/gomonkey/v2 v2.11.0/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
@@ -52,11 +55,17 @@ github.com/apolloconfig/agollo/v4 v4.4.0/go.mod h1:6WjI68IzqMk/Y6ghMtrj5AX6Uewo2
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/ayflying/excel2json v1.1.3 h1:Qy7HnF5aib7lIknaOqICvvZsSwAieLu6KJFeUccOISo=
+github.com/ayflying/excel2json v1.1.9 h1:AKaUFc/FNQXV/53/VSgp3J+2d4PMWhVpTDRj/yx3VOs=
-github.com/ayflying/excel2json v1.1.3/go.mod h1:aNzB271bUAuRq+P4J+S8a3NAltcghLIGR2HdM6akqFU=
+github.com/ayflying/excel2json v1.1.9/go.mod h1:GjXYP2cDzeTgQxssQ3ba8QRa9JsScAeJMwCrZ7QTlQo=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
+github.com/casdoor/casdoor-go-sdk v1.20.0 h1:Xr8vzs25a0QzsLfs99x9kLoHkYznCa1Lf5nEvks9GLI=
+github.com/casdoor/casdoor-go-sdk v1.20.0/go.mod h1:cMnkCQJgMYpgAlgEx8reSt1AVaDIQLcJ1zk5pzBaz+4=
 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=
@@ -73,10 +82,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4=
+github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
-github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
+github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
-github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q=
+github.com/elastic/go-elasticsearch/v8 v8.19.0 h1:VmfBLNRORY7RZL+9hTxBD97ehl9H8Nxf2QigDh6HuMU=
-github.com/elastic/go-elasticsearch/v8 v8.17.1/go.mod h1:MVJCtL+gJJ7x5jFeUmA20O7rvipX8GcQmo5iBcmaJn4=
+github.com/elastic/go-elasticsearch/v8 v8.19.0/go.mod h1:F3j9e+BubmKvzvLjNui/1++nJuJxbkhHefbaT0kFKGY=
 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=
@@ -89,9 +98,13 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -99,16 +112,16 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-pay/crypto v0.0.1 h1:B6InT8CLfSLc6nGRVx9VMJRBBazFMjr293+jl0lLXUY=
 github.com/go-pay/crypto v0.0.1/go.mod h1:41oEIvHMKbNcYlWUlRWtsnC6+ASgh7u29z0gJXe5bes=
 github.com/go-pay/errgroup v0.0.3 h1:DB4s8e8oWYDyETKQ1y1riMJ7y29zE1uIsMCSjEOFSbU=
 github.com/go-pay/errgroup v0.0.3/go.mod h1:0+4b8mvFMS71MIzsaC+gVvB4x37I93lRb2dqrwuU8x8=
-github.com/go-pay/gopay v1.5.109 h1:rF9bCUaAuz2jWHwgIuIfgrAejFOMufo9UsNENouFVcU=
+github.com/go-pay/gopay v1.5.114 h1:jNYpcylr7WJev6i/MBeer0Z58E0x5NyqG4FfZrar3pQ=
-github.com/go-pay/gopay v1.5.109/go.mod h1:1B4NjEWKwRtJeNk2YhYwjcIJuwtxrOK0nZsh5slqrWI=
+github.com/go-pay/gopay v1.5.114/go.mod h1:p48xvWeepPolZuakAjCeucWynWwW7msoXsqahcoJpKE=
 github.com/go-pay/smap v0.0.2 h1:kKflYor5T5FgZltPFBMTFfjJvqYMHr5VnIFSEyhVTcA=
 github.com/go-pay/smap v0.0.2/go.mod h1:HW9oAo0okuyDYsbpbj5fJFxnNj/BZorRGFw26SxrNWw=
 github.com/go-pay/util v0.0.4 h1:TuwSU9o3Qd7m9v1PbzFuIA/8uO9FJnA6P7neG/NwPyk=
@@ -117,18 +130,21 @@ github.com/go-pay/xlog v0.0.3 h1:avyMhCL/JgBHreoGx/am/kHxfs1udDOAeVqbmzP/Yes=
 github.com/go-pay/xlog v0.0.3/go.mod h1:mH47xbobrdsSHWsmFtSF5agWbMHFP+tK0ZbVCk5OAEw=
 github.com/go-pay/xtime v0.0.2 h1:7YR4/iuELsEHpJ6LUO0SVK80hQxDO9MLCfuVYIiTCRM=
 github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcUE9xE=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3 h1:KU51l3uaU7Mxq+FSoLjROyDERUGKCMo4qExxPEgA7KQ=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.3 h1:/IcE+DmlQDWeDjnkKWr1Rql7VCLUxEqz7gXoQKZHd8o=
-github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3/go.mod h1:Uo6f/Pr6zVHSbdP2Lj9iToEMuh/TzU/bE2E5SJlquEk=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.3/go.mod h1:mek4CnNsvdum4jYhf0PzaIYzoSBuSvVXyuCZG4I9qvw=
-github.com/gogf/gf/v2 v2.8.3 h1:h9Px3lqJnnH6It0AqHRz4/1hx0JmvaSf1IvUir5x1rA=
+github.com/gogf/gf/v2 v2.9.3 h1:qjN4s55FfUzxZ1AE8vUHNDX3V0eIOUGXhF2DjRTVZQ4=
-github.com/gogf/gf/v2 v2.8.3/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY=
+github.com/gogf/gf/v2 v2.9.3/go.mod h1:w6rcfD13SmO7FKI80k9LSLiSMGqpMYp50Nfkrrc2sEE=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 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=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -154,8 +170,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -169,8 +186,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -187,13 +204,17 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
+github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -215,7 +236,6 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
@@ -226,41 +246,44 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230 h1:B0oaMTAQKDZd8cwYT0qsAI7+c3KbFeBNA8GhgoBMXWw=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230/go.mod h1:C5LA5UO2ZXJrLaPLYtE1wUJMiyd/nwWaCO5cw/2pSHs=
+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-20250916043522-9a14e3273609 h1:LfPCMQ+fjqOLKNYrE1wCrmq2CX2ukY0AItPt2rneF4s=
+github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20250916043522-9a14e3273609/go.mod h1:+mNMTBuDMdEGhWzoQgc6kBdqeaQpWh5ba8zqmp2MxCU=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
-github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI=
+github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.85 h1:9psTLS/NTvC3MWoyjhjXpwcKoNbkongaCSF3PNpSuXo=
+github.com/minio/minio-go/v7 v7.0.95 h1:ywOUPg+PebTMTzn9VDsoFJy32ZuARN9zhB+K3IYEvYU=
-github.com/minio/minio-go/v7 v7.0.85/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY=
+github.com/minio/minio-go/v7 v7.0.95/go.mod h1:wOOX3uxS334vImCNRVyIDdXX9OsXDm89ToynKgqUKlo=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
@@ -268,24 +291,41 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+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/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0=
+github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
+github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
+github.com/olekukonko/ll v0.1.1 h1:9Dfeed5/Mgaxb9lHRAftLK9pVfYETvHn+If6lywVhJc=
+github.com/olekukonko/ll v0.1.1/go.mod h1:2dJo+hYZcJMLMbKwHEWvxCUbAOLc/CXWS9noET22Mdo=
+github.com/olekukonko/tablewriter v1.0.9 h1:XGwRsYLC2bY7bNd93Dk51bcPZksWZmLYuaTHR0FqfL8=
+github.com/olekukonko/tablewriter v1.0.9/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
+github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 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.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
+github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
+github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
+github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
+github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
 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=
@@ -296,46 +336,55 @@ 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.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
+github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
+github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
+github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
+github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
+github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
-github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
+github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
+github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 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.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-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/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU0=
 github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZMibh0H/k=
-github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d h1:llb0neMWDQe87IzJLS4Ci7psK/lVsjIS2otl+1WyRyY=
+github.com/tiendc/go-deepcopy v1.6.1 h1:uVRTItFeNHkMcLueHS7OCsxgxT9P8MzGB/taUa2Y4Tk=
-github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/tiendc/go-deepcopy v1.6.1/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
-github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE=
+github.com/tinylib/msgp v1.4.0 h1:SYOeDRiydzOw9kSiwdYp9UcBgPFtLU2WDHaJXyHruf8=
-github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
+github.com/tinylib/msgp v1.4.0/go.mod h1:cvjFkb4RiC8qSBOPMGPSzSAx47nAsfhLVTCZZNuHv5o=
-github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 h1:hPVCafDV85blFTabnqKgNhDCkJX25eik94Si9cTER4A=
+github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
-github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
+github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.9.1 h1:VdSGk+rraGmgLHGFaGG9/9IWu1nj4ufjJ7uwMDtj8Qw=
+github.com/xuri/excelize/v2 v2.9.1/go.mod h1:x7L6pKz2dvo9ejrRuD8Lnl98z4JLt0TGAwjhW+EiP8s=
+github.com/xuri/nfp v0.0.1 h1:MDamSGatIvp8uOmDP8FnmjuQpu90NzdJxo7242ANR9Q=
+github.com/xuri/nfp v0.0.1/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -350,19 +399,31 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 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/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
-go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
-go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
+go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
+go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
+go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
+go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
+go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
+go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -370,8 +431,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -384,8 +445,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
+golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
-golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
+golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -445,8 +506,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -458,8 +519,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.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
+golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 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=
@@ -471,6 +533,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -512,10 +576,9 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -524,8 +587,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -584,6 +647,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -605,15 +670,15 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.44.0 h1:URs6qR1lAxDsqWITsQXI4ZkGiYJ5dHtRNiCpfs2OeKA=
 google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
+google.golang.org/api v0.249.0 h1:0VrsWAKzIZi058aeq+I86uIXbNhm9GxSHpbmZ92a38w=
+google.golang.org/api v0.249.0/go.mod h1:dGk9qyI0UYPwO/cjt2q06LG/EhUpwZGdAbYF14wHHrQ=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -655,8 +720,13 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
+google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
+google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU=
+google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 h1:/OQuEa4YWtDt7uQWHd3q3sUMb+QOLQUg1xa8CEsRv5w=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -676,8 +746,9 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
+google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -689,18 +760,22 @@ 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.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
+google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+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/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/boot/boot.go

@@ -0,0 +1,43 @@
+package boot
+
+import (
+	"context"
+
+	v1 "github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/service"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+var (
+	ctx   = gctx.GetInitCtx()
+	_func = []func(){}
+)
+
+func Boot() (err error) {
+	// 启动计划任务定时器，预防debug工具激活计划任务造成重复执行，此处不执行计划任务
+	//err = service.SystemCron().StartCron()
+
+	//用户活动持久化每小时执行一次
+	service.SystemCron().AddCronV2(v1.CronType_HOUR, func(context.Context) error {
+		go func() {
+			err = service.GameKv().SavesV1()
+			err = service.GameAct().SavesV2()
+			if err != nil {
+				g.Log().Error(gctx.New(), err)
+			}
+		}()
+		return nil
+	}, true)
+
+	//初始化自启动方法
+	for _, v := range _func {
+		v()
+	}
+	return nil
+}
+
+// AddFunc 注册方法，在启动时执行
+func AddFunc(f func()) {
+	_func = append(_func, f)
+}

internal/game/act/act.go

@@ -2,16 +2,16 @@ package act
 
 import (
 	"fmt"
+	"github.com/ayflying/utility_go/pgk"
+	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
-	"new-gitlab.adesk.com/public_project/utility_go/package/aycache"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
 	"time"
 )
 
 var (
-	Cache           = aycache.New()
+	Cache           = pgk.Cache("redis")
 	ActIdListIsShow map[int]func(uid int64) bool
 	RedDotList      map[string]func(uid int64) int32
 )

internal/logic/casdoor/casdoor.go

@@ -0,0 +1,60 @@
+package casdoor
+
+import (
+	"github.com/ayflying/utility_go/service"
+	"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+type sCasdoor struct {
+	client *casdoorsdk.Client
+	config *casdoorsdk.AuthConfig
+}
+
+func init() {
+	var casdoor = &sCasdoor{}
+
+	service.RegisterCasdoor(New(casdoor))
+}
+
+func New(s *sCasdoor) *sCasdoor {
+	return s
+}
+
+func (s *sCasdoor) Load(endpoint string, clientId string, clientSecret string, certificate string, organizationName string, applicationName string) {
+	s.config = &casdoorsdk.AuthConfig{
+		Endpoint:         endpoint,
+		ClientId:         clientId,
+		ClientSecret:     clientSecret,
+		Certificate:      certificate,
+		OrganizationName: organizationName,
+		ApplicationName:  applicationName,
+	}
+}
+
+func (s *sCasdoor) New() *casdoorsdk.Client {
+	if s.config == nil {
+		g.Log().Errorf(gctx.New(), "未读取到配置，请先加载Load方法")
+		return nil
+	}
+	s.client = casdoorsdk.NewClient(
+		s.config.Endpoint,
+		s.config.ClientId,
+		s.config.ClientSecret,
+		s.config.Certificate,
+		s.config.OrganizationName,
+		s.config.ApplicationName,
+	)
+	return s.client
+}
+
+//func (s *sCasdoor) EditPassword(name, oldPassword, newPassword string) (res bool, err error) {
+//	res, err = s.client.SetPassword(s.config.OrganizationName, name, oldPassword, newPassword)
+//	return
+//}
+//
+//func (s *sCasdoor) Edit() {
+//	s.client.GetGroups()
+//
+//}

internal/logic/gameAct/gameAct.go

@@ -1,26 +1,31 @@
 package gameAct
 
 import (
+	"context"
+	"errors"
 	"fmt"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/ayflying/utility_go/internal/model/do"
+	"github.com/ayflying/utility_go/internal/model/entity"
+	"github.com/ayflying/utility_go/pkg"
+	service2 "github.com/ayflying/utility_go/service"
+	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/container/gset"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
-	"new-gitlab.adesk.com/public_project/utility_go/internal/game/act"
+	"github.com/gogf/gf/v2/util/gconv"
-	"new-gitlab.adesk.com/public_project/utility_go/internal/model/do"
-	"new-gitlab.adesk.com/public_project/utility_go/internal/model/entity"
-	"new-gitlab.adesk.com/public_project/utility_go/package/aycache"
-	service2 "new-gitlab.adesk.com/public_project/utility_go/service"
-	"new-gitlab.adesk.com/public_project/utility_go/tools"
-	"strconv"
-	"strings"
-	"time"
 )
 
 var (
-	ctx     = gctx.New()
 	Name       = "game_act"
 	ActList    = gset.New(true)
+	RunTimeMax *gtime.Time
 )
 
 type sGameAct struct {
@@ -43,6 +48,7 @@ func init() {
 // @return data *v1.Act: 返回活动信息结构体指针
 // @return err error: 返回错误信息
 func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return
@@ -70,8 +76,8 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
 	// 将查询到的活动信息保存到Redis缓存中
 	_, err = g.Redis().Set(ctx, keyCache, data)
 
-	var ActUidUpdateTimeCacheKey = fmt.Sprintf("act:update:%d", uid)
+	var CacheKey = fmt.Sprintf("act:update:%d", uid)
-	aycache.New("redis").Set(ctx, ActUidUpdateTimeCacheKey, uid, time.Hour*24*3)
+	pkg.Cache("redis").Set(ctx, CacheKey, uid, time.Hour*24*1)
 
 	return
 }
@@ -85,6 +91,7 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
 // @param data interface{}: 要存储的活动信息数据。
 // @return err error: 返回错误信息，如果操作成功，则返回nil。
 func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return
@@ -105,61 +112,82 @@ func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
 	return
 }
 
+// Saves 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @return err error: 返回错误信息
+// Deprecated: 该方法已被弃用，建议使用SavesV2方法
 func (s *sGameAct) Saves() (err error) {
+	var ctx = gctx.New()
+	g.Log().Debug(ctx, "开始执行游戏act数据保存了")
+	//如果没有执行过，设置时间戳
+	// 最大允许执行时间
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
 	//遍历执行
 	ActList.Iterator(func(i interface{}) bool {
-		err = s.Save(i.(int))
+		//在时间内允许执行
+		if gtime.Now().Before(RunTimeMax) {
+			g.Log().Debugf(ctx, "开始执行游戏act数据保存:act=%v", i)
+			err = s.Save(ctx, i.(int))
+		} else {
+			g.Log().Errorf(ctx, "游戏act数据保存超时:act=%v", i)
+		}
 		return true
 	})
 	return
 }
 
-func (s *sGameAct) Save(actId int) (err error) {
+// Save 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param actId int: 活动ID
+// @return err error: 返回错误信息
+// deprecated: 该方法已被弃用，建议使用SaveV2方法
+func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 
 	cacheKey := fmt.Sprintf("act:%v:*", actId)
-	//获取当前用户的key值
+	var add = make([]*entity.GameAct, 0)
-	//keys, err := utils.RedisScan(cacheKey)
+	var update = make([]*entity.GameAct, 0)
-	//if len(keys) > 10000 {
-	//	keys = keys[:10000]
-	//}
-
 	//循环获取缓存数据
 	err = tools.Redis.RedisScanV2(cacheKey, func(keys []string) (err error) {
-		var add []interface{}
+		//判断是否超时
-		var delKey []string
+		if gtime.Now().After(RunTimeMax) {
+			g.Log().Debug(ctx, "act执行超时了,停止执行！")
+			err = errors.New("act执行超时了,停止执行！")
+			return
+		}
+
 		for _, cacheKey = range keys {
 			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 {
+				g.Log().Error(ctx, err)
 				continue
 			}
 
 			cacheGet, _ := g.Redis().Get(ctx, cacheKey)
-			//最后删除key
+
-			delKey = append(delKey, cacheKey)
 			if uid == 0 {
 				//跳过为空的用户缓存
 				continue
 			}
 			if cacheGet.IsEmpty() {
-				//空数据也不巴保存
+				//空数据也不保存
 				continue
 			}
 
-			var ActUidUpdateTimeCacheKey = fmt.Sprintf("act:update:%d", uid)
 			//如果有活跃，跳过持久化
-			if getBool, _ := aycache.New("redis").Contains(ctx, ActUidUpdateTimeCacheKey); getBool {
+			if getBool, _ := pkg.Cache("redis").
+				Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
 				continue
 			}
 
-			////如果1天没有活跃，跳过
-			//user, _ := service.MemberUser().Info(uid)
-			//if user.UpdatedAt.Seconds < gtime.Now().Add(consts.ActSaveTime).Unix() {
-			//	continue
-			//}
-
 			//获取数据库数据
 			var data *entity.GameAct
 			// 从数据库中查询活动信息
@@ -168,45 +196,81 @@ func (s *sGameAct) Save(actId int) (err error) {
 				ActId: actId,
 			}).Fields("uid,act_id").Scan(&data)
 			if err != nil {
-				g.Log().Debugf(ctx, "当前数据错误: %v", cacheKey)
+				g.Log().Errorf(ctx, "当前数据错误: %v", cacheKey)
 				continue
 			}
 			actionData := cacheGet.String()
 			if data == nil {
-				//data =
+				add = append(add, &entity.GameAct{
-				add = append(add, &do.GameAct{
 					ActId:  actId,
 					Uid:    uid,
 					Action: actionData,
 				})
 			} else {
 				//覆盖数据
+				data.ActId = actId
+				data.Uid = uid
 				data.Action = actionData
-				add = append(add, data)
+				update = append(update, data)
 			}
-
 		}
 
 		//批量写入数据库
-		if len(add) > 0 {
+		updateCount := 0
-			dbRes, err2 := g.Model(Name).Batch(30).Data(add).Save()
+
-			add = make([]interface{}, 0)
+		//g.Log().Debugf(ctx, "当前 %v 要更新的数据: %v 条", actId, len(update))
+		if len(update) > 100 {
+			for _, v := range update {
+				v.UpdatedAt = gtime.Now()
+				updateRes, err2 := g.Model(Name).Where(do.GameAct{
+					Uid:   v.Uid,
+					ActId: v.ActId,
+				}).Data(v).Update()
 				if err2 != nil {
 					g.Log().Error(ctx, err2)
 					return
 				}
+				if row, _ := updateRes.RowsAffected(); row == 0 {
+					g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+					continue
+				}
 
-			for _, v := range delKey {
+				//删除缓存
-				_, err2 = g.Redis().Del(ctx, v)
+				go s.DelCacheKey(ctx, v.ActId, v.Uid)
-				if err2 != nil {
+
+				updateCount++
+				update = make([]*entity.GameAct, 0)
+			}
+			g.Log().Debugf(ctx, "当前 %v 更新数据库: %v 条", actId, updateCount)
+			update = make([]*entity.GameAct, 0)
+		}
+
+		var count int64
+		//g.Log().Debugf(ctx, "当前 %v 要添加的数据: %v 条", actId, len(add))
+		if len(add) > 100 {
+			dbRes, err2 := g.Model(Name).Data(add).Save()
+
+			err = err2
+			if err != nil {
 				g.Log().Error(ctx, err2)
 				return
 			}
+			count, _ = dbRes.RowsAffected()
+			if count == 0 {
+				g.Log().Error(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+				for _, vTemp := range add {
+					g.Log().Debugf(ctx, "当前act：%v，add写入数据: %v,内容：%v", vTemp.ActId, vTemp.Uid, vTemp.Action)
+				}
+				return
 			}
-			delKey = make([]string, 0)
 
-			count, _ := dbRes.RowsAffected()
+			for _, v2 := range add {
-			g.Log().Debugf(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+				//删除缓存
+				go s.DelCacheKey(ctx, v2.ActId, v2.Uid)
+			}
+
+			//g.Log().Debugf(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+			add = make([]*entity.GameAct, 0)
 		}
 
 		if err != nil {
@@ -219,48 +283,305 @@ func (s *sGameAct) Save(actId int) (err error) {
 	return
 }
 
-// 清空GetRedDot缓存
+// SavesV2 保存游戏活动数据
-func (s *sGameAct) RefreshGetRedDotCache(uid int64) {
+//
-	//cacheKey2 := fmt.Sprintf("gameAct:GetRedDot:%d", uid)
+// @Description: 保存游戏活动数据
-	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("Ymd"), uid)
+// @receiver s *sGameAct: 游戏活动服务结构体指针
-	act.Cache.Remove(gctx.New(), cacheKey)
+// @return err error: 返回错误信息
+// SavesV2 保存游戏活动数据
+func (s *sGameAct) SavesV2() (err error) {
+	var ctx = gctx.New()
+	g.Log().Debug(ctx, "开始执行游戏act数据保存了")
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
+
+	// 使用局部通道替代包级通道，避免并发冲突
+	addChan := make(chan *entity.GameAct, 1000)
+	updateChan := make(chan *entity.GameAct, 1000)
+
+	errChan := make(chan error, 1)
+	var wg sync.WaitGroup
+	wg.Add(1) // 仅需添加1次（对应Cache2SqlChan协程）
+	// wg.Add(1)  // 移除多余的Add调用，避免计数不平衡
+
+	go func() {
+		defer wg.Done() // Cache2SqlChan协程完成后减1
+		s.Cache2SqlChan(ctx, addChan, updateChan)
+	}()
+
+	go func() {
+		scanErr := tools.Redis.RedisScanV2("act:*", func(keys []string) error {
+			if gtime.Now().After(RunTimeMax) {
+				return errors.New("Redis扫描超时")
+			}
+			for _, key := range keys {
+				if keyErr := s.SaveV2(ctx, key, addChan, updateChan); keyErr != nil {
+					g.Log().Errorf(ctx, "处理key %s失败: %v", key, keyErr)
+				}
+			}
+			return nil
+		})
+		close(addChan)
+		close(updateChan)
+		errChan <- scanErr
+	}()
+
+	// 等待扫描和处理完成，同时监听上下文取消
+	select {
+	case scanErr := <-errChan:
+		wg.Wait() // 等待Cache2SqlChan处理完剩余数据
+		if scanErr != nil {
+			return gerror.New(fmt.Sprintf("Redis扫描失败: %v", scanErr))
+		}
+	case <-ctx.Done():
+		wg.Wait()
+		return ctx.Err() // 返回上下文取消原因
+	}
+	return
 }
 
+// SaveV2 保存游戏活动数据
 //
-//func (s *sGameAct) GetRedDot(uid int64) (res map[string]int32, err error) {
+// @Description: 保存游戏活动数据
-//	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("Ymd"), uid)
+// @receiver s *sGameAct: 游戏活动服务结构体指针
-//	if get, _ := act.Cache.Get(ctx, cacheKey); !get.IsEmpty() {
+// @param ctx context.Context: 上下文对象
-//		err = get.Scan(&res)
+// @param cacheKey string: 缓存键
-//		return
+// @param add []*entity.GameAct: 添加数据
-//	}
+// @param update []*entity.GameAct: 更新数据
-//
+// @return err error: 返回错误信息
-//	res = make(map[string]int32)
+func (s *sGameAct) SaveV2(ctx context.Context, cacheKey string, addChan, updateChan chan *entity.GameAct) (err error) {
-//
+
-//	//res["notice_count"] = 0
+	result := strings.Split(cacheKey, ":")
-//	//获取所有帖子红点
+	actId := gconv.Int(result[1])
-//	for _, v := range communityNotice.Types {
+	if actId == 0 {
-//		res[fmt.Sprintf("notice_%d", v)], err = service.CommunityNotice().Ping(uid, noticeV1.NoticeType(v))
+		return
-//	}
+	}
-//
+	var uid int64
-//	//邮件红点
+	uid = gconv.Int64(result[2])
-//	res["mail_count"], err = service.GameMail().RedDot(uid)
+	if uid == 0 {
-//
+		//跳过为空的用户缓存
-//	//act1可领取数量
+		return
-//	res["act1_count"], err = act1.New().RedDot(uid)
+	}
-//
+
-//	//act2可领取数量
+	//获取缓存数据
-//	res["act2_count"], err = act2.New().RedDot(uid)
+	cacheGet, _ := g.Redis().Get(ctx, cacheKey)
-//
+
-//	//成就红点
+	if cacheGet.IsEmpty() {
-//	res["act4_count"], err = act4.New().RedDot(uid)
+		//空数据也不保存
-//
+		return
-//	//广告点击
+	}
-//	res["act6_count"], err = act6.New().RedDot(uid)
+
-//
+	//如果有活跃，跳过持久化
-//	for k, v := range act.RedDotList {
+	if getBool, _ := pkg.Cache("redis").
-//		res[k] = v(uid)
+		Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
-//	}
+		return
-//
+	}
-//	aycache.New().Set(ctx, cacheKey, res, time.Hour)
+
-//	return
+	//获取数据库数据
-//}
+	var data *entity.GameAct
+	// 从数据库中查询活动信息
+	err = g.Model(Name).Where(do.GameAct{
+		Uid:   uid,
+		ActId: actId,
+	}).Fields("uid,act_id").Scan(&data)
+	if err != nil {
+		g.Log().Errorf(ctx, "当前数据错误: %v", cacheKey)
+		return
+	}
+
+	//如果没有数据，添加
+	actionData := cacheGet.String()
+	if data == nil {
+		//add = append(add, &entity.GameAct{
+		//	ActId:  actId,
+		//	Uid:    uid,
+		//	Action: actionData,
+		//})
+		addChan <- &entity.GameAct{
+			ActId:  actId,
+			Uid:    uid,
+			Action: actionData,
+		}
+	} else {
+		//覆盖数据
+		data.ActId = actId
+		data.Uid = uid
+		data.Action = actionData
+		//update = append(update, data)
+		updateChan <- data
+	}
+
+	return
+}
+
+// Cache2Sql 缓存持久化到数据库
+// @Description: 缓存持久化到数据库
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param add []*entity.GameAct: 添加数据
+// @param update []*entity.GameAct: 更新数据
+// @return err error: 返回错误信息
+func (s *sGameAct) Cache2Sql(ctx context.Context, add, update []*entity.GameAct) {
+	//批量写入数据库
+	updateCount := 0
+	if len(update) > 0 {
+		for _, v := range update {
+			v.UpdatedAt = gtime.Now()
+			updateRes, err2 := g.Model(Name).Where(do.GameAct{
+				Uid:   v.Uid,
+				ActId: v.ActId,
+			}).Data(v).Update()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := updateRes.RowsAffected(); row == 0 {
+				g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+				continue
+			}
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+			updateCount++
+		}
+		g.Log().Debugf(ctx, "act当前更新数据库: %v 条", updateCount)
+		update = (update)[:0]
+	}
+
+	var addCount int64
+	if len(add) > 0 {
+		for _, v := range add {
+			addRes, err2 := g.Model(Name).Data(v).Insert()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := addRes.RowsAffected(); row == 0 {
+				g.Log().Error(ctx, "本次新增为0，新增数据失败: %v", v)
+				continue
+			}
+			addCount++
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+		}
+		g.Log().Debugf(ctx, "act当前写入数据库: %v 条", addCount)
+		add = (add)[:0]
+	}
+	return
+}
+
+// Cache2AddChan 批量添加数据库
+func (s *sGameAct) Cache2SqlChan(ctx context.Context, addChan, updateChan chan *entity.GameAct) {
+	//批量写入数据库计数
+	var addCount int64
+	//批量更新数据库计数
+	var updateCount int64
+	//通道关闭标志
+	addClosed := false
+	updateClosed := false
+
+	// 使用链式安全模式
+	var db = g.Model(Name).Safe()
+
+	for {
+		//检查是否两个通道都已关闭且为空
+		if addClosed && updateClosed {
+			break
+		}
+
+		select {
+		case v, ok := <-addChan:
+			if !ok {
+				addClosed = true // 仅标记关闭，不立即日志
+				continue
+			}
+			addRes, err2 := db.Data(v).Insert()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := addRes.RowsAffected(); row == 0 {
+				//g.Log().Error(ctx, "本次新增为0，新增数据失败: %v", v)
+				continue
+			}
+			row, _ := addRes.RowsAffected()
+			addCount += row
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+
+		case v, ok := <-updateChan:
+			if !ok {
+				updateClosed = true // 仅标记关闭，不立即日志
+				continue
+			}
+			v.UpdatedAt = gtime.Now()
+			updateRes, err2 := db.Where(do.GameAct{
+				Uid:   v.Uid,
+				ActId: v.ActId,
+			}).Data(v).Update()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := updateRes.RowsAffected(); row == 0 {
+				//g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+				continue
+			}
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+			updateCount++
+
+		case <-ctx.Done():
+			g.Log().Debug(ctx, "act协程被上下文取消")
+			return
+		}
+	}
+
+	// 仅在所有通道处理完毕后打印最终计数（移除中间冗余日志）
+	g.Log().Debugf(ctx, "act当前写入数据库: %v 条", addCount)
+	g.Log().Debugf(ctx, "act当前更新数据库: %v 条", updateCount)
+	return
+}
+
+// 删除缓存key
+func (s *sGameAct) DelCacheKey(ctx context.Context, aid int, uid int64) {
+	//如果有活跃，跳过删除
+	if getBool, _ := pkg.Cache("redis").
+		Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+		return
+	}
+
+	cacheKey := fmt.Sprintf("act:%v:%v", aid, uid)
+	_, err := g.Redis().Del(ctx, cacheKey)
+	if err != nil {
+		g.Log().Error(ctx, err)
+	}
+}
+
+// 清空GetRedDot缓存
+func (s *sGameAct) RefreshGetRedDotCache(uid int64) {
+	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("d"), uid)
+	_, err := pkg.Cache("redis").Remove(gctx.New(), cacheKey)
+	if err != nil {
+		g.Log().Error(gctx.New(), err)
+		g.Dump(err)
+	}
+}
+
+func (s *sGameAct) Del(uid int64, actId int) {
+	var ctx = gctx.New()
+	if uid == 0 || actId == 0 {
+		g.Log().Error(ctx, "当前参数为空")
+		return
+	}
+	// 构造缓存键名
+	keyCache := fmt.Sprintf("act:%v:%v", actId, uid)
+
+	//删除活动缓存
+	g.Redis().Del(ctx, keyCache)
+
+	//删除当前活动储存
+	g.Model(Name).Where(do.GameAct{
+		Uid:   uid,
+		ActId: actId,
+	}).Delete()
+
+}

internal/logic/gameKv/gameKv.go

@@ -0,0 +1,137 @@
+package gameKv
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/ayflying/utility_go/pkg"
+	"github.com/ayflying/utility_go/service"
+	"github.com/ayflying/utility_go/tools"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+var (
+	Name       = "game_kv"
+	RunTimeMax *gtime.Time
+)
+
+type sGameKv struct {
+	Lock sync.Mutex
+}
+
+func New() *sGameKv {
+	return &sGameKv{}
+}
+
+func init() {
+	service.RegisterGameKv(New())
+}
+
+// SavesV1 方法
+//
+// @Description: 保存用户KV数据列表。
+// @receiver s: sGameKv的实例。
+// @return err: 错误信息，如果操作成功，则为nil。
+func (s *sGameKv) SavesV1() (err error) {
+	var ctx = gctx.New()
+	// 最大允许执行时间
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
+	g.Log().Debug(ctx, "开始执行游戏kv数据保存")
+
+	// 定义用于存储用户数据的结构体
+	type ListData struct {
+		Uid int64       `json:"uid"`
+		Kv  interface{} `json:"kv"`
+	}
+	var list []*ListData
+	// 初始化列表，长度与keys数组一致
+	list = make([]*ListData, 0)
+
+	// 从Redis列表中获取所有用户KV索引的键
+	//keys, err := utils.RedisScan("user:kv:*")
+	err = tools.Redis.RedisScanV2("user:kv:*", func(keys []string) (err error) {
+		//判断是否超时
+		if gtime.Now().After(RunTimeMax) {
+			g.Log().Error(ctx, "kv执行超时了,停止执行！")
+			err = errors.New("kv执行超时了,停止执行！")
+			return
+		}
+
+		//需要删除的key
+
+		// 遍历keys，获取每个用户的数据并填充到list中
+		for _, cacheKey := range keys {
+			//g.Log().Infof(ctx, "保存用户kv数据%v", v)
+			//uid := v.Int64()
+			//cacheKey = "user:kv:" + strconv.FormatInt(uid, 10)
+			result := strings.Split(cacheKey, ":")
+			var uid = gconv.Int64(result[2])
+			if uid == 0 {
+				continue
+			}
+			//uid, err = strconv.ParseInt(result[2], 10, 64)
+			if err != nil {
+				g.Log().Error(ctx, err)
+				g.Redis().Del(ctx, cacheKey)
+				continue
+			}
+
+			//如果有活跃，跳过持久化
+			if getBool, _ := pkg.Cache("redis").
+				Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+				continue
+			}
+
+			get, _ := g.Redis().Get(ctx, cacheKey)
+			var data interface{}
+			get.Scan(&data)
+			if data == nil {
+				continue
+			}
+			list = append(list, &ListData{
+				Uid: uid,
+				Kv:  data,
+			})
+		}
+
+		// 将列表数据保存到数据库
+		if len(list) > 100 {
+			_, err2 := g.Model("game_kv").Data(list).Save()
+			if err2 != nil {
+				g.Log().Error(ctx, "当前kv数据入库失败: %v", err2)
+				err = err2
+				return
+			}
+			//删除当前key
+			for _, v := range list {
+				s.DelCacheKey(ctx, v.Uid)
+			}
+			list = make([]*ListData, 0)
+		}
+		return
+	})
+
+	return
+}
+
+// 删除缓存key
+func (s *sGameKv) DelCacheKey(ctx context.Context, uid int64) {
+	//如果有活跃，跳过删除
+	if getBool, _ := pkg.Cache("redis").
+		Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+		return
+	}
+
+	cacheKey := fmt.Sprintf("user:kv:%v", uid)
+	_, err := g.Redis().Del(ctx, cacheKey)
+	if err != nil {
+		g.Log().Error(ctx, err)
+	}
+}

internal/logic/ip2region/ip2region.go

@@ -1,82 +1,142 @@
 package ip2region
 
 import (
+	"net"
+	"path"
+	"strings"
+
+	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/lionsoul2014/ip2region/binding/golang/xdb"
-	"net"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
-	"strings"
 )
 
 var (
 	ctx  = gctx.New()
+	wait = false
 )
 
+const IpDbPath = "runtime/library"
+
 type sIp2region struct {
-	searcher *xdb.Searcher
+	//searcher  *xdb.Searcher
+	searchers map[string]*xdb.Searcher
 }
 
 func New() *sIp2region {
-	s := &sIp2region{}
+	return &sIp2region{}
-	s.Load()
-	return s
 }
 
 func init() {
 	service.RegisterIp2Region(New())
+
+	//boot.AddFunc(func() {
+	//	service.Ip2Region().Load()
+	//})
 }
 
+//func (s *sIp2region) New() *xdb.Searcher {
+//
+//	return nil
+//}
+
 // Load 加载到内存中
 //
 //	@Description: 加载ip2region数据库到内存中。
-//	@receiver s *sIp2region: sIp2region的实例。
-func (s *sIp2region) Load() {
-	var err error
-	//var dbPath = "/mnt/s3/ip2region.xdb"
-	var dbPath = "lib/ip2region.xdb"
 
-	if gfile.IsEmpty(dbPath) {
+//	@receiver s *sIp2region: sIp2region的实例。
+func (s *sIp2region) Load(t *xdb.Version) {
+	var err error
+	var url string
+	//var dbPath = "runtime/library/ip2region.xdb"
+	switch t {
+	case xdb.IPv4:
+		//url = "https://github.com/ayflying/resource/raw/refs/heads/master/attachment/ip2region_v4.xdb"
+		url = "https://github.com/lionsoul2014/ip2region/raw/refs/heads/master/data/ip2region_v4.xdb"
+	case xdb.IPv6:
+		url = "https://github.com/lionsoul2014/ip2region/raw/refs/heads/master/data/ip2region_v6.xdb"
+	}
+
+	if wait {
+		return
+	}
+	filename := gfile.Basename(url)
+	var IpDbFile = path.Join(IpDbPath, filename)
+	g.Log().Debugf(ctx, "加载ip库文件:%v", filename)
+	if gfile.IsEmpty(IpDbFile) {
+		wait = true
+		defer func() {
+			wait = false
+		}()
+		g.Log().Debug(ctx, "等待下载ip库文件")
 		//下载文件
-		putData, err2 := g.Client().Discovery(nil).
+		putData, err2 := g.Client().Discovery(nil).Get(ctx, url)
-			Get(ctx, "https://resource.luoe.cn/pgk/ip2region.xdb")
 		if err2 != nil {
 			return
 		}
-		err = gfile.PutBytes(dbPath, putData.ReadAll())
+		err = gfile.PutBytes(IpDbFile, putData.ReadAll())
 	}
-	cBuff := gfile.GetBytes(dbPath)
-	/*
-		var cBuff []byte
-		if gres.Contains(dbPath) {
-			cBuff = gres.GetContent(dbPath)
-		} else {
-			cBuff = gfile.GetBytes(dbPath)
-		}
-	*/
 
-	// 基于读取的内容，创建查询对象
+	err = xdb.VerifyFromFile(IpDbFile)
-	s.searcher, err = xdb.NewWithBuffer(cBuff)
 	if err != nil {
-		g.Log().Errorf(ctx, "无法创建内容为的搜索器： %s", err)
+		// err 包含的验证的错误
+		gfile.RemoveFile(IpDbFile)
+		g.Log().Errorf(ctx, "ip库xdb file verify: %v", err)
 		return
 	}
 
+	// 1、从 dbPath 加载 VectorIndex 缓存，把下述 vIndex 变量全局到内存里面。
+	vIndex, err := xdb.LoadVectorIndexFromFile(IpDbFile)
+	if err != nil {
+		g.Log().Errorf(ctx, "failed to load vector index from `%s`: %s\n", IpDbFile, err)
+		return
+	}
+	// 2、用全局的 vIndex 创建带 VectorIndex 缓存的查询对象。
+	if s.searchers == nil {
+		s.searchers = make(map[string]*xdb.Searcher)
+	}
+	s.searchers[t.Name], err = xdb.NewWithVectorIndex(t, IpDbFile, vIndex)
+	if err != nil {
+		g.Log().Errorf(ctx, "failed to create searcher with vector index: %s\n", err)
+		return
+	}
+
+	//cBuff := gfile.GetBytes(IpDbFile)
+	//// 基于读取的内容，创建查询对象
+	//s.searchers[t.Name], err = xdb.NewWithBuffer(t, cBuff)
+	//if err != nil {
+	//	g.Log().Errorf(ctx, "无法创建内容为的搜索器： %s", err)
+	//	return
+	//}
+
 }
 
 func (s *sIp2region) GetIp(ip string) (res []string) {
-	res = make([]string, 5)
+	//初始化加载
-	if s.searcher == nil {
+	//if s.searcher == nil {
-		return
+	//	s.Load(xdb.IPv6)
-	}
+	//}
-
+	var searchers *xdb.Searcher
-	//如果是ipv6直接跳过
+	//区分ipv6与ipv4
 	if s.isIPv6(ip) {
+		if s.searchers[xdb.IPv6.Name] == nil {
+			s.Load(xdb.IPv6)
+		}
+		searchers = s.searchers[xdb.IPv6.Name]
+	} else {
+		if s.searchers[xdb.IPv4.Name] == nil {
+			s.Load(xdb.IPv4)
+		}
+		searchers = s.searchers[xdb.IPv4.Name]
+	}
+
+	res = make([]string, 5)
+	if searchers == nil {
 		return
 	}
 
-	region, err := s.searcher.SearchByStr(ip)
+	region, err := searchers.SearchByStr(ip)
 	if err != nil {
 		return
 	}

internal/logic/logData/logData.go

@@ -2,10 +2,10 @@ package logData
 
 import (
 	"context"
+	"github.com/ayflying/utility_go/service"
+	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
-	"new-gitlab.adesk.com/public_project/utility_go/tools"
 	"time"
 )
 

internal/logic/logic.go

@@ -5,9 +5,11 @@
 package logic
 
 import (
-	_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/gameAct"
+	_ "github.com/ayflying/utility_go/internal/logic/casdoor"
-	_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/ip2region"
+	_ "github.com/ayflying/utility_go/internal/logic/gameAct"
-	_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/logData"
+	_ "github.com/ayflying/utility_go/internal/logic/gameKv"
-	_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/systemCron"
+	_ "github.com/ayflying/utility_go/internal/logic/ip2region"
-	_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/systemLog"
+	_ "github.com/ayflying/utility_go/internal/logic/logData"
+	_ "github.com/ayflying/utility_go/internal/logic/systemCron"
+	_ "github.com/ayflying/utility_go/internal/logic/systemLog"
 )

internal/logic/systemCron/listener.go

@@ -3,10 +3,11 @@ package systemCron
 import (
 	"encoding/json"
 	"fmt"
+	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"
-	v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
+	"github.com/gogf/gf/v2/os/gctx"
-	"new-gitlab.adesk.com/public_project/utility_go/pgk/notice"
 )
 
 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 {

internal/logic/systemCron/systemCron.go

@@ -2,18 +2,21 @@ package systemCron
 
 import (
 	"context"
+	"sync"
+	"time"
+
+	"github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/service"
 	"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"
-	"new-gitlab.adesk.com/public_project/utility_go/api/system/v1"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
-	"sync"
-	"time"
 )
 
 var (
-	ctx = gctx.New()
+	//ctx       = gctx.New()
+	startTime *gtime.Time
 )
 
 // sSystemCron 结构体定义了系统定时任务的秒计时器。
@@ -21,39 +24,44 @@ var (
 type sSystemCron struct {
 	//互斥锁
 	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 * 60,
+	}
 }
 
 func init() {
@@ -63,13 +71,42 @@ 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, true)
+}
+
+// AddCronV2  添加一个定时任务到相应的调度列表中。
+//
+// @Description: 根据指定的类型将函数添加到不同的任务列表中，以供后续执行。
+// @receiver s: sSystemCron的实例，代表一个调度系统。
+// @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
+// @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
+// @param _onlyMain: 是否只在主服务器上执行一次,true 唯一执行，false 全局执行不判断唯一
+func (s *sSystemCron) AddCronV2(typ v1.CronType, _func func(context.Context) error, _onlyMain ...bool) {
+	//如果传过来的任务是需要主服务器执行一次
+	if len(_onlyMain) > 0 && _onlyMain[0] {
+		//判断当前是否为主服务器
+		if !g.Cfg().MustGet(gctx.New(), "game.cron_main").Bool() {
+			return
+		}
+	}
+
 	//加锁
 	s.Lock.Lock()
 	defer s.Lock.Unlock()
+	//
+	//ctx := gctx.New()
+	//newFunc := func()
 
 	switch typ {
 	case v1.CronType_SECOND:
@@ -110,140 +147,133 @@ 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 g.Cfg().MustGet(gctx.New(), "database") == nil {
+		return
+	}
+	//预防重复启动
+	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 {
+	s.AddFuncChan(s.SecondlyTask)
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
 	return
 }
 
 // 每分钟任务
-func (s *sSystemCron) minutelyTask() (err error) {
+func (s *sSystemCron) minutelyTask() {
 	if len(s.MinutelyTask) == 0 {
 		return
 	}
-	for _, _func := range s.MinutelyTask {
+	s.AddFuncChan(s.MinutelyTask)
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
 	return
 }
 
 // 每小时任务
-func (s *sSystemCron) hourlyTask() (err error) {
+func (s *sSystemCron) hourlyTask() {
 	if len(s.HourlyTask) == 0 {
 		return
 	}
-	for _, _func := range s.HourlyTask {
+	s.AddFuncChan(s.HourlyTask)
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
 	return
 }
 
 // 每天任务
-func (s *sSystemCron) dailyTask() (err error) {
+func (s *sSystemCron) dailyTask() {
 	if len(s.DailyTask) == 0 {
 		return
 	}
-	for _, _func := range s.DailyTask {
+	s.AddFuncChan(s.DailyTask)
-		err = _func()
-		if err != nil {
-			g.Log().Error(ctx, err)
-		}
-	}
 	return
 }
 
 // 每周任务
-func (s *sSystemCron) weeklyTask(day int) (err error) {
+func (s *sSystemCron) weeklyTask(day int) {
-	var arr []func() error
+	var arr []func(context.Context) error
 	switch day {
 	case 1:
 		arr = s.MondayTask
@@ -267,39 +297,91 @@ func (s *sSystemCron) weeklyTask(day int) (err error) {
 	if len(arr) == 0 {
 		return
 	}
-	for _, _func := range arr {
+	s.AddFuncChan(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)
-		}
-	}
 	return
 }
 
 // 每月任务
-func (s *sSystemCron) monthlyTask() (err error) {
+func (s *sSystemCron) monthlyTask() {
 	if len(s.MonthlyTask) == 0 {
 		return
 	}
-	for _, _func := range s.MonthlyTask {
+	s.AddFuncChan(s.MonthlyTask)
-		err = _func()
+	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(gctx.New(), 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
 }

internal/logic/systemLog/systemLog.go

@@ -2,10 +2,10 @@ package systemLog
 
 import (
 	"context"
+	v1 "github.com/ayflying/utility_go/api/admin/v1"
+	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
-	v1 "new-gitlab.adesk.com/public_project/utility_go/api/admin/v1"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
 )
 
 type sSystemLog struct {

main.go

@@ -1,33 +0,0 @@
-package utility_go
-
-import (
-	_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic"
-
-	"context"
-	"time"
-
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/os/gtimer"
-	v1 "new-gitlab.adesk.com/public_project/utility_go/api/system/v1"
-	"new-gitlab.adesk.com/public_project/utility_go/service"
-
-	"new-gitlab.adesk.com/public_project/utility_go/config"
-)
-
-var (
-	Config = config.Cfg{}
-	ctx    = gctx.GetInitCtx()
-)
-
-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
-		})
-	})
-
-}

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 枚举

modules/websocket/go.mod

@@ -0,0 +1,5 @@
+module github.com/ayflying/utility_go/modules/websocket
+
+go 1.24.0
+
+require github.com/ayflying/utility_go v1.2.26

modules/websocket/go.sum

@@ -0,0 +1,2 @@
+github.com/ayflying/utility_go v1.2.26/go.mod h1:y6qwRUmYk73cH/dTRSzj2mnaQdtrAfFNH4wRFewxlIc=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=

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

modules/websocket/socket_new.go

@@ -0,0 +1,361 @@
+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:"用户编号"`
+	Guid   string          `json:"guid" dc:"用户凭证"`
+	Groups []string        `json:"groups" dc:"群组"`
+	Ctx    context.Context `json:"ctx" dc:""`
+	RoomId string          `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: "",
+	}
+	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, guid string) {
+	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
+	}
+	conn.Guid = guid
+
+}
+
+//解绑用户
+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, roomId string, req proto.Message) {
+	cacheKey := "websocket:group:" + roomId
+	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
+}

package/aycache/cache.go

@@ -1,38 +0,0 @@
-package aycache
-
-import (
-	"github.com/gogf/gf/v2/os/gcache"
-	"new-gitlab.adesk.com/public_project/utility_go/package/aycache/drive"
-)
-
-type Mod struct {
-	client *gcache.Cache
-}
-
-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.Cache
-//}
-
-// Deprecated: Use pgk.Cache()
-func New(_name ...string) gcache.Adapter {
-
-	var cacheAdapterObj gcache.Adapter
-	var name = "cache"
-	if len(_name) > 0 {
-		name = _name[0]
-	}
-	switch name {
-	case "cache":
-		cacheAdapterObj = NewAdapterMemory()
-	case "redis":
-		cacheAdapterObj = NewAdapterRedis()
-	case "file":
-		cacheAdapterObj = NewAdapterFile("runtime/cache")
-	case "es":
-		cacheAdapterObj = drive.NewAdapterElasticsearch([]string{"http://127.0.0.1:9200"})
-	}
-
-	//var client = gcache.New()
-	//client.SetAdapter(cacheAdapterObj)
-	return cacheAdapterObj
-}

package/aycache/drive/elasticsearch.go

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

package/aycache/file.go

@@ -1,134 +0,0 @@
-package aycache
-
-import (
-	"context"
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/os/gcache"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/util/gconv"
-	"path"
-	"strings"
-	"time"
-)
-
-type AdapterFile struct {
-	FilePath string
-}
-
-func (a AdapterFile) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
-	//defer a.handleLruKey(ctx, key)
-	//expireTime := a.getInternalExpire(duration)
-	//a.data.Set(key, memoryDataItem{
-	//	a: value,
-	//	a: expireTime,
-	//})
-	//c.eventList.PushBack(&adapterMemoryEvent{
-	//	k: key,
-	//	e: expireTime,
-	//})
-
-	arr := strings.Split(":", gconv.String(key))
-	fileName := path.Join(arr...)
-	return gfile.PutBytes(fileName, gconv.Bytes(value))
-}
-
-func (a AdapterFile) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) SetIfNotExist(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) SetIfNotExistFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) SetIfNotExistFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (ok bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Get(ctx context.Context, key interface{}) (*gvar.Var, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetOrSetFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Contains(ctx context.Context, key interface{}) (bool, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Size(ctx context.Context) (size int, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Data(ctx context.Context) (data map[interface{}]interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Keys(ctx context.Context) (keys []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Values(ctx context.Context) (values []interface{}, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Update(ctx context.Context, key interface{}, value interface{}) (oldValue *gvar.Var, exist bool, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) UpdateExpire(ctx context.Context, key interface{}, duration time.Duration) (oldDuration time.Duration, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) GetExpire(ctx context.Context, key interface{}) (time.Duration, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Remove(ctx context.Context, keys ...interface{}) (lastValue *gvar.Var, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Clear(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a AdapterFile) Close(ctx context.Context) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func NewAdapterFile(filePath string) gcache.Adapter {
-	return &AdapterFile{
-		FilePath: filePath,
-	}
-}

package/aycache/memory.go

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

package/aycache/mencached.go

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

package/aycache/redis.go

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

package/excel/excel.go

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

package/gamelog/sdk.go

@@ -0,0 +1,440 @@
+package gamelog
+
+import (
+	"bytes"
+	"compress/gzip"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/gclient"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gtime"
+)
+
+type sendBody struct {
+	Pid  string  `json:"pid"`
+	Data [][]any `json:"data"`
+}
+
+// todo 游戏日志对象
+type GameLog struct {
+	Uid          string         // 唯一uid
+	Event        string         // 事件名
+	Property     map[string]any // 事件属性
+	EventTimems  int64          // 时间戳毫秒级别
+	EventTimeLoc string         // 带时区的本地时间字符串
+}
+
+type SDKConfig struct {
+	// 配置变量
+	Pid           string // 项目id
+	BaseUrl       string // 日志服务器地址
+	ReportSk      string // 上报解密key
+	FlushInterval int    // 刷新间隔
+	DiskBakPath   string // 磁盘备份路径
+	RetryN        int    // 每N次重试
+	ChanSize      int    // 信道大小, 默认1000
+
+	reportN int
+}
+
+type SDK struct {
+	// 控制变量
+	wg         sync.WaitGroup
+	shutdown   chan struct{}
+	mu         sync.Mutex
+	sdkConfig  *SDKConfig
+	bufferChan chan GameLog // 日志队列
+	buffer     []GameLog    // 日志队列
+}
+
+var (
+	ctx           = context.Background()
+	gamelogClient *gclient.Client
+
+	// location map
+	// locationMap map[string]*time.Location = map[string]*time.Location{}
+	locationMap sync.Map // 声明一个线程安全的Map
+
+)
+
+func getLocationMapValue(key string) *time.Location {
+	// 1. 先尝试读
+	value, loaded := locationMap.Load(key)
+	if loaded {
+		return value.(*time.Location) // 如果已经存在，直接返回
+	}
+	// 2. 不存在，就初始化一个该key对应的**固定的**新值
+	location, err := time.LoadLocation(key)
+	if err != nil {
+		g.Log().Warningf(ctx, "[GameLog]load location error, try use local timezone: %v", err)
+		return nil
+	}
+	// 3. 核心：原子性地存储，如果key已存在则返回已存在的值
+	actualValue, loaded := locationMap.LoadOrStore(key, location)
+	if loaded {
+		// 如果loaded为true，说明其他goroutine抢先存了
+		// 我们可以丢弃刚创建的newValue（如果有需要的话），返回已存在的actualValue
+		return actualValue.(*time.Location)
+	}
+	// 如果loaded为false，说明是我们存成功的，返回我们刚创建的newValue
+	return actualValue.(*time.Location)
+}
+
+func (sdk *SDK) varinit() error {
+	sdk.sdkConfig = &SDKConfig{}
+
+	_pid, err := g.Config().Get(ctx, "angergs.bisdk.pid")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.Pid = _pid.String()
+
+	_baseUrl, err := g.Config().Get(ctx, "angergs.bisdk.recodeServerBaseUrl")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.BaseUrl = _baseUrl.String()
+
+	_sk, err := g.Config().Get(ctx, "angergs.bisdk.reportSk")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.ReportSk = _sk.String()
+
+	_flushInterval, err := g.Config().Get(ctx, "angergs.bisdk.flushInterval")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.FlushInterval = _flushInterval.Int()
+
+	_diskBakPath, err := g.Config().Get(ctx, "angergs.bisdk.diskBakPath")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.DiskBakPath = _diskBakPath.String()
+
+	_retryN, err := g.Config().Get(ctx, "angergs.bisdk.retryN")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.RetryN = _retryN.Int()
+
+	_chanSize, err := g.Config().Get(ctx, "angergs.bisdk.chanSize")
+	if err != nil {
+		return err
+	}
+	sdk.sdkConfig.ChanSize = _chanSize.Int()
+
+	g.Log().Infof(ctx, "[GameLog]client init success, config: %v", sdk.sdkConfig)
+	return nil
+}
+
+func (sdk *SDK) checkConfig() error {
+	config := sdk.sdkConfig
+	if config.Pid == "" {
+		return fmt.Errorf("pid is empty")
+	}
+	if config.BaseUrl == "" {
+		return fmt.Errorf("baseUrl is empty")
+	}
+	if config.ReportSk == "" {
+		return fmt.Errorf("reportSk is empty")
+	}
+	if config.FlushInterval <= 0 {
+		return fmt.Errorf("flushInterval is invalid")
+	}
+	if config.DiskBakPath == "" {
+		return fmt.Errorf("diskBakPath is empty")
+	}
+	if config.RetryN == 0 {
+		config.RetryN = 10
+	}
+	if config.ChanSize == 0 {
+		config.ChanSize = 1000
+	}
+	config.DiskBakPath = strings.TrimSuffix(config.DiskBakPath, "/")
+
+	return nil
+}
+
+func INIT(config *SDKConfig) (*SDK, error) {
+	// 加载并检查配置
+	sdk := &SDK{}
+	if config != nil {
+		sdk.sdkConfig = config
+	} else if err := sdk.varinit(); err != nil { // 可以读goframe的配置
+		return nil, err
+	}
+	if err := sdk.checkConfig(); err != nil {
+		return nil, err
+	}
+	gamelogClient = g.Client()
+
+	// 初始化队列
+	sdk.shutdown = make(chan struct{})
+	sdk.bufferChan = make(chan GameLog, 1000)
+	sdk.buffer = make([]GameLog, 0, 100)
+	// 加载失败日志
+	failLogs, err := sdk.loadFailLogs4disk()
+	if err != nil {
+		g.Log().Errorf(ctx, "[GameLog]load fail logs error: %v", err)
+	} else if len(failLogs) > 0 {
+		sdk.buffer = append(sdk.buffer, failLogs...)
+	}
+
+	// 开启协程进行日志发送
+	sdk.wg = sync.WaitGroup{}
+	sdk.wg.Add(1)
+	go func() {
+		defer sdk.wg.Done()
+		ticker := time.NewTicker(time.Duration(sdk.sdkConfig.FlushInterval) * time.Second)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-sdk.shutdown:
+				// 关闭时, 上传一次并备份失败数据
+				g.Log().Infof(ctx, "[GameLog]begin shutdown and flush last")
+				sdk.flush()
+				return
+			case log := <-sdk.bufferChan:
+				sdk.buffer = append(sdk.buffer, log)
+			case <-ticker.C:
+				sdk.flush()
+
+			}
+		}
+	}()
+	return sdk, nil
+}
+
+// 从磁盘加载失败日志
+func (sdk *SDK) loadFailLogs4disk() (logs []GameLog, err error) {
+	if !gfile.Exists(sdk.sdkConfig.DiskBakPath) {
+		return
+	}
+	// 遍历diskBakPath下所有failBufferxxx.bak.log文件， 读取到log中
+	files, err := gfile.ScanDir(sdk.sdkConfig.DiskBakPath, "failBuffer*.bak.log")
+	logs = []GameLog{}
+	if err != nil {
+		return
+	}
+	// 读取每个备份文件
+	for _, fp := range files {
+		// 每一行都是一次失败的记录
+		gfile.ReadLines(fp, func(line string) error {
+			_logs := []GameLog{}
+			err := json.Unmarshal([]byte(line), &_logs)
+			if err != nil {
+				return err
+			}
+			// 合并到总日志列表
+			logs = append(logs, _logs...)
+			return nil
+		})
+		g.Log().Infof(ctx, "[GameLog]load %d faillogs from %s", len(logs), fp)
+		gfile.Remove(fp)
+	}
+	return
+
+}
+
+// 备份失败日志追加到磁盘
+func (sdk *SDK) bakFailLogs2disk(failLogs []GameLog) {
+	bakPath := fmt.Sprintf("%s/failBuffer%s.bak.log", sdk.sdkConfig.DiskBakPath, gtime.Now().Format("YmdH"))
+	content, err := json.Marshal(failLogs)
+	if err != nil {
+		g.Log().Errorf(ctx, "[GameLog]marshal fail logs error: %v", err)
+		return
+	}
+	gfile.PutContentsAppend(bakPath, string(content)+"\n")
+	g.Log().Infof(ctx, "[GameLog]backup fail buffer to %s", bakPath)
+}
+
+// 优雅关闭
+func (sdk *SDK) Shutdown() {
+	close(sdk.shutdown)
+	sdk.wg.Wait()
+}
+
+// 日志时间格式
+const datetimeFmt = time.DateOnly + " " + time.TimeOnly
+
+// 记录日志
+func (sdk *SDK) Log(uid, event string, property map[string]any, timezone string, customEventTime ...time.Time) {
+	loc := time.Local
+	if _loc := getLocationMapValue(timezone); _loc != nil {
+		loc = _loc
+	}
+	if len(property) == 0 {
+		property = map[string]any{"ts": gtime.Now().Timestamp()}
+	}
+	var et *gtime.Time
+	if len(customEventTime) > 0 {
+		et = gtime.NewFromTime(customEventTime[0])
+	} else {
+		et = gtime.Now()
+	}
+	log := GameLog{
+		Uid:          uid,
+		Event:        event,
+		Property:     property,
+		EventTimems:  et.TimestampMilli(),
+		EventTimeLoc: et.In(loc).Format(datetimeFmt),
+	}
+	// 线程安全
+	sdk.bufferChan <- log
+}
+
+// 按服务器时区记录日志
+func (sdk *SDK) LogLtz(uid, event string, property map[string]any, customEventTime ...time.Time) {
+	sdk.Log(uid, event, property, time.Local.String(), customEventTime...)
+}
+
+// 用户属性初始化
+func (sdk *SDK) Uinit(uid string, property map[string]any, timezone string, customEventTime ...time.Time) {
+	sdk.Log(uid, "u_init", property, timezone, customEventTime...)
+}
+func (sdk *SDK) UinitLtz(uid string, property map[string]any, customEventTime ...time.Time) {
+	sdk.Uinit(uid, property, time.Local.String(), customEventTime...)
+}
+
+// 用户属性设置
+func (sdk *SDK) Uset(uid string, property map[string]any, timezone string, customEventTime ...time.Time) {
+	sdk.Log(uid, "u_set", property, timezone, customEventTime...)
+}
+func (sdk *SDK) UsetLtz(uid string, property map[string]any, customEventTime ...time.Time) {
+	sdk.Uset(uid, property, time.Local.String(), customEventTime...)
+}
+
+// 用户属性删除
+func (sdk *SDK) Uunset(uid string, property map[string]any, timezone string, customEventTime ...time.Time) {
+	sdk.Log(uid, "u_unset", property, timezone, customEventTime...)
+}
+func (sdk *SDK) UunsetLtz(uid string, property map[string]any, customEventTime ...time.Time) {
+	sdk.Uunset(uid, property, time.Local.String(), customEventTime...)
+}
+
+// 用户属性自增/减
+func (sdk *SDK) Uinc(uid string, property map[string]any, timezone string, customEventTime ...time.Time) {
+	sdk.Log(uid, "u_inc", property, timezone, customEventTime...)
+}
+func (sdk *SDK) UincLtz(uid string, property map[string]any, customEventTime ...time.Time) {
+	sdk.Uinc(uid, property, time.Local.String(), customEventTime...)
+}
+
+// 这个方法只会在内部协程调用
+func (sdk *SDK) flush() {
+	sdk.mu.Lock()
+	defer sdk.mu.Unlock()
+	if len(sdk.buffer) == 0 {
+		return
+	}
+
+	batch := make([]GameLog, len(sdk.buffer))
+	copy(batch, sdk.buffer)
+	sdk.buffer = sdk.buffer[:0]
+
+	// 第N次的时候加载失败数据进行尝试
+	if sdk.sdkConfig.reportN != 0 && sdk.sdkConfig.reportN%sdk.sdkConfig.RetryN == 0 {
+		faillogs, err := sdk.loadFailLogs4disk()
+		if err != nil {
+			g.Log().Errorf(ctx, "[GameLog]load fail logs error: %v", err)
+		}
+		// 如果有失败日志则加入到批量数组中
+		if len(faillogs) > 0 {
+			batch = append(batch, faillogs...)
+		}
+	}
+	sdk.send(batch)
+}
+
+// 发送消息
+func (sdk *SDK) send(logs []GameLog) {
+	waitSecond := time.Duration(sdk.sdkConfig.FlushInterval/4) * time.Second
+	timeoutCtx, cancel := context.WithTimeout(context.Background(), waitSecond)
+	defer cancel()
+	data := make([][]any, 0, len(logs))
+	// logs 拆分成二维数组
+	for _, log := range logs {
+		propertyJson, err := json.Marshal(log.Property)
+		if err != nil {
+			g.Log().Errorf(ctx, "[GameLog]skip log parse, marshal property error: %v", err)
+			continue
+		}
+		data = append(data, []any{
+			log.Uid,
+			log.Event,
+			string(propertyJson),
+			log.EventTimems,
+			log.EventTimeLoc,
+		})
+	}
+	// json化
+	sbody := sendBody{
+		Pid:  sdk.sdkConfig.Pid,
+		Data: data,
+	}
+	jsonBody, err := json.Marshal(sbody)
+	if err != nil {
+		g.Log().Errorf(ctx, "[GameLog]marshal send body error: %v", err)
+		return
+	}
+
+	// giz压缩
+	gzBody := bytes.NewBuffer([]byte{})
+	gz := gzip.NewWriter(gzBody)
+	gz.Write(jsonBody)
+	gz.Close()
+
+	// XOR 加密
+	xorBody := bytesXOR(gzBody.Bytes(), []byte(sdk.sdkConfig.ReportSk))
+
+	sdk.sdkConfig.reportN += 1
+	res, err := gamelogClient.Post(timeoutCtx, sdk.sdkConfig.BaseUrl+"/report/event", xorBody)
+	// 失败重新加入缓冲区
+	if err != nil {
+		sdk.bakFailLogs2disk(logs)
+		g.Log().Warningf(ctx, "[GameLog]send log error, bak to fail buffer(%d): %v", len(logs), err)
+		return
+	}
+	defer func() {
+		cerr := res.Close()
+		if cerr != nil {
+			g.Log().Errorf(ctx, "[GameLog]close response error: %v", cerr)
+		}
+	}()
+	httpcode := res.StatusCode
+	resBody := res.ReadAllString()
+	// 收集器拦截, 重新加入缓冲区
+	if httpcode != http.StatusOK {
+		sdk.bakFailLogs2disk(logs)
+		g.Log().Warningf(ctx, "[GameLog]send log error, bak to fail buffer(%d): %v", len(logs), resBody)
+	}
+}
+
+// 混淆
+func bytesXOR(data []byte, key []byte) []byte {
+	obfuscated := make([]byte, len(data))
+	keyLen := len(key)
+	if keyLen == 0 {
+		return data
+	}
+
+	for i := range data {
+		obfuscated[i] = data[i] ^ key[i%keyLen]
+	}
+	return obfuscated
+
+	// // 使用示例
+	// key := []byte{0x12, 0x34, 0x56, 0x78}
+	// obfuscated := multiXorObfuscate(original, key)
+	// deobfuscated := multiXorObfuscate(obfuscated, key) // 解密
+}

package/gamelog/test/gamelog_test.go

@@ -0,0 +1,52 @@
+package test
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/ayflying/utility_go/package/gamelog"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/grand"
+	"github.com/google/uuid"
+)
+
+func TestGamelog(t *testing.T) {
+	glsdk, err := gamelog.INIT(&gamelog.SDKConfig{
+		// 必填
+		Pid:     "test5",                     // 项目ID
+		BaseUrl: "http://47.76.178.47:10101", // 香港测试服上报地址
+		// BaseUrl:       "http://127.0.0.1:10101", // 本次测试上报地址
+		ReportSk:      "sngame2025", // xor混淆key
+		FlushInterval: 5,            // 上报间隔
+		DiskBakPath:   "gamelog",    // 本地磁盘备份, 用于意外情况下临时保存日志, 请确保该目录持久化(容器内要挂载). 每次启动时或每N次上报时加载到失败队列
+		// 可填
+		RetryN:   2,   // 默认每10次, 上传检查一次磁盘的失败数据
+		ChanSize: 500, // 默认1000, 信道size
+	})
+
+	// 随机测试事件和属性
+	events := []string{"e1", "e2", "e3", "e4"}
+	pms := []map[string]any{
+		{"a": "1"},
+		{"a": "2"},
+		{"a": "3"},
+		{"a": "4"},
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	gtest.C(t, func(t *gtest.T) {
+		go func() {
+			for {
+				uuidval, _ := uuid.NewUUID()
+				randUid := strings.ReplaceAll(uuidval.String(), "-", "")
+				glsdk.LogLtz(randUid, events[grand.Intn(len(events))], pms[grand.Intn(len(pms))])
+				time.Sleep(time.Millisecond * 100)
+			}
+		}()
+		time.Sleep(time.Second * 14)
+		// 模拟等待信号后优雅关闭
+		glsdk.Shutdown()
+	})
+}

package/pay/chongchong/chongchong.go

@@ -0,0 +1,32 @@
+package chongchong
+
+import (
+	"fmt"
+	"github.com/ayflying/utility_go/package/pay/common"
+	"github.com/gogf/gf/v2/crypto/gmd5"
+)
+
+//验单
+func (p *Pay) Verify(req *CallbackData, sign string) (isOk bool, err error) {
+	//req := g.RequestFromCtx(ctx).Request
+	//data, err := common.ParseNotifyToBodyMap(req)
+
+	var data = map[string]interface{}{
+		"orderPrice":           req.OrderPrice,
+		"packageId":            req.PackageId,
+		"partnerTransactionNo": req.PartnerTransactionNo,
+		"productId":            req.ProductId,
+		"statusCode":           req.StatusCode,
+		"transactionNo":        req.TransactionNo,
+	}
+
+	dataStr, err := common.BuildSignStr(data)
+
+	var SingStr = fmt.Sprintf("%v&%v", dataStr, p.ApiKey)
+	sign2, err := gmd5.EncryptString(SingStr)
+
+	if sign == sign2 {
+		isOk = true
+	}
+	return
+}

package/pay/chongchong/model.go

@@ -0,0 +1,25 @@
+package chongchong
+
+type Pay struct {
+	ApiKey string `json:"api_key"`
+}
+
+func New(pay *Pay) *Pay {
+	return &Pay{
+		ApiKey: pay.ApiKey,
+	}
+}
+
+// CallbackData 用于处理回调数据的结构体
+type CallbackData struct {
+	TransactionNo        string  `json:"transactionNo" dc:"平台交易单号，唯一标识一笔交易"`
+	PartnerTransactionNo string  `json:"partnerTransactionNo" dc:"合作方交易单号，由合作方生成"`
+	StatusCode           string  `json:"statusCode" dc:"交易状态码，SUCCESS表示成功，FAIL表示失败"`
+	ProductId            int     `json:"productId" dc:"产品ID，对应后台配置的商品"`
+	OrderPrice           float64 `json:"orderPrice" dc:"订单金额，单位为元"`
+	PackageId            int     `json:"packageId" dc:"套餐ID，可选字段，部分商品有套餐区分"`
+	ProductName          string  `json:"productName" dc:"产品名称，展示用"`
+	ExtParam             string  `json:"extParam" dc:"扩展参数，回调时原样返回"`
+	UserId               int     `json:"userId" dc:"用户ID，标识购买者"`
+	Sign                 string  `json:"sign" dc:"签名，用于验证请求合法性"`
+}

package/pay/common/func.go

@@ -0,0 +1,105 @@
+package common
+
+import (
+	"errors"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+	"net/http"
+	"sort"
+	"strings"
+)
+
+// FormatPublicKey 将原始公钥字符串格式化为标准PEM格式的公钥
+// 功能：为原始公钥添加PEM头部和尾部，并按64字符长度拆分换行，符合PKCS#8标准格式要求
+// 参数 publicKey: 原始未格式化的公钥字符串（通常为Base64编码且无换行）
+// 返回值: 格式化后的PEM格式公钥字符串
+func FormatPublicKey(publicKey string) (pKey string) {
+	var buffer strings.Builder
+	// 写入PEM格式头部
+	buffer.WriteString("-----BEGIN PUBLIC KEY-----\n")
+
+	// 定义每行公钥的标准长度（PEM格式要求64字符/行）
+	rawLen := 64
+	keyLen := len(publicKey)
+	// 计算需要拆分的总行数（向上取整）
+	raws := keyLen / rawLen
+	temp := keyLen % rawLen
+	if temp > 0 {
+		raws++ // 若有余数则增加一行
+	}
+
+	// 按行拆分并写入公钥内容
+	start := 0
+	end := start + rawLen
+	for i := 0; i < raws; i++ {
+		if i == raws-1 {
+			// 最后一行取剩余所有字符（处理不足64字符的情况）
+			buffer.WriteString(publicKey[start:])
+		} else {
+			// 非最后行取固定64字符
+			buffer.WriteString(publicKey[start:end])
+		}
+		buffer.WriteByte('\n') // 每行结束添加换行符
+		start += rawLen
+		end = start + rawLen
+	}
+
+	// 写入PEM格式尾部
+	buffer.WriteString("-----END PUBLIC KEY-----\n")
+	pKey = buffer.String()
+	return
+}
+
+// ParseNotifyToBodyMap 将HTTP请求中的表单数据解析为键值对映射
+// 功能：解析请求表单数据，提取单值字段并转换为map[string]interface{}格式
+// 参数 req: 包含表单数据的HTTP请求对象
+// 返回值: 解析后的键值对映射(bm)和可能的错误(err)
+func ParseNotifyToBodyMap(req *http.Request) (bm map[string]interface{}, err error) {
+	// 解析请求表单数据，若失败则返回错误
+	if err = req.ParseForm(); err != nil {
+		return nil, err
+	}
+	// 获取解析后的表单数据（key为字段名，value为字符串切片形式的字段值）
+	var form map[string][]string = req.Form
+	// 初始化结果映射，预分配容量（表单字段数+1，预留扩展空间）
+	bm = make(map[string]interface{}, len(form)+1)
+	// 遍历表单字段，仅保留单值字段（忽略多值字段）
+	for k, v := range form {
+		if len(v) == 1 {
+			bm[k] = v[0]
+		}
+	}
+	return
+}
+
+// BuildSignStr 根据传入的g.Map构建签名字符串
+// 规则：对所有非空值的键进行字母排序后，按"key=value&"格式拼接，最后去除末尾的"&"
+// 参数 bm: 包含键值对的g.Map
+// 返回值: 构建好的签名字符串和可能的错误
+func BuildSignStr(bm g.Map) (string, error) {
+	var (
+		buf     strings.Builder
+		keyList []string
+	)
+	// 收集所有键名
+	for k := range bm {
+		keyList = append(keyList, k)
+	}
+	// 对键名进行字母排序
+	sort.Strings(keyList)
+	// 遍历排序后的键，拼接非空值的键值对
+	for _, k := range keyList {
+		if v := bm[k]; v != "" {
+			buf.WriteString(k)
+			buf.WriteByte('=')
+			buf.WriteString(gconv.String(v))
+			buf.WriteByte('&')
+			// 去除末尾多余的'&'字符
+			// 检查是否有有效的键值对被拼接
+		}
+	}
+	if buf.Len() <= 0 {
+		return "", errors.New("length is error")
+	}
+	return buf.String()[:buf.Len()-1], nil
+}

package/pay/google.go

@@ -2,12 +2,12 @@ package pay
 
 import (
 	"context"
+	"github.com/ayflying/utility_go/package/pay/playstore"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"google.golang.org/api/androidpublisher/v3"
-	"new-gitlab.adesk.com/public_project/utility_go/package/pay/playstore"
 )
 
 var (

package/pay/honor/const.go

@@ -0,0 +1,6 @@
+package honor
+
+const (
+	Host      = "https://iap-api-drcn.cloud.honor.com"
+	TokenHost = "https://hnoauth-login-drcn.cloud.honor.com"
+)

package/pay/honor/honor.go

@@ -0,0 +1,101 @@
+package honor
+
+import (
+	"context"
+	"crypto"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/pem"
+	"errors"
+	"time"
+
+	"github.com/ayflying/utility_go/package/pay/common"
+	"github.com/ayflying/utility_go/pkg"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+type Pay struct {
+	PubKey       string `json:"pubKey"`
+	AppId        string `json:"appId"`
+	ClientSecret string `json:"client_secret"`
+}
+
+func New(pay *Pay) *Pay {
+	return pay
+}
+
+func (p *Pay) GetToken(ctx context.Context) (accessToken string, err error) {
+	type TokenResp struct {
+		AccessToken string `json:"access_token"`
+		ExpiresIn   int    `json:"expires_in"`
+		TokenType   string `json:"token_type"`
+	}
+
+	get, err := pkg.Cache("redis", "cache").GetOrSetFunc(ctx, "pay:honor:Sign:token", func(ctx context.Context) (value interface{}, err error) {
+
+		url := TokenHost + "/oauth2/v3/token"
+		get, err := g.Client().Post(ctx, url, g.Map{
+			"client_id":     p.AppId,
+			"client_secret": p.ClientSecret,
+			"grant_type":    "client_credentials",
+		})
+
+		//var res *TokenResp
+		//gjson.DecodeTo(get, &res)
+		value = get.ReadAllString()
+		return
+	}, time.Hour)
+
+	var res *TokenResp
+	err = get.Scan(&res)
+	accessToken = res.AccessToken
+
+	return
+}
+
+// VerifyRSASignature 验证RSA数字签名
+// data: 原始数据字节
+// sign: 签名的Base64编码字符串
+// pubKey: PEM格式的公钥字符串
+// 返回验证结果和可能的错误
+func (p *Pay) VerifyRSASignature(ctx context.Context, data []byte, signature string) (bool, error) {
+	//req := g.RequestFromCtx(ctx).Request
+	//post, err := common.ParseNotifyToBodyMap(req)
+	//var data = gjson.MustEncode(post)
+
+	// 解码Base64格式的签名
+	signBytes, err := base64.StdEncoding.DecodeString(signature)
+	if err != nil {
+		return false, errors.New("签名解码失败: " + err.Error())
+	}
+
+	pubkey := common.FormatPublicKey(p.PubKey)
+	// 解析PEM格式的公钥
+	block, _ := pem.Decode([]byte(pubkey))
+	if block == nil {
+		return false, errors.New("无效的PEM格式公钥")
+	}
+
+	// 解析公钥
+	publicKey, err := x509.ParsePKIXPublicKey(block.Bytes)
+	if err != nil {
+		return false, errors.New("公钥解析失败: " + err.Error())
+	}
+
+	// 类型断言为公钥
+	rsaPubKey, ok := publicKey.(*rsa.PublicKey)
+	if !ok {
+		return false, errors.New("不是有效的RSA公钥")
+	}
+
+	// 计算数据的SHA-256哈希
+	hasher := sha256.New()
+	hasher.Write(data)
+	hash := hasher.Sum(nil)
+
+	// 验证签名
+	err = rsa.VerifyPKCS1v15(rsaPubKey, crypto.SHA256, hash, signBytes)
+	return err == nil, err
+}

package/pay/honor/model.go

@@ -0,0 +1,45 @@
+package honor
+
+type PayCallbackHeader struct {
+	Charset   string `json:"charset" dc:"字符集，当前只支持utf-8。"`
+	SignType  string `json:"signType" dc:"签名算法类型, 当前只支持RSA"`
+	Sign      string `json:"sign" dc:"notificationMessage的签名，已废弃，请用signature。"`
+	Signature string `json:"signature" dc:"对data的签名。"`
+	AppId     string `json:"appId" dc:"应用ID"`
+}
+
+type PayCallback struct {
+	Env       string          `json:"env" dc:"发送通知的环境，sandbox为沙盒测试环境，非sandbox为正式环境"`
+	EventType string          `json:"eventType" dc:"事件类型，如付款成功、退款失败等"`
+	EventCode int             `json:"eventCode" dc:"事件类型对应的code值"`
+	Version   string          `json:"version" dc:"iap版本"`
+	EventTime string          `json:"eventTime" dc:"通知时间"`
+	Data      PayCallbackData `json:"data" dc:"通知内容notificationMessage的json字符串"`
+}
+
+type PayCallbackData struct {
+	AppId            string `json:"appId"        dc:"应用ID"`
+	OrderId          string `json:"orderId"      dc:"订单ID"`
+	BizOrderNo       string `json:"bizOrderNo,omitempty" dc:"max-length:64#业务订单号"`
+	ProductType      int    `json:"productType"  dc:"商品类型0：消耗型，1：非消耗型，2：订阅型"`
+	ProductId        string `json:"productId"    dc:"商品ID"`
+	ProductName      string `json:"productName"  dc:"商品名称"`
+	PurchaseTime     int64  `json:"purchaseTime" dc:"购买时间UTC时间戳(毫秒)"`
+	PurchaseState    int    `json:"purchaseState" dc:"订单状态  0:已购买 1:已退款 2:付款失败 3:退款失败 4:未支付 5:退款中"`
+	ConsumptionState int    `json:"consumptionState" dc:"消耗状态  0:未消耗 1:已消耗"`
+	PurchaseToken    string `json:"purchaseToken" dc:"购买令牌"`
+	Currency         string `json:"currency"     dc:"币种"`
+	Price            string `json:"price"        dc:"商品价格"`
+	PayMoney         string `json:"payMoney"     dc:"实际支付金额"`
+	DeveloperPayload string `json:"developerPayload,omitempty" dc:"max-length:1024#商户信息"`
+	OriOrder         string `json:"oriOrder"     dc:"原订单信息"`
+	SandboxFlag      int    `json:"sandboxFlag"  dc:"沙盒标识"`
+	AgreementNo      string `json:"agreementNo,omitempty" dc:"订阅合约号"`
+	ExecuteTime      string `json:"executeTime,omitempty" dc:"下次扣费时间(订阅)"`
+	SecondChargeTime int64  `json:"secondChargeTime,omitempty" dc:"第二次扣费时间(订阅升级)"`
+	OldProductId     string `json:"oldProductId,omitempty" dc:"老商品ID(订阅升级)"`
+	SubStartTime     string `json:"subStartTime,omitempty" dc:"订阅开始时间"`
+	SubEndTime       string `json:"subEndTime,omitempty" dc:"订阅结束时间"`
+	OriginalPrice    string `json:"originalPrice"  dc:"原始价格"`
+	CancelTime       string `json:"cancelTime,omitempty" dc:"订阅取消时间"`
+}

package/pay/honor/notification.go

@@ -0,0 +1,74 @@
+package honor
+
+import (
+	"errors"
+
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/util/grand"
+
+	"net/http"
+)
+
+type Response struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		PurchaseProductInfo string `json:"purchaseProductInfo"`
+		DataSig             string `json:"dataSig"`
+		SigAlgorithm        string `json:"sigAlgorithm"`
+	} `json:"data"`
+}
+
+//// 响应结果结构体
+//type Response struct {
+//	Code    int          `json:"code"`    // 结果码 0: 成功，其他: 失败
+//	Message string       `json:"message"` // 错误信息
+//	Data    *DataContent `json:"data"`    // 包含购买信息的结构体
+//}
+//
+//// 数据内容结构体，对应data字段
+//type DataContent struct {
+//	PurchaseProductInfo string `json:"purchaseProductInfo"` // 消耗结果数据的JSON字符串
+//	DataSig             string `json:"dataSig"`             // purchaseProductInfo的签名
+//	SigAlgorithm        string `json:"sigAlgorithm"`        // 签名算法，云侧加密算法为"RSA"
+//}
+
+func (p *Pay) Notification(r *http.Request) {
+
+}
+
+// ConsumeProduct 商品消耗
+func (p *Pay) ConsumeProduct(purchaseToken string) (err error) {
+	url := Host + "/iap/server/consumeProduct"
+	//获取token
+	token, err := p.GetToken(gctx.New())
+	if err != nil {
+		return
+	}
+	var header = g.MapStrStr{
+		"access-token":  token,
+		"x-iap-appid":   p.AppId,
+		"purchaseToken": purchaseToken,
+	}
+	var params = g.Map{
+		"purchaseToken":      purchaseToken,
+		"developerChallenge": grand.S(16),
+	}
+
+	get := g.Client().ContentJson().Header(header).PostContent(gctx.New(), url, params)
+	g.Log().Debugf(gctx.New(), "商品消耗请求发送:url=%v, header=%v, params=%v", url, header, params)
+	g.Log().Debugf(gctx.New(), "商品消耗请求收到回复: %s", get)
+	var res *Response
+	err = gjson.DecodeTo(get, &res)
+	if err != nil {
+		return
+	}
+	if res.Code != 0 {
+		g.Log().Error(gctx.New(), "商品消耗失败: "+res.Message)
+		return errors.New(res.Message)
+	}
+
+	return
+}

package/pay/huawei/consts.go

@@ -0,0 +1,25 @@
+package huawei
+
+import (
+	"net/http"
+	"time"
+)
+
+const (
+	TokenUrl = "https://oauth-login.cloud.huawei.com/oauth2/v3/token"
+)
+
+func getOrderUrl(accountFlag int) string {
+	if accountFlag == 1 {
+		// site for telecom carrier
+		//return "https://orders-at-dre.iap.dbankcloud.com"
+		return "https://orders-drcn.iap.cloud.huawei.com.cn"
+	} else {
+		// TODO: replace the (ip:port) to the real one
+		return "http://exampleserver/_mockserver_"
+	}
+
+}
+
+// default http client with 5 seconds timeout
+var RequestHttpClient = http.Client{Timeout: time.Second * 5}

package/pay/huawei/huawei.go

@@ -0,0 +1,166 @@
+package huawei
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"io"
+	"log"
+	"net/http"
+	"net/url"
+)
+
+type Pay struct {
+	ClientSecret string `json:"client_secret"`
+	ClientId     string `json:"client_id"`
+	//TokenUrl             string `json:"token_url"`
+	ApplicationPublicKey string `json:"application_public_key"`
+}
+
+func New(cfg *Pay) *Pay {
+	return cfg
+}
+
+// ConfirmPurchase 发货后确认购买接口（华为支付）消耗商品
+// 功能：通知华为支付平台当前订单已完成发货，触发支付完成流程（需在商品实际发货后调用）
+// 参数说明：
+//   purchaseToken: 华为支付返回的购买令牌（唯一标识一笔具体的购买交易，由客户端支付成功后返回）
+//   productId: 应用内商品的唯一标识（需与客户端发起支付时使用的productId一致）
+//   accountFlag: 账户标识（用于区分不同账户体系/环境，如0-普通用户、1-企业用户，具体值由业务定义）
+func (p *Pay) ConfirmPurchase(purchaseToken, productId string, accountFlag int) {
+	// 构造请求体参数（包含购买令牌和产品ID）
+	bodyMap := map[string]string{
+		"purchaseToken": purchaseToken, // 华为支付返回的购买凭证
+		"productId":     productId,     // 对应应用内商品的唯一标识
+	}
+	url := getOrderUrl(accountFlag) + "/applications/v2/purchases/confirm"
+	bodyBytes, err := p.SendRequest(url, bodyMap)
+	if err != nil {
+		// 请求失败时记录错误日志（实际业务中建议增加重试或异常处理逻辑）
+		log.Printf("err is %s", err)
+	}
+	// 打印响应结果（实际业务中需替换为具体处理逻辑，如更新订单状态、校验响应数据等）
+	// TODO:  建议根据华为支付文档解析响应数据（如检查responseCode是否为0表示成功）
+	log.Printf("%s", bodyBytes)
+}
+
+// VerifyToken 验证回调订单
+//您可以调用本接口向华为应用内支付服务器校验支付结果中的购买令牌，确认支付结果的准确性。
+func (p *Pay) VerifyToken(purchaseToken, productId string, accountFlag int) (res *PurchaseTokenData, err error) {
+	bodyMap := map[string]string{"purchaseToken": purchaseToken, "productId": productId}
+	url := getOrderUrl(accountFlag) + "/applications/purchases/tokens/verify"
+	bodyBytes, err := p.SendRequest(url, bodyMap)
+	if err != nil {
+		g.Log().Error(gctx.New(), "err is %s", err)
+	}
+	var data *VerifyTokenRes
+	err = gjson.DecodeTo(bodyBytes, &data)
+	err = gjson.DecodeTo(data.PurchaseTokenData, &res)
+
+	return
+}
+
+func (p *Pay) SendRequest(url string, bodyMap map[string]string) (string, error) {
+	authHeaderString, err := p.BuildAuthorization()
+	if err != nil {
+		return "", err
+	}
+	bodyString, err := json.Marshal(bodyMap)
+	if err != nil {
+		return "", err
+	}
+
+	req, err := http.NewRequest("POST", url, bytes.NewReader(bodyString))
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("Content-Type", "application/json; charset=UTF-8")
+	req.Header.Set("Authorization", authHeaderString)
+	response, err := RequestHttpClient.Do(req)
+	defer response.Body.Close()
+	bodyBytes, err := io.ReadAll(response.Body)
+
+	//req, err := g.Client().Header(g.MapStrStr{
+	//	"Content-Type":  "application/json; charset=UTF-8",
+	//	"Authorization": authHeaderString,
+	//}).Post(gctx.New(), url, bodyString)
+	//defer req.Close()
+	//var bodyBytes = req.ReadAll()
+
+	if err != nil {
+		return "", err
+	}
+	return string(bodyBytes), nil
+}
+
+func (p *Pay) VerifyRsaSign(content string, sign string, publicKey string) error {
+	//publicKey = common.FormatPublicKey(publicKey)
+	publicKeyByte, err := base64.StdEncoding.DecodeString(publicKey)
+	if err != nil {
+		return err
+	}
+	pub, err := x509.ParsePKIXPublicKey(publicKeyByte)
+	if err != nil {
+		return err
+	}
+	hashed := sha256.Sum256([]byte(content))
+	signature, err := base64.StdEncoding.DecodeString(sign)
+	if err != nil {
+		return err
+	}
+	return rsa.VerifyPKCS1v15(pub.(*rsa.PublicKey), crypto.SHA256, hashed[:], signature)
+}
+
+func (p *Pay) GetAppAt() (string, error) {
+	//demoConfig := GetDefaultConfig()
+	urlValue := url.Values{
+		"grant_type":    {"client_credentials"},
+		"client_secret": {p.ClientSecret},
+		"client_id":     {p.ClientId},
+	}
+	resp, err := RequestHttpClient.PostForm(TokenUrl, urlValue)
+	defer resp.Body.Close()
+	bodyBytes, err := io.ReadAll(resp.Body)
+
+	//post := g.MapStrStr{
+	//	"grant_type":    "client_credentials",
+	//	"client_secret": p.ClientSecret,
+	//	"client_id":     p.ClientId,
+	//}
+	//resp, err := g.Client().PostForm(gctx.New(), p.TokenUrl, post)
+	//if err != nil {
+	//	return "", err
+	//}
+	//resp.Close()
+	//bodyBytes := resp.ReadAll()
+	if err != nil {
+		return "", err
+	}
+	var atResponse AtResponse
+	json.Unmarshal(bodyBytes, &atResponse)
+	if atResponse.AccessToken != "" {
+		return atResponse.AccessToken, nil
+	} else {
+		return "", errors.New("Get token fail, " + string(bodyBytes))
+	}
+}
+
+func (p *Pay) BuildAuthorization() (string, error) {
+	appAt, err := p.GetAppAt()
+	if err != nil {
+		return "", err
+	}
+	oriString := fmt.Sprintf("APPAT:%s", appAt)
+	var authString = base64.StdEncoding.EncodeToString([]byte(oriString))
+	var authHeaderString = fmt.Sprintf("Basic %s", authString)
+	return authHeaderString, nil
+}

package/pay/huawei/model.go

@@ -0,0 +1,82 @@
+package huawei
+
+type CallbackType struct {
+	Version           string             `json:"version"`
+	NotifyTime        int64              `json:"notifyTime"`
+	EventType         string             `json:"eventType"`
+	ApplicationId     string             `json:"applicationId"`
+	OrderNotification *OrderNotification `json:"orderNotification"`
+	SubNotification   *SubNotification   `json:"subNotification"`
+}
+
+type OrderNotification struct {
+	Version          string `json:"version" dc:"通知版本：v2"`
+	NotificationType int    `json:"notificationType" dc:"通知事件的类型，取值如下：1：支付成功 2：退款成功"`
+	PurchaseToken    string `json:"purchaseToken" dc:"待下发商品的购买Token"`
+	ProductId        string `json:"productId" dc:"商品ID"`
+}
+
+type SubNotification struct {
+	StatusUpdateNotification *StatusUpdateNotification `json:"statusUpdateNotification" dc:"通知消息"`
+	NotificationSignature    string                    `json:"notificationSignature" dc:"对statusUpdateNotification字段的签名字符串，签名算法为signatureAlgorithm表示的签名算法。"`
+	Version                  string                    `json:"version" dc:"通知版本：v2"`
+	SignatureAlgorithm       string                    `json:"signatureAlgorithm" dc:"签名算法。"`
+}
+
+// StatusUpdateNotification 订阅状态更新通知
+type StatusUpdateNotification struct {
+	Environment                       string `json:"environment" dc:"发送通知的环境。PROD：正式环境；Sandbox：沙盒测试"`
+	NotificationType                  int    `json:"notificationType" dc:"通知事件的类型，具体定义需参考相关文档说明"`
+	SubscriptionID                    string `json:"subscriptionId" dc:"订阅ID"`
+	CancellationDate                  int64  `json:"cancellationDate" dc:"撤销订阅时间或退款时间，UTC时间戳，以毫秒为单位，仅在notificationType取值为CANCEL的场景下会传入"`
+	OrderID                           string `json:"orderId" dc:"订单ID，唯一标识一笔需要收费的收据，由华为应用内支付服务器在创建订单以及订阅型商品续费时生成。每一笔新的收据都会使用不同的orderId。通知类型为NEW_RENEWAL_PREF时不存在"`
+	LatestReceipt                     string `json:"latestReceipt" dc:"最近的一笔收据的token，仅在notificationType取值为INITIAL_BUY 、RENEWAL或INTERACTIVE_RENEWAL并且续期成功情况下传入"`
+	LatestReceiptInfo                 string `json:"latestReceiptInfo" dc:"最近的一笔收据，JSON字符串格式，包含的参数请参见InappPurchaseDetails，在notificationType取值为CANCEL时无值"`
+	LatestReceiptInfoSignature        string `json:"latestReceiptInfoSignature" dc:"对latestReceiptInfo的签名字符串，签名算法为statusUpdateNotification中的signatureAlgorithm。服务器在收到签名字符串后，需要参见对返回结果验签使用IAP公钥对latestReceiptInfo的JSON字符串进行验签。公钥获取请参见查询支付服务信息"`
+	LatestExpiredReceipt              string `json:"latestExpiredReceipt" dc:"最近的一笔过期收据的token"`
+	LatestExpiredReceiptInfo          string `json:"latestExpiredReceiptInfo" dc:"最近的一笔过期收据，JSON字符串格式，在notificationType取值为RENEWAL或INTERACTIVE_RENEWAL时有值"`
+	LatestExpiredReceiptInfoSignature string `json:"latestExpiredReceiptInfoSignature" dc:"对latestExpiredReceiptInfo的签名字符串，签名算法为statusUpdateNotification中的signatureAlgorithm。服务器在收到签名字符串后，需要参见对返回结果验签使用IAP公钥对latestExpiredReceiptInfo的JSON字符串进行验签。公钥获取请参见查询支付服务信息"`
+	AutoRenewStatus                   int    `json:"autoRenewStatus" dc:"续期状态。取值说明：1：当前周期到期后正常续期；0：用户已终止续期"`
+	RefundPayOrderId                  string `json:"refundPayOrderId" dc:"退款交易号，在notificationType取值为CANCEL时有值"`
+	ProductID                         string `json:"productId" dc:"订阅型商品ID"`
+	ApplicationID                     string `json:"applicationId" dc:"应用ID"`
+	ExpirationIntent                  int    `json:"expirationIntent" dc:"超期原因，仅在notificationType为RENEWAL或INTERACTIVE_RENEWAL时并且续期失败情况下有值"`
+	PurchaseToken                     string `json:"purchaseToken" dc:"订阅token，与上述订阅ID字段subscriptionId对应。"`
+}
+
+type AtResponse struct {
+	AccessToken string `json:"access_token"`
+}
+
+type VerifyTokenRes struct {
+	ResponseCode       string `json:"responseCode"`
+	PurchaseTokenData  string `json:"purchaseTokenData"`
+	DataSignature      string `json:"dataSignature"`
+	SignatureAlgorithm string `json:"signatureAlgorithm"`
+}
+
+type PurchaseTokenData struct {
+	AutoRenewing        bool   `json:"autoRenewing" dc:"表示订阅是否自动续费"`
+	OrderId             string `json:"orderId" dc:"订单ID，唯一标识一笔订单"`
+	PackageName         string `json:"packageName" dc:"应用的包名"`
+	ApplicationId       int    `json:"applicationId" dc:"应用ID，以整数形式表示"`
+	ApplicationIdString string `json:"applicationIdString" dc:"应用ID的字符串形式"`
+	Kind                int    `json:"kind" dc:"购买类型的某种标识，具体含义可能取决于业务逻辑"`
+	ProductId           string `json:"productId" dc:"商品ID，用于标识购买的商品"`
+	ProductName         string `json:"productName" dc:"商品名称"`
+	PurchaseTime        int64  `json:"purchaseTime" dc:"购买时间，可能是某种特定格式的时间表示"`
+	PurchaseTimeMillis  int64  `json:"purchaseTimeMillis" dc:"购买时间，以毫秒为单位的时间戳"`
+	PurchaseState       int    `json:"purchaseState" dc:"购买状态，不同的整数值代表不同的状态，具体含义取决于业务逻辑"`
+	DeveloperPayload    string `json:"developerPayload" dc:"开发者自定义负载数据"`
+	PurchaseToken       string `json:"purchaseToken" dc:"购买令牌"`
+	ResponseCode        string `json:"responseCode" dc:"响应代码，用于表示购买操作的响应结果"`
+	ConsumptionState    int    `json:"consumptionState" dc:"消费状态，不同的整数值代表不同的消费状态，具体含义取决于业务逻辑"`
+	Confirmed           int    `json:"confirmed" dc:"确认状态，不同的整数值代表不同的确认情况，具体含义取决于业务逻辑"`
+	PurchaseType        int    `json:"purchaseType" dc:"购买类型，不同的整数值代表不同的购买类型，具体含义取决于业务逻辑"`
+	Currency            string `json:"currency" dc:"货币类型"`
+	Price               int    `json:"price" dc:"商品价格"`
+	Country             string `json:"country" dc:"购买所在国家"`
+	PayOrderId          string `json:"payOrderId" dc:"支付订单ID"`
+	PayType             string `json:"payType" dc:"支付类型"`
+	SdkChannel          string `json:"sdkChannel" dc:"SDK渠道"`
+}

package/pay/huawei/notification.go

@@ -0,0 +1,107 @@
+package huawei
+
+/*
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+//import "encoding/json"
+
+const (
+	INITIAL_BUY            = 0
+	CANCEL                 = 1
+	RENEWAL                = 2
+	INTERACTIVE_RENEWAL    = 3
+	NEW_RENEWAL_PREF       = 4
+	RENEWAL_STOPPED        = 5
+	RENEWAL_RESTORED       = 6
+	RENEWAL_RECURRING      = 7
+	ON_HOLD                = 9
+	PAUSED                 = 10
+	PAUSE_PLAN_CHANGED     = 11
+	PRICE_CHANGE_CONFIRMED = 12
+	DEFERRED               = 13
+)
+
+//type NotificationServer struct {
+//}
+//
+//var NotificationDemo = &NotificationServer{}
+
+//type NotificationRequest struct {
+//	StatusUpdateNotification string `json:"statusUpdateNotification"`
+//	NotificationSignature    string `json:"notifycationSignature"`
+//}
+
+//
+//type NotificationResponse struct {
+//	ErrorCode string `json:"errorCode"`
+//	ErrorMsg  string `json:"errorMsg"`
+//}
+
+//type StatusUpdateNotification struct {
+//	Environment                       string `json:"environment"`
+//	NotificationType                  int    `json:"notificationType"`
+//	SubscriptionID                    string `json:"subscriptionId"`
+//	CancellationDate                  int64  `json:"cancellationDate"`
+//	OrderID                           string `json:"orderId"`
+//	LatestReceipt                     string `json:"latestReceipt"`
+//	LatestReceiptInfo                 string `json:"latestReceiptInfo"`
+//	LatestReceiptInfoSignature        string `json:"latestReceiptInfoSignature"`
+//	LatestExpiredReceipt              string `json:"latestExpiredReceipt"`
+//	LatestExpiredReceiptInfo          string `json:"latestExpiredReceiptInfo"`
+//	LatestExpiredReceiptInfoSignature string `json:"latestExpiredReceiptInfoSignature"`
+//	AutoRenewStatus                   int    `json:"autoRenewStatus"`
+//	RefundPayOrderId                  string `json:"refundPayOrderId"`
+//	ProductID                         string `json:"productId"`
+//	ApplicationID                     string `json:"applicationId"`
+//	ExpirationIntent                  int    `json:"expirationIntent"`
+//}
+
+func (p *Pay) DealNotification(information string) (err error) {
+	//var request PayCallback
+	//err = json.Unmarshal([]byte(information), &request)
+	//if err != nil {
+	//	return
+	//}
+	//err = p.VerifyRsaSign(request.StatusUpdateNotification, request.NotificationSignature, DefaultConfig.ApplicationPublicKey)
+	//if err != nil {
+	//	return
+	//}
+	//
+	//var info = request.StatusUpdateNotification
+	////json.Unmarshal([]byte(request.StatusUpdateNotification), &info)
+	//switch notificationType := info.NotificationType; notificationType {
+	//case INITIAL_BUY:
+	//case CANCEL:
+	//case RENEWAL:
+	//case INTERACTIVE_RENEWAL:
+	//case NEW_RENEWAL_PREF:
+	//case RENEWAL_STOPPED:
+	//case RENEWAL_RESTORED:
+	//case RENEWAL_RECURRING:
+	//case ON_HOLD:
+	//case PAUSED:
+	//case PAUSE_PLAN_CHANGED:
+	//case PRICE_CHANGE_CONFIRMED:
+	//case DEFERRED:
+	//default:
+	//}
+	//
+	////response := NotificationResponse{ErrorCode: "0"}
+	////return &response, nil
+	//return
+	return
+}

package/pay/oppo/const.go

@@ -0,0 +1,9 @@
+package oppo
+
+const (
+	LoginUrl = "https://iopen.game.oppomobile.com/sdkopen/user/fileIdInfo?fileId=%s&token=%s"
+	LocationShanghai          = "Asia/Shanghai"
+
+	RSA                       = "RSA"
+	RSA2                      = "RSA2"
+)

package/pay/oppo/login.go

@@ -0,0 +1,97 @@
+package oppo
+
+import (
+	"context"
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/base64"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/grand"
+	"io"
+	"net/url"
+	"strings"
+)
+
+const host = "https://iopen.game.heytapmobi.com"
+
+// oppo参数类型
+type LoginType struct {
+	Token   string `json:"token"`
+	Ssoid   string `json:"ssoid"`
+	Channel int    `json:"channel"`
+	AdId    string `json:"adId"`
+}
+
+//登录回复
+type LoginResType struct {
+	ResultCode string `json:"resultCode" dc:"响应码，成功为 200"`
+	ResultMsg  string `json:"resultMsg" dc:"响应信息"`
+	LoginToken string `json:"loginToken" dc:"透传的token"`
+	Ssoid      string `json:"ssoid" dc:"透传的ssoid"`
+	//AppKey       string `json:"appKey" dc:"秘钥key,因隐私安全规范，该字段目前已不返回信息"`
+	UserName string `json:"userName" dc:"用户ssoid绑定的账户昵称"`
+	//Email        string `json:"email" dc:"因隐私安全规范，该字段目前已不返回信息"`
+	//MobileNumber string `json:"mobileNumber" dc:"因隐私安全规范，该字段目前已不返回信息"`
+	//CreateTime   string `json:"createTime" dc:"因隐私安全规范，该字段目前已不返回信息"`
+	UserStatus string `json:"userStatus" dc:"用户状态：NORMAL 表示正常"`
+}
+
+func (p *OppoType) FileIdInfo(ctx context.Context, oauthToken string, ssoid string) (res *LoginResType, err error) {
+	url := host + "/sdkopen/user/fileIdInfo"
+	header := p.GetHeader(oauthToken)
+	getHtml, err := g.Client().Header(header).Get(ctx, url, g.Map{
+		"token":  oauthToken,
+		"fileId": ssoid,
+	})
+	getRes := getHtml.ReadAllString()
+	gjson.DecodeTo(getRes, &res)
+	//g.Log().Debugf(ctx, "当前登陆请求的：%v", res)
+	return
+
+}
+
+func (p *OppoType) GenParam(oauthToken, oauthTimestamp, oauthNonce string) string {
+	// 注意：拼接的顺序不能有改变，不然会导致联运方验签失败
+	params := []string{
+		"oauthConsumerKey=" + url.QueryEscape(p.AppKey),
+		"oauthToken=" + url.QueryEscape(oauthToken),
+		"oauthSignatureMethod=" + url.QueryEscape("HMAC-SHA1"),
+		"oauthTimestamp=" + url.QueryEscape(oauthTimestamp),
+		"oauthNonce=" + url.QueryEscape(oauthNonce),
+		"oauthVersion=" + url.QueryEscape("1.0"),
+	}
+	return strings.Join(params, "&") + "&"
+}
+
+// 生成签名
+func (p *OppoType) GenOauthSignature(param string) string {
+	oauthSignatureKey := p.AppSecret + "&"
+	mac := hmac.New(sha1.New, []byte(oauthSignatureKey))
+	io.WriteString(mac, param)
+	signature := base64.StdEncoding.EncodeToString(mac.Sum(nil))
+	return url.QueryEscape(signature)
+}
+
+func (p *OppoType) GetHeader(oauthToken string) (headers map[string]string) {
+
+	// 没有做过 urlEncode 的 token，由游戏客户端调用 OPPO SDK 直接获取
+	//oauthToken := "TICKET_Ajnxxxxx"
+	oauthTimestamp := gtime.Now().TimestampStr()
+	oauthNonce := grand.S(5)
+
+	// 生成请求头参数和签名
+	param := p.GenParam(oauthToken, oauthTimestamp, oauthNonce)
+	oauthSignature := p.GenOauthSignature(param)
+
+	// 封装请求头
+	headers = map[string]string{
+		"param":          param,
+		"oauthSignature": oauthSignature,
+	}
+
+	//fmt.Println("游戏服务端登录鉴权请求头为：", headers)
+
+	return
+}

package/pay/oppo/model.go

@@ -0,0 +1,13 @@
+package oppo
+
+// OPPO支付回调参数结构体
+type PayCallback struct {
+	NotifyId     string `json:"notifyId" dc:"回调通知单号，以GC开头，必填，示例:GC20230314657000"`
+	PartnerOrder string `json:"partnerOrder" dc:"开发者订单号，必填，示例:123456"`
+	ProductName  string `json:"productName" dc:"商品名称，必填，示例:10元宝"`
+	ProductDesc  string `json:"productDesc" dc:"商品描述，必填，示例:10元宝等于1元"`
+	Price        int64  `json:"price" dc:"商品价格，单位为分，需要游戏服务端做验证，必填，示例:100"`
+	Count        int    `json:"count" dc:"商品数量（一般为1），必填，示例:1"`
+	Attach       string `json:"attach" dc:"请求支付时上传的附加参数，可能为空，选填"`
+	Sign         string `json:"sign" dc:"OPPO服务端签名，需要游戏服务端做验证，必填"`
+}

package/pay/oppo/notify.go

@@ -0,0 +1,32 @@
+package oppo
+
+import (
+	"net/http"
+	"net/url"
+)
+
+func (p *OppoType) ParseNotifyToBodyMap(req *http.Request) (bm map[string]interface{}, err error) {
+	if err = req.ParseForm(); err != nil {
+		return nil, err
+	}
+	var form map[string][]string = req.Form
+	bm = make(map[string]interface{}, len(form)+1)
+	for k, v := range form {
+		if len(v) == 1 {
+			bm[k] = v[0]
+			//bm.Set(k, v[0])
+		}
+	}
+	return
+}
+
+func (p *OppoType) ParseNotifyByURLValues(value url.Values) (bm map[string]interface{}, err error) {
+	bm = make(map[string]interface{}, len(value)+1)
+	for k, v := range value {
+		if len(v) == 1 {
+			bm[k] = v[0]
+			//bm.Set(k, v[0])
+		}
+	}
+	return
+}

package/pay/oppo/oppo.go

@@ -0,0 +1,40 @@
+package oppo
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// 跟充值平台通信的加密key
+//const PUBLIC_KEY = `dfsdfs`
+
+type OppoType struct {
+	AppId     string `json:"app_id"`
+	AppKey    string `json:"app_key"`
+	AppSecret string `json:"app_secret"`
+	PublicKey string `json:"public_key"`
+}
+
+func New(cfg *OppoType) *OppoType {
+
+	return &OppoType{
+		AppKey:    cfg.AppKey,
+		AppSecret: cfg.AppSecret,
+		PublicKey: cfg.PublicKey,
+	}
+}
+
+func (p *OppoType) Verify(ctx context.Context) (err error) {
+	// OPPO公钥. 在官方给的 demo 中. 无需修改,改了就验证不过
+	oppoPublicKey := "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmreYIkPwVovKR8rLHWlFVw7YDfm9uQOJKL89Smt6ypXGVdrAKKl0wNYc3/jecAoPi2ylChfa2iRu5gunJyNmpWZzlCNRIau55fxGW0XEu553IiprOZcaw5OuYGlf60ga8QT6qToP0/dpiL/ZbmNUO9kUhosIjEu22uFgR+5cYyQIDAQAB"
+	//oppoPublicKey := p.PublicKey
+	// 解析请求参数
+	bodyMap, err := p.ParseNotifyToBodyMap(g.RequestFromCtx(ctx).Request)
+	if err != nil {
+		// 解析失败, 处理错误逻辑
+		return
+	}
+
+	err = p.VerifySign(oppoPublicKey, bodyMap)
+	return
+}

package/pay/oppo/sign.go

@@ -0,0 +1,80 @@
+package oppo
+
+import (
+	"crypto"
+	"crypto/hmac"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"github.com/ayflying/utility_go/package/pay/common"
+	"github.com/gogf/gf/v2/util/gconv"
+	"hash"
+	"math/rand"
+	"net/url"
+	"time"
+)
+
+func (p *OppoType) GenLoginBaseStr(bm map[string]interface{}, appKey, appSecret string) (string, string) {
+	baseStr := fmt.Sprintf("oauthConsumerKey=%s&oauthToken=%s&oauthSignatureMethod=HMAC-SHA1&oauthTimestamp=%d&oauthNonce=%d&oauthVersion=1.0&",
+		appKey, url.QueryEscape(gconv.String(bm["token"])), time.Now().Unix(), rand.Int31n(100000000))
+
+	var h hash.Hash
+	h = hmac.New(sha1.New, []byte(appSecret+"&"))
+	h.Write([]byte(baseStr))
+
+	sign := url.QueryEscape(base64.StdEncoding.EncodeToString(h.Sum(nil)))
+	return baseStr, sign
+}
+
+func (p *OppoType) VerifySign(oppoPayPublicKey string, bm map[string]interface{}) (err error) {
+	if oppoPayPublicKey == "" || bm == nil {
+		return errors.New("oppoPayPublicKey or bm is nil")
+	}
+
+	bodySign := bm["sign"].(string)
+	bodySignType := RSA
+	signData := fmt.Sprintf("notifyId=%s&partnerOrder=%s&productName=%s&productDesc=%s&price=%s&count=%s&attach=%s",
+		bm["notifyId"], bm["partnerOrder"], bm["productName"],
+		bm["productDesc"], bm["price"], bm["count"], bm["attach"])
+	pKey := common.FormatPublicKey(oppoPayPublicKey)
+	if err = p.verifySign(signData, bodySign, bodySignType, pKey); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (p *OppoType) verifySign(signData, sign, signType, oppoPayPublicKey string) (err error) {
+	var (
+		h         hash.Hash
+		hashs     crypto.Hash
+		block     *pem.Block
+		pubKey    interface{}
+		publicKey *rsa.PublicKey
+		ok        bool
+	)
+	signBytes, _ := base64.StdEncoding.DecodeString(sign)
+	if block, _ = pem.Decode([]byte(oppoPayPublicKey)); block == nil {
+		return errors.New("OPPO公钥Decode错误")
+	}
+	if pubKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
+		return fmt.Errorf("x509.ParsePKIXPublicKey：%w", err)
+	}
+	if publicKey, ok = pubKey.(*rsa.PublicKey); !ok {
+		return errors.New("OPPO公钥转换错误")
+	}
+	switch signType {
+	case RSA:
+		hashs = crypto.SHA1
+	case RSA2:
+		hashs = crypto.SHA256
+	default:
+		hashs = crypto.SHA256
+	}
+	h = hashs.New()
+	h.Write([]byte(signData))
+	return rsa.VerifyPKCS1v15(publicKey, hashs, h.Sum(nil), signBytes)
+}

package/pay/taptap/sign.go

@@ -0,0 +1,103 @@
+package taptap
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"net/http"
+	"sort"
+	"strings"
+)
+
+type pTapTap struct {
+	Secret string `json:"secret" dc:"秘钥"`
+	//OrderId  string `json:"order_id" dc:"订单唯一 ID"`
+	ClientId string `json:"client_id" dc:"应用的 Client ID"`
+}
+
+func New(clientId string, secret string) *pTapTap {
+	return &pTapTap{
+		Secret:   secret,
+		ClientId: clientId,
+		//OrderId:  orderId,
+	}
+}
+
+// Sign signs the request.
+func (p *pTapTap) Sign(req *http.Request, secret string) (string, error) {
+	//获取请求参数
+	//req := g.RequestFromCtx(ctx).Request
+	return Sign(req, secret)
+}
+
+//func (p *pTapTap) SignOld(ctx context.Context, method, url string, token string, data any) (sign string, ts int64, nonce string, err error) {
+//	//secret := p.Secret
+//	//ts = gtime.Now().Unix()
+//	//nonce = grand.S(5)
+//	//header := http.Header{
+//	//	"Content-Type": {"Content-Type: application/json; charset=utf-8"},
+//	//	"X-Tap-Ts":     {strconv.FormatInt(ts, 10)},
+//	//	"X-Tap-Nonce":  {nonce},
+//	//}
+//	//if method == "POST" {
+//	//	header.Set("Content-Type", "application/json; charset=utf-8")
+//	//}
+//	////ctx := context.Background()
+//	//request := g.RequestFromCtx(ctx).Request
+//	//body, _ := json.Marshal(data)
+//	////req, err := http.NewRequestWithContext(ctx, method, url, strings.NewReader(string(body)))
+//	//req.Header = header
+//	//sign, err = Sign(req, secret)
+//	//if err != nil {
+//	//	panic(err)
+//	//}
+//	//req.Header.Set("X-Tap-Sign", sign)
+//	//return
+//}
+
+// Sign signs the request.
+func Sign(req *http.Request, secret string) (string, error) {
+	methodPart := req.Method
+	urlPathAndQueryPart := req.URL.RequestURI()
+	headersPart, err := getHeadersPart(req.Header)
+	if err != nil {
+		return "", err
+	}
+	bodyPart, err := io.ReadAll(req.Body)
+	if err != nil {
+		return "", err
+	}
+	signParts := methodPart + "\n" + urlPathAndQueryPart + "\n" + headersPart + "\n" + string(bodyPart) + "\n"
+	fmt.Println(signParts)
+	h := hmac.New(sha256.New, []byte(secret))
+	h.Write([]byte(signParts))
+	rawSign := h.Sum(nil)
+	sign := base64.StdEncoding.EncodeToString(rawSign)
+	return sign, nil
+}
+
+// getHeadersPart returns the headers part of the request.
+func getHeadersPart(header http.Header) (string, error) {
+	var headerKeys []string
+	for k, v := range header {
+		k = strings.ToLower(k)
+		if !strings.HasPrefix(k, "x-tap-") {
+			continue
+		}
+		if k == "x-tap-sign" {
+			continue
+		}
+		if len(v) > 1 {
+			return "", fmt.Errorf("invalid header, %q has multiple values", k)
+		}
+		headerKeys = append(headerKeys, k)
+	}
+	sort.Strings(headerKeys)
+	headers := make([]string, 0, len(headerKeys))
+	for _, k := range headerKeys {
+		headers = append(headers, fmt.Sprintf("%s:%s", k, header.Get(k)))
+	}
+	return strings.Join(headers, "\n"), nil
+}

package/pay/taptap/taptap.go

@@ -0,0 +1,129 @@
+package taptap
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/gclient"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/grand"
+	"io"
+	"net/http"
+)
+
+type GetPayData struct {
+	Data struct {
+		Order struct {
+			Order
+		} `json:"order"`
+	} `json:"data"`
+	Success bool `json:"success"`
+}
+
+type Order struct {
+	OrderID       string        `json:"order_id"`       // 订单唯一 ID
+	PurchaseToken string        `json:"purchase_token"` // 用于订单核销的 token
+	ClientID      string        `json:"client_id"`      // 应用的 Client ID
+	OpenID        string        `json:"open_id"`        // 用户的开放平台 ID
+	UserRegion    string        `json:"user_region"`    // 用户地区
+	GoodsOpenID   string        `json:"goods_open_id"`  // 商品唯一 ID
+	GoodsName     string        `json:"goods_name"`     // 商品名称
+	Status        PaymentStatus `json:"status"`         // 订单状态
+	Amount        string        `json:"amount"`         // 金额（本币金额 x 1,000,000）
+	Currency      string        `json:"currency"`       // 币种
+	CreateTime    string        `json:"create_time"`    // 创建时间
+	PayTime       string        `json:"pay_time"`       // 支付时间
+	Extra         string        `json:"extra"`          // 商户自定义数据，如角色信息等，长度不超过 255 UTF-8 字符
+}
+type PaymentStatus string
+
+const (
+	ChargePending   PaymentStatus = "charge.pending"   // 待支付
+	ChargeSucceeded PaymentStatus = "charge.succeeded" //支付成功
+	ChargeConfirmed PaymentStatus = "charge.confirmed" //已核销
+	ChargeOverdue   PaymentStatus = "charge.overdue"   //支付超时关闭
+	RefundPending   PaymentStatus = "refund.pending"   //退款中
+	RefundSucceeded PaymentStatus = "refund.succeeded" //退款成功
+	RefundFailed    PaymentStatus = "refund.failed"    //退款失败
+	RefundRejected  PaymentStatus = "refund.rejected"  //退款被拒绝
+)
+
+// 查询订单信息
+func (p *pTapTap) Info(ctx context.Context, order string) (getPayData *GetPayData, err error) {
+	url := fmt.Sprintf("https://cloud-payment.tapapis.cn/order/v1/info?client_id=%v&order_id=%v", p.ClientId, order)
+	getPayData, err = p.get(ctx, url)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// 验证并核销订单
+func (p *pTapTap) Verify(ctx context.Context, req any) (getPayData *GetPayData, err error) {
+	url := fmt.Sprintf("https://cloud-payment.tapapis.cn/order/v1/verify?client_id=%v", p.ClientId)
+	getPayData, err = p.get(ctx, url, req)
+	if err != nil {
+		return
+	}
+	return
+}
+
+func (p *pTapTap) get(ctx context.Context, url string, _data ...any) (getPayData *GetPayData, err error) {
+
+	var _get *gclient.Response
+
+	var header = map[string]string{
+		"Content-Type": "Content-Type: application/json; charset=utf-8",
+		"X-Tap-Nonce":  grand.S(6),
+		"X-Tap-Ts":     gtime.Now().TimestampStr(),
+	}
+	ctx2 := context.Background()
+	var method = "GET"
+	if len(_data) > 0 {
+		method = "POST"
+
+	}
+
+	//temp := []byte(`{"event_type":"charge.succeeded","order":{"order_id":"1790288650833465345","purchase_token":"rT2Et9p0cfzq4fwjrTsGSacq0jQExFDqf5gTy1alp+Y=","client_id":"o6nD4iNavjQj75zPQk","open_id":"4+Axcl2RFgXbt6MZwdh++w==","user_region":"US","goods_open_id":"com.goods.open_id","goods_name":"TestGoodsName","status":"charge.succeeded","amount":"19000000000","currency":"USD","create_time":"1716168000","pay_time":"1716168000","extra":"1111111111111111111"}}`)
+	var body io.Reader
+	if len(_data) > 0 {
+		body = bytes.NewBuffer(gjson.MustEncode(_data[0]))
+	} else {
+		body = bytes.NewBuffer([]byte{})
+	}
+	req, _ := http.NewRequestWithContext(ctx2, method, url, body)
+	for k, v := range header {
+		req.Header.Set(k, v)
+	}
+	sign, err2 := p.Sign(req, p.Secret)
+	if err2 != nil {
+		err = err2
+		return
+	}
+	req.Header.Set("X-Tap-Sign", sign)
+	header["X-Tap-Sign"] = sign
+	if len(_data) == 0 {
+		_get, err = g.Client().Header(header).ContentJson().Get(gctx.New(), url)
+	} else {
+		_get, err = g.Client().Header(header).ContentJson().Post(gctx.New(), url, _data[0])
+	}
+
+	if err != nil {
+		return
+	}
+	getPayData = &GetPayData{}
+	resData := _get.ReadAll()
+	g.Dump(resData)
+	if err = json.Unmarshal(resData, &getPayData); err != nil {
+		return
+	}
+	if !getPayData.Success {
+		err = errors.New(string(resData))
+	}
+	return
+}

package/pay/vivo/client.go

@@ -0,0 +1,15 @@
+package vivo
+
+type Pay struct {
+	AppId  string
+	AppKey string
+	//AppSecret string
+}
+
+func New(cfg *Pay) (client *Pay) {
+	return &Pay{
+		AppId:  cfg.AppId,
+		AppKey: cfg.AppKey,
+		//AppSecret: cfg.AppSecret,
+	}
+}

package/pay/vivo/const.go

@@ -0,0 +1,9 @@
+package vivo
+
+const (
+	AuthTokenUrl = "https://joint-account.vivo.com.cn/cp/user/auth"
+	LocationShanghai          = "Asia/Shanghai"
+
+	RSA                       = "RSA"
+	RSA2                      = "RSA2"
+)

package/pay/vivo/model.go

@@ -0,0 +1,34 @@
+package vivo
+
+type TokenAuthResponse struct {
+	ReturnCode int                    `json:"retcode"`
+	Data       *TokenAuthResponseData `json:"data,omitempty"`
+}
+
+type TokenAuthResponseData struct {
+	Success bool   `json:"success,omitempty"`
+	OpenId  string `json:"openid,omitempty"`
+}
+
+type LoginType struct {
+	Token   string `json:"token"`
+	Ssoid   string `json:"ssoid"`
+	Channel int    `json:"channel"`
+	AdId    string `json:"adId"`
+}
+
+type PayCallback struct {
+	AppId         string `json:"appId"`
+	CpId          string `json:"cpId"`
+	CpOrderNumber string `json:"cpOrderNumber"`
+	ExtInfo       string `json:"extInfo"`
+	OrderAmount   string `json:"orderAmount"`
+	OrderNumber   string `json:"orderNumber"`
+	PayTime       string `json:"payTime"`
+	RespCode      string `json:"respCode"`
+	RespMsg       string `json:"respMsg"`
+	SignMethod    string `json:"signMethod"`
+	Signature     string `json:"signature"`
+	TradeStatus   string `json:"tradeStatus"`
+	TradeType     string `json:"tradeType"`
+}

package/pay/vivo/payment_api.go

@@ -0,0 +1,3 @@
+package vivo
+
+

package/pay/vivo/sign.go

@@ -0,0 +1,51 @@
+package vivo
+
+import (
+	"context"
+	"errors"
+	"github.com/ayflying/utility_go/package/pay/common"
+	"github.com/gogf/gf/v2/crypto/gmd5"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+
+	"sort"
+	"strings"
+)
+
+func (p *Pay) VerifySign(ctx context.Context, key string) bool {
+	bm, _ := common.ParseNotifyToBodyMap(g.RequestFromCtx(ctx).Request)
+	signature := bm["signature"]
+	delete(bm, "signature")
+	delete(bm, "signMethod")
+	sign := p.sign(bm, key)
+	return signature == sign
+}
+
+func (p *Pay) sign(bm g.Map, key string) string {
+	s, _ := p.buildSignStr(bm)
+	s += "&" + gmd5.MustEncrypt(key)
+	return gmd5.MustEncrypt(s)
+}
+
+func (p *Pay) buildSignStr(bm g.Map) (string, error) {
+	var (
+		buf     strings.Builder
+		keyList []string
+	)
+	for k := range bm {
+		keyList = append(keyList, k)
+	}
+	sort.Strings(keyList)
+	for _, k := range keyList {
+		if v := bm[k]; v != "" {
+			buf.WriteString(k)
+			buf.WriteByte('=')
+			buf.WriteString(gconv.String(v))
+			buf.WriteByte('&')
+		}
+	}
+	if buf.Len() <= 0 {
+		return "", errors.New("length is error")
+	}
+	return buf.String()[:buf.Len()-1], nil
+}

package/pay/vivo/sign_test.go

@@ -0,0 +1,49 @@
+package vivo
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"testing"
+)
+
+func TestVerifySign(t *testing.T) {
+	type args struct {
+		bm  g.Map
+		key string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "testCase-01",
+			args: args{
+				bm: map[string]interface{}{
+					"appId":         "111",
+					"cpId":          "11",
+					"cpOrderNumber": "111",
+					"extInfo":       "扩展参数",
+					"orderAmount":   "1",
+					"orderNumber":   "11",
+					"payTime":       "20210610213219",
+					"respCode":      "200",
+					"respMsg":       "交易成功",
+					"signMethod":    "MD5",
+					"signature":     "111",
+					"tradeStatus":   "0000",
+					"tradeType":     "01",
+					"uid":           "111",
+				},
+				key: "1111",
+			},
+			want: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := New(nil).VerifySign(tt.args.bm, tt.args.key); got != tt.want {
+				t.Errorf("VerifySign() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

package/pay/vivo/user_api.go

@@ -0,0 +1,52 @@
+package vivo
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"net/url"
+)
+
+func (p *Pay) AuthToken(bm g.Map) (rsp *TokenAuthResponse, err error) {
+	if _, ok := bm["opentoken"]; !ok {
+		return
+	}
+	//err = bm.CheckEmptyError("opentoken")
+	if err != nil {
+		return nil, err
+	}
+	bs, err := p.doAuthToken(bm)
+	if err != nil {
+		return nil, err
+	}
+	rsp = new(TokenAuthResponse)
+	if err = json.Unmarshal(bs, rsp); err != nil {
+		return nil, fmt.Errorf("json.Unmarshal(%s)：%w", string(bs), err)
+	}
+	return rsp, nil
+}
+
+func (p *Pay) doAuthToken(bm g.Map) (bs []byte, err error) {
+	param := p.FormatURLParam(bm)
+	//httpClient := xhttp.NewClient()
+	//res, bs, errs := httpClient.Type(xhttp.TypeFormData).Post(AuthTokenUrl).SendString(param).EndBytes()
+	res, err := g.Client().Post(gctx.New(), AuthTokenUrl, param)
+
+	if err != nil {
+		return nil, err
+	}
+	if res.StatusCode != 200 {
+		return nil, fmt.Errorf("HTTP Request Error, StatusCode = %d", res.StatusCode)
+	}
+	return res.ReadAll(), nil
+}
+
+// 格式化请求URL参数
+func (p *Pay) FormatURLParam(body g.Map) (urlParam string) {
+	v := url.Values{}
+	for key, value := range body {
+		v.Add(key, value.(string))
+	}
+	return v.Encode()
+}

package/pay/vivo/user_api_test.go

@@ -0,0 +1,70 @@
+package vivo
+
+import (
+	"encoding/json"
+	"github.com/gogf/gf/v2/frame/g"
+	"reflect"
+	"testing"
+)
+
+func TestAuthToken(t *testing.T) {
+	type args struct {
+		bm g.Map
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRsp *TokenAuthResponse
+		wantErr bool
+	}{
+		{
+			name: "testCase-01",
+			args: args{
+				bm: map[string]interface{}{
+					"opentoken": "_STV1_797e3324f7e3f1a3_797e3324f7e3f1a3_8db97942_Awykia3hpb90kcu3l",
+				},
+			},
+			wantRsp: nil,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRsp, err := New(nil).AuthToken(tt.args.bm)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("AuthToken() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(gotRsp, tt.wantRsp) {
+				if gotRsp != nil {
+					marshal, _ := json.Marshal(gotRsp)
+					println(string(marshal))
+				}
+				t.Errorf("AuthToken() gotRsp = %v, want %v", gotRsp, tt.wantRsp)
+			}
+		})
+	}
+}
+
+func TestFormatURLParam(t *testing.T) {
+	type args struct {
+		body g.Map
+	}
+	tests := []struct {
+		name         string
+		args         args
+		wantUrlParam string
+	}{
+		{name: "testCase-01", args: args{body: map[string]interface{}{
+			"opentoken": "_STV1_797e3324f7e3f1a3_797e3324f7e3f1a3_8db97942_Abbccayhpb90kvd3m",
+			"123":       "123",
+		}}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if gotUrlParam := New(nil).FormatURLParam(tt.args.body); gotUrlParam != tt.wantUrlParam {
+				t.Errorf("FormatURLParam() = %v, want %v", gotUrlParam, tt.wantUrlParam)
+			}
+		})
+	}
+}

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

package/pay/xiaomi/helper.go

@@ -0,0 +1,63 @@
+package xiaomi
+
+import (
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/hex"
+	"fmt"
+	"sort"
+	"strings"
+)
+
+// SignatureHelper 签名辅助类
+type SignatureHelper struct{}
+
+// hmacSHA1 计算HMAC-SHA1哈希值
+func hmacSHA1(data, key string) string {
+	h := hmac.New(sha1.New, []byte(key))
+	h.Write([]byte(data))
+	return hex.EncodeToString(h.Sum(nil))
+}
+
+// Sign 计算hmac-sha1签名
+func (m *MiPay) Sign(params map[string]string, secretKey string) string {
+	if _, ok := params["signature"]; ok {
+		delete(params, "signature")
+	}
+	for k, v := range params {
+		if v == "" || v == "0" {
+			delete(params, k)
+		}
+	}
+	sortString := m.buildSortString(params)
+	signature := hmacSHA1(sortString, secretKey)
+	return signature
+}
+
+// VerifySignature 验证签名
+func (m *MiPay) VerifySignature(params map[string]string, signature, secretKey string) bool {
+	tmpSign := m.Sign(params, secretKey)
+	return tmpSign == signature
+}
+
+// buildSortString 构造排序字符串
+func (m *MiPay) buildSortString(params map[string]string) string {
+	if len(params) == 0 {
+		return ""
+	}
+
+	// 按键排序
+	keys := make([]string, 0, len(params))
+	for k := range params {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	// 构建排序字符串
+	var fields []string
+	for _, k := range keys {
+		fields = append(fields, fmt.Sprintf("%s=%s", k, params[k]))
+	}
+
+	return strings.Join(fields, "&")
+}

package/pay/xiaomi/model.go

@@ -0,0 +1,20 @@
+package xiaomi
+
+import "github.com/gogf/gf/v2/os/gtime"
+
+type PayCallback struct {
+	AppID              string      `json:"appId" dc:"游戏ID" required:"true"`
+	CPOrderID          string      `json:"cpOrderId" dc:"开发商订单ID" required:"true"`
+	CPUserInfo         string      `json:"cpUserInfo" dc:"开发商透传信息" required:"false"`
+	OrderConsumeType   int         `json:"orderConsumeType" dc:"订单类型：10：普通订单 11：直充直消订单" required:"false"`
+	OrderID            string      `json:"orderId" dc:"游戏平台订单ID" required:"true"`
+	OrderStatus        string      `json:"orderStatus" dc:"订单状态，TRADE_SUCCESS代表成功" required:"true"`
+	PayFee             int         `json:"payFee" dc:"支付金额，单位为分，即0.01米币。（请务必使用payFee字段值与游戏发起订单金额做校验，确保订单金额一致性）" required:"true"`
+	PayTime            *gtime.Time `json:"payTime" dc:"支付时间，格式yyyy-MM-dd HH:mm:ss" required:"true"`
+	ProductCode        string      `json:"productCode" dc:"商品代码" required:"true"`
+	ProductCount       int         `json:"productCount" dc:"商品数量" required:"true"`
+	ProductName        string      `json:"productName" dc:"商品名称" required:"true"`
+	UID                string      `json:"uid" dc:"用户ID" required:"true"`
+	PartnerGiftConsume int64       `json:"partnerGiftConsume" dc:"使用游戏券金额（如果订单使用游戏券则有，long型），如果有则参与签名" required:"false"`
+	Signature          string      `json:"signature" dc:"签名，签名方法见后面说明" required:"true"`
+}

package/pay/xiaomi/xiaomi.go

@@ -0,0 +1,29 @@
+package xiaomi
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+// Config 小米支付配置信息
+type Config struct {
+	AppID     string `json:"app_id"`     // 应用ID
+	AppSecret string `json:"app_secret"` // 应用密钥
+	//PrivateKey string // 商户私钥（如需证书）
+	//MIAPIURL   string // 小米支付API基础地址
+	//IsSandbox  bool   // 是否沙箱环境
+}
+
+// Miipay 小米支付客户端
+type MiPay struct {
+	config *Config
+}
+
+func New() *MiPay {
+	_cfg, _ := g.Cfg().Get(gctx.New(), "pay.xiaomi")
+	var cfg *Config
+	_cfg.Scan(&cfg)
+	return &MiPay{
+		config: cfg,
+	}
+}

package/s3/s3.go

@@ -270,7 +270,7 @@ func (s *Mod) GetPath(url string) (filePath string) {
 	return url[len(get+bucketName)+1:]
 }
 
-// 复制文件
+// CopyObject 复制文件
 func (s *Mod) CopyObject(bucketName string, dstStr string, srcStr string) (err error) {
 
 	// 原始文件
@@ -288,3 +288,15 @@ func (s *Mod) CopyObject(bucketName string, dstStr string, srcStr string) (err e
 	_, err = s.client.CopyObject(ctx, dst, src)
 	return
 }
+
+// Rename 重命名文件
+func (s *Mod) Rename(bucketName string, name string, newName string) (err error) {
+	// 复制文件到新的名称
+	err = s.CopyObject(bucketName, name, newName)
+	if err != nil {
+		return
+	}
+	// 删除原始文件
+	err = s.RemoveObject(bucketName, name)
+	return
+}

pgk/aycache/cache.go

@@ -1,38 +0,0 @@
-package aycache
-
-import (
-	"github.com/gogf/gf/v2/os/gcache"
-	"new-gitlab.adesk.com/public_project/utility_go/package/aycache/drive"
-	drive2 "new-gitlab.adesk.com/public_project/utility_go/pgk/aycache/drive"
-)
-
-type Mod struct {
-	client *gcache.Cache
-}
-
-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.Cache
-//}
-
-func New(_name ...string) gcache.Adapter {
-
-	var cacheAdapterObj gcache.Adapter
-	var name = "cache"
-	if len(_name) > 0 {
-		name = _name[0]
-	}
-	switch name {
-	case "cache":
-		cacheAdapterObj = drive2.NewAdapterMemory()
-	case "redis":
-		cacheAdapterObj = drive2.NewAdapterRedis()
-	case "file":
-		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")
-	case "es":
-		cacheAdapterObj = drive.NewAdapterElasticsearch([]string{"http://127.0.0.1:9200"})
-	}
-
-	//var client = gcache.New()
-	//client.SetAdapter(cacheAdapterObj)
-	return cacheAdapterObj
-}

pgk/aycache/drive/file.go

@@ -1,134 +0,0 @@
-package drive
-
-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,
-	}
-}

pgk/aycache/drive/redis.go

@@ -1,18 +0,0 @@
-package drive
-
-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
-}

pgk/elasticsearch/elasticsearch.go

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

pgk/notice/notice.go

@@ -1,19 +0,0 @@
-package notice
-
-import (
-	v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
-	"new-gitlab.adesk.com/public_project/utility_go/pgk/notice/drive"
-)
-
-type MessageV1 interface {
-	Send(value string)
-}
-
-func New(typ v1.NoticeType, host string) MessageV1 {
-	switch typ {
-	case v1.NoticeType_DINGTALK:
-		return drive.Load(host)
-
-	}
-	return nil
-}

pgk/pgk.go

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

pgk/rank/rank.go

@@ -2,7 +2,7 @@ package rank
 
 import (
 	"fmt"
-	v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"time"
 
 	"github.com/gogf/gf/v2/database/gredis"
@@ -46,6 +46,8 @@ func (s *Mod) Load() {
 // 返回值:
 //
 //	*F64CountRank: 返回一个指向新创建的F64CountRank实例的指针
+
+// Deprecated: pgk.Rnak().CreateF64CountRank("赛季")
 func (s *Mod) CreateF64CountRank(name string) *F64CountRank {
 	// 初始化F64CountRank实例的name和updateTs字段
 	// name字段用于标识排行榜的名称，格式为"rank:<name>:score"

pgk/s3/s3.go

@@ -1,289 +0,0 @@
-package s3
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"net/url"
-	"path"
-	"time"
-
-	"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"
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
-)
-
-var (
-	//client *minio.Client
-	ctx = gctx.New()
-)
-
-type DataType struct {
-	AccessKey     string `json:"access_key"`
-	SecretKey     string `json:"secret_key"`
-	Address       string `json:"address"`
-	Ssl           bool   `json:"ssl"`
-	Url           string `json:"url"`
-	BucketName    string `json:"bucket_name"`
-	BucketNameCdn string `json:"bucket_name_cdn"`
-}
-
-type Mod struct {
-	client *minio.Client
-	cfg    DataType
-}
-
-func New(_name ...string) *Mod {
-	var name string
-	if len(_name) > 0 {
-		name = _name[0]
-	} else {
-		getName, _ := g.Cfg().Get(ctx, "s3.type")
-		name = getName.String()
-	}
-
-	get, err := g.Cfg().Get(ctx, "s3."+name)
-	if err != nil {
-		panic(err.Error())
-	}
-	var cfg DataType
-	get.Scan(&cfg)
-
-	// 使用minio-go创建S3客户端
-	obj, err := minio.New(
-		cfg.Address,
-		&minio.Options{
-			Creds:  credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
-			Secure: cfg.Ssl,
-		},
-	)
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	mod := &Mod{
-		client: obj,
-		cfg:    cfg,
-	}
-
-	return mod
-}
-
-//func (s *Mod) Load() {
-//	//导入配置
-//	get, err := g.Cfg().Get(ctx, "s3.type")
-//	cfgType := get.String()
-//	if cfgType == "" {
-//		cfgType = "default"
-//	}
-//
-//	cfgData, err := g.Cfg().Get(ctx, "s3."+cfgType)
-//	if cfgData.IsEmpty() {
-//		panic("当前配置中未配置s3：" + cfgType)
-//	}
-//
-//	get, err = g.Cfg().Get(ctx, "s3."+cfgType)
-//	err = get.Scan(&Cfg)
-//
-//	// 使用minio-go创建S3客户端
-//	obj, err := minio.New(
-//		Cfg.Address,
-//		&minio.Options{
-//			Creds:  credentials.NewStaticV4(Cfg.AccessKey, Cfg.SecretKey, ""),
-//			Secure: Cfg.Ssl,
-//		},
-//	)
-//	if err != nil {
-//		log.Fatalln(err)
-//	}
-//
-//	client = obj
-//}
-//
-//func (s *Mod) S3(name string) {
-//	get, err := g.Cfg().Get(ctx, "s3."+name)
-//	if err != nil {
-//		panic(err)
-//	}
-//	get.Scan(&Cfg)
-//
-//	// 使用minio-go创建S3客户端
-//	obj, err := minio.New(
-//		Cfg.Address,
-//		&minio.Options{
-//			Creds:  credentials.NewStaticV4(Cfg.AccessKey, Cfg.SecretKey, ""),
-//			Secure: Cfg.Ssl,
-//		},
-//	)
-//	if err != nil {
-//		log.Fatalln(err)
-//	}
-//
-//	client = obj
-//
-//}
-
-// GetCfg 获取配置
-func (s *Mod) GetCfg() *DataType {
-	return &s.cfg
-}
-
-// GetFileUrl 生成指向S3存储桶中指定文件的预签名URL
-//
-// @Description: 生成一个具有有限有效期的预签名URL，可用于访问S3存储桶中的文件。
-// @receiver s: S3的实例，用于执行S3操作。
-// @param name: 要获取预签名URL的文件名。
-// @param bucketName: 文件所在的存储桶名称。
-// @return presignedURL: 生成的预签名URL，可用于访问文件。
-// @return err: 在获取预签名URL过程中遇到的任何错误。
-func (s *Mod) GetFileUrl(name string, bucketName string, _expires ...time.Duration) (presignedURL *url.URL, err error) {
-	// 设置预签名URL的有效期为1小时
-	expires := time.Hour * 1
-	if len(_expires) > 0 {
-		expires = _expires[0]
-	}
-	cacheKey := fmt.Sprintf("s3:%v:%v", name, bucketName)
-	get, _ := gcache.Get(ctx, cacheKey)
-	//g.Dump(get.Vars())
-	if !get.IsEmpty() {
-		err = gconv.Struct(get.Val(), &presignedURL)
-		//presignedURL =
-		return
-	}
-	//expires := time.Duration(604800)
-	// 调用s3().PresignedGetObject方法生成预签名URL
-	presignedURL, err = s.client.PresignedGetObject(ctx, bucketName, name, expires, nil)
-	err = gcache.Set(ctx, cacheKey, presignedURL, expires)
-	return
-}
-
-// PutFileUrl 生成一个用于上传文件到指定bucket的预签名URL
-//
-//	@Description:
-//	@receiver s
-//	@param name 文件名
-//	@param bucketName 存储桶名称
-//	@return presignedURL 预签名的URL，用于上传文件
-//	@return err 错误信息，如果在生成预签名URL时发生错误
-func (s *Mod) PutFileUrl(name string, bucketName string) (presignedURL *url.URL, err error) {
-	// 设置预签名URL的有效期
-	//expires := time.Now().Add(time.Minute * 30).Unix() // 例如：有效期30分钟
-	//expires2 := time.Duration(expires)
-	expires := time.Minute * 10
-	// 生成预签名URL
-	presignedURL, err = s.client.PresignedPutObject(ctx, bucketName, name, expires)
-
-	return
-}
-
-// 获取储存桶列表
-func (s *Mod) ListBuckets() []minio.BucketInfo {
-	buckets, err := s.client.ListBuckets(ctx)
-	//g.Dump(buckets)
-	if err != nil {
-		//fmt.Println(err)
-		return nil
-	}
-	return buckets
-}
-
-// PutObject 上传文件到指定的存储桶中。
-//
-// @Description: 上传一个文件到指定的存储桶。
-// @receiver s *Mod: 表示调用此方法的Mod实例。
-// @param f io.Reader: 文件的读取器，用于读取待上传的文件内容。
-// @param name string: 待上传文件的名称。
-// @param bucketName string: 存储桶的名称。
-// @param _size ...int64: 可选参数，指定上传文件的大小。如果未提供，则默认为-1，表示读取文件直到EOF。
-// @return res minio.UploadInfo: 上传成功后返回的上传信息。
-// @return err error: 如果上传过程中出现错误，则返回错误信息。
-func (s *Mod) PutObject(f io.Reader, name string, bucketName string, _size ...int64) (res minio.UploadInfo, err error) {
-	// 初始化文件大小为-1，表示将读取文件至结束。
-	var size = int64(-1)
-	// 如果提供了文件大小，则使用提供的大小值。
-	if len(_size) > 0 {
-		size = _size[0]
-	}
-
-	// 调用client的PutObject方法上传文件，并设置内容类型为"application/octet-stream"。
-	res, err = s.client.PutObject(ctx, bucketName, name, f, size, minio.PutObjectOptions{ContentType: "application/octet-stream"})
-	if err != nil {
-		g.Log().Error(ctx, err)
-	}
-	return
-}
-
-// RemoveObject 删除文件
-func (s *Mod) RemoveObject(name string, bucketName string) (err error) {
-	opts := minio.RemoveObjectOptions{
-		//GovernanceBypass: true,
-		//VersionID:        "myversionid",
-	}
-	err = s.client.RemoveObject(ctx, bucketName, name, opts)
-	return
-}
-
-// ListObjects 文件列表
-func (s *Mod) ListObjects(bucketName string, prefix string) (res <-chan minio.ObjectInfo, err error) {
-	res = s.client.ListObjects(ctx, bucketName, minio.ListObjectsOptions{
-		Prefix: prefix,
-	})
-	return
-}
-
-// SetBucketPolicy 设置bucket或对象前缀的访问权限
-func (s *Mod) SetBucketPolicy(bucketName string, prefix string) (err error) {
-
-	policy := `{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::my-bucketname/*"],"Sid": ""}]}`
-
-	err = s.client.SetBucketPolicy(ctx, bucketName, policy)
-	return
-}
-
-// GetUrl 获取文件访问地址
-func (s *Mod) GetUrl(filePath string, defaultFile ...string) (url string) {
-	bucketName := s.cfg.BucketNameCdn
-	get := s.cfg.Url
-
-	//如果没有图片，返回默认的图片地址
-	if filePath == "" && len(defaultFile) > 0 {
-		filePath = defaultFile[0]
-	}
-
-	if s.cfg.Ssl {
-		url = get + filePath
-	} else {
-		url = get + path.Join(bucketName, filePath)
-	}
-
-	return
-}
-
-func (s *Mod) GetPath(url string) (filePath string) {
-	bucketName := s.cfg.BucketNameCdn
-	get := s.cfg.Url
-
-	return url[len(get+bucketName)+1:]
-}
-
-// 复制文件
-func (s *Mod) CopyObject(bucketName string, dstStr string, srcStr string) (err error) {
-
-	// 原始文件
-	var dst = minio.CopyDestOptions{
-		Bucket: bucketName,
-		Object: dstStr,
-	}
-
-	// 新文件
-	var src = minio.CopySrcOptions{
-		Bucket: bucketName,
-		Object: srcStr,
-	}
-
-	_, err = s.client.CopyObject(ctx, dst, src)
-	return
-}

pkg/aycache/cache.go

@@ -0,0 +1,80 @@
+package aycache
+
+import (
+	"context"
+	"math"
+
+	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"
+)
+
+// Mod 定义缓存模块结构体，包含一个 gcache.Cache 客户端实例
+type Mod struct {
+	client *gcache.Cache
+}
+
+// QPSCount 记录缓存的 QPS 计数
+var QPSCount int
+
+// QPS 是一个 Prometheus 指标，用于记录当前缓存的 QPS 数量
+var QPS = promauto.NewGauge(
+	prometheus.GaugeOpts{
+		Name: "Cache_QPS",
+		Help: "当前缓存QPS数量",
+	},
+)
+
+// init 函数在包被导入时执行，用于初始化定时任务以更新 QPS 指标
+func init() {
+	boot.AddFunc(func() {
+		// 初始化指标，每分钟计算一次平均 QPS 并重置计数器
+		service.SystemCron().AddCronV2(v1.CronType_MINUTE, func(context.Context) error {
+			QPS.Set(math.Round(float64(QPSCount) / 60))
+			QPSCount = 0
+			return nil
+		})
+	})
+}
+
+// New 根据传入的名称创建不同类型的缓存适配器
+// 如果未传入名称，默认使用 "cache" 类型
+// 支持的类型包括 "cache"（内存缓存）、"redis"（Redis 缓存）、"file"（文件缓存）和 "es"（Elasticsearch 缓存）
+func New(_name ...string) gcache.Adapter {
+	var cacheAdapterObj gcache.Adapter
+	var name = "cache"
+	if len(_name) > 0 {
+		name = _name[0]
+	}
+	switch name {
+	case "cache":
+		// 创建内存缓存适配器
+		cacheAdapterObj = drive2.NewAdapterMemory()
+	case "redis":
+		//第二个参数为配置名称，默认为default
+		var typ = "default"
+		if len(_name) >= 2 {
+			typ = _name[1]
+		}
+		// 创建 Redis 缓存适配器
+		cacheAdapterObj = drive2.NewAdapterRedis(typ)
+	case "file":
+		// 创建文件缓存适配器，指定缓存目录为 "runtime/cache"
+		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")
+	case "es":
+		// 创建 Elasticsearch 缓存适配器，需要传入额外参数
+		cacheAdapterObj = drive.NewAdapterElasticsearch(_name[1])
+	}
+
+	//var client = gcache.New()
+	//client.SetAdapter(cacheAdapterObj)
+
+	// 每次创建适配器时，QPS 计数加 1
+	QPSCount++
+	return cacheAdapterObj
+}

pkg/aycache/drive/elasticsearch.go

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

pkg/aycache/drive/file.go

@@ -0,0 +1,272 @@
+package drive
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/crypto/gmd5"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
+	"path"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+var (
+	fileIndex = "index.txt"
+)
+
+type FileIndex struct {
+	File     string        `json:"file"`
+	Duration time.Duration `json:"duration"`
+}
+type FileData struct {
+	Data interface{} `json:"data"`
+	Time int64       `json:"time"`
+}
+
+type AdapterFile struct {
+	FilePath string
+	Lock     sync.Mutex
+}
+
+func (a *AdapterFile) Key2Name(key interface{}) string {
+	md5Str, _ := gmd5.Encrypt(key)
+	fileName := path.Join(md5Str[0:2], md5Str[2:4], md5Str[4:6], md5Str[16:])
+	fileNameAll := path.Join(a.FilePath, fileName)
+
+	return fileNameAll
+}
+
+func (a *AdapterFile) AddIndex(FileName interface{}, duration time.Duration) {
+	var isEdit bool
+
+	var setTime int64
+	if duration == 0 {
+		setTime = 0
+	} else {
+		setTime = gtime.Now().Add(duration).Unix()
+	}
+	saveArr := []string{
+		gconv.String(FileName),
+		strconv.FormatInt(setTime, 10),
+	}
+	saveStr := strings.Join(saveArr, "|")
+
+	gfile.ReadLines(fileIndex, func(text string) (err error) {
+		arr := strings.Split(text, "|")
+		if arr[0] == FileName {
+			isEdit = true
+			gfile.ReplaceFile(text, saveStr, fileIndex)
+			return
+		}
+		return
+	})
+
+	if isEdit {
+		return
+	}
+
+	gfile.PutContentsAppend(fileIndex, saveStr+"\n")
+}
+
+func (a *AdapterFile) DelIndex(FileName interface{}) {
+	//var save bool
+	gfile.ReadLines(fileIndex, func(text string) (err error) {
+		arr := strings.Split(text, "|")
+		if arr[0] == FileName {
+			//save = true
+			err = gfile.ReplaceFile(text+"\n", "", fileIndex)
+			return
+		}
+
+		return
+	})
+
+}
+
+func (a *AdapterFile) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (err error) {
+	fileNameAll := a.Key2Name(key)
+	var send = &FileData{
+		Data: value,
+		Time: gtime.Now().Add(duration).Unix(),
+	}
+	err = gfile.PutBytes(fileNameAll, gjson.MustEncode(send))
+
+	if err != nil {
+		return
+	}
+	a.AddIndex(key, duration)
+	return
+}
+
+func (a *AdapterFile) SetMap(ctx context.Context, data map[interface{}]interface{}, duration time.Duration) (err error) {
+	for k, v := range data {
+		//fileNameAll := a.Key2Name(k)
+		//var send = &FileData{
+		//	Data: v,
+		//	Time: gtime.Now().Add(duration).Unix(),
+		//}
+		//
+		//err = gfile.PutBytes(fileNameAll, gconv.Bytes(send))
+		a.Set(ctx, k, v, duration)
+	}
+	return
+}
+
+func (a *AdapterFile) SetIfNotExist(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (ok bool, err error) {
+	err = a.Set(ctx, key, value, duration)
+	return
+}
+
+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{}) (res *gvar.Var, err error) {
+	var data *FileData
+	name := a.Key2Name(key)
+	if !gfile.IsFile(name) {
+		return
+	}
+	file := gfile.GetBytes(name)
+	gjson.DecodeTo(file, &data)
+	if data.Time < time.Now().Unix() {
+		a.Remove(ctx, key)
+		return
+	}
+	res = gvar.New(data.Data)
+	return
+}
+
+func (a *AdapterFile) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) {
+	a.Set(ctx, key, value, duration)
+	result, err = a.Get(ctx, key)
+	return
+}
+
+func (a *AdapterFile) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+	value := f
+	a.Set(ctx, key, value, duration)
+	result, err = a.Get(ctx, key)
+	return
+}
+
+func (a *AdapterFile) GetOrSetFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) {
+	a.Lock.Lock()
+	defer a.Lock.Unlock()
+	result, err = a.GetOrSetFunc(ctx, key, f, duration)
+	return
+}
+
+func (a *AdapterFile) Contains(ctx context.Context, key interface{}) (bool, error) {
+	return gfile.IsFile(a.FilePath), nil
+}
+
+func (a *AdapterFile) Size(ctx context.Context) (size int, err error) {
+	size = int(gfile.Size(a.FilePath))
+	return
+}
+
+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) {
+	keys = make([]interface{}, 0)
+	gfile.ReadLines(fileIndex, func(text string) (err error) {
+		arr := strings.Split(text, "|")
+		keys = append(keys, arr[0])
+		return
+	})
+	return
+}
+
+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) {
+	fileNameAll := a.Key2Name(key)
+	getFile := gfile.GetBytes(fileNameAll)
+	var data *FileData
+	gconv.Scan(getFile, &data)
+	oldValue.Set(data.Data)
+
+	var send = &FileData{
+		Data: value,
+		Time: data.Time,
+	}
+
+	err = gfile.PutBytes(fileNameAll, gconv.Bytes(send))
+	if err != nil {
+		return
+	}
+	a.AddIndex(key, time.Duration(data.Time-gtime.Now().Unix()))
+	return
+}
+
+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) {
+	for _, v := range keys {
+		fileNameAll := a.Key2Name(v)
+		lastValue, err = a.Get(ctx, fileNameAll)
+		err = gfile.RemoveFile(fileNameAll)
+		//删除索引文件
+		a.DelIndex(v)
+	}
+	return nil, nil
+}
+
+func (a *AdapterFile) Clear(ctx context.Context) error {
+	return gfile.RemoveAll(a.FilePath)
+}
+
+func (a *AdapterFile) Close(ctx context.Context) error {
+	return nil
+}
+
+func NewAdapterFile(filePath string) gcache.Adapter {
+	fileIndex = path.Join(filePath, fileIndex)
+
+	//清空过期文件目录
+	delKeys := make([]interface{}, 0)
+	gfile.ReadLines(fileIndex, func(text string) error {
+		arr := strings.Split(text, "|")
+		if gtime.Now().Unix() > gconv.Int64(arr[1]) {
+			delKeys = append(delKeys, arr[0])
+		}
+		return nil
+	})
+
+	obj := &AdapterFile{
+		FilePath: filePath,
+	}
+	if len(delKeys) > 0 {
+		obj.Remove(gctx.New(), delKeys...)
+	}
+
+	return obj
+}

pkg/aycache/drive/redis.go

@@ -0,0 +1,28 @@
+package drive
+
+import (
+	"github.com/gogf/gf/v2/database/gredis"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+var adapterRedisClient = make(map[string]gcache.Adapter)
+var adapterRedisCache = make(map[string]*gcache.Cache)
+
+func NewAdapterRedis(name string) gcache.Adapter {
+	if adapterRedisClient[name] == nil {
+		_cfg, err := g.Cfg().Get(gctx.New(), "redis."+name)
+		if err != nil {
+			panic("当前redis配置不存在")
+		}
+		var cfg *gredis.Config
+		_cfg.Scan(&cfg)
+		redisObj, _ := gredis.New(cfg)
+		//adapterRedisClient[name] = gcache.NewAdapterRedis(g.Redis(name))
+		adapterRedisClient[name] = gcache.NewAdapterRedis(redisObj)
+		adapterRedisCache[name] = gcache.New()
+		adapterRedisCache[name].SetAdapter(adapterRedisClient[name])
+	}
+	return adapterRedisCache[name]
+}

pkg/config/config.go

@@ -0,0 +1,203 @@
+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/gctx"
+	"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 存储需要监听的 Apollo 配置项名称
+	ApolloListener []string
+	// Item2Obj 存储配置项名称和对应的加载器对象的映射
+	Item2Obj = map[string]Load{}
+)
+
+// Load 接口定义了 Load 方法，用于加载数据
+type Load interface {
+	// Load 方法用于加载配置数据，支持传入可选的配置参数
+	Load(cfg ...string)
+}
+
+// NewV1 创建一个新的 Cfg 实例
+func NewV1() *Cfg {
+	return &Cfg{}
+}
+
+// Cfg 结构体包含配置操作的相关方法
+type Cfg struct {
+	// Lock 用于保证并发安全的互斥锁
+	Lock sync.Mutex
+}
+
+// GetDbFile 从数据库中获取指定名称的配置文件
+// 参数:
+//   name - 配置文件的名称
+// 返回值:
+//   *g.Var - 存储配置数据的变量
+//   error  - 操作过程中遇到的错误
+func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
+	// 从数据库的 game_config 表中查询指定名称的配置数据
+	get2, err := g.Model("game_config").
+		Where("name", name).Master().Value("data")
+	// 将查询结果扫描到 res 变量中
+	err = get2.Scan(&res)
+	if res == nil {
+		res = &gvar.Var{}
+	}
+	return
+}
+
+// GetFile 从文件系统或资源文件中加载 JSON 配置
+// 参数:
+//   filename   - 需要加载的配置文件名（不带扩展名）
+//   _pathStr   - 可选参数，指定配置文件目录路径，默认"manifest/game/"
+// 返回值:
+//   *gjson.Json - 解析后的 JSON 对象
+//   error       - 文件加载或解析过程中遇到的错误
+func (c *Cfg) GetFile(filename string, _pathStr ...string) (jsonObj *gjson.Json, err error) {
+	// 处理路径参数，使用默认路径或传入参数
+	pathStr := "manifest/game/"
+	if len(_pathStr) > 0 {
+		pathStr = _pathStr[0]
+	}
+	// 拼接完整的文件路径
+	filePath := pathStr + filename + ".json"
+
+	// 载入静态资源到文件对象
+	err = gres.Load(filePath)
+	var bytes []byte
+
+	// 优先从文件系统读取，不存在时从资源文件读取
+	if gfile.IsFile(filePath) {
+		bytes = gfile.GetBytes(filePath) // 读取物理文件内容
+	} else {
+		bytes = gres.GetContent(filePath) // 从打包资源中获取内容
+	}
+
+	for range 5 {
+		//如果还是没有读取到配置，从当前目录返回上级读取
+		if bytes == nil {
+			// 上级拼接完整的文件路径
+			filePath = "../" + filePath
+			if gfile.IsFile(filePath) {
+				bytes = gfile.GetBytes(filePath) // 读取物理文件内容
+				//找到配置了，跳过
+				break
+			}
+		}
+	}
+	if bytes == nil {
+		g.Log().Errorf(gctx.New(), "未读取到配置文件：%v", filePath)
+	}
+
+	// 解析 JSON 内容并返回结果
+	jsonObj, err = gjson.DecodeToJson(bytes)
+	return
+}
+
+// GetUrlFile 获取远程配置
+// 参数:
+//   name - 配置文件的名称
+// 返回值:
+//   *gjson.Json - 解析后的 JSON 对象
+//   error       - 请求或解析过程中遇到的错误
+func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
+	// 拼接远程配置文件的 URL
+	urlStr := fmt.Sprintf("http://sdf.sdfs.sdf/%s.json", name)
+	// 发送 HTTP 请求获取远程配置数据
+	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
+	// 读取响应内容
+	bytes := getUrl.ReadAll()
+	// 解析 JSON 内容并返回结果
+	jsonObj, err = gjson.DecodeToJson(bytes)
+	return
+}
+
+// GetApollo 从 Apollo 配置中心获取指定名称的配置
+// 参数:
+//   name - 配置文件的名称
+//   obj  - 实现了 Load 接口的加载器对象
+// 返回值:
+//   *gjson.Json - 解析后的 JSON 对象
+//   error       - 操作过程中遇到的错误
+func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
+	// 将配置项名称和对应的加载器对象存入映射
+	Item2Obj[name+".json"] = obj
+
+	// 接入 Apollo 配置
+	ApolloCfg.NamespaceName = name + ".json"
+	// 创建 Apollo 配置适配器
+	adapter, err := apollo.New(nil, *ApolloCfg)
+	if err != nil {
+		// 配置适配器创建失败，记录致命错误日志
+		g.Log().Fatalf(nil, `%+v`, err)
+	}
+	// 更改默认配置实例的适配器
+	g.Cfg(name).SetAdapter(adapter)
+
+	// 首次运行加入监听器
+	if !gstr.InArray(ApolloListener, name+".json") {
+		// 启动 Apollo 客户端
+		client, _ := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
+			return &apolloConfig.AppConfig{
+				AppID:             ApolloCfg.AppID,
+				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{}
+		// 为 Apollo 客户端添加监听器
+		client.AddChangeListener(c2)
+		// 将配置项名称添加到监听器列表
+		ApolloListener = append(ApolloListener, name+".json")
+	}
+
+	// 从配置中心获取指定配置项的值
+	cfg, err := g.Cfg(name).Get(nil, "content")
+	// 将配置值扫描到 jsonObj 中
+	cfg.Scan(&jsonObj)
+	return
+}
+
+// CustomChangeListener 是 Apollo 配置变化的自定义监听器
+type CustomChangeListener struct {
+	// wg 用于等待所有处理任务完成
+	wg sync.WaitGroup
+}
+
+// OnChange 当 Apollo 配置发生变化时触发
+func (c *CustomChangeListener) OnChange(changeEvent *storage.ChangeEvent) {
+	// 记录配置变化的日志
+	g.Log().Debugf(nil, "当前Namespace变化了：%v", changeEvent.Namespace)
+	// 获取变化的配置项名称
+	filename := changeEvent.Namespace
+	if obj, ok := Item2Obj[filename]; ok {
+		// 重载配置文件
+		obj.Load(changeEvent.Changes["content"].NewValue.(string))
+	}
+}
+
+// OnNewestChange 当获取到最新配置时触发，当前为空实现
+func (c *CustomChangeListener) OnNewestChange(event *storage.FullChangeEvent) {
+	//write your code here
+}

pkg/elasticsearch/elasticsearch.go

@@ -0,0 +1,148 @@
+package elasticsearch
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"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"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+var (
+	es *elasticsearch.TypedClient
+)
+
+type Elastic struct {
+	client *elasticsearch.TypedClient
+	name   string
+}
+
+type elkBulk struct {
+	Index struct {
+		Index string `json:"_index"`
+		Id    string `json:"_id"`
+	} `json:"index"`
+}
+
+func NewV1(name string) *Elastic {
+	var cfg elasticsearch.Config
+	_cfg := g.Cfg().MustGetWithEnv(gctx.New(), "elasticsearch")
+	_cfg.Scan(&cfg)
+	if es == nil {
+		var err error
+		es, err = elasticsearch.NewTypedClient(cfg)
+		if err != nil {
+			fmt.Printf("elasticsearch.NewTypedClient failed, err:%v\n", err)
+			return &Elastic{}
+		}
+	}
+	return &Elastic{
+		client: es,
+		name:   name,
+	}
+}
+
+//// Create 创建索引
+//func (s *Elastic) Create(ctx context.Context) {
+//	resp, err := s.client.Indices.
+//		Create(s.name).Do(ctx)
+//	if err != nil {
+//		fmt.Printf("create index failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("index:%#v\n", resp.Index)
+//}
+
+// Set 添加文档索引文档
+func (s *Elastic) Set(ctx context.Context, key string, data interface{}) (err error) {
+	// 添加文档
+	_, err = s.client.Index(s.name).Id(key).Document(data).Do(ctx)
+	return
+}
+
+// SetBulk 批量添加文档
+func (s *Elastic) SetBulk(ctx context.Context, data []any) (err error) {
+	var save bulk.Request
+	save = make(bulk.Request, 0)
+	for _, v := range data {
+		val := gconv.Map(v)
+		var saveIndex = elkBulk{}
+		saveIndex.Index.Index = s.name
+		if _, ok := val["uuid"]; ok {
+			saveIndex.Index.Id = val["uuid"].(string)
+		}
+		save = append(save, saveIndex)
+		save = append(save, v)
+	}
+	//save = data
+	response, err2 := s.client.Bulk().Index(s.name).Request(&save).Do(ctx)
+	if err2 != nil {
+		err = err2
+		return
+	}
+	//需要接收返回信息，判断是否全部执行成功
+	if response.Errors { //未全部完成
+		//是否需要删除已成功导入的部分数据
+		for _, item := range response.Items {
+			for _, v := range item {
+				if v.Error != nil { //失败
+					g.Log().Errorf(ctx, "导入数据出错 err: %v", *v.Error.Reason)
+
+				} else {
+					//删除已导入成功的数据
+					_, err = s.Delete(ctx, *v.Id_)
+					if err != nil {
+						g.Log().Errorf(ctx, "删除数据错误, err:%v\n", err)
+					}
+				}
+			}
+		}
+		return errors.New("部分数据导入失败")
+	}
+	return
+}
+
+// Get 获取文档
+func (s *Elastic) Get(ctx context.Context, id string) (res json.RawMessage, err error) {
+	get, err := s.client.Get(s.name, id).Do(ctx)
+	if err != nil {
+		return
+	}
+	res = get.Source_
+	return
+}
+
+// Update 更新文档
+func (s *Elastic) Update(ctx context.Context, key string, data interface{}) (res *update.Response, err error) {
+	res, err = s.client.Update(s.name, key).Doc(data).Do(ctx)
+	return
+}
+
+// Delete 删除 document
+func (s *Elastic) Delete(ctx context.Context, key string) (res *delete.Response, err error) {
+	res, err = s.client.Delete(s.name, key).Do(ctx)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// Select 查询
+func (s *Elastic) Select(ctx context.Context, query *types.MatchAllQuery) (res *search.Response, err error) {
+	res, err = s.client.Search(). //Index("my_index").
+					Request(&search.Request{
+			Query: &types.Query{
+				MatchAll: &types.MatchAllQuery{},
+			},
+		}).Do(ctx)
+	return
+}

pkg/notice/drive/dingtalk.go

@@ -6,17 +6,17 @@ import (
 	"github.com/gogf/gf/v2/os/gtime"
 )
 
-type Mod struct {
+type DingTalkMod struct {
 	DingTalkWebHook string
 }
 
-func Load(webHook string) *Mod {
+func DingTalkLoad(webHook string) *DingTalkMod {
-	return &Mod{
+	return &DingTalkMod{
 		DingTalkWebHook: webHook,
 	}
 }
 
-func (m Mod) Send(value string) {
+func (m DingTalkMod) Send(value string) {
 	ctx := gctx.New()
 	// 从配置中获取发送者名称
 	name, _ := g.Cfg().Get(ctx, "name")

pkg/notice/drive/email.go

@@ -0,0 +1,51 @@
+package drive
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"gopkg.in/gomail.v2"
+)
+
+type MailMod struct {
+	Host    string `json:"host" dc:"邮件服务器地址"`
+	Port    int    `json:"port" dc:"邮件服务器端口"`
+	User    string `json:"user" dc:"邮件服务器用户名"`
+	Pass    string `json:"pass" dc:"邮件服务器密码"`
+	From    string `json:"from" dc:"邮件发送者"`
+	To      string `json:"to" dc:"邮件接收者"`
+	Subject string `json:"subject" dc:"邮件主题"`
+}
+
+func MailLoad(Host string, port int, to string, subject string) *MailMod {
+	return &MailMod{
+		Host:    Host,
+		Port:    port,
+		User:    "root",
+		Pass:    "root",
+		From:    "root",
+		To:      to,
+		Subject: subject,
+	}
+}
+
+func (m MailMod) Send(value string) {
+	// 创建一个新的消息
+	obj := gomail.NewMessage()
+	// 设置发件人
+	obj.SetHeader("From", m.From)
+	// 设置收件人
+	obj.SetHeader("To", m.To)
+	// 设置邮件主题
+	obj.SetHeader("Subject", m.Subject)
+	// 设置邮件正文
+	obj.SetBody("text/plain", value)
+
+	// 创建 SMTP 拨号器，这里需要提供 SMTP 服务器地址、端口、发件人邮箱和密码
+	d := gomail.NewDialer(m.Host, m.Port, m.User, m.Pass)
+
+	// 发送邮件
+	if err := d.DialAndSend(obj); err != nil {
+		g.Log().Error(gctx.New(), err)
+	}
+	return
+}