增加单元测试，统一初始化方法

增加缺少的库
更新
2025-04-02 15:19:49 +08:00 · 2025-04-02 12:12:13 +08:00 · 2025-04-02 11:51:25 +08:00 · 2025-04-02 11:43:05 +08:00 · 2025-04-02 11:32:54 +08:00 · 2025-03-31 18:30:41 +08:00
65 changed files with 2955 additions and 451 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,36 @@
+# This file is a template, and might need editing before it works on your project.
+# You can copy and paste this template into a new `.gitlab-ci.yml` file.
+# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword.
+#
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Go.gitlab-ci.yml
+
+image: golang:latest
+
+stages:
+  - test
+#  - build
+#  - deploy
+
+format:
+  stage: test
+  script:
+    - go fmt $(go list ./... | grep -v /vendor/)
+    - go vet $(go list ./... | grep -v /vendor/)
+    - go test -race $(go list ./... | grep -v /vendor/)
+
+#compile:
+#  stage: build
+#  script:
+#    - mkdir -p mybinaries
+#    - go build -o mybinaries main.go
+#  artifacts:
+#    paths:
+#      - build
+#
+#deploy:
+#  stage: deploy
+#  script: echo "Define your deployment script!"
+#  environment: production
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
--- a/.idea/goframehelperCache.xml
+++ b/.idea/goframehelperCache.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="com.github.oldmegit.goframehelper.ui.goframehelperCache">
-    <option name="gf" value="true" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/utility-go.iml" filepath="$PROJECT_DIR$/.idea/utility-go.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/utility-go.iml
+++ b/.idea/utility-go.iml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/README.md
+++ b/README.md
@@ -1,8 +1,159 @@
-go语言工具类
+# utility_go：强大的Go语言工具类库

-####
-进行安装
-~~~
+## 一、项目概述
+`utility_go` 是一个功能丰富的Go语言工具类库，旨在助力开发者更高效地开发Go应用程序。它提供了一系列实用的功能模块，广泛涵盖数据库操作、缓存处理、支付接口集成、排名算法实现等多个方面，适用于各类Go项目。
+
+## 二、安装方式
+要使用 `utility_go` 工具类库，可使用 `go get` 命令进行安装。请确保你的Go环境已正确配置，且可访问互联网。
+
+### 安装命令
+```sh
 go get github.com/ayflying/utility_go
-~~~
+```

+### 安装验证
+安装完成后，你可以在Go代码中导入 `utility_go` 相关的包，检查是否能够正常使用。示例如下：
+```go
+package main
+
+import (
+    // 这里导入utility_go中的某个具体包，根据实际使用情况调整
+    "github.com/ayflying/utility_go/package/pay/apple"
+)
+
+func main() {
+    // 进行一些简单的操作，如打印版本信息等
+    // 这里假设apple包有一个Version函数
+    // fmt.Println(apple.Version())
+}
+```
+
+## 三、项目结构
+`utility_go` 的项目结构设计清晰，各模块分工明确，便于开发者使用和扩展。以下是项目的主要目录结构及说明：
+
+### 主要目录说明
+- **api/**：存放与API相关的代码，包含不同模块的API接口定义，如 `admin`、`callback`、`system` 等。这些API接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
+- **service/**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
+- **controller/**：控制器层代码，主要用于处理HTTP请求和响应。控制器接收客户端的请求，调用相应的服务层方法进行处理，并将处理结果返回给客户端。
+- **internal/**：内部包，包含项目的核心业务逻辑，如 `game`、`logic`、`model` 等模块。其中，`model` 模块定义了项目中使用的数据模型，如数据库表对应的结构体；`logic` 模块实现了各种业务逻辑的处理函数。
+- **package/**：包含各种功能包，提供了丰富的工具和功能，具体如下：
+  - **aycache**：缓存相关的功能包，提供了缓存操作的接口和实现，帮助开发者更方便地使用缓存技术，提高应用程序的性能。
+  - **elasticsearch**：Elasticsearch相关的功能包，用于与Elasticsearch搜索引擎进行交互，实现数据的存储、检索和分析等功能。
+  - **excel**：Excel处理相关的功能包，提供了Excel文件的读写操作接口，方便开发者处理Excel文件中的数据。
+  - **pay**：支付相关的功能包，包含了与各种支付平台的接口集成，如 `apple`（苹果支付）、`playstore`（Google Play Store支付）等，支持应用内购买等支付功能。
+  - **rand**：随机数相关的功能包，提供了生成各种随机数的函数，可用于测试、加密等场景。
+  - **rank**：排名相关的功能包，实现了各种排名算法，如基于Redis的排行榜功能，可用于游戏排名、活动排名等场景。
+  - **s3**：S3存储相关的功能包，用于与Amazon S3等云存储服务进行交互，实现文件的上传、下载、删除等操作。
+- **tools/**：工具类代码，包含了一些常用的工具函数，如 `redis.go`（Redis操作相关）、`time.go`（时间处理相关）、`tools.go`（通用工具函数）等，方便开发者在项目中使用。
+
+## 四、主要模块功能
+
+### 4.1 pay/playstore
+该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作，提供以下主要功能：
+- **创建客户端**：通过 `New` 函数创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，方便开发者与Google Play Store API进行通信。
+- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的HTTP客户端创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，增加了客户端的灵活性。
+- **验证签名**：`VerifySignature` 函数用于验证应用内购买的签名，确保支付信息的安全性和合法性。
+
+### 4.2 s3
+`s3` 模块主要用于与S3存储服务进行交互，提供文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。
+
+### 4.3 model
+`model` 模块定义了项目中使用的数据模型，这些数据模型通常与数据库表相对应，用于数据的存储和操作。例如：
+- **GameMailMass**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
+- **GameBag**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
+- **MemberSave**：（根据具体代码中的定义）可能表示用户会员信息的数据模型，用于存储用户的会员相关数据。
+
+### 4.4 tools
+`tools` 模块提供了一系列通用工具函数，涵盖时间处理、Redis操作、道具数据处理等功能：
+- **时间处理**：`time.go` 文件中的函数可以进行时间计算，如获取本周开始时间、计算两个时间间隔天数等。
+- **Redis操作**：`redis.go` 文件中的函数可以进行Redis的扫描操作，支持批量获取大量数据。
+- **通用工具**：`tools.go` 文件中的函数提供了字符串处理、切片操作、道具数据合并等功能。
+
+## 五、使用示例
+
+### 5.1 支付模块示例
+以下是一个使用 `pay/playstore` 模块验证应用内购买签名的示例代码：
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/ayflying/utility_go/package/pay/playstore"
+)
+
+func main() {
+    // 初始化参数
+    purchaseData := "your_purchase_data"
+    signature := "your_signature"
+
+    // 验证签名
+    err := playstore.VerifySignature(purchaseData, signature)
+    if err != nil {
+        fmt.Println("Signature verification failed:", err)
+        return
+    }
+
+    fmt.Println("Signature verification succeeded")
+}
+```
+
+### 5.2 S3模块示例
+以下是一个使用 `s3` 模块列出S3存储桶信息的示例代码：
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/ayflying/utility_go/package/s3"
+)
+
+func main() {
+    // 列出S3存储桶信息
+    buckets, err := s3.ListBuckets()
+    if err != nil {
+        fmt.Println("Failed to list buckets:", err)
+        return
+    }
+
+    for _, bucket := range buckets {
+        fmt.Println("Bucket name:", bucket.Name)
+    }
+}
+```
+
+### 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语言版本，以获得更好的性能和稳定性。
+
+## 七、更新和维护
+`utility_go` 工具类库会定期进行更新和维护，以修复已知的问题、添加新的功能和优化性能。你可以关注项目的GitHub仓库（https://github.com/ayflying/utility_go）获取最新的更新信息。如果你在使用过程中遇到任何问题或有任何建议，欢迎提交Issue或Pull Request。
+
+## 八、许可证信息
+`utility_go` 工具类库遵循MIT许可证，你可以在项目的 `LICENSE` 文件中查看详细的许可证条款。请确保在使用该工具类库时遵守相关的许可证规定。
--- a/api/pkg/v1/pkg.pb.go
+++ b/api/pkg/v1/pkg.pb.go
@@ -0,0 +1,237 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.20.0
+// source: pkg/v1/pkg.proto
+
+package v1
+
+import (
+	reflect "reflect"
+	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// 定义 NoticeType 枚举
+type NoticeType int32
+
+const (
+	NoticeType_DINGTALK NoticeType = 0
+	NoticeType_WECHAT   NoticeType = 1
+	NoticeType_EMAIL    NoticeType = 2
+	NoticeType_SMS      NoticeType = 3
+	NoticeType_VOICE    NoticeType = 4
+)
+
+// Enum value maps for NoticeType.
+var (
+	NoticeType_name = map[int32]string{
+		0: "DINGTALK",
+		1: "WECHAT",
+		2: "EMAIL",
+		3: "SMS",
+		4: "VOICE",
+	}
+	NoticeType_value = map[string]int32{
+		"DINGTALK": 0,
+		"WECHAT":   1,
+		"EMAIL":    2,
+		"SMS":      3,
+		"VOICE":    4,
+	}
+)
+
+func (x NoticeType) Enum() *NoticeType {
+	p := new(NoticeType)
+	*p = x
+	return p
+}
+
+func (x NoticeType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (NoticeType) Descriptor() protoreflect.EnumDescriptor {
+	return file_pkg_v1_pkg_proto_enumTypes[0].Descriptor()
+}
+
+func (NoticeType) Type() protoreflect.EnumType {
+	return &file_pkg_v1_pkg_proto_enumTypes[0]
+}
+
+func (x NoticeType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use NoticeType.Descriptor instead.
+func (NoticeType) EnumDescriptor() ([]byte, []int) {
+	return file_pkg_v1_pkg_proto_rawDescGZIP(), []int{0}
+}
+
+// 排行榜数据
+type RankData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id       int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Score    int64 `protobuf:"varint,2,opt,name=score,proto3" json:"score,omitempty"`
+	Rank     int32 `protobuf:"varint,3,opt,name=rank,proto3" json:"rank,omitempty"`
+	UpdateTs int64 `protobuf:"varint,4,opt,name=update_ts,json=updateTs,proto3" json:"update_ts,omitempty"`
+}
+
+func (x *RankData) Reset() {
+	*x = RankData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_v1_pkg_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RankData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RankData) ProtoMessage() {}
+
+func (x *RankData) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_v1_pkg_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RankData.ProtoReflect.Descriptor instead.
+func (*RankData) Descriptor() ([]byte, []int) {
+	return file_pkg_v1_pkg_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *RankData) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *RankData) GetScore() int64 {
+	if x != nil {
+		return x.Score
+	}
+	return 0
+}
+
+func (x *RankData) GetRank() int32 {
+	if x != nil {
+		return x.Rank
+	}
+	return 0
+}
+
+func (x *RankData) GetUpdateTs() int64 {
+	if x != nil {
+		return x.UpdateTs
+	}
+	return 0
+}
+
+var File_pkg_v1_pkg_proto protoreflect.FileDescriptor
+
+var file_pkg_v1_pkg_proto_rawDesc = []byte{
+	0x0a, 0x10, 0x70, 0x6b, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6b, 0x67, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x12, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0x61, 0x0a, 0x08, 0x52,
+	0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e,
+	0x6b, 0x12, 0x1b, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x73, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x73, 0x2a, 0x45,
+	0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08,
+	0x44, 0x49, 0x4e, 0x47, 0x54, 0x41, 0x4c, 0x4b, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x57, 0x45,
+	0x43, 0x48, 0x41, 0x54, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x4d, 0x41, 0x49, 0x4c, 0x10,
+	0x02, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x4d, 0x53, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x56, 0x4f,
+	0x49, 0x43, 0x45, 0x10, 0x04, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x79, 0x66, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x2f, 0x75, 0x74, 0x69,
+	0x6c, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x6b, 0x67, 0x2f,
+	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_pkg_v1_pkg_proto_rawDescOnce sync.Once
+	file_pkg_v1_pkg_proto_rawDescData = file_pkg_v1_pkg_proto_rawDesc
+)
+
+func file_pkg_v1_pkg_proto_rawDescGZIP() []byte {
+	file_pkg_v1_pkg_proto_rawDescOnce.Do(func() {
+		file_pkg_v1_pkg_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_v1_pkg_proto_rawDescData)
+	})
+	return file_pkg_v1_pkg_proto_rawDescData
+}
+
+var file_pkg_v1_pkg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_pkg_v1_pkg_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_v1_pkg_proto_goTypes = []interface{}{
+	(NoticeType)(0),  // 0: package.NoticeType
+	(*RankData)(nil), // 1: package.RankData
+}
+var file_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
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_pkg_v1_pkg_proto_init() }
+func file_pkg_v1_pkg_proto_init() {
+	if File_pkg_v1_pkg_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_v1_pkg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RankData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_v1_pkg_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_v1_pkg_proto_goTypes,
+		DependencyIndexes: file_pkg_v1_pkg_proto_depIdxs,
+		EnumInfos:         file_pkg_v1_pkg_proto_enumTypes,
+		MessageInfos:      file_pkg_v1_pkg_proto_msgTypes,
+	}.Build()
+	File_pkg_v1_pkg_proto = out.File
+	file_pkg_v1_pkg_proto_rawDesc = nil
+	file_pkg_v1_pkg_proto_goTypes = nil
+	file_pkg_v1_pkg_proto_depIdxs = nil
+}
--- a/aycache/aycache.go
+++ b/aycache/aycache.go
@@ -0,0 +1,15 @@
+package aycache
+
+import (
+	"github.com/ayflying/utility_go/pkg"
+	"github.com/gogf/gf/v2/os/gcache"
+)
+
+type Mod struct {
+	client *gcache.Cache
+}
+
+// Deprecated:弃用，改用 pkg.Cache()
+func New(_name ...string) gcache.Adapter {
+	return pkg.Cache(_name...)
+}
--- a/cmd/load.go
+++ b/cmd/load.go
@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"github.com/ayflying/utility_go/controller/callback"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+)
+
+func Load(s *ghttp.Server) {
+
+	//开启prometheus监控
+	s.Group("/metrics", func(group *ghttp.RouterGroup) {
+		group.Bind(
+			ghttp.WrapH(promhttp.Handler()),
+		)
+	})
+}
+
+// 注册游客方法
+func RegistrationAnonymous(group *ghttp.RouterGroup) (res []interface{}) {
+	group.Bind(
+		callback.NewV1(),
+	)
+	return
+
+}
+
+// 注册用户方法
+func RegistrationUser(group *ghttp.RouterGroup) (res []interface{}) {
+	group.Bind()
+	return
+}
--- a/cmd/make/act
+++ b/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 {
--- a/cmd/make/logic
+++ b/cmd/make/logic
@@ -9,7 +9,7 @@ type s{name} struct {
 }

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

 func New() *s{name} {
--- a/cmd/middleware.go
+++ b/cmd/middleware.go
@@ -62,9 +62,9 @@ func MiddlewareAdmin(r *ghttp.Request) {
 	ip := r.GetClientIp()
 	r.SetCtxVar("ip", ip)

-	get := r.Cookie.Get("uid")
+	getUid := r.Cookie.Get("uid")

-	if get == nil {
+	if getUid == nil {
 		//调试模式允许不验证用户名
 		debug, _ := g.Cfg().GetWithEnv(nil, "debug")
 		if !debug.Bool() {
@@ -82,7 +82,13 @@ func MiddlewareAdmin(r *ghttp.Request) {

 	}

-	uid := get.Int()
+	uid := getUid.Int()
+
+	//获取所有请求的信息
+	get := r.GetRequestMapStrStr()
+	if _, ok := get["uid"]; ok {
+		r.SetCtxVar("uid", get["uid"])
+	}

 	r.Middleware.Next()

--- a/drivers/db/elasticsearch/elasticsearch.go
+++ b/drivers/db/elasticsearch/elasticsearch.go
@@ -0,0 +1,83 @@
+package elasticsearch
+
+import (
+	"github.com/elastic/go-elasticsearch/v8"
+)
+
+var (
+	es *elasticsearch.TypedClient
+)
+
+type elastic struct {
+	client *elasticsearch.TypedClient
+}
+
+//func (d *Driver) Insert(ctx context.Context, table string, data interface{}, batch ...int) (res sql.Result, err error) {
+//
+//	return
+//}
+//
+//// createIndex 创建索引
+//func (d *Driver) CreateIndex(name string) {
+//
+//	resp, err := d.client.Indices.
+//		Create(name).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("create index failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("index:%#v\n", resp.Index)
+//}
+//
+//// indexDocument 索引文档
+//func (d *Driver) IndexDocument(name string, key string, data interface{}) {
+//
+//	// 添加文档
+//	resp, err := d.client.Index(name).
+//		Id(key).
+//		Document(data).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("indexing document failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("result:%#v\n", resp.Result)
+//}
+//
+//// getDocument 获取文档
+//func (d *Driver) Get(name string, id string) (res json.RawMessage) {
+//	resp, err := d.client.Get(name, id).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("get document by id failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("fileds:%d\n", resp.Source_)
+//	res = resp.Source_
+//	return
+//}
+//
+//// updateDocument 更新文档
+//func (d *Driver) UpdateDocument(name string, key string, data interface{}) {
+//
+//	resp, err := d.client.Update(name, key).
+//		Doc(data). // 使用结构体变量更新
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("update document failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("result:%v\n", resp.Result)
+//}
+//
+//// deleteDocument 删除 document
+//func (d *Driver) DeleteDocument(name string, key string) {
+//	resp, err := d.client.Delete(name, key).
+//		Do(context.Background())
+//	if err != nil {
+//		fmt.Printf("delete document failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("result:%v\n", resp.Result)
+//}
--- a/drivers/db/elasticsearch/es_open.go
+++ b/drivers/db/elasticsearch/es_open.go
@@ -0,0 +1,39 @@
+package elasticsearch
+
+import (
+	"database/sql"
+	"github.com/elastic/go-elasticsearch/v8"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+)
+
+func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {
+	var (
+		source               string
+		underlyingDriverName = "elasticsearch"
+	)
+	source = config.Host
+
+	cfg := elasticsearch.Config{
+		Addresses: []string{
+			config.Host,
+		},
+	}
+
+	es, err = elasticsearch.NewTypedClient(cfg)
+	//if err != nil {
+	//	fmt.Printf("elasticsearch.NewTypedClient failed, err:%v\n", err)
+	//	return
+	//}
+
+	if db, err = sql.Open(underlyingDriverName, source); err != nil {
+		err = gerror.WrapCodef(
+			gcode.CodeDbOperationError, err,
+			`sql.Open failed for driver "%s" by source "%s"`, underlyingDriverName, source,
+		)
+		return nil, err
+	}
+
+	return
+}
--- a/drivers/db/elasticsearch/load.go
+++ b/drivers/db/elasticsearch/load.go
@@ -0,0 +1,47 @@
+package elasticsearch
+
+import (
+	"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() {
+	var (
+		err         error
+		driverObj   = New()
+		driverNames = g.SliceStr{"es", "elasticsearch"}
+	)
+	for _, driverName := range driverNames {
+		if err = gdb.Register(driverName, driverObj); err != nil {
+			panic(err)
+		}
+	}
+}
+
+// New create and returns a driver that implements gdb.Driver, which supports operations for MySQL.
+func New() gdb.Driver {
+	return &Driver{}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *Driver) New(core *gdb.Core, node *gdb.ConfigNode) (res gdb.DB, err error) {
+	res = &Driver{
+		Core: core,
+	}
+	return
+}
+
+// GetChars returns the security char for this type of database.
+func (d *Driver) GetChars() (charLeft string, charRight string) {
+	return quoteChar, quoteChar
+}
--- a/drivers/db/found/found.go
+++ b/drivers/db/found/found.go
@@ -0,0 +1,56 @@
+package found
+
+import (
+	"database/sql"
+	"github.com/ayflying/utility_go/internal/boot"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// Driver is the driver for mysql database.
+type Driver struct {
+	*gdb.Core
+}
+
+func (d *Driver) Open(config *gdb.ConfigNode) (*sql.DB, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
+const (
+	quoteChar = "`"
+)
+
+func init() {
+	boot.AddFunc(func() {
+		var (
+			err         error
+			driverObj   = New()
+			driverNames = g.SliceStr{"es", "found"}
+		)
+		for _, driverName := range driverNames {
+			if err = gdb.Register(driverName, driverObj); err != nil {
+				panic(err)
+			}
+		}
+	})
+}
+
+// New create and returns a driver that implements gdb.Driver, which supports operations for MySQL.
+func New() gdb.Driver {
+	return &Driver{}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *Driver) New(core *gdb.Core, node *gdb.ConfigNode) (res gdb.DB, err error) {
+	res = &Driver{
+		Core: core,
+	}
+	return
+}
+
+// GetChars returns the security char for this type of database.
+func (d *Driver) GetChars() (charLeft string, charRight string) {
+	return quoteChar, quoteChar
+}
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ayflying/utility_go

-go 1.23.0
+go 1.24.0

 require (
 	github.com/apolloconfig/agollo/v4 v4.4.0
@@ -10,21 +10,29 @@ require (
 	github.com/go-pay/gopay v1.5.109
 	github.com/go-pay/util v0.0.4
 	github.com/goccy/go-json v0.10.4
-	github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3
-	github.com/gogf/gf/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0
+	github.com/gogf/gf/v2 v2.9.0
+	github.com/google/uuid v1.6.0
+	github.com/gorilla/websocket v1.5.3
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230
 	github.com/minio/minio-go/v7 v7.0.85
+	github.com/prometheus/client_golang v1.21.1
+	github.com/stretchr/testify v1.10.0
 	github.com/xuri/excelize/v2 v2.9.0
-	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
+	golang.org/x/oauth2 v0.24.0
 	google.golang.org/api v0.44.0
-	google.golang.org/protobuf v1.26.0
+	google.golang.org/protobuf v1.36.1
+	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )

 require (
 	cloud.google.com/go v0.81.0 // indirect
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
@@ -39,9 +47,7 @@ require (
 	github.com/go-pay/xtime v0.0.2 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
@@ -53,8 +59,13 @@ require (
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml v1.9.3 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
@@ -68,10 +79,10 @@ require (
 	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
 	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
@@ -79,6 +90,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
 	google.golang.org/grpc v1.38.0 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -54,9 +54,13 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/ayflying/excel2json v1.1.3 h1:Qy7HnF5aib7lIknaOqICvvZsSwAieLu6KJFeUccOISo=
 github.com/ayflying/excel2json v1.1.3/go.mod h1:aNzB271bUAuRq+P4J+S8a3NAltcghLIGR2HdM6akqFU=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -89,6 +93,8 @@ 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/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.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
@@ -120,10 +126,10 @@ github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcU
 github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
 github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3 h1:KU51l3uaU7Mxq+FSoLjROyDERUGKCMo4qExxPEgA7KQ=
-github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3/go.mod h1:Uo6f/Pr6zVHSbdP2Lj9iToEMuh/TzU/bE2E5SJlquEk=
-github.com/gogf/gf/v2 v2.8.3 h1:h9Px3lqJnnH6It0AqHRz4/1hx0JmvaSf1IvUir5x1rA=
-github.com/gogf/gf/v2 v2.8.3/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0 h1:BewnDc3gq2iqYzPH56FtOelmT9F9WcAm6nnlOVgw3J8=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0/go.mod h1:uNjaJcnMvMl7bkcoL0amxwcrOM+Q5XGADKKwKTY+8MY=
+github.com/gogf/gf/v2 v2.9.0 h1:semN5Q5qGjDQEv4620VzxcJzJlSD07gmyJ9Sy9zfbHk=
+github.com/gogf/gf/v2 v2.9.0/go.mod h1:sWGQw+pLILtuHmbOxoe0D+0DdaXxbleT57axOLH2vKI=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -236,11 +242,15 @@ github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
 github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+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/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230 h1:B0oaMTAQKDZd8cwYT0qsAI7+c3KbFeBNA8GhgoBMXWw=
 github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230/go.mod h1:C5LA5UO2ZXJrLaPLYtE1wUJMiyd/nwWaCO5cw/2pSHs=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -275,6 +285,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -285,7 +297,15 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
@@ -296,6 +316,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -306,7 +328,6 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK
 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/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 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.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
@@ -324,8 +345,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU0=
@@ -352,14 +373,14 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
-go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
-go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
-go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
-go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
+go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
@@ -458,8 +479,9 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 h1:0Ja1LBD+yisY6RWM/BH7TJVXWsSjs2VwBSmvSX4HdBc=
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
+golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -689,12 +711,18 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/hack/config.yaml
+++ b/hack/config.yaml
@@ -9,6 +9,7 @@ gfcli:
    pb:
      path: "manifest/protobuf"
      api: "api"
+      ctrl: "controller"
  docker:
    build: "-a amd64 -s linux -p temp -ew"
    tagPrefixes:
--- a/internal/boot/boot.go
+++ b/internal/boot/boot.go
@@ -0,0 +1,46 @@
+package boot
+
+import (
+	v1 "github.com/ayflying/utility_go/api/system/v1"
+	"github.com/ayflying/utility_go/drivers/db/elasticsearch"
+	"github.com/ayflying/utility_go/pkg/aycache"
+	"github.com/ayflying/utility_go/service"
+	"github.com/gogf/gf/v2/os/gctx"
+	"math"
+)
+
+var (
+	ctx   = gctx.GetInitCtx()
+	_func = []func(){}
+)
+
+func Boot() (err error) {
+	err = service.SystemCron().StartCron()
+
+	//用户活动持久化
+	service.SystemCron().AddCron(v1.CronType_DAILY, func() error {
+		return service.GameAct().Saves()
+	})
+
+	//初始化ES
+	elasticsearch.Init()
+
+	//初始化指标
+	service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
+		aycache.QPS.Set(math.Round(float64(aycache.QPSCount) / 60))
+		aycache.QPSCount = 0
+		return nil
+	})
+
+	//初始化自启动方法
+	for _, v := range _func {
+		v()
+	}
+
+	return nil
+}
+
+// AddFunc 注册方法，在启动时执行
+func AddFunc(f func()) {
+	_func = append(_func, f)
+}
--- a/internal/game/act/act.go
+++ b/internal/game/act/act.go
@@ -2,7 +2,7 @@ package act

 import (
 	"fmt"
-	"github.com/ayflying/utility_go/package/aycache"
+	"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"
@@ -11,7 +11,7 @@ import (
 )

 var (
-	Cache           = aycache.New()
+	Cache           = pgk.Cache("redis")
 	ActIdListIsShow map[int]func(uid int64) bool
 	RedDotList      map[string]func(uid int64) int32
 )
--- a/internal/logic/gameAct/gameAct.go
+++ b/internal/logic/gameAct/gameAct.go
@@ -2,16 +2,16 @@ package gameAct

 import (
 	"fmt"
-	"github.com/ayflying/utility_go/internal/game/act"
 	"github.com/ayflying/utility_go/internal/model/do"
 	"github.com/ayflying/utility_go/internal/model/entity"
-	"github.com/ayflying/utility_go/package/aycache"
+	"github.com/ayflying/utility_go/pkg"
 	service2 "github.com/ayflying/utility_go/service"
 	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
 	"strconv"
 	"strings"
 	"time"
@@ -70,8 +70,8 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
 	// 将查询到的活动信息保存到Redis缓存中
 	_, err = g.Redis().Set(ctx, keyCache, data)

-	var ActUidUpdateTimeCacheKey = fmt.Sprintf("act:update:%d", uid)
-	aycache.New("redis").Set(ctx, ActUidUpdateTimeCacheKey, uid, time.Hour*24*3)
+	var CacheKey = fmt.Sprintf("act:update:%d", uid)
+	pkg.Cache("redis").Set(ctx, CacheKey, uid, time.Hour*24*1)

 	return
 }
@@ -131,35 +131,29 @@ func (s *sGameAct) Save(actId int) (err error) {
 			result := strings.Split(cacheKey, ":")
 			actId, err = strconv.Atoi(result[1])
 			var uid int64
-			uid, err = strconv.ParseInt(result[2], 10, 64)
+			uid = gconv.Int64(result[2])
+			//uid, err = strconv.ParseInt(result[2], 10, 64)
 			if err != nil {
 				continue
 			}

 			cacheGet, _ := g.Redis().Get(ctx, cacheKey)
-			//最后删除key
-			delKey = append(delKey, cacheKey)
+
 			if uid == 0 {
 				//跳过为空的用户缓存
 				continue
 			}
 			if cacheGet.IsEmpty() {
-				//空数据也不巴保存
+				//空数据也不保存
 				continue
 			}

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

-			////如果1天没有活跃，跳过
-			//user, _ := service.MemberUser().Info(uid)
-			//if user.UpdatedAt.Seconds < gtime.Now().Add(consts.ActSaveTime).Unix() {
-			//	continue
-			//}
-
 			//获取数据库数据
 			var data *entity.GameAct
 			// 从数据库中查询活动信息
@@ -184,7 +178,8 @@ func (s *sGameAct) Save(actId int) (err error) {
 				data.Action = actionData
 				add = append(add, data)
 			}
-
+			//最后删除key
+			delKey = append(delKey, cacheKey)
 		}

 		//批量写入数据库
@@ -221,46 +216,29 @@ func (s *sGameAct) Save(actId int) (err error) {

 // 清空GetRedDot缓存
 func (s *sGameAct) RefreshGetRedDotCache(uid int64) {
-	//cacheKey2 := fmt.Sprintf("gameAct:GetRedDot:%d", uid)
-	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("Ymd"), uid)
-	act.Cache.Remove(gctx.New(), cacheKey)
+	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(ctx, err)
+		g.Dump(err)
+	}
 }

-//
-//func (s *sGameAct) GetRedDot(uid int64) (res map[string]int32, err error) {
-//	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("Ymd"), uid)
-//	if get, _ := act.Cache.Get(ctx, cacheKey); !get.IsEmpty() {
-//		err = get.Scan(&res)
-//		return
-//	}
-//
-//	res = make(map[string]int32)
-//
-//	//res["notice_count"] = 0
-//	//获取所有帖子红点
-//	for _, v := range communityNotice.Types {
-//		res[fmt.Sprintf("notice_%d", v)], err = service.CommunityNotice().Ping(uid, noticeV1.NoticeType(v))
-//	}
-//
-//	//邮件红点
-//	res["mail_count"], err = service.GameMail().RedDot(uid)
-//
-//	//act1可领取数量
-//	res["act1_count"], err = act1.New().RedDot(uid)
-//
-//	//act2可领取数量
-//	res["act2_count"], err = act2.New().RedDot(uid)
-//
-//	//成就红点
-//	res["act4_count"], err = act4.New().RedDot(uid)
-//
-//	//广告点击
-//	res["act6_count"], err = act6.New().RedDot(uid)
-//
-//	for k, v := range act.RedDotList {
-//		res[k] = v(uid)
-//	}
-//
-//	aycache.New().Set(ctx, cacheKey, res, time.Hour)
-//	return
-//}
+func (s *sGameAct) Del(uid int64, actId int) {
+	if uid == 0 || actId == 0 {
+		g.Log().Error(ctx, "当前参数为空")
+		return
+	}
+	// 构造缓存键名
+	keyCache := fmt.Sprintf("act:%v:%v", actId, uid)
+
+	//删除活动缓存
+	g.Redis().Del(ctx, keyCache)
+
+	//删除当前活动储存
+	g.Model(Name).Where(do.GameAct{
+		Uid:   uid,
+		ActId: actId,
+	}).Delete()
+
+}
--- a/internal/logic/gameKv/gameKv.go
+++ b/internal/logic/gameKv/gameKv.go
@@ -0,0 +1,125 @@
+package gameKv
+
+import (
+	"github.com/ayflying/utility_go/service"
+	"github.com/ayflying/utility_go/tools"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+var (
+	ctx  = gctx.New()
+	Name = "game_kv"
+)
+
+type sGameKv struct {
+	Lock sync.Mutex
+}
+
+func New() *sGameKv {
+	return &sGameKv{}
+}
+
+func init() {
+	service.RegisterGameKv(New())
+
+	//支付钩子
+	//task.Task.Trigger(tasks.TaskType_PAY, service.GameKv().HookPay)
+	//task.Task.Trigger(tasks.TaskType_WARDROBE_LEVEL, service.GameKv().HookLevelRwd)
+}
+
+// SavesV1 方法
+//
+// @Description: 保存用户KV数据列表。
+// @receiver s: sGameKv的实例。
+// @return err: 错误信息，如果操作成功，则为nil。
+func (s *sGameKv) SavesV1() (err error) {
+	// 从Redis列表中获取所有用户KV索引的键
+	//keys, err := utils.RedisScan("user:kv:*")
+	err = tools.Redis.RedisScanV2("user:kv:*", func(keys []string) (err error) {
+		// 定义用于存储用户数据的结构体
+		type ListData struct {
+			Uid int64       `json:"uid"`
+			Kv  interface{} `json:"kv"`
+		}
+		var list []*ListData
+		// 初始化列表，长度与keys数组一致
+		list = make([]*ListData, 0)
+		//需要删除的key
+		var delKey []string
+		// 遍历keys，获取每个用户的数据并填充到list中
+		for _, cacheKey := range keys {
+			//g.Log().Infof(ctx, "保存用户kv数据%v", v)
+			//uid := v.Int64()
+			//cacheKey = "user:kv:" + strconv.FormatInt(uid, 10)
+			result := strings.Split(cacheKey, ":")
+			var uid int64
+			uid, err = strconv.ParseInt(result[2], 10, 64)
+			if err != nil {
+				g.Log().Error(ctx, err)
+				g.Redis().Del(ctx, cacheKey)
+				continue
+			}
+
+			////如果1天没有活跃，跳过
+			//user, _ := service.MemberUser().Info(uid)
+			//if user.UpdatedAt.Seconds < gtime.Now().Add(consts.ActSaveTime).Unix() {
+			//	continue
+			//}
+
+			get, _ := g.Redis().Get(ctx, cacheKey)
+			var data interface{}
+			get.Scan(&data)
+			list = append(list, &ListData{
+				Uid: int64(uid),
+				Kv:  data,
+			})
+
+			delKey = append(delKey, cacheKey)
+		}
+
+		// 将列表数据保存到数据库
+		if len(list) > 0 {
+			_, err2 := g.Model("game_kv").Batch(30).Data(list).Save()
+			list = make([]*ListData, 0)
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				return
+			}
+
+			//批量删除key
+			for _, v := range delKey {
+				_, err2 = g.Redis().Del(ctx, v)
+				if err2 != nil {
+					g.Log().Errorf(ctx, "删除存档错误：%v,err=%v", v, err2)
+					return
+				}
+			}
+
+			delKey = make([]string, 0)
+
+		}
+		if err != nil {
+			g.Log().Error(ctx, "当前kv数据入库失败: %v", err)
+		}
+
+		return
+	})
+
+	//if err != nil {
+	//	return err
+	//}
+	////跳过
+	//if len(keys) == 0 {
+	//	return
+	//}
+	////一次最多处理10w条
+	//if len(keys) > 10000 {
+	//	keys = keys[:10000]
+	//}
+
+	return
+}
--- a/internal/logic/ip2region/ip2region.go
+++ b/internal/logic/ip2region/ip2region.go
@@ -34,13 +34,12 @@ func init() {
 //	@receiver s *sIp2region: sIp2region的实例。
 func (s *sIp2region) Load() {
 	var err error
-	//var dbPath = "/mnt/s3/ip2region.xdb"
-	var dbPath = "lib/ip2region.xdb"
+	var dbPath = "/runtime/library/ip2region.xdb"

 	if gfile.IsEmpty(dbPath) {
 		//下载文件
 		putData, err2 := g.Client().Discovery(nil).
-			Get(ctx, "https://resource.luoe.cn/pgk/ip2region.xdb")
+			Get(ctx, "https://resource.luoe.cn/attachment/ip2region.xdb")
 		if err2 != nil {
 			return
 		}
--- a/internal/logic/logic.go
+++ b/internal/logic/logic.go
@@ -6,6 +6,7 @@ package logic

 import (
 	_ "github.com/ayflying/utility_go/internal/logic/gameAct"
+	_ "github.com/ayflying/utility_go/internal/logic/gameKv"
 	_ "github.com/ayflying/utility_go/internal/logic/ip2region"
 	_ "github.com/ayflying/utility_go/internal/logic/logData"
 	_ "github.com/ayflying/utility_go/internal/logic/systemCron"
--- a/internal/logic/systemCron/listener.go
+++ b/internal/logic/systemCron/listener.go
@@ -3,9 +3,10 @@ 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"
-	"github.com/gogf/gf/v2/os/gtime"
 )

 type Status struct {
@@ -28,14 +29,14 @@ func (s *sSystemCron) Guardian(DingTalkWebHook string) {

 		defer get.Close()
 		if err != nil {
-			s.DingTalk(DingTalkWebHook, fmt.Sprintf("监控报警：服务端访问失败 (%v 服务器),err=%v", v.Name, err))
+			notice.New(v1.NoticeType_DINGTALK, DingTalkWebHook).Send(fmt.Sprintf("监控报警：服务端访问失败 (%v 服务器),err=%v", v.Name, err))
 		} else if get.StatusCode != 200 {
-			s.DingTalk(DingTalkWebHook, fmt.Sprintf("监控报警：服务端访问失败 (%v 服务器),code=%v,err=%v", v.Name, get.StatusCode, err))
+			notice.New(v1.NoticeType_DINGTALK, DingTalkWebHook).Send(fmt.Sprintf("监控报警：服务端访问失败 (%v 服务器),code=%v,err=%v", v.Name, get.StatusCode, err))
 		} else {
 			var ststus Status
 			err = json.Unmarshal(get.ReadAll(), &ststus)
 			if ststus.Code != 0 {
-				s.DingTalk(DingTalkWebHook, fmt.Sprintf("监控报警：服务端访问失败 (%v 服务器),msg=%v", v.Name, ststus.Message))
+				notice.New(v1.NoticeType_DINGTALK, DingTalkWebHook).Send(fmt.Sprintf("监控报警：服务端访问失败 (%v 服务器),msg=%v", v.Name, ststus.Message))
 			}
 		}
 	}
@@ -46,26 +47,8 @@ func (s *sSystemCron) Guardian(DingTalkWebHook string) {
 // @Description: 向指定的钉钉机器人发送消息。
 // @receiver s: 系统定时任务结构体指针。
 // @param value: 要发送的消息内容。
+// Deprecated: Use message.New(message.DingTalk, DingTalkWebHook).Send(value)
 func (s *sSystemCron) DingTalk(DingTalkWebHook string, value string) (res *gclient.Response) {
-	// 从配置中获取发送者名称
-	name, _ := g.Cfg().Get(ctx, "name")
-
-	// 定义钉钉机器人发送消息的URL，其中access_token为固定值
-	url := DingTalkWebHook
-	url += "&timestamp=" + gtime.Now().TimestampMilliStr()
-	// 使用goroutine异步发送消息
-
-	var post = g.Map{
-		"msgtype": "text",
-		"text": g.Map{
-			"content": "通知姬 " + name.String() + "：\n" + value + "\n" + gtime.Now().String(),
-		},
-	}
-
-	// 构建发送的消息体，包含消息类型和内容
-	res, err := g.Client().Discovery(nil).ContentJson().Post(ctx, url, post)
-	if err != nil {
-		g.Log().Info(ctx, err)
-	}
+	notice.New(v1.NoticeType_DINGTALK, DingTalkWebHook).Send(value)
 	return
 }
--- a/internal/logic/systemCron/systemCron.go
+++ b/internal/logic/systemCron/systemCron.go
@@ -7,13 +7,15 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcron"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/os/gtimer"
 	"sync"
 	"time"
 )

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

 // sSystemCron 结构体定义了系统定时任务的秒计时器。
@@ -110,6 +112,12 @@ func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
 //	@receiver s
 //	@return err
 func (s *sSystemCron) StartCron() (err error) {
+	//预防重复启动
+	if startTime != nil {
+		return
+	}
+	startTime = gtime.Now()
+
 	g.Log().Debug(ctx, "启动计划任务定时器详情")
 	//每秒任务
 	gtimer.SetInterval(ctx, time.Second, func(ctx context.Context) {
--- a/manifest/protobuf/pkg/v1/pkg.proto
+++ b/manifest/protobuf/pkg/v1/pkg.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+package package;
+
+option go_package = "github.com/ayflying/utility_go/api/pkg/v1";
+
+
+// 定义 NoticeType 枚举
+enum NoticeType {
+  DINGTALK = 0;
+  WECHAT = 1;
+  EMAIL = 2;
+  SMS = 3;
+  VOICE = 4;
+}
+
+//排行榜数据
+message RankData {
+  int64 id = 1;
+  int64 score = 2;
+  int32 rank = 3;
+  int64 update_ts = 4;
+}
--- a/manifest/protobuf/system/v1/cron.proto
+++ b/manifest/protobuf/system/v1/cron.proto
@@ -1,4 +1,3 @@
-
 syntax = "proto3";
 package system;

--- a/package/aycache/cache.go
+++ b/package/aycache/cache.go
@@ -1,37 +0,0 @@
-package aycache
-
-import (
-	"github.com/ayflying/utility_go/package/aycache/drive"
-	"github.com/gogf/gf/v2/os/gcache"
-)
-
-type Mod struct {
-	client *gcache.Cache
-}
-
-//func NewV1(_name ...string) *cache.Mod {
-//	return pgk.Cache
-//}
-
-func New(_name ...string) gcache.Adapter {
-
-	var cacheAdapterObj gcache.Adapter
-	var name = "cache"
-	if len(_name) > 0 {
-		name = _name[0]
-	}
-	switch name {
-	case "cache":
-		cacheAdapterObj = NewAdapterMemory()
-	case "redis":
-		cacheAdapterObj = NewAdapterRedis()
-	case "file":
-		cacheAdapterObj = NewAdapterFile("runtime/cache")
-	case "es":
-		cacheAdapterObj = drive.NewAdapterElasticsearch([]string{"http://127.0.0.1:9200"})
-	}
-
-	//var client = gcache.New()
-	//client.SetAdapter(cacheAdapterObj)
-	return cacheAdapterObj
-}
--- a/package/aycache/redis.go
+++ b/package/aycache/redis.go
@@ -1,18 +0,0 @@
-package aycache
-
-import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcache"
-)
-
-var adapterRedisClient gcache.Adapter
-var adapterRedisCache = gcache.New()
-
-func NewAdapterRedis() gcache.Adapter {
-
-	if adapterRedisClient == nil {
-		adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default"))
-		adapterRedisCache.SetAdapter(adapterRedisClient)
-	}
-	return adapterRedisCache
-}
--- a/package/elasticsearch/elasticsearch.go
+++ b/package/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)
-}
--- a/package/excel/excel.go
+++ b/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,193 @@ 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 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
 }
--- a/package/pay/wechat.go
+++ b/package/pay/wechat.go
@@ -1,3 +1,4 @@
+//Deprecated: 使用新的 pkg.Pay()
 package pay

 import (
@@ -27,6 +28,7 @@ type WechatPay struct {
 	PrivateKey string
 }

+// Deprecated: pkg.Pay().Wechat()
 func Wechat() *WechatPay {
 	var pay = &WechatPay{}
 	var err error
--- a/package/rand/rand.go
+++ b/package/rand/rand.go
@@ -1,51 +0,0 @@
-package utility
-
-import (
-	"github.com/ayflying/utility_go/tools"
-	"math/rand"
-	"time"
-)
-
-// rands 结构体用于封装 rand.Rand 实例，以提供随机数生成功能。
-// 该结构体目前不包含锁，因此在多线程环境下使用时应注意同步问题。
-type rands struct {
-	r *rand.Rand
-	// lock sync.Mutex
-}
-
-// Rand 是一个全局的 rands 实例，用于在整个程序中生成随机数。
-// 它使用当前时间的毫秒值作为随机源，以确保每次程序运行时都能获得不同的随机数序列。
-var Rand = rands{
-	r: rand.New(rand.NewSource(time.Now().UnixMilli())),
-}
-
-// RandByArrInt 函数从一个整数数组中按权重选择一个索引，并返回该索引。
-// 权重是数组中相应元素的值。该函数通过计算累积和来确定选择的索引。
-// 参数 v 是一个泛型参数，限制为实现了 Number 接口的类型。
-// 返回值是一个整数，表示在数组中的索引。
-func RandByArrInt[v tools.Number](s []v) int {
-	sv := 0
-	for i := range s {
-		sv += int(s[i])
-	}
-	r := Rand.Intn(sv)
-	var all v
-	for i := range s {
-		all += s[i]
-		if all > v(r) {
-			return i
-		}
-	}
-	return 0
-}
-
-// Intn 方法通过给定的整数 i 生成一个 0 到 i-1 之间的随机数。
-// 如果 i 为0，则会触发 panic。
-// 参数 i 是一个整数，表示生成随机数的上限（不包含）。
-// 返回值 ret 是一个在 0 到 i-1 范围内的随机整数。
-func (r rands) Intn(i int) (ret int) {
-	if i == 0 {
-		panic(1)
-	}
-	return rand.Intn(i)
-}
--- a/package/s3/s3.go
+++ b/package/s3/s3.go
@@ -36,6 +36,7 @@ type Mod struct {
 	cfg    DataType
 }

+// Deprecated: Use Pgk.S3()
 func New(_name ...string) *Mod {
 	var name string
 	if len(_name) > 0 {
--- a/pgk/pgk.go
+++ b/pgk/pgk.go
@@ -0,0 +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"
+)
+
+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()
+}
--- a/pgk/rank/rank.go
+++ b/pgk/rank/rank.go
@@ -0,0 +1,396 @@
+package rank
+
+import (
+	"fmt"
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
+	"time"
+
+	"github.com/gogf/gf/v2/database/gredis"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+var (
+	ctx = gctx.New()
+)
+
+type Mod struct {
+}
+
+type F64CountRank struct {
+	name     string // 排行榜名
+	updateTs string // 更新时间key
+}
+
+//
+//type RankData struct {
+//	Id       int64
+//	Score    int64
+//	Rank     int32
+//	UpdateTs int64
+//}
+
+func New() *Mod {
+	return &Mod{}
+}
+
+func (s *Mod) Load() {
+
+}
+
+// CreateF64CountRank 创建一个排行榜实例
+// 参数:
+//
+//	name: 排行榜的名称，通常代表一个赛季
+//
+// 返回值:
+//
+//	*F64CountRank: 返回一个指向新创建的F64CountRank实例的指针
+
+// Deprecated: pgk.Rnak().CreateF64CountRank("赛季")
+func (s *Mod) CreateF64CountRank(name string) *F64CountRank {
+	// 初始化F64CountRank实例的name和updateTs字段
+	// name字段用于标识排行榜的名称，格式为"rank:<name>:score"
+	// updateTs字段用于标识排行榜的更新时间，格式为"rank:<name>:updateTs"
+	return &F64CountRank{
+		name:     fmt.Sprintf("rank:%s:score", name),
+		updateTs: fmt.Sprintf("rank:%s:updateTs", name),
+	}
+}
+
+// IncrScore 对指定ID的分数进行增加，并返回增加后的当前分数。
+// 该方法首先更新成员的更新时间戳，然后增加成员的分数。
+//
+// 参数:
+//
+//	id - 要操作的成员ID。
+//	score - 要增加的分数。
+//
+// 返回值:
+//
+//	curScore - 增加分数后的当前分数。
+//	err - 操作过程中可能发生的错误。
+//
+// IncrScore 先改redis再改cache
+//
+//	@Description:
+//	@receiver r
+//	@param id
+//	@param score
+//	@return curScore
+//	@return err
+func (r *F64CountRank) IncrScore(id int64, score int64) (curScore float64, err error) {
+	// 记录当前时间戳，用于更新成员的最新活动时间。
+	now := time.Now().UnixMilli()
+
+	// 将成员的更新时间戳加入到Redis的有序集合中，确保成员的排序依据是最新的活动时间。
+	_, err = g.Redis().ZAdd(ctx, r.updateTs, &gredis.ZAddOption{}, gredis.ZAddMember{
+		Score:  float64(now),
+		Member: id,
+	})
+
+	// 增加成员的分数，并返回增加后的当前分数。
+	curScore, err = g.Redis().ZIncrBy(ctx, r.name, float64(score), id)
+
+	//如果分数小于0，则删除
+	if curScore <= 0 {
+		err = r.DelScore(id)
+	}
+
+	return
+}
+
+// todo暂时未使用
+func (r *F64CountRank) GetCount() {
+	count, _ := g.Redis().ZCard(ctx, r.name)
+	if count > 9999 {
+		//删除超过9999的数据
+		g.Redis().ZRemRangeByRank(ctx, r.name, 0, -9999)
+	}
+}
+
+// Delete 删除当前排行榜
+// 该方法通过删除Redis中与排行榜相关的键来清除排行榜信息
+func (r *F64CountRank) Delete() {
+	// 删除排行榜数据键
+	_, err := g.Redis().Del(ctx, r.name)
+	if err != nil {
+		// 如果删除失败，记录错误日志
+		g.Log().Error(ctx, "排行榜删除失败:%v", err)
+	}
+	// 删除排行榜更新时间键
+	_, err = g.Redis().Del(ctx, r.updateTs)
+	if err != nil {
+		// 如果删除失败，记录错误日志
+		g.Log().Error(ctx, "排行榜删除失败:%v", err)
+	}
+}
+
+// DelScore 删除当前分数
+//
+// 该方法从更新时间有序集合和排名有序集合中移除指定的id。
+// 这通常用于从排行榜中删除一个条目，同时确保其在更新时间集合中的对应记录也被清除。
+//
+//	@Description: 从更新时间和排名集合中移除指定id
+//	@receiver r 接收者为F64CountRank类型的实例
+//	@param id 要从集合中移除的条目的ID
+//	@return err 可能发生的错误，如果操作成功，err为nil
+func (r *F64CountRank) DelScore(id int64) (err error) {
+	// 从更新时间集合中移除id
+	_, err = g.Redis().ZRem(ctx, r.updateTs, id)
+	// 从排名集合中移除id
+	_, err = g.Redis().ZRem(ctx, r.name, id)
+	return
+}
+
+// DelByRank 根据排名范围删除元素。
+// 该方法使用了Redis的有序集合数据结构，通过ZRange和ZRemRangeByRank命令来实现。
+// 参数start和stop定义了要删除的排名范围，从start到stop（包括start和stop）。
+// 返回可能的错误。
+func (r *F64CountRank) DelByRank(start int64, stop int64) (err error) {
+	// 初始化一个空的int64切片，用于存储指定排名范围内的元素。
+	var members []int64
+
+	// 使用Redis的ZRange命令获取指定排名范围内的元素。
+	// 选项Rev设置为true，表示按照分数从高到低的顺序返回元素。
+	get, err := g.Redis().ZRange(ctx, r.name, start, stop,
+		gredis.ZRangeOption{
+			Rev: true,
+		})
+
+	// 使用Scan方法将获取到的元素扫描到members切片中。
+	err = get.Scan(&members)
+	// 如果扫描过程中出现错误，直接返回错误。
+	if err != nil {
+		return
+	}
+
+	// 遍历members切片，对于每个元素，使用ZRem命令从更新时间集合中删除对应的成员。
+	for _, member := range members {
+		_, err = g.Redis().ZRem(ctx, r.updateTs, member)
+		// 忽略ZRem操作的错误，因为即使元素不存在，ZRem也不会返回错误。
+	}
+
+	// 使用ZRemRangeByRank命令从有序集合中删除指定排名范围内的元素。
+	_, err = g.Redis().ZRemRangeByRank(ctx, r.name, start, stop)
+	// 返回可能的错误。
+	return
+}
+
+// updateScore 更新给定ID的分数值。
+//
+// 参数:
+//
+//	id - 需要更新分数的实体ID。
+//	score - 新的分数值。
+//
+// 返回值:
+//
+//	error - 更新过程中可能出现的错误。
+//
+// 该方法首先记录当前时间作为更新时间戳，然后将新的分数值添加到排名系统中。
+// 使用Redis的ZAdd方法来确保操作的原子性和一致性。
+// UpdateScore 更新分数
+//
+//	@Description:
+//	@receiver r
+//	@param id
+//	@param score
+//	@return err
+func (r *F64CountRank) UpdateScore(id int64, score int64) (err error) {
+	// 获取当前时间戳，以毫秒为单位。
+	now := time.Now().UnixMilli()
+
+	// 向更新时间戳的有序集合中添加新的成员和分数，成员为id，分数为当前时间戳。
+	_, err = g.Redis().ZAdd(ctx, r.updateTs, &gredis.ZAddOption{}, gredis.ZAddMember{
+		Score:  float64(now),
+		Member: id,
+	})
+
+	// 向排名的有序集合中添加新的成员和分数，成员为id，分数为传入的score。
+	_, err = g.Redis().ZAdd(ctx, r.name, &gredis.ZAddOption{}, gredis.ZAddMember{
+		Score:  float64(score),
+		Member: id,
+	})
+	return
+}
+
+//// GetRankInfosV1 获取0~count跳记录
+//func (r *F64CountRank) getRankInfosV1(offset, count int) (list []*RankInfo, err error) {
+//	/*
+//		找到maxRank的玩家的分数
+//		根据分数拿到所有分数大于等于minScore玩家
+//		将这些玩家进行排序
+//		返回maxRank条目
+//	*/
+//	var (
+//		minScore int64 // 最低分
+//		maxScore int64
+//		//zl       []redis2.Z
+//		zl     []gredis.ZAddMember
+//		length int
+//	)
+//	// 拉取所有玩家的更新时间戳
+//	zl, err = g.Redis().ZRemRangeByScore(ctx,r.updateTs, strconv.Itoa(0), strconv.Itoa(-1))//ZRemRangeByScore(ctx, r.updateTs, strconv.Itoa(0), strconv.Itoa(-1))
+//	//zl, err = rdbV1.ZRangeWithScores(ctx, r.updateTs, 0, -1).Result()
+//	if err != nil {
+//		g.Log().Errorf(ctx, "redis err:%v", err)
+//		return
+//	}
+//	if len(zl) == 0 {
+//		//logs.Infof("empty list")
+//		return
+//	}
+//	tsl := make(map[int64]int64, len(zl))
+//	for _, z := range zl {
+//		id := gconv.Int64(z.Member) //pgk.InterfaceToNumber[uint64](z.Member)
+//		tsl[id] = int64(z.Score)
+//	}
+//
+//	// 找到maxRank的玩家的分数
+//	zl, err = rdbV1.ZRevRangeByScoreWithScores(ctx, r.name, &redis2.ZRangeBy{
+//		Min:    "0",
+//		Max:    strconv.Itoa(math.MaxInt),
+//		Offset: 0,
+//		Count:  int64(count),
+//	}).Result()
+//	if err != nil {
+//		g.Log().Errorf(ctx, "redis err:%v", err)
+//		return
+//	}
+//	if len(zl) == 0 {
+//		g.Log().Info(ctx, "empty list")
+//		return
+//	}
+//	minScore = int64(zl[len(zl)-1].Score)
+//	maxScore = int64(zl[0].Score)
+//	// 根据分数拿到所有分数大于等于minScore玩家
+//	zl, err = rdbV1.ZRevRangeByScoreWithScores(ctx, r.name, &redis2.ZRangeBy{
+//		Min: fmt.Sprintf("%v", minScore),
+//		Max: fmt.Sprintf("%v", maxScore),
+//	}).Result()
+//	if err != nil {
+//		g.Log().Errorf(ctx, "redis err:%v", err)
+//		return
+//	}
+//	if len(zl) == 0 {
+//		g.Log().Info(ctx, "empty list")
+//		return
+//	}
+//	//如果开始已经大于等于总长度,就返回空
+//	if offset >= len(zl) {
+//		return
+//	}
+//	list = make([]*RankInfo, len(zl))
+//	for i, z := range zl {
+//		id := gconv.Int64(z.Member)
+//		list[i] = &RankInfo{
+//			Id:       id,
+//			Score:    int64(z.Score),
+//			UpdateTs: tsl[id],
+//		}
+//	}
+//	// 将这些玩家进行排序
+//	sort.Slice(list, func(i, j int) bool {
+//		if list[i].Score != list[j].Score {
+//			return list[i].Score > list[j].Score
+//		} else {
+//			return list[i].UpdateTs < list[j].UpdateTs
+//		}
+//	})
+//	length = len(list)
+//	if length > count {
+//		length = count
+//	}
+//	for i := range list {
+//		info := list[i]
+//		info.Rank = i + 1
+//	}
+//
+//	list = list[offset:length]
+//	return
+//}
+
+// GetRankInfosNotTs 获取0~count跳记录 不根据更新时间来
+// 该方法使用ZRange命令从Redis中获取指定范围的排名信息，不考虑更新时间
+// 参数:
+//
+//	offset - 获取记录的起始偏移量
+//	count - 获取记录的数量
+//
+// 返回值:
+//
+//	list - 排名信息列表
+//	err - 错误信息，如果执行过程中遇到错误
+func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*v1.RankData, err error) {
+	// 初始化存储成员ID的切片
+	var members []int64
+
+	// 使用Redis的ZRange命令获取指定范围的成员ID
+	// 参数Rev设为true以从高分到低分获取成员
+	get, err := g.Redis().ZRange(ctx, r.name, int64(offset), int64(count),
+		gredis.ZRangeOption{
+			Rev: true,
+		}) //.ScanSlice(&members)
+
+	// 将获取的结果扫描到members切片中
+	err = get.Scan(&members)
+	// 如果发生错误，记录日志并返回
+	if err != nil {
+		//logs.Withf("redis err:%v", err)
+		return
+	}
+
+	// 根据获取的成员ID数量初始化排名信息列表
+	list = make([]*v1.RankData, len(members))
+	for i := range members {
+		// 获取当前成员ID
+		id := members[i]
+		// 使用成员ID获取排名信息，不考虑更新时间
+		list[i] = r.GetIdRankNotTs(id)
+	}
+	// 返回排名信息列表和可能的错误
+	return
+}
+
+// GetIdRankNotTs 获取指定id的当前排名
+// 该方法从Redis的有序集合中查询指定id的分数和排名信息，不考虑时间戳
+// 参数:
+//
+//	id - 需要查询排名的id
+//
+// 返回值:
+//
+//	rankInfo - 包含id的分数和排名信息的指针，如果没有找到，则返回nil
+func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *v1.RankData) {
+	// 初始化rankInfo结构体，设置id，其他字段将通过查询填充
+	rankInfo = &v1.RankData{Id: id}
+
+	// 查询有序集合中指定id的分数
+	score, err := g.Redis().ZScore(ctx, r.name, id)
+	if err != nil {
+		// 如果发生错误，直接返回，rankInfo为初始化状态，Id已设置，其他字段为零值
+		return
+	}
+
+	// 将分数转换为int64类型并更新rankInfo
+	rankInfo.Score = int64(score)
+
+	// 如果分数为0，直接返回，表示该id的分数为0，没有进一步查询排名的必要
+	if score == 0 {
+		return
+	}
+
+	// 查询有序集合中指定id的排名
+	rank, err := g.Redis().ZRevRank(ctx, r.name, id)
+	if err != nil {
+		// 如果发生错误，直接返回，rankInfo中仅分数有效，排名信息未更新
+		return
+	}
+
+	// 更新rankInfo中的排名信息，排名从0开始，所以需要加1以符合人类的计数习惯
+	rankInfo.Rank = int32(rank) + 1
+
+	// 返回包含完整排名信息的rankInfo指针
+	return rankInfo
+}
--- a/pkg/aycache/cache.go
+++ b/pkg/aycache/cache.go
@@ -0,0 +1,48 @@
+package aycache
+
+import (
+	"github.com/ayflying/utility_go/pkg/aycache/drive"
+	drive2 "github.com/ayflying/utility_go/pkg/aycache/drive"
+	"github.com/gogf/gf/v2/os/gcache"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+type Mod struct {
+	client *gcache.Cache
+}
+
+var (
+	QPSCount int
+	QPS      = promauto.NewGauge(
+		prometheus.GaugeOpts{
+			Name: "Cache_QPS",
+			Help: "当前缓存QPS数量",
+		},
+	)
+)
+
+func New(_name ...string) gcache.Adapter {
+
+	var cacheAdapterObj gcache.Adapter
+	var name = "cache"
+	if len(_name) > 0 {
+		name = _name[0]
+	}
+	switch name {
+	case "cache":
+		cacheAdapterObj = drive2.NewAdapterMemory()
+	case "redis":
+		cacheAdapterObj = drive2.NewAdapterRedis()
+	case "file":
+		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")
+	case "es":
+		cacheAdapterObj = drive.NewAdapterElasticsearch(_name[1])
+	}
+
+	//var client = gcache.New()
+	//client.SetAdapter(cacheAdapterObj)
+
+	QPSCount++
+	return cacheAdapterObj
+}
--- a/package/aycache/drive/elasticsearch.go
+++ b/package/aycache/drive/elasticsearch.go
@@ -2,23 +2,51 @@ package drive

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

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

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

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

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

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

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

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

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

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

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

-func NewAdapterElasticsearch(addresses []string) gcache.Adapter {
-	return &AdapterElasticsearch{
-		Addresses: addresses,
+func NewAdapterElasticsearch(name string) gcache.Adapter {
+
+	if adapterElasticsearchClient == nil {
+		_cfg, _ := g.Cfg().Get(gctx.New(), "elasticsearch")
+		var cfg elasticsearch.Config
+		_cfg.Scan(&cfg)
+		es, _ := elasticsearch.NewTypedClient(cfg)
+		adapterElasticsearchClient = &AdapterElasticsearch{
+			client: es,
+			name:   name,
+		}
 	}
+	return adapterElasticsearchClient
 }
--- a/pkg/aycache/drive/file.go
+++ b/pkg/aycache/drive/file.go
@@ -1,4 +1,4 @@
-package aycache
+package drive

 import (
 	"context"
@@ -16,17 +16,6 @@ type AdapterFile struct {
 }

 func (a AdapterFile) Set(ctx context.Context, key interface{}, value interface{}, duration time.Duration) error {
-	//defer a.handleLruKey(ctx, key)
-	//expireTime := a.getInternalExpire(duration)
-	//a.data.Set(key, memoryDataItem{
-	//	a: value,
-	//	a: expireTime,
-	//})
-	//c.eventList.PushBack(&adapterMemoryEvent{
-	//	k: key,
-	//	e: expireTime,
-	//})
-
 	arr := strings.Split(":", gconv.String(key))
 	fileName := path.Join(arr...)
 	return gfile.PutBytes(fileName, gconv.Bytes(value))
--- a/pkg/aycache/drive/memory.go
+++ b/pkg/aycache/drive/memory.go
@@ -1,4 +1,4 @@
-package aycache
+package drive

 import (
 	"github.com/gogf/gf/v2/os/gcache"
--- a/pkg/aycache/drive/mencached.go
+++ b/pkg/aycache/drive/mencached.go
@@ -1,4 +1,4 @@
-package aycache
+package drive

 import (
 	"context"
--- a/pkg/aycache/drive/redis.go
+++ b/pkg/aycache/drive/redis.go
@@ -0,0 +1,25 @@
+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 gcache.Adapter
+var adapterRedisCache = gcache.New()
+
+func NewAdapterRedis() gcache.Adapter {
+
+	if adapterRedisClient == nil {
+		_cfg, _ := g.Cfg().Get(gctx.New(), "redis.default")
+		var cfg *gredis.Config
+		_cfg.Scan(&cfg)
+		redisObj, _ := gredis.New(cfg)
+		//adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default"))
+		adapterRedisClient = gcache.NewAdapterRedis(redisObj)
+		adapterRedisCache.SetAdapter(adapterRedisClient)
+	}
+	return adapterRedisCache
+}
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -0,0 +1,189 @@
+package config
+
+import (
+	"fmt"
+	"github.com/apolloconfig/agollo/v4"
+	apolloConfig "github.com/apolloconfig/agollo/v4/env/config"
+	"github.com/apolloconfig/agollo/v4/storage"
+	"github.com/gogf/gf/contrib/config/apollo/v2"
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gres"
+	"github.com/gogf/gf/v2/text/gstr"
+	"sync"
+)
+
+var (
+	//ApolloCfg      *apolloConfig.AppConfig
+	ApolloCfg      *apollo.Config
+	ApolloListener []string
+	Item2Obj       = map[string]Load{}
+)
+
+// load接口定义了Load方法，用于加载数据
+type Load interface {
+	Load(cfg ...string)
+}
+
+func NewV1() *Cfg {
+	return &Cfg{}
+}
+
+type Cfg struct {
+	Lock sync.Mutex
+}
+
+func (c *Cfg) GetDbFile(name string) (res *g.Var, err error) {
+	get2, err := g.Model("game_config").
+		Where("name", name).Master().Value("data")
+	err = get2.Scan(&res)
+	if res == nil {
+		res = &gvar.Var{}
+	}
+	return
+}
+
+func (c *Cfg) GetFile(filename string, obj ...Load) (jsonObj *gjson.Json, err error) {
+	pathStr := "manifest/game/"
+	filePath := pathStr + filename + ".json"
+	//err := gres.Load(pathStr + filename)
+
+	//载入静态资源到文件对象
+	err = gres.Load(filePath)
+	var bytes []byte
+
+	if gfile.IsFile(filePath) {
+		bytes = gfile.GetBytes(filePath)
+	} else {
+		bytes = gres.GetContent(filePath)
+	}
+
+	jsonObj, err = gjson.DecodeToJson(bytes)
+	//g.Dump(filePath, jsonObj)
+	return
+}
+
+// getUrlFile 获取远程配置
+func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
+	urlStr := fmt.Sprintf("http://sdf.sdfs.sdf/%s.json", name)
+	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
+	bytes := getUrl.ReadAll()
+	jsonObj, err = gjson.DecodeToJson(bytes)
+	return
+}
+
+// 获取阿波罗
+//func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
+//	jsonObj, err = c.GetApolloV2(name, obj)
+//	return
+//
+//	//c.Lock.Lock()
+//	//defer c.Lock.Unlock()
+//	//
+//	//Item2Obj[name+".json"] = obj
+//	//var cfg = apolloConfig.AppConfig{
+//	//	AppID:             ApolloCfg.AppID,
+//	//	Cluster:           ApolloCfg.Cluster,
+//	//	IP:                ApolloCfg.IP,
+//	//	NamespaceName:     name + ".json",
+//	//	Secret:            ApolloCfg.Secret,
+//	//	IsBackupConfig:    ApolloCfg.IsBackupConfig,
+//	//	BackupConfigPath:  ApolloCfg.BackupConfigPath,
+//	//	SyncServerTimeout: 60,
+//	//	MustStart:         true,
+//	//}
+//	////cfg.NamespaceName = name + ".json"
+//	//
+//	//client, err := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
+//	//	return ApolloCfg, nil
+//	//})
+//	//if client == nil {
+//	//	return
+//	//}
+//	//var getStr string
+//	//var getApollo *storage.Config
+//	//for range 5 {
+//	//	getApollo = client.GetConfig(cfg.NamespaceName)
+//	//	if getApollo != nil {
+//	//		break
+//	//	}
+//	//	time.Sleep(time.Second * 5)
+//	//}
+//	//
+//	//if getApollo != nil {
+//	//	getStr = getApollo.GetValue("content")
+//	//	if getStr != "" {
+//	//		//写入配置
+//	//		gfile.PutContents(path.Join("manifest", "game", name+".json"), getStr)
+//	//	}
+//	//} else {
+//	//	jsonObj, err = c.GetFile(name)
+//	//}
+//	//jsonObj, err = gjson.DecodeToJson(getStr)
+//	////首次运行加入监听器
+//	//if !gstr.InArray(ApolloListener, name) {
+//	//	c2 := &CustomChangeListener{}
+//	//	client.AddChangeListener(c2)
+//	//	ApolloListener = append(ApolloListener, name)
+//	//}
+//	//return
+//}
+
+func (c *Cfg) GetApollo(name string, obj Load) (jsonObj *gjson.Json, err error) {
+	Item2Obj[name+".json"] = obj
+
+	// 接入阿波罗配置
+	ApolloCfg.NamespaceName = name + ".json"
+	adapter, err := apollo.New(nil, *ApolloCfg)
+	if err != nil {
+		g.Log().Fatalf(nil, `%+v`, err)
+	}
+	// Change the adapter of default configuration instance.
+	g.Cfg(name).SetAdapter(adapter)
+
+	//首次运行加入监听器
+	if !gstr.InArray(ApolloListener, name+".json") {
+		//放置监听器
+		client, _ := agollo.StartWithConfig(func() (*apolloConfig.AppConfig, error) {
+			return &apolloConfig.AppConfig{
+				AppID:             ApolloCfg.AppID,
+				Cluster:           ApolloCfg.Cluster,
+				NamespaceName:     ApolloCfg.NamespaceName,
+				IP:                ApolloCfg.IP,
+				IsBackupConfig:    ApolloCfg.IsBackupConfig,
+				BackupConfigPath:  ApolloCfg.BackupConfigPath,
+				Secret:            ApolloCfg.Secret,
+				SyncServerTimeout: ApolloCfg.SyncServerTimeout,
+				MustStart:         ApolloCfg.MustStart,
+			}, nil
+		})
+		c2 := &CustomChangeListener{}
+		client.AddChangeListener(c2)
+		ApolloListener = append(ApolloListener, name+".json")
+	}
+
+	cfg, err := g.Cfg(name).Get(nil, "content")
+	cfg.Scan(&jsonObj)
+	return
+}
+
+// 阿波罗监听器
+type CustomChangeListener struct {
+	wg sync.WaitGroup
+}
+
+func (c *CustomChangeListener) OnChange(changeEvent *storage.ChangeEvent) {
+	g.Log().Debugf(nil, "当前Namespace变化了：%v", changeEvent.Namespace)
+	filename := changeEvent.Namespace
+	if obj, ok := Item2Obj[filename]; ok {
+		//重载配置文件
+		obj.Load(changeEvent.Changes["content"].NewValue.(string))
+	}
+}
+
+func (c *CustomChangeListener) OnNewestChange(event *storage.FullChangeEvent) {
+	//write your code here
+
+}
--- a/pkg/elasticsearch/elasticsearch.go
+++ b/pkg/elasticsearch/elasticsearch.go
@@ -0,0 +1,106 @@
+package elasticsearch
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"github.com/elastic/go-elasticsearch/v8"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/bulk"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/delete"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/search"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/core/update"
+	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+var (
+	es *elasticsearch.TypedClient
+)
+
+type Elastic struct {
+	client *elasticsearch.TypedClient
+	name   string
+}
+
+func NewV1(name string) *Elastic {
+	var cfg elasticsearch.Config
+	_cfg := g.Cfg().MustGetWithEnv(gctx.New(), "elasticsearch")
+	_cfg.Scan(&cfg)
+	if es == nil {
+		var err error
+		es, err = elasticsearch.NewTypedClient(cfg)
+		if err != nil {
+			fmt.Printf("elasticsearch.NewTypedClient failed, err:%v\n", err)
+			return &Elastic{}
+		}
+	}
+	return &Elastic{
+		client: es,
+		name:   name,
+	}
+}
+
+//// Create 创建索引
+//func (s *Elastic) Create(ctx context.Context) {
+//	resp, err := s.client.Indices.
+//		Create(s.name).Do(ctx)
+//	if err != nil {
+//		fmt.Printf("create index failed, err:%v\n", err)
+//		return
+//	}
+//	fmt.Printf("index:%#v\n", resp.Index)
+//}
+
+// Set 索引文档
+func (s *Elastic) Set(ctx context.Context, key string, data interface{}) (err error) {
+	// 添加文档
+	_, err = s.client.Index(s.name).Id(key).Document(data).Do(ctx)
+	return
+}
+
+// SetBulk 批量添加文档
+func (s *Elastic) SetBulk(ctx context.Context, data []any) (err error) {
+	var save *bulk.Request
+	save = &bulk.Request{
+		data,
+	}
+	s.client.Bulk().Index(s.name).Request(save).Do(ctx)
+	return
+}
+
+// Get 获取文档
+func (s *Elastic) Get(ctx context.Context, id string) (res json.RawMessage, err error) {
+	get, err := s.client.Get(s.name, id).Do(ctx)
+	if err != nil {
+		return
+	}
+	res = get.Source_
+	return
+}
+
+// Update 更新文档
+func (s *Elastic) Update(ctx context.Context, key string, data interface{}) (res *update.Response, err error) {
+	res, err = s.client.Update(s.name, key).Doc(data).Do(ctx)
+	return
+}
+
+// Delete 删除 document
+func (s *Elastic) Delete(ctx context.Context, key string) (res *delete.Response, err error) {
+	res, err = s.client.Delete(s.name, key).Do(ctx)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// Select 查询
+func (s *Elastic) Select(ctx context.Context, query *types.MatchAllQuery) (res *search.Response, err error) {
+	res, err = s.client.Search(). //Index("my_index").
+		Request(&search.Request{
+			Query: &types.Query{
+				MatchAll: &types.MatchAllQuery{},
+			},
+		}).Do(ctx)
+	return
+}
--- a/pkg/notice/drive/dingtalk.go
+++ b/pkg/notice/drive/dingtalk.go
@@ -0,0 +1,43 @@
+package drive
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
+)
+
+type DingTalkMod struct {
+	DingTalkWebHook string
+}
+
+func DingTalkLoad(webHook string) *DingTalkMod {
+	return &DingTalkMod{
+		DingTalkWebHook: webHook,
+	}
+}
+
+func (m DingTalkMod) Send(value string) {
+	ctx := gctx.New()
+	// 从配置中获取发送者名称
+	name, _ := g.Cfg().Get(ctx, "name")
+
+	// 定义钉钉机器人发送消息的URL，其中access_token为固定值
+	url := m.DingTalkWebHook
+	url += "&timestamp=" + gtime.Now().TimestampMilliStr()
+	// 使用goroutine异步发送消息
+
+	var post = g.Map{
+		"msgtype": "text",
+		"text": g.Map{
+			"content": "通知姬 " + name.String() + "：\n" + value + "\n" + gtime.Now().String(),
+		},
+	}
+
+	// 构建发送的消息体，包含消息类型和内容
+	_, err := g.Client().Discovery(nil).ContentJson().Post(ctx, url, post)
+	if err != nil {
+		g.Log().Info(ctx, err)
+	}
+
+	return
+}
--- a/pkg/notice/drive/email.go
+++ b/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
+}
--- a/pkg/notice/notice.go
+++ b/pkg/notice/notice.go
@@ -0,0 +1,20 @@
+package notice
+
+import (
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
+	"github.com/ayflying/utility_go/pkg/notice/drive"
+)
+
+type MessageV1 interface {
+	Send(value string)
+}
+
+func New(typ v1.NoticeType, host string, value ...interface{}) MessageV1 {
+	switch typ {
+	case v1.NoticeType_DINGTALK:
+		return drive.DingTalkLoad(host)
+	case v1.NoticeType_EMAIL:
+		return drive.MailLoad(host, value[0].(int), value[1].(string), value[2].(string))
+	}
+	return nil
+}
--- a/pkg/pkg.go
+++ b/pkg/pkg.go
@@ -0,0 +1,45 @@
+package pkg
+
+import (
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
+	"github.com/ayflying/utility_go/pkg/aycache"
+	"github.com/ayflying/utility_go/pkg/config"
+	"github.com/ayflying/utility_go/pkg/elasticsearch"
+	"github.com/ayflying/utility_go/pkg/notice"
+	"github.com/ayflying/utility_go/pkg/rank"
+	"github.com/ayflying/utility_go/pkg/s3"
+	"github.com/ayflying/utility_go/pkg/websocket"
+	"github.com/gogf/gf/v2/os/gcache"
+)
+
+var ()
+
+// 统一调用
+func Notice(typ v1.NoticeType, host string) notice.MessageV1 {
+	return notice.New(typ, host)
+}
+
+// 统一调用cache
+func Cache(_name ...string) gcache.Adapter {
+	return aycache.New(_name...)
+}
+
+func S3(_name ...string) *s3.Mod {
+	return s3.New(_name...)
+}
+
+func Rank() *rank.Mod {
+	return rank.New()
+}
+
+func Websocket() *websocket.SocketV1 {
+	return websocket.NewV1()
+}
+
+func Config() *config.Cfg {
+	return config.NewV1()
+}
+
+func Elastic(name string) *elasticsearch.Elastic {
+	return elasticsearch.NewV1(name)
+}
--- a/package/rank/rank.go
+++ b/package/rank/rank.go
@@ -2,6 +2,7 @@ package rank

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

 	"github.com/gogf/gf/v2/database/gredis"
@@ -21,12 +22,13 @@ type F64CountRank struct {
 	updateTs string // 更新时间key
 }

-type Data struct {
-	Id       int64
-	Score    int64
-	Rank     int32
-	UpdateTs int64
-}
+//
+//type RankData struct {
+//	Id       int64
+//	Score    int64
+//	Rank     int32
+//	UpdateTs int64
+//}

 func New() *Mod {
 	return &Mod{}
@@ -318,7 +320,7 @@ func (r *F64CountRank) UpdateScore(id int64, score int64) (err error) {
 //
 //	list - 排名信息列表
 //	err - 错误信息，如果执行过程中遇到错误
-func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*Data, err error) {
+func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*v1.RankData, err error) {
 	// 初始化存储成员ID的切片
 	var members []int64

@@ -338,7 +340,7 @@ func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*Data, err e
 	}

 	// 根据获取的成员ID数量初始化排名信息列表
-	list = make([]*Data, len(members))
+	list = make([]*v1.RankData, len(members))
 	for i := range members {
 		// 获取当前成员ID
 		id := members[i]
@@ -358,9 +360,9 @@ func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*Data, err e
 // 返回值:
 //
 //	rankInfo - 包含id的分数和排名信息的指针，如果没有找到，则返回nil
-func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *Data) {
+func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *v1.RankData) {
 	// 初始化rankInfo结构体，设置id，其他字段将通过查询填充
-	rankInfo = &Data{Id: id}
+	rankInfo = &v1.RankData{Id: id}

 	// 查询有序集合中指定id的分数
 	score, err := g.Redis().ZScore(ctx, r.name, id)
--- a/pkg/s3/s3.go
+++ b/pkg/s3/s3.go
@@ -0,0 +1,289 @@
+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
+}
--- a/pkg/websocket/registerer.go
+++ b/pkg/websocket/registerer.go
@@ -0,0 +1,16 @@
+package websocket
+
+import "context"
+
+// 定义一个处理方法的类型
+type Handler func(ctx context.Context, req any) (err error)
+
+// 路由器的处理映射
+var (
+	handlers = make(map[int]Handler)
+)
+
+// 注册方法，将某个消息路由器ID和对应的处理方法关联起来
+func (s *SocketV1) RegisterRouter(cmd int, handler Handler) {
+	handlers[cmd] = handler
+}
--- a/pkg/websocket/socket_new.go
+++ b/pkg/websocket/socket_new.go
@@ -0,0 +1,179 @@
+package websocket
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/glog"
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/google/uuid"
+	"github.com/gorilla/websocket"
+	"sync"
+	"github.com/gogf/gf/v2/net/ghttp"
+)
+
+type SocketV1 struct{}
+
+var (
+	//ctx = gctx.New()
+	//Conn map[uuid.UUID]*WebsocketData
+	lock sync.Mutex
+
+	m = gmap.New(true)
+)
+
+type WebsocketData struct {
+	Ws   *websocket.Conn
+	Uuid uuid.UUID
+	Uid  int64
+	Ctx  context.Context
+}
+
+func NewV1() *SocketV1 {
+	return &SocketV1{}
+}
+
+type SocketInterface interface {
+	OnConnect(*websocket.Conn)
+	OnMessage(*WebsocketData, []byte, int)
+	Send(uuid.UUID, []byte) (err error)
+	SendAll(data []byte)
+	OnClose(conn *websocket.Conn)
+}
+
+func (s *SocketV1) Load(serv *ghttp.Server, prefix string) {
+	//websocket服务启动
+	serv.Group(prefix, func(group *ghttp.RouterGroup) {
+
+		var websocketCfg = websocket.Upgrader{
+			ReadBufferSize:  1024,
+			WriteBufferSize: 1024,
+		}
+		group.Bind(
+			func(r *ghttp.Request) {
+				ctx := r.Context()
+				ws, err := websocketCfg.Upgrade(r.Response.Writer, r.Request, nil)
+				if err != nil {
+					glog.Error(ctx, err)
+					r.Exit()
+				}
+
+				//ws联机触发器
+				NewV1().OnConnect(ctx, ws)
+			},
+		)
+
+	})
+}
+
+// OnConnect
+//
+//	@Description:
+//	@receiver s
+//	@param conn
+func (s *SocketV1) OnConnect(ctx context.Context, conn *websocket.Conn) {
+	//lock.Lock()
+	//defer lock.Unlock()
+
+	defer conn.Close()
+	id, _ := uuid.NewUUID()
+	ip := conn.RemoteAddr().String()
+
+	data := &WebsocketData{
+		Uuid: id,
+		Ws:   conn,
+		Ctx:  ctx,
+	}
+	m.Set(id, data)
+
+	//defer delete(Conn, id)
+
+	//to := fmt.Sprintf("创建连接：%v,ip=%v", id, ip)
+	//s.Send(id, []byte(to))
+
+	for {
+		//进入当前连接线程拥堵
+		msgType, msg, err := conn.ReadMessage()
+		if err != nil {
+			//客户端断开返回错误，断开当前连接
+			break
+		}
+		s.OnMessage(m.Get(id).(*WebsocketData), msg, msgType)
+	}
+	//关闭连接触发
+	s.OnClose(id, 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) {
+	//g.Log().Debugf(ctx, "收到消息：%v,type=%v,conn=%v", string(req), msgType, conn)
+	//s.Send(conn.Uuid, msg)
+	//s.SendAll(msg)
+	msgStr := string(req)
+	msg := msgStr[8:]
+	cmd := gconv.Int(msgStr[:8])
+	//GetRouter(cmd, conn.Uid, msg)
+	handler, exist := handlers[cmd]
+	if exist {
+		//匹配上路由器
+		handler(conn.Ctx, msg)
+	} else {
+		//fmt.Println("未注册的路由器ID:", cmd)
+		s.Send(conn.Uuid, []byte("未注册的协议号:"+msgStr[:8]))
+		s.OnClose(conn.Uuid, conn.Ws)
+		return
+	}
+
+}
+
+// Send
+//
+//	@Description:
+//	@receiver s
+//	@param uid
+//	@param data
+//	@return err
+func (s *SocketV1) Send(id uuid.UUID, data []byte) (err error) {
+	if !m.Contains(id) {
+		return
+	}
+
+	conn := m.Get(id).(*WebsocketData)
+	conn.Ws.WriteMessage(1, data)
+
+	return
+}
+
+// 批量发送
+func (s *SocketV1) SendAll(data []byte) {
+	m.Iterator(func(k interface{}, v interface{}) bool {
+		//fmt.Printf("%v:%v ", k, v)
+		conn := v.(*WebsocketData)
+		conn.Ws.WriteMessage(1, data)
+		return true
+	})
+}
+
+// OnClose
+//
+//	@Description:
+//	@receiver s
+//	@param conn
+func (s *SocketV1) OnClose(id uuid.UUID, conn *websocket.Conn) {
+	// 在此处编写断开连接后的处理逻辑
+	g.Log().Debugf(gctx.New(), "WebSocket connection from %s has been closed.", conn.RemoteAddr())
+
+	// 可能的后续操作：
+	// 1. 更新连接状态或从连接池移除
+	// 2. 发送通知或清理关联资源
+	// 3. 执行特定于业务的断开处理
+	m.Remove(id)
+	conn.Close()
+}
--- a/service/game_act.go
+++ b/service/game_act.go
@@ -33,6 +33,7 @@ type (
 		Save(actId int) (err error)
 		// 清空GetRedDot缓存
 		RefreshGetRedDotCache(uid int64)
+		Del(uid int64, actId int)
 	}
 )

--- a/service/game_kv.go
+++ b/service/game_kv.go
@@ -0,0 +1,32 @@
+// ================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// You can delete these comments if you wish manually maintain this interface file.
+// ================================================================================
+
+package service
+
+type (
+	IGameKv interface {
+		// SavesV1 方法
+		//
+		// @Description: 保存用户KV数据列表。
+		// @receiver s: sGameKv的实例。
+		// @return err: 错误信息，如果操作成功，则为nil。
+		SavesV1() (err error)
+	}
+)
+
+var (
+	localGameKv IGameKv
+)
+
+func GameKv() IGameKv {
+	if localGameKv == nil {
+		panic("implement not found for interface IGameKv, forgot register?")
+	}
+	return localGameKv
+}
+
+func RegisterGameKv(i IGameKv) {
+	localGameKv = i
+}
--- a/service/system_cron.go
+++ b/service/system_cron.go
@@ -18,6 +18,7 @@ type (
 		// @Description: 向指定的钉钉机器人发送消息。
 		// @receiver s: 系统定时任务结构体指针。
 		// @param value: 要发送的消息内容。
+		// Deprecated: Use message.New(message.DingTalk, DingTalkWebHook).Send(value)
 		DingTalk(DingTalkWebHook string, value string) (res *gclient.Response)
 		ReadLog()
 		// AddCron 添加一个定时任务到相应的调度列表中。
--- a/tools/random.go
+++ b/tools/random.go
@@ -0,0 +1,84 @@
+package tools
+
+import (
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/grand"
+	"math/rand"
+	"time"
+)
+
+var (
+	Rand *randMod
+)
+
+type randMod struct {
+}
+
+// RandomAll 按权重随机选取 N 个不重复的元素
+func (m *randMod) RandomAll(data map[int]int, n int) []int {
+	if n > len(data) {
+		n = len(data)
+	}
+	rand.Seed(time.Now().UnixNano())
+	// 复制权重映射，避免修改原始数据
+	remainingWeights := make(map[int]int)
+	for k, v := range data {
+		remainingWeights[k] = v
+	}
+	result := make([]int, 0, n)
+
+	for i := 0; i < n; i++ {
+		totalWeight := 0
+		// 计算剩余元素的总权重
+		for _, weight := range remainingWeights {
+			totalWeight += weight
+		}
+		if totalWeight == 0 {
+			break
+		}
+		// 生成一个 0 到总权重之间的随机数
+		randomNum := rand.Intn(totalWeight)
+		currentWeight := 0
+		for key, weight := range remainingWeights {
+			currentWeight += weight
+			if randomNum < currentWeight {
+				// 将选中的元素添加到结果切片中
+				result = append(result, key)
+				// 从剩余权重映射中移除选中的元素
+				delete(remainingWeights, key)
+				break
+			}
+		}
+	}
+	return result
+}
+
+// RandByArrInt 根据传入的 interface 切片中的整数值按权重随机返回一个索引
+// 参数 s: 一个包含整数的 interface 切片，切片中的每个元素代表一个权重
+// 返回值: 随机选中的元素的索引
+func RandByArrInt(s []interface{}) int {
+	// 初始化总权重为 0
+	sv := 0
+	// 遍历切片，累加每个元素的权重
+	for i := range s {
+		sv += gconv.Int(s[i])
+	}
+	if sv < 1 {
+		return 0
+	}
+
+	// 使用 grand.Intn 生成一个 0 到总权重之间的随机数
+	r := grand.Intn(sv)
+	// 初始化当前累加的权重为 0
+	var all int
+	// 再次遍历切片，累加权重
+	for i := range s {
+		all += gconv.Int(s[i])
+		// 如果当前累加的权重大于随机数，则返回当前索引
+		if all > r {
+			return i
+		}
+	}
+	// 如果没有找到符合条件的索引，返回 0
+	return 0
+}
--- a/tools/redis.go
+++ b/tools/redis.go
@@ -14,7 +14,7 @@ type redis struct {
 }

 func (r *redis) Load() {
-	g.Log().Debugf(gctx.New(), "初始化工具类")
+	g.Log().Debugf(gctx.New(), "初始化redis工具类")
 	if Redis == nil {
 		Redis = &redis{}
 	}
--- a/tools/time.go
+++ b/tools/time.go
@@ -121,3 +121,10 @@ func (m *timeMod) GetDailyTimeList(time1 time.Time, time2 time.Time) (timeList [
 	}
 	return
 }
+
+// ExcelTime2Time excel时间转时间 (12/10/24 02:03转为时间)
+func (m *timeMod) ExcelTime2Time(excelTime string) time.Time {
+	layout := "01/02/06 15:04" // 月/日/年(最后两位) 小时:分钟 (24小时制)
+	timeNew, _ := time.ParseInLocation(layout, excelTime, time.Local)
+	return timeNew
+}
--- a/tools/tools.go
+++ b/tools/tools.go
@@ -1,6 +1,8 @@
 package tools

 import (
+	"encoding/json"
+	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
@@ -30,15 +32,17 @@ type tools struct {
 }

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

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

+	})
 }

 func (m *tools) Load() {
@@ -124,11 +128,11 @@ func (m *tools) Items2Map(items [][]int64) (list map[int64]int64) {
 // 该函数通过遍历切片，从后向前检查每个元素，如果找到与指定值相等的元素，则将其从切片中移除。
 // 这种从后向前的遍历方法可以避免因移除元素而导致的数组重新排列带来的额外计算。
 // RemoveSlice 删除切片中的某个值
-func RemoveSlice[t Number](slice []t, value t) []t {
+func RemoveSlice[t Number](slice []t, value ...t) []t {
 	// 从后向前遍历切片
 	for i := len(slice) - 1; i >= 0; i-- {
 		// 检查当前元素是否等于需要移除的值
-		if slice[i] == value {
+		if InArray(slice[i], value) {
 			// 如果相等，移除该元素
 			// 使用append和切片操作符来实现移除操作，将i之前和i之后的元素合并到一起
 			slice = append(slice[:i], slice[i+1:]...)
@@ -223,3 +227,63 @@ func ReverseSlice[T comparable](s []T) []T {
 	}
 	return s
 }
+
+// 道具数量合并
+func (m *tools) ItemsMerge(_items ...[][]int64) [][]int64 {
+	var items [][]int64
+	for _, v := range _items {
+		items = append(items, v...)
+	}
+	if len(items) == 0 {
+		return [][]int64{}
+	}
+	var temp = make(map[int64]int64)
+	for _, v := range items {
+		if len(v) < 2 {
+			g.Log().Errorf(ctx, "分解的物品格式不对:%v", v)
+			continue
+		}
+		if _, ok := temp[v[0]]; !ok {
+			temp[v[0]] = 0
+		}
+		temp[v[0]] += v[1]
+	}
+
+	items = make([][]int64, len(temp))
+	i := 0
+	for k, v := range temp {
+		items[i] = []int64{k, v}
+		i++
+	}
+	return items
+}
+
+// ProcessingMap 处理map
+// 该函数用于递归处理一个键为字符串、值为int64的map。
+// 如果键是一个JSON字符串，会尝试将其解析为一个新的map，并递归处理这个新的map。
+// 最终返回一个处理后的map，其中所有键都是非JSON字符串。
+func (m *tools) ProcessingMap(data map[string]int64) map[string]int64 {
+	// 创建一个临时map，用于存储处理后的键值对
+	var temp = make(map[string]int64)
+	// 遍历输入的map
+	for k, v := range data {
+		// 创建一个新的map，用于存储解析后的JSON数据
+		data_k := make(map[string]int64)
+		// 尝试将键解析为JSON数据
+		err := json.Unmarshal([]byte(k), &data_k)
+		// 如果解析成功
+		if err == nil {
+			// 递归处理解析后的map
+			data_kmap := m.ProcessingMap(data_k)
+			// 返回处理后的map
+			// 如果解析失败，直接将原键值对添加到临时map中
+			// 将递归处理后的结果合并到临时map中
+			for k_k, k_v := range data_kmap {
+				temp[k_k] = k_v
+			}
+		} else {
+			temp[k] = v
+		}
+	}
+	return temp
+}
--- a/utility.go
+++ b/utility.go
@@ -1,15 +1,10 @@
 package utility_go

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

 var (
@@ -18,14 +13,12 @@ var (
 )

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

 }
--- a/utility_test.go
+++ b/utility_test.go
@@ -0,0 +1,66 @@
+package utility_go_test
+
+import (
+	"github.com/ayflying/utility_go/internal/boot"
+	_ "github.com/ayflying/utility_go/internal/logic"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"testing"
+)
+
+var (
+	ctx = gctx.GetInitCtx()
+)
+
+func TestInit(t *testing.T) {
+	g.Log().Debug(ctx, "开始调试了")
+	// 初始化配置
+	var err = boot.Boot()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+//
+//func TestLoadConfig(t *testing.T) {
+//
+//	tests := []struct {
+//		name     string
+//		filePath string
+//		wantErr  bool
+//	}{
+//		{
+//			name:     "valid config file",
+//			filePath: "testdata/valid_config.json",
+//			wantErr:  false,
+//		},
+//		{
+//			name:     "non-existent file",
+//			filePath: "nonexistent.json",
+//			wantErr:  true,
+//		},
+//		{
+//			name:     "invalid config format",
+//			filePath: "testdata/invalid_config.json",
+//			wantErr:  true,
+//		},
+//		{
+//			name:     "empty file path",
+//			filePath: "",
+//			wantErr:  true,
+//		},
+//	}
+//
+//	for _, tt := range tests {
+//		t.Run(tt.name, func(t *testing.T) {
+//
+//			_, err := config.Load(tt.filePath)
+//			if tt.wantErr {
+//				assert.Error(t, err)
+//			} else {
+//				assert.NoError(t, err)
+//			}
+//		})
+//	}
+//}
Author	SHA1	Message	Date
ayflying	743d232c38	增加单元测试，统一初始化方法	2025-04-02 15:19:49 +08:00
ayflying	1d0661ae40	增加缺少的库	2025-04-02 12:12:13 +08:00
ayflying	69e72283dc	更新	2025-04-02 11:51:25 +08:00
ayflying	a9d84c2db9	增加新的路由器	2025-04-02 11:43:05 +08:00
ayflying	db3a2bf405	增加缓存qps	2025-04-02 11:32:54 +08:00
ayflying	5e18d67747	修改ip库的内容	2025-03-31 18:30:41 +08:00
ayflying	8be47af097	更新说明	2025-03-31 18:04:43 +08:00
ayflying	4c24c4274c	定时器只允许启动一次	2025-03-31 14:57:04 +08:00
ayflying	2a34ce6043	更新g.redis方法的传参	2025-03-27 11:53:19 +08:00
ayflying	e8f94c911c	修稿红点删除缓存清理方式	2025-03-27 11:25:31 +08:00
ayflying	f55b3bc609	更新缓存模块	2025-03-27 11:20:07 +08:00
ayflying	d05d865b0d	去掉重复注册	2025-03-25 16:04:50 +08:00
ayflying	6e19671d06	增加控制器的反向注册	2025-03-25 15:58:20 +08:00
ayflying	f349dca0f7	所有包同意改为pkg	2025-03-25 15:00:54 +08:00
ayflying	58f00b4f8e	跟新mod	2025-03-25 14:24:56 +08:00
ayflying	d9ab1be2e7	更新pb目录	2025-03-25 14:14:48 +08:00
ayflying	4b77cd140d	初始化驱动	2025-03-25 14:06:03 +08:00
ayflying	8d640be472	增加websocket库	2025-03-24 17:39:09 +08:00
ayflying	cc08e830d3	分离websocket	2025-03-21 16:33:44 +08:00
ayflying	696f1bcbdb	导表支持忽略注释行	2025-03-20 16:22:28 +08:00
ayflying	5c45ddb80b	修改引用头部，不是用ctx	2025-03-19 17:41:23 +08:00
ayflying	14de836089	调整缓存key，增加kv持久化方法	2025-03-18 16:16:44 +08:00
ayflying	1c4f804738	修改持久化的顺序	2025-03-17 11:21:37 +08:00
ayflying	5fbe4d5dcf	更新库pkg	2025-03-14 14:26:07 +08:00
ayflying	4963780a32	修改删除结构体方法，支持传递多个数据进行删除	2025-03-13 16:25:28 +08:00
ayflying	70ebaae3d2	增加权重随机	2025-03-13 15:33:13 +08:00
ayflying	9cd286fd92	增加权重随机方法	2025-03-13 14:28:26 +08:00
ayflying	f8ec441241	修复缓存可能遇到的问题	2025-03-10 19:00:29 +08:00
ayflying	92a127e128	包名改回来	2025-03-06 14:38:03 +08:00
ayflying	f654e0feda	更新	2025-03-06 11:53:18 +08:00
ayflying	d44810e174	更新包名	2025-03-06 11:50:17 +08:00
ayflying	843cdc94d4	修改ci	2025-03-06 11:36:17 +08:00
ayflying	dd1d6ce2a6	增加ci文件	2025-03-06 11:16:41 +08:00
ayflying	1df0172acc	忽略目录	2025-03-05 17:27:54 +08:00
ayflying	1a3d79a605	去掉多余文件	2025-03-05 17:22:03 +08:00
ayflying	0e55698a47	使用统一方法pgk进行调用	2025-03-04 18:58:10 +08:00
ayflying	6eeb5a57cd	分离钉钉消息到通知管理	2025-03-04 17:24:10 +08:00
ayflying	6988e99717	修改说明文件	2025-03-04 16:03:19 +08:00