任务通道信息携带周期信息并打印定时任务执行进度 观察堵塞情况

This reverts commit f3e1ad74b5.

README.md

@@ -1,78 +1,309 @@
-# utility_go：强大的Go语言工具类库
+# utility_go
 
-## 一、项目概述
+[![Go Version](https://img.shields.io/badge/Go-1.24+-blue.svg)](https://golang.org)
-`utility_go` 是一个功能丰富的Go语言工具类库，旨在助力开发者更高效地开发Go应用程序。它提供了一系列实用的功能模块，广泛涵盖数据库操作、缓存处理、支付接口集成、排名算法实现等多个方面，适用于各类Go项目。
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
+[![GitHub stars](https://img.shields.io/github/stars/ayflying/utility_go.svg)](https://github.com/ayflying/utility_go/stargazers)
 
-## 二、安装方式
+一个功能丰富的Go语言工具类库，提供支付集成、缓存管理、排名算法、数据库操作、系统管理等核心功能模块，适用于各类Go项目开发。
-要使用 `utility_go` 工具类库，可使用 `go get` 命令进行安装。请确保你的Go环境已正确配置，且可访问互联网。
 
-### 安装命令
+## ✨ 核心特性
-```sh
+
+- **🔧 多模块集成**: 支付、缓存、排名、数据库、系统管理等完整解决方案
+- **⚡ 高性能**: 基于Redis的高性能排名算法和缓存管理
+- **📱 支付支持**: 集成Apple Pay、Google Play Store、支付宝、微信支付等主流支付平台
+- **🛠️ CLI工具**: 提供代码生成器，快速创建模块文件
+- **📊 监控告警**: 集成Prometheus监控和系统日志管理
+- **🌐 多存储支持**: 支持S3对象存储、Elasticsearch搜索引擎
+
+## 📦 安装
+
+```bash
 go get github.com/ayflying/utility_go
 ```
 
-### 安装验证
+## 🏗️ 项目结构
-安装完成后，你可以在Go代码中导入 `utility_go` 相关的包，检查是否能够正常使用。示例如下：
+
+```
+utility_go/
+├── api/                    # API接口定义
+│   ├── admin/             # 管理后台API
+│   ├── callback/          # 回调接口
+│   ├── system/            # 系统API
+│   └── pkg/               # 包相关API
+├── cmd/                   # CLI命令工具
+│   ├── make.go            # 代码生成器
+│   ├── load.go            # 配置加载
+│   ├── update.go          # 更新工具
+│   └── middleware.go      # 中间件工具
+├── controller/            # 控制器层
+│   └── callback/          # 回调控制器
+├── service/               # 服务层
+│   ├── casdoor.go         # 认证服务
+│   ├── game_act.go        # 游戏活动服务
+│   ├── game_kv.go         # 键值存储服务
+│   ├── ip_2_region.go     # IP地理位置服务
+│   ├── log_data.go        # 日志数据服务
+│   ├── os.go              # 操作系统服务
+│   ├── system_cron.go     # 定时任务服务
+│   └── system_log.go      # 系统日志服务
+├── internal/              # 内部核心逻辑
+│   ├── boot/              # 启动初始化
+│   ├── game/              # 游戏逻辑
+│   ├── logic/             # 业务逻辑
+│   │   ├── casdoor/       # 认证逻辑
+│   │   ├── gameAct/       # 游戏活动
+│   │   ├── gameKv/        # 游戏键值存储
+│   │   ├── ip2region/     # IP区域查询
+│   │   ├── logData/       # 日志处理
+│   │   ├── os/            # 系统操作
+│   │   ├── systemCron/    # 定时任务
+│   │   └── systemLog/     # 系统日志
+│   └── model/             # 数据模型
+│       ├── do/            # 数据对象
+│       └── entity/        # 实体定义
+├── package/               # 功能包
+│   ├── aycache/           # 缓存管理
+│   ├── excel/             # Excel处理
+│   ├── gamelog/           # 游戏日志
+│   ├── pay/               # 支付集成
+│   │   ├── alipay/        # 支付宝
+│   │   ├── apple/         # Apple Pay
+│   │   ├── google/        # Google Play
+│   │   ├── wechat/        # 微信支付
+│   │   ├── playstore/     # Play Store
+│   │   └── ...            # 其他支付平台
+│   ├── rank/              # 排名算法
+│   └── s3/                # S3存储
+├── pkg/                   # 公共包
+│   ├── aycache/           # 缓存包
+│   ├── config/            # 配置包
+│   ├── elasticsearch/     # ES包
+│   ├── notice/            # 通知包
+│   ├── rank/              # 排名包
+│   └── s3/                # S3包
+├── tools/                 # 工具函数
+│   ├── random.go          # 随机数
+│   ├── redis.go           # Redis操作
+│   ├── time.go            # 时间处理
+│   └── tools.go           # 通用工具
+├── utility.go             # 主入口
+├── go.mod                 # 模块定义
+└── README.md              # 说明文档
+```
+
+## 🚀 快速开始
+
+### 1. 初始化项目
+
 ```go
 package main
 
 import (
-    // 这里导入utility_go中的某个具体包，根据实际使用情况调整
+    _ "github.com/ayflying/utility_go"
-    "github.com/ayflying/utility_go/package/pay/apple"
+    "github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {
-    // 进行一些简单的操作，如打印版本信息等
+    g.Log().Info(nil, "项目启动成功")
-    // 这里假设apple包有一个Version函数
-    // fmt.Println(apple.Version())
 }
 ```
 
-## 三、项目结构
+### 2. 使用CLI工具生成代码
-`utility_go` 的项目结构设计清晰，各模块分工明确，便于开发者使用和扩展。以下是项目的主要目录结构及说明：
 
-### 主要目录说明
+```bash
-- **api/**：存放与API相关的代码，包含不同模块的API接口定义，如 `admin`、`callback`、`system` 等。这些API接口用于处理各种外部请求，是项目与外部系统交互的重要入口。
+# 创建活动模块
-- **service/**：服务层代码，包含各种业务逻辑的实现，如 `game_act.go`、`ip_2_region.go` 等。服务层负责处理具体的业务需求，将数据处理和业务逻辑封装在独立的函数或方法中，提高代码的可维护性和复用性。
+go run main.go make -m act -i 1
-- **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`（通用工具函数）等，方便开发者在项目中使用。
 
-## 四、主要模块功能
+# 创建逻辑模块
+go run main.go make -m logic -n test
 
-### 4.1 pay/playstore
+# 创建配置文件
-该模块主要用于与Google Play Store API交互，处理应用内购买相关的操作，提供以下主要功能：
+go run main.go make -m config -n test
-- **创建客户端**：通过 `New` 函数创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，方便开发者与Google Play Store API进行通信。
-- **使用自定义客户端**：`NewWithClient` 函数允许开发者使用自定义的HTTP客户端创建并返回一个包含访问 `androidpublisher` API所需凭证的HTTP客户端，增加了客户端的灵活性。
-- **验证签名**：`VerifySignature` 函数用于验证应用内购买的签名，确保支付信息的安全性和合法性。
 
-### 4.2 s3
+# 创建Socket模块
-`s3` 模块主要用于与S3存储服务进行交互，提供文件存储和管理的功能。其中，`ListBuckets` 函数可以列出S3存储桶的信息，方便开发者管理存储桶中的文件。
+go run main.go make -m socket -n test
+```
 
-### 4.3 model
+## 📚 核心模块详解
-`model` 模块定义了项目中使用的数据模型，这些数据模型通常与数据库表相对应，用于数据的存储和操作。例如：
-- **GameMailMass**：表示游戏邮件群发的数据模型，包含邮件的标题、内容、类型等信息。
-- **GameBag**：表示游戏背包的数据模型，包含用户标识、道具数据、图鉴、手势等信息。
-- **MemberSave**：（根据具体代码中的定义）可能表示用户会员信息的数据模型，用于存储用户的会员相关数据。
 
-### 4.4 tools
+### 🔐 支付模块 (package/pay)
-`tools` 模块提供了一系列通用工具函数，涵盖时间处理、Redis操作、道具数据处理等功能：
-- **时间处理**：`time.go` 文件中的函数可以进行时间计算，如获取本周开始时间、计算两个时间间隔天数等。
-- **Redis操作**：`redis.go` 文件中的函数可以进行Redis的扫描操作，支持批量获取大量数据。
-- **通用工具**：`tools.go` 文件中的函数提供了字符串处理、切片操作、道具数据合并等功能。
 
-## 五、使用示例
+支持多种支付平台集成：
 
-### 5.1 支付模块示例
+#### Google Play Store
-以下是一个使用 `pay/playstore` 模块验证应用内购买签名的示例代码：
+```go
+import "github.com/ayflying/utility_go/package/pay/playstore"
+
+// 创建客户端
+client, err := playstore.New(jsonKey)
+
+// 验证签名
+isValid, err := playstore.VerifySignature(publicKey, receipt, signature)
+```
+
+#### Apple Pay
+```go
+import "github.com/ayflying/utility_go/package/pay/apple"
+
+// 处理Apple支付验证
+```
+
+#### 支付宝/微信支付
+```go
+import (
+    "github.com/ayflying/utility_go/package/pay/alipay"
+    "github.com/ayflying/utility_go/package/pay/wechat"
+)
+```
+
+### 🏆 排名模块 (package/rank)
+
+基于Redis的高性能排行榜实现：
+
+```go
+import "github.com/ayflying/utility_go/pkg/rank"
+
+// 创建排行榜
+rankMod := rank.New()
+leaderboard := rankMod.CreateF64CountRank("season_1")
+
+// 增加分数
+curScore, err := leaderboard.IncrScore(userID, 100)
+
+// 设置分数
+err := leaderboard.SetScore(userID, 500)
+
+// 获取排名信息
+rankInfo, err := leaderboard.GetRankInfosNotTs(0, 10)
+```
+
+### 💾 缓存模块 (package/aycache)
+
+```go
+import "github.com/ayflying/utility_go/package/aycache"
+
+// 使用缓存
+cache := aycache.New()
+```
+
+### 📊 数据库操作
+
+#### Elasticsearch
+```go
+import "github.com/ayflying/utility_go/package/elasticsearch"
+
+// ES操作
+```
+
+#### MySQL (基于GoFrame)
+```go
+import "github.com/gogf/gf/v2/database/gdb"
+```
+
+### 🔄 定时任务 (systemCron)
+
+```go
+import "github.com/ayflying/utility_go/service"
+
+// 添加定时任务
+service.SystemCron().AddCronV2(v1.CronType_HOUR, func(ctx context.Context) error {
+    // 执行任务
+    return nil
+}, true)
+```
+
+### 📝 日志管理 (systemLog)
+
+```go
+import "github.com/ayflying/utility_go/service"
+
+// 记录日志
+service.SystemLog().Info("操作成功")
+service.SystemLog().Error("操作失败: %v", err)
+```
+
+### 🌐 IP地理位置查询 (ip2region)
+
+```go
+import "github.com/ayflying/utility_go/service"
+
+// 查询IP位置
+ipInfo, err := service.Ip2Region().Search("192.168.1.1")
+```
+
+### 📁 S3存储 (s3)
+
+```go
+import "github.com/ayflying/utility_go/package/s3"
+
+// 列出存储桶
+buckets, err := s3.ListBuckets()
+
+// 上传文件
+err := s3.UploadFile("bucket-name", "file-key", fileData)
+```
+
+### 📑 Excel处理 (excel)
+
+```go
+import "github.com/ayflying/utility_go/package/excel"
+
+// 读取Excel
+data, err := excel.Read("file.xlsx")
+
+// 导出Excel
+err := excel.Export(data, "output.xlsx")
+```
+
+## 🛠️ 配置管理
+
+项目使用GoFrame框架的配置管理：
+
+```go
+import (
+    "github.com/ayflying/utility_go/config"
+    "github.com/gogf/gf/v2/frame/g"
+)
+
+// 获取配置
+cfg := config.Cfg{}
+dbConfig := g.Cfg().Get("database")
+```
+
+## 🔧 工具函数
+
+### 时间处理 (tools/time.go)
+```go
+import "github.com/ayflying/utility_go/tools"
+
+// 获取本周开始时间
+weekStart := tools.GetWeekStart()
+
+// 计算天数差
+days := tools.DiffDays(startTime, endTime)
+```
+
+### Redis操作 (tools/redis.go)
+```go
+// 批量获取数据
+data, err := tools.ScanRedis(pattern)
+```
+
+### 通用工具 (tools/tools.go)
+```go
+// 字符串转道具类型
+items := tools.Tools.Spilt2Item("1|10|2|20")
+
+// 切片转道具类型
+items := tools.Tools.Slice2Item([]int64{1, 10, 2, 20})
+
+// 道具格式转Map
+itemMap := tools.Tools.Items2Map(items)
+```
+
+## 🎯 使用示例
+
+### 完整的支付验证流程
 ```go
 package main
 
@@ -82,78 +313,107 @@ import (
 )
 
 func main() {
-    // 初始化参数
+    // Google Play Store应用内购买验证
-    purchaseData := "your_purchase_data"
+    purchaseData := "purchase_data_string"
-    signature := "your_signature"
+    signature := "signature_string"
+    publicKey := "base64_encoded_public_key"
     
-    // 验证签名
+    isValid, err := playstore.VerifySignature(publicKey, []byte(purchaseData), signature)
-    err := playstore.VerifySignature(purchaseData, signature)
     if err != nil {
-        fmt.Println("Signature verification failed:", err)
+        fmt.Println("验证失败:", err)
         return
     }
     
-    fmt.Println("Signature verification succeeded")
+    if isValid {
+        fmt.Println("支付验证成功")
+    }
 }
 ```
 
-### 5.2 S3模块示例
+### 排行榜使用示例
-以下是一个使用 `s3` 模块列出S3存储桶信息的示例代码：
 ```go
 package main
 
 import (
     "fmt"
-    "github.com/ayflying/utility_go/package/s3"
+    "github.com/ayflying/utility_go/pkg/rank"
 )
 
 func main() {
-    // 列出S3存储桶信息
+    rankMod := rank.New()
-    buckets, err := s3.ListBuckets()
+    leaderboard := rankMod.CreateF64CountRank("game_season_1")
+    
+    // 用户得分
+    score, err := leaderboard.IncrScore(1001, 50)
     if err != nil {
-        fmt.Println("Failed to list buckets:", err)
+        fmt.Println("更新分数失败:", err)
         return
     }
     
-    for _, bucket := range buckets {
+    fmt.Printf("当前分数: %.0f\n", score)
-        fmt.Println("Bucket name:", bucket.Name)
+    
+    // 获取前10名
+    top10, err := leaderboard.GetRankInfosNotTs(0, 9)
+    if err != nil {
+        fmt.Println("获取排名失败:", err)
+        return
+    }
+    
+    for i, info := range top10 {
+        fmt.Printf("第%d名: 用户%d - 分数%d\n", i+1, info.Id, info.Score)
     }
 }
 ```
 
-### 5.3 工具模块示例
+## ⚙️ 开发指南
-以下是一个使用 `tools` 模块处理道具数据的示例代码：
-```go
-package main
 
-import (
+### 代码规范
-    "fmt"
+- 使用GoFrame框架的最佳实践
-    "github.com/ayflying/utility_go/tools"
+- 遵循Go语言命名规范
-)
+- 添加必要的注释和文档
+- 使用错误处理和日志记录
 
-func main() {
+### 项目启动流程
-    // 字符串转道具类型
+1. 配置文件加载
-    str := "1|10|2|20"
+2. 数据库连接初始化
-    result := tools.Tools.Spilt2Item(str)
+3. 缓存系统初始化
-    fmt.Println("Spilt2Item result:", result)
+4. 定时任务注册
+5. 服务启动监听
 
-    // 切片换道具类型
+### 注意事项
-    slice := []int64{1, 10, 2, 20}
+- ⚠️ **自动生成文件**: 使用CLI工具生成的文件包含 `// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.` 注释，请勿手动修改
-    res := tools.Tools.Slice2Item(slice)
+- 🔒 **版本兼容性**: 建议使用Go 1.24+版本
-    fmt.Println("Slice2Item result:", res)
+- 📦 **依赖管理**: 使用go mod管理依赖
 
-    // 道具格式转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。
 
-## 八、许可证信息
+本项目采用 [MIT License](LICENSE) 许可证。
-`utility_go` 工具类库遵循MIT许可证，你可以在项目的 `LICENSE` 文件中查看详细的许可证条款。请确保在使用该工具类库时遵守相关的许可证规定。
+
+## 🤝 贡献指南
+
+欢迎提交Issue和Pull Request来贡献代码！
+
+1. Fork本仓库
+2. 创建特性分支 (`git checkout -b feature/AmazingFeature`)
+3. 提交更改 (`git commit -m 'Add some AmazingFeature'`)
+4. 推送到分支 (`git push origin feature/AmazingFeature`)
+5. 开启Pull Request
+
+## 📞 联系方式
+
+- **GitHub**: https://github.com/ayflying/utility_go
+- **Gitee**: https://gitea.adesk.com/public_project/utility_go
+
+## 🙏 致谢
+
+感谢所有贡献者和开源社区的支持！
+
+---
+
+**utility_go** © 2025 - Made with ❤️ by [ayflying]

api/callback/callback.go

@@ -12,4 +12,5 @@ import (
 
 type ICallbackV1 interface {
 	Ip(ctx context.Context, req *v1.IpReq) (res *v1.IpRes, err error)
+	Robots(ctx context.Context, req *v1.RobotsReq) (res *v1.RobotsRes, err error)
 }

api/callback/v1/robots.go

@@ -0,0 +1,9 @@
+package v1
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type RobotsReq struct {
+	g.Meta `path:"/robots.txt" tags:"回调响应" method:"get" summary:"禁止爬虫"`
+}
+type RobotsRes struct {
+}

cmd/make/config

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

cmd/update.go

@@ -2,15 +2,16 @@ package cmd
 
 import (
 	"context"
+	"os"
+	"path"
+	"time"
+
 	"github.com/ayflying/utility_go/pkg"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gctx"
-	"os"
-	"path"
-	"time"
 )
 
 type serverCfg struct {
@@ -41,21 +42,8 @@ var (
 			getFileName, err := g.Cfg("hack").Get(ctx, "gfcli.build.name")
 			Filename := getFileName.String()
 
-			////获取架构
+			getPath, err := g.Cfg("hack").Get(ctx, "gfcli.build.path")
-			//getArch, err := g.Cfg("hack").Get(ctx, "gfcli.build.arch")
+			Path := getPath.String()
-			//Arch := getArch.String()
-			//if Arch == "" {
-			//	Arch = "amd64"
-			//}
-			//
-			////获取操作系统
-			//getSystem, err := g.Cfg("hack").Get(ctx, "gfcli.build.system")
-			//System := getSystem.String()
-			//
-			//if System == "" {
-			//	System = "linux"
-			//}
-			//var systemName = System + "_" + Arch
 
 			//获取版本号
 			getVersion, err := g.Cfg("hack").Get(ctx, "gfcli.build.version")
@@ -85,9 +73,7 @@ var (
 			//filename := "linux_amd64/" + Filename
 			//filename := path.Join(Version, "linux_amd64", Filename)
 
-			client := g.Client()
+			client := g.Client().SetTimeout(time.Minute)
-			client.SetTimeout(time.Minute)
-			client.SetDiscovery(nil)
 
 			//循环服务器，推送更新
 			for _, v := range list {
@@ -104,7 +90,7 @@ var (
 					if v.Arch != "" && v.System != "" {
 						systemName = v.System + "_" + v.Arch
 					}
-					var filename = path.Join(Version, systemName, Filename)
+					var filename = path.Join(Path, Version, systemName, Filename)
 					g.Log().Debugf(ctx, "当前上传文件："+filename)
 
 					url[v.S3], err = UploadS3(v.S3, filename)
@@ -124,11 +110,26 @@ var (
 					FileUrl: url[v.S3],
 				})
 				if err != nil {
-					g.Log().Debugf(ctx, "切换代理进行上传:err=%v", err)
+					// 读取HTTP代理环境变量（小写/大写通常都兼容，部分系统可能用大写）
-					get, err = client.Proxy("http://192.168.50.114:10808").
+					httpProxy := os.Getenv("http_proxy")
-						Post(ctx, address+"/callback/update", &UpdateReq{
+					if httpProxy == "" {
-							FileUrl: url[v.S3],
+						httpProxy = os.Getenv("HTTP_PROXY")
-						})
+					}
+					if httpProxy == "" {
+						// 读取HTTPS代理环境变量
+						httpProxy = os.Getenv("https_proxy")
+						if httpProxy == "" {
+							httpProxy = os.Getenv("HTTPS_PROXY")
+						}
+					}
+					// 如果没有读取到本地的代理，使用配置上传
+					if httpProxy == "" {
+						httpProxy = g.Cfg().MustGet(ctx, "update_proxy", "http://192.168.50.173:10808").String()
+					}
+					g.Log().Debugf(ctx, "切换代理进行上传:ip=%v,err=%v", httpProxy, err)
+					get, err = client.Proxy(httpProxy).Post(ctx, address+"/callback/update", &UpdateReq{
+						FileUrl: url[v.S3],
+					})
 				}
 				if err != nil {
 					g.Log().Error(ctx, err)

controller/callback/callback_v1_robots.go

@@ -0,0 +1,14 @@
+package callback
+
+import (
+	"context"
+
+	"github.com/ayflying/utility_go/api/callback/v1"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) Robots(ctx context.Context, req *v1.RobotsReq) (res *v1.RobotsRes, err error) {
+	text := "User-agent: *\nDisallow: /"
+	g.RequestFromCtx(ctx).Response.Write(text)
+	return
+}

go.mod

@@ -5,91 +5,125 @@ go 1.24.0
 require (
 	github.com/apolloconfig/agollo/v4 v4.4.0
 	github.com/ayflying/excel2json v1.1.9
-	github.com/elastic/go-elasticsearch/v8 v8.18.0
+	github.com/casdoor/casdoor-go-sdk v1.39.0
+	github.com/elastic/go-elasticsearch/v8 v8.19.0
+	github.com/getlantern/systray v1.2.2
 	github.com/go-pay/crypto v0.0.1
-	github.com/go-pay/gopay v1.5.109
+	github.com/go-pay/gopay v1.5.115
 	github.com/go-pay/util v0.0.4
 	github.com/goccy/go-json v0.10.5
-	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0
+	github.com/gogf/gf/contrib/config/apollo/v2 v2.9.6
-	github.com/gogf/gf/v2 v2.9.0
+	github.com/gogf/gf/contrib/config/consul/v2 v2.9.7
-	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230
+	github.com/gogf/gf/v2 v2.9.7
-	github.com/minio/minio-go/v7 v7.0.91
+	github.com/google/uuid v1.6.0
-	github.com/prometheus/client_golang v1.22.0
+	github.com/hashicorp/consul/api v1.24.0
-	github.com/xuri/excelize/v2 v2.9.0
+	github.com/hashicorp/go-cleanhttp v0.5.2
-	golang.org/x/oauth2 v0.26.0
+	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20251207115101-d4b8f9f841b9
-	google.golang.org/api v0.44.0
+	github.com/minio/minio-go/v7 v7.0.97
-	google.golang.org/protobuf v1.36.6
+	github.com/prometheus/client_golang v1.23.2
+	github.com/xuri/excelize/v2 v2.10.0
+	golang.org/x/oauth2 v0.33.0
+	google.golang.org/api v0.257.0
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )
 
 require (
-	cloud.google.com/go v0.81.0 // indirect
+	cloud.google.com/go/auth v0.17.0 // indirect
-	github.com/BurntSushi/toml v1.4.0 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	cloud.google.com/go/compute/metadata v0.9.0 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/armon/go-metrics v0.4.1 // 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/clipperhouse/displaywidth v0.6.1 // indirect
+	github.com/clipperhouse/stringish v0.1.1 // indirect
+	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
+	github.com/elastic/elastic-transport-go/v8 v8.8.0 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/emirpasic/gods/v2 v2.0.0-alpha // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201 // indirect
+	github.com/getlantern/errors v1.0.4 // indirect
+	github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 // indirect
+	github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
+	github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 // indirect
+	github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-pay/errgroup v0.0.3 // indirect
 	github.com/go-pay/smap v0.0.2 // indirect
 	github.com/go-pay/xlog v0.0.3 // indirect
 	github.com/go-pay/xtime v0.0.2 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
-	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
+	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hashicorp/go-hclog v1.5.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/magiconair/properties v1.8.9 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/klauspost/crc32 v1.3.0 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
-	github.com/minio/crc64nvme v1.0.1 // indirect
+	github.com/minio/crc64nvme v1.1.1 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
-	github.com/pelletier/go-toml v1.9.3 // indirect
+	github.com/olekukonko/errors v1.1.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/olekukonko/ll v0.1.3 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
+	github.com/olekukonko/tablewriter v1.1.2 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/philhofer/fwd v1.2.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.17.0 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.4 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rs/xid v1.6.0 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
+	github.com/sagikazarmark/locafero v0.12.0 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
-	github.com/spf13/viper v1.8.1 // indirect
+	github.com/spf13/viper v1.21.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79 // indirect
+	github.com/tiendc/go-deepcopy v1.7.2 // indirect
-	github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba // indirect
+	github.com/tinylib/msgp v1.6.1 // indirect
-	go.opencensus.io v0.23.0 // indirect
+	github.com/xuri/efp v0.0.1 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	golang.org/x/crypto v0.37.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	golang.org/x/net v0.39.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	go.uber.org/zap v1.27.1 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	google.golang.org/grpc v1.72.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
+	google.golang.org/grpc v1.77.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -17,14 +17,19 @@ cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKP
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
 cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0 h1:at8Tk2zUz63cLPR0JPWm5vp77pEZmzxEQBEfRKn1VV8=
 cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4=
+cloud.google.com/go/auth v0.17.0/go.mod h1:6wv/t5/6rOPAX4fJiRjKkJCvswLwdet7G8+UGXt7nCQ=
+cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
+cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
+cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
@@ -39,48 +44,71 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/agiledragon/gomonkey/v2 v2.11.0 h1:5oxSgA+tC1xuGsrIorR+sYiziYltmJyEZ9qA25b6l5U=
 github.com/agiledragon/gomonkey/v2 v2.11.0/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apolloconfig/agollo/v4 v4.4.0 h1:bIIRTEN4f7HgLx97/cNpduEvP9qQ7BkCyDOI2j800VM=
 github.com/apolloconfig/agollo/v4 v4.4.0/go.mod h1:6WjI68IzqMk/Y6ghMtrj5AX6Uewo20ZnncvRhTceQqg=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
+github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/ayflying/excel2json v1.1.9 h1:AKaUFc/FNQXV/53/VSgp3J+2d4PMWhVpTDRj/yx3VOs=
 github.com/ayflying/excel2json v1.1.9/go.mod h1:GjXYP2cDzeTgQxssQ3ba8QRa9JsScAeJMwCrZ7QTlQo=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
+github.com/casdoor/casdoor-go-sdk v1.39.0 h1:jo8pDi4Ue2Qdivps3Gs1l4DWBX1Z8zVps04ZaMTHM9Q=
+github.com/casdoor/casdoor-go-sdk v1.39.0/go.mod h1:hVSgmSdwTCsBEJNt9r2K5aLVsoeMc37/N4Zzescy5SA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 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=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
 github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/clipperhouse/displaywidth v0.6.1 h1:/zMlAezfDzT2xy6acHBzwIfyu2ic0hgkT83UX5EY2gY=
+github.com/clipperhouse/displaywidth v0.6.1/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
+github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
+github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
+github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
+github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
+github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
-github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
+github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
-github.com/elastic/go-elasticsearch/v8 v8.18.0 h1:ANNq1h7DEiPUaALb8+5w3baQzaS08WfHV0DNzp0VG4M=
+github.com/elastic/go-elasticsearch/v8 v8.19.0 h1:VmfBLNRORY7RZL+9hTxBD97ehl9H8Nxf2QigDh6HuMU=
-github.com/elastic/go-elasticsearch/v8 v8.18.0/go.mod h1:WLqwXsJmQoYkoA9JBFeEwPkQhCfAZuUvfpdU/NvSSf0=
+github.com/elastic/go-elasticsearch/v8 v8.19.0/go.mod h1:F3j9e+BubmKvzvLjNui/1++nJuJxbkhHefbaT0kFKGY=
-github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
+github.com/emirpasic/gods/v2 v2.0.0-alpha h1:dwFlh8pBg1VMOXWGipNMRt8v96dKAIvBehtCt6OtunU=
-github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/emirpasic/gods/v2 v2.0.0-alpha/go.mod h1:W0y4M2dtBB9U5z3YlghmpuUhiaZT2h6yoeE+C1sCp6A=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -89,30 +117,61 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
+github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201 h1:oEZYEpZo28Wdx+5FZo4aU7JFXu0WG/4wJWese5reQSA=
+github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201/go.mod h1:Y9WZUHEb+mpra02CbQ/QczLUe6f0Dezxaw5DCJlJQGo=
+github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/getlantern/errors v1.0.4 h1:i2iR1M9GKj4WuingpNqJ+XQEw6i6dnAgKAmLj6ZB3X0=
+github.com/getlantern/errors v1.0.4/go.mod h1:/Foq8jtSDGP8GOXzAjeslsC4Ar/3kB+UiQH+WyV4pzY=
+github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7/go.mod h1:zx/1xUUeYPy3Pcmet8OSXLbF47l+3y6hIPpyLWoR9oc=
+github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 h1:NlQedYmPI3pRAXJb+hLVVDGqfvvXGRPV8vp7XOjKAZ0=
+github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65/go.mod h1:+ZU1h+iOVqWReBpky6d5Y2WL0sF2Llxu+QcxJFs2+OU=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
+github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc h1:sue+aeVx7JF5v36H1HfvcGFImLpSD5goj8d+MitovDU=
+github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc/go.mod h1:D9RWpXy/EFPYxiKUURo2TB8UBosbqkiLhttRrZYtvqM=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
+github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 h1:cSrD9ryDfTV2yaur9Qk3rHYD414j3Q1rl7+L0AylxrE=
+github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770/go.mod h1:GOQsoDnEHl6ZmNIL+5uVo+JWRFWozMEp18Izcb++H+A=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
+github.com/getlantern/ops v0.0.0-20220713155959-1315d978fff7/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
+github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534 h1:3BwvWj0JZzFEvNNiMhCu4bf60nqcIuQpTYb00Ezm1ag=
+github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534/go.mod h1:ZsLfOY6gKQOTyEcPYNA9ws5/XHZQFroxqCOhHjGcs9Y=
+github.com/getlantern/systray v1.2.2 h1:dCEHtfmvkJG7HZ8lS/sLklTH4RKUcIsKrAD9sThoEBE=
+github.com/getlantern/systray v1.2.2/go.mod h1:pXFOI1wwqwYXEhLPm9ZGjS2u/vVELeIgNMY5HvhHhcE=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-pay/crypto v0.0.1 h1:B6InT8CLfSLc6nGRVx9VMJRBBazFMjr293+jl0lLXUY=
 github.com/go-pay/crypto v0.0.1/go.mod h1:41oEIvHMKbNcYlWUlRWtsnC6+ASgh7u29z0gJXe5bes=
 github.com/go-pay/errgroup v0.0.3 h1:DB4s8e8oWYDyETKQ1y1riMJ7y29zE1uIsMCSjEOFSbU=
 github.com/go-pay/errgroup v0.0.3/go.mod h1:0+4b8mvFMS71MIzsaC+gVvB4x37I93lRb2dqrwuU8x8=
-github.com/go-pay/gopay v1.5.109 h1:rF9bCUaAuz2jWHwgIuIfgrAejFOMufo9UsNENouFVcU=
+github.com/go-pay/gopay v1.5.115 h1:8WjWftPChKCiVt5Qz2xLqXeUdidsR+y9/R2S/7Q9szc=
-github.com/go-pay/gopay v1.5.109/go.mod h1:1B4NjEWKwRtJeNk2YhYwjcIJuwtxrOK0nZsh5slqrWI=
+github.com/go-pay/gopay v1.5.115/go.mod h1:p48xvWeepPolZuakAjCeucWynWwW7msoXsqahcoJpKE=
 github.com/go-pay/smap v0.0.2 h1:kKflYor5T5FgZltPFBMTFfjJvqYMHr5VnIFSEyhVTcA=
 github.com/go-pay/smap v0.0.2/go.mod h1:HW9oAo0okuyDYsbpbj5fJFxnNj/BZorRGFw26SxrNWw=
 github.com/go-pay/util v0.0.4 h1:TuwSU9o3Qd7m9v1PbzFuIA/8uO9FJnA6P7neG/NwPyk=
@@ -121,18 +180,27 @@ github.com/go-pay/xlog v0.0.3 h1:avyMhCL/JgBHreoGx/am/kHxfs1udDOAeVqbmzP/Yes=
 github.com/go-pay/xlog v0.0.3/go.mod h1:mH47xbobrdsSHWsmFtSF5agWbMHFP+tK0ZbVCk5OAEw=
 github.com/go-pay/xtime v0.0.2 h1:7YR4/iuELsEHpJ6LUO0SVK80hQxDO9MLCfuVYIiTCRM=
 github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcUE9xE=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
+github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0 h1:BewnDc3gq2iqYzPH56FtOelmT9F9WcAm6nnlOVgw3J8=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.6 h1:ROMR3JwVAhIwURP/UP1RRkY6ulfCTW3y0S9Y8kp2ZY4=
-github.com/gogf/gf/contrib/config/apollo/v2 v2.9.0/go.mod h1:uNjaJcnMvMl7bkcoL0amxwcrOM+Q5XGADKKwKTY+8MY=
+github.com/gogf/gf/contrib/config/apollo/v2 v2.9.6/go.mod h1:g+qZiP4dVqHxdSf8WrhQJeGIA05wPBlYcSArpNXHvlw=
-github.com/gogf/gf/v2 v2.9.0 h1:semN5Q5qGjDQEv4620VzxcJzJlSD07gmyJ9Sy9zfbHk=
+github.com/gogf/gf/contrib/config/consul/v2 v2.9.7 h1:2uN0gq4XlIkV9PvABlo3NgdGiseBgOfySZ0nVUmNOms=
-github.com/gogf/gf/v2 v2.9.0/go.mod h1:sWGQw+pLILtuHmbOxoe0D+0DdaXxbleT57axOLH2vKI=
+github.com/gogf/gf/contrib/config/consul/v2 v2.9.7/go.mod h1:01mqOYEbs/krnoWuSVk/ZdFICSiXpuAixY7ry/t/rfc=
+github.com/gogf/gf/v2 v2.9.7 h1:Vp3VGZ7drPs89tZslT6j6BKBTaw7Xs3DMGWx4MlVtMA=
+github.com/gogf/gf/v2 v2.9.7/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -163,6 +231,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
+github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -174,6 +244,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -192,12 +263,17 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.3.7 h1:zrn2Ee/nWmHulBx5sAVrGgAa0f2/R35S4DJwfFaUPFQ=
+github.com/googleapis/enterprise-certificate-proxy v0.3.7/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
+github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -205,40 +281,80 @@ github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtg
 github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/api v1.24.0 h1:u2XyStA2j0jnCiVUU7Qyrt8idjRn4ORhK6DlvZ3bWhA=
+github.com/hashicorp/consul/api v1.24.0/go.mod h1:NZJGRFYruc/80wYowkPFCp1LbGmJC9L8izrwfyVx/Wg=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/consul/sdk v0.14.1 h1:ZiwE2bKb+zro68sWzZ1SgHF3kRMBZ94TwOCFRF4ylPs=
+github.com/hashicorp/consul/sdk v0.14.1/go.mod h1:vFt03juSzocLRFo59NkeQHHmQa6+g7oU0pfzdI1mUhg=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
+github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
+github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
+github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
+github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
+github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
+github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
+github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
-github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/crc32 v1.3.0 h1:sSmTt3gUt81RP655XGZPElI0PelVTZ6YwCRnPSupoFM=
+github.com/klauspost/crc32 v1.3.0/go.mod h1:D7kQaZhnkX/Y0tstFGf8VUzv2UofNGqCjnC3zdHB0Hw=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 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=
@@ -248,117 +364,179 @@ 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-20251207115101-d4b8f9f841b9 h1:0IngVEHYqJUpjrnY9T1dZ2AMIbsI/sCUxxg77eGXXes=
-github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230/go.mod h1:C5LA5UO2ZXJrLaPLYtE1wUJMiyd/nwWaCO5cw/2pSHs=
+github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20251207115101-d4b8f9f841b9/go.mod h1:+mNMTBuDMdEGhWzoQgc6kBdqeaQpWh5ba8zqmp2MxCU=
+github.com/lxn/walk v0.0.0-20210112085537-c389da54e794/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
+github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
-github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY=
+github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
+github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
+github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI=
+github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.91 h1:tWLZnEfo3OZl5PoXQwcwTAPNNrjyWwOh6cbZitW5JQc=
+github.com/minio/minio-go/v7 v7.0.97 h1:lqhREPyfgHTB/ciX8k2r8k0D93WaFqxbJX36UZq5occ=
-github.com/minio/minio-go/v7 v7.0.91/go.mod h1:uvMUcGrpgeSAAI6+sD3818508nUyMULw94j2Nxku/Go=
+github.com/minio/minio-go/v7 v7.0.97/go.mod h1:re5VXuo0pwEtoNLsNuSr0RrLfT/MBtohwdaSmPPSRSk=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
-github.com/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/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc=
+github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0=
+github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
+github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
+github.com/olekukonko/ll v0.1.3 h1:sV2jrhQGq5B3W0nENUISCR6azIPf7UBUpVq0x/y70Fg=
+github.com/olekukonko/ll v0.1.3/go.mod h1:b52bVQRRPObe+yyBl0TxNfhesL0nedD4Cht0/zx55Ew=
+github.com/olekukonko/tablewriter v1.1.2 h1:L2kI1Y5tZBct/O/TyZK1zIE9GlBj/TVs+AY5tZDCDSc=
+github.com/olekukonko/tablewriter v1.1.2/go.mod h1:z7SYPugVqGVavWoA2sGsFIoOVNmEHxUAAMrhXONtfkg=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
+github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 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.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
-github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
+github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
 github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00=
 github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-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.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=
+github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 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/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
+github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
-github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
+github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
+github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU0=
 github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZMibh0H/k=
-github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79 h1:78nKszZqigiBRBVcoe/AuPzyLTWW5B+ltBaUX1rlIXA=
+github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44=
-github.com/xuri/efp v0.0.0-20250227110027-3491fafc2b79/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ=
-github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE=
+github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY=
-github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
+github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA=
-github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba h1:DhIu6n3qU0joqG9f4IO6a/Gkerd+flXrmlJ+0yX2W8U=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/xuri/nfp v0.0.0-20250226145837-86d5fc24b2ba/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
+github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
+github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.10.0 h1:8aKsP7JD39iKLc6dH5Tw3dgV3sPRh8uRVXu/fMstfW4=
+github.com/xuri/excelize/v2 v2.10.0/go.mod h1:SC5TzhQkaOsTWpANfm+7bJCldzcnU/jrhqkTi/iBHBU=
+github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE=
+github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
@@ -368,33 +546,49 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
-go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo=
-go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
+go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
+go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo=
+go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
+go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
+go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -405,10 +599,12 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
+golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
-golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
+golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -432,10 +628,10 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -444,9 +640,11 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -469,9 +667,9 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -484,8 +682,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ
 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/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
-golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -497,23 +695,32 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -528,26 +735,28 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -555,10 +764,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -576,6 +784,7 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -613,11 +822,13 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -639,8 +850,9 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.44.0 h1:URs6qR1lAxDsqWITsQXI4ZkGiYJ5dHtRNiCpfs2OeKA=
 google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
+google.golang.org/api v0.257.0 h1:8Y0lzvHlZps53PEaw+G29SsQIkuKrumGWs9puiexNAA=
+google.golang.org/api v0.257.0/go.mod h1:4eJrr+vbVaZSqs7vovFd1Jb/A6ml6iw2e6FBYf3GAO4=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -648,8 +860,6 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
-google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -690,8 +900,13 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
+google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
+google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 h1:mepRgnBZa07I4TRuomDE4sTIYieg/osKmzIf4USdWS4=
+google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 h1:Wgl1rcDNThT+Zn47YyCXOXyX/COgMTIdhJ717F0l4xk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -712,8 +927,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
+google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
-google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
+google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -726,24 +941,27 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 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/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/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/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/boot/boot.go

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

internal/logic/casdoor/casdoor.go

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

internal/logic/gameAct/gameAct.go

@@ -2,26 +2,31 @@ package gameAct
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
 	"github.com/ayflying/utility_go/internal/model/do"
 	"github.com/ayflying/utility_go/internal/model/entity"
 	"github.com/ayflying/utility_go/pkg"
 	service2 "github.com/ayflying/utility_go/service"
 	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/container/gset"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/gconv"
-	"strconv"
-	"strings"
-	"time"
 )
 
 var (
-	ctx     = gctx.New()
+	Name       = "game_act"
-	Name    = "game_act"
+	ActList    = gset.New(true)
-	ActList = gset.New(true)
+	RunTimeMax *gtime.Time
+	TaskMax    int64 = 100
 )
 
 type sGameAct struct {
@@ -44,6 +49,7 @@ func init() {
 // @return data *v1.Act: 返回活动信息结构体指针
 // @return err error: 返回错误信息
 func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return
@@ -72,7 +78,7 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
 	_, err = g.Redis().Set(ctx, keyCache, data)
 
 	var CacheKey = fmt.Sprintf("act:update:%d", uid)
-	pkg.Cache("redis").Set(ctx, CacheKey, uid, time.Hour*24*1)
+	pkg.Cache("redis").Set(ctx, CacheKey, uid, time.Hour*24*3+time.Hour*12)
 
 	return
 }
@@ -86,6 +92,7 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
 // @param data interface{}: 要存储的活动信息数据。
 // @return err error: 返回错误信息，如果操作成功，则返回nil。
 func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return
@@ -106,36 +113,54 @@ func (s *sGameAct) Set(uid int64, actId int, data interface{}) (err error) {
 	return
 }
 
-func (s *sGameAct) Saves(ctx context.Context) (err error) {
+// Saves 保存游戏活动数据
-	getCache, _ := pkg.Cache("redis").Get(nil, "cron:game_act")
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @return err error: 返回错误信息
+// Deprecated: 该方法已被弃用，建议使用SavesV2方法
+func (s *sGameAct) Saves() (err error) {
+	var ctx = gctx.New()
+	g.Log().Debug(ctx, "开始执行游戏act数据保存了")
 	//如果没有执行过，设置时间戳
-	if getCache.Int64() > 0 {
+	// 最大允许执行时间
-		return
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
-	} else {
-		pkg.Cache("redis").Set(nil, "cron:game_act", gtime.Now().Unix(), time.Hour)
-	}
-
 	//遍历执行
 	ActList.Iterator(func(i interface{}) bool {
-		err = s.Save(ctx, i.(int))
+		//在时间内允许执行
+		if gtime.Now().Before(RunTimeMax) {
+			g.Log().Debugf(ctx, "开始执行游戏act数据保存:act=%v", i)
+			err = s.Save(ctx, i.(int))
+		} else {
+			g.Log().Errorf(ctx, "游戏act数据保存超时:act=%v", i)
+		}
 		return true
 	})
 	return
 }
 
+// Save 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param actId int: 活动ID
+// @return err error: 返回错误信息
+// deprecated: 该方法已被弃用，建议使用SaveV2方法
 func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 
 	cacheKey := fmt.Sprintf("act:%v:*", actId)
-	//获取当前用户的key值
+	var add = make([]*entity.GameAct, 0)
-	//keys, err := utils.RedisScan(cacheKey)
+	var update = make([]*entity.GameAct, 0)
-	//if len(keys) > 10000 {
-	//	keys = keys[:10000]
-	//}
-
 	//循环获取缓存数据
 	err = tools.Redis.RedisScanV2(cacheKey, func(keys []string) (err error) {
-		var add []interface{}
+		//判断是否超时
-		var delKey []string
+		if gtime.Now().After(RunTimeMax) {
+			g.Log().Debug(ctx, "act执行超时了,停止执行！")
+			err = errors.New("act执行超时了,停止执行！")
+			return
+		}
+
 		for _, cacheKey = range keys {
 			result := strings.Split(cacheKey, ":")
 			actId, err = strconv.Atoi(result[1])
@@ -143,6 +168,7 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 			uid = gconv.Int64(result[2])
 			//uid, err = strconv.ParseInt(result[2], 10, 64)
 			if err != nil {
+				g.Log().Error(ctx, err)
 				continue
 			}
 
@@ -171,46 +197,81 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 				ActId: actId,
 			}).Fields("uid,act_id").Scan(&data)
 			if err != nil {
-				g.Log().Debugf(ctx, "当前数据错误: %v", cacheKey)
+				g.Log().Errorf(ctx, "当前数据错误: %v", cacheKey)
 				continue
 			}
 			actionData := cacheGet.String()
 			if data == nil {
-				//data =
+				add = append(add, &entity.GameAct{
-				add = append(add, &do.GameAct{
 					ActId:  actId,
 					Uid:    uid,
 					Action: actionData,
 				})
 			} else {
 				//覆盖数据
+				data.ActId = actId
+				data.Uid = uid
 				data.Action = actionData
-				add = append(add, data)
+				update = append(update, data)
 			}
-			//最后删除key
-			delKey = append(delKey, cacheKey)
 		}
 
 		//批量写入数据库
-		if len(add) > 0 {
+		updateCount := 0
-			dbRes, err2 := g.Model(Name).Batch(30).Data(add).Save()
-			add = make([]interface{}, 0)
-			if err2 != nil {
-				g.Log().Error(ctx, err2)
-				return
-			}
 
-			for _, v := range delKey {
+		//g.Log().Debugf(ctx, "当前 %v 要更新的数据: %v 条", actId, len(update))
-				_, err2 = g.Redis().Del(ctx, v)
+		if len(update) > 100 {
+			for _, v := range update {
+				v.UpdatedAt = gtime.Now()
+				updateRes, err2 := g.Model(Name).Where(do.GameAct{
+					Uid:   v.Uid,
+					ActId: v.ActId,
+				}).Data(v).Update()
 				if err2 != nil {
 					g.Log().Error(ctx, err2)
 					return
 				}
-			}
+				if row, _ := updateRes.RowsAffected(); row == 0 {
-			delKey = make([]string, 0)
+					g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+					continue
+				}
 
-			count, _ := dbRes.RowsAffected()
+				//删除缓存
-			g.Log().Debugf(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+				s.DelCacheKey(ctx, v.ActId, v.Uid)
+
+				updateCount++
+				update = make([]*entity.GameAct, 0)
+			}
+			g.Log().Debugf(ctx, "当前 %v 更新数据库: %v 条", actId, updateCount)
+			update = make([]*entity.GameAct, 0)
+		}
+
+		var count int64
+		//g.Log().Debugf(ctx, "当前 %v 要添加的数据: %v 条", actId, len(add))
+		if len(add) > 100 {
+			dbRes, err2 := g.Model(Name).Data(add).Save()
+
+			err = err2
+			if err != nil {
+				g.Log().Error(ctx, err2)
+				return
+			}
+			count, _ = dbRes.RowsAffected()
+			if count == 0 {
+				g.Log().Error(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+				for _, vTemp := range add {
+					g.Log().Debugf(ctx, "当前act：%v，add写入数据: %v,内容：%v", vTemp.ActId, vTemp.Uid, vTemp.Action)
+				}
+				return
+			}
+
+			//for _, v2 := range add {
+			//	//删除缓存
+			//	s.DelCacheKey(ctx, v2.ActId, v2.Uid)
+			//}
+
+			//g.Log().Debugf(ctx, "当前 %v 写入数据库: %v 条", actId, count)
+			add = make([]*entity.GameAct, 0)
 		}
 
 		if err != nil {
@@ -223,17 +284,364 @@ func (s *sGameAct) Save(ctx context.Context, actId int) (err error) {
 	return
 }
 
+// SavesV2 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @return err error: 返回错误信息
+// SavesV2 保存游戏活动数据
+func (s *sGameAct) SavesV2() (err error) {
+	var ctx = gctx.New()
+	g.Log().Debug(ctx, "开始执行游戏act数据保存了")
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
+
+	// 使用局部通道替代包级通道，避免并发冲突
+	addChan := make(chan *entity.GameAct, 1000)
+	updateChan := make(chan *entity.GameAct, 1000)
+
+	errChan := make(chan error, 1)
+	var wg sync.WaitGroup
+	wg.Add(1) // 仅需添加1次（对应Cache2SqlChan协程）
+	// wg.Add(1)  // 移除多余的Add调用，避免计数不平衡
+
+	go func() {
+		defer wg.Done() // Cache2SqlChan协程完成后减1
+		s.Cache2SqlChan(ctx, addChan, updateChan)
+	}()
+
+	go func() {
+		scanErr := tools.Redis.RedisScanV2("act:*", func(keys []string) error {
+			if gtime.Now().After(RunTimeMax) {
+				return errors.New("redis扫描超时")
+			}
+			for _, key := range keys {
+				if keyErr := s.SaveV2(ctx, key, addChan, updateChan); keyErr != nil {
+					g.Log().Errorf(ctx, "处理key %s失败: %v", key, keyErr)
+				}
+			}
+			return nil
+		})
+		close(addChan)
+		close(updateChan)
+		errChan <- scanErr
+	}()
+
+	// 等待扫描和处理完成，同时监听上下文取消
+	select {
+	case scanErr := <-errChan:
+		wg.Wait() // 等待Cache2SqlChan处理完剩余数据
+		if scanErr != nil {
+			return gerror.New(fmt.Sprintf("Redis扫描失败: %v", scanErr))
+		}
+	case <-ctx.Done():
+		wg.Wait()
+		return ctx.Err() // 返回上下文取消原因
+	}
+	return
+}
+
+// SaveV2 保存游戏活动数据
+//
+// @Description: 保存游戏活动数据
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param cacheKey string: 缓存键
+// @param add []*entity.GameAct: 添加数据
+// @param update []*entity.GameAct: 更新数据
+// @return err error: 返回错误信息
+func (s *sGameAct) SaveV2(ctx context.Context, cacheKey string, addChan, updateChan chan *entity.GameAct) (err error) {
+
+	result := strings.Split(cacheKey, ":")
+	actId := gconv.Int(result[1])
+	if actId == 0 {
+		return
+	}
+	var uid int64
+	uid = gconv.Int64(result[2])
+	if uid == 0 {
+		//跳过为空的用户缓存
+		return
+	}
+
+	//获取缓存数据
+	cacheGet, _ := g.Redis().Get(ctx, cacheKey)
+
+	if cacheGet.IsEmpty() {
+		//空数据也不保存
+		return
+	}
+
+	//如果有活跃，跳过持久化
+	if getBool, _ := pkg.Cache("redis").
+		Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+		return
+	}
+
+	//获取数据库数据
+	var data *entity.GameAct
+	// 从数据库中查询活动信息
+	err = g.Model(Name).Where(do.GameAct{
+		Uid:   uid,
+		ActId: actId,
+	}).Fields("uid,act_id").Scan(&data)
+	if err != nil {
+		g.Log().Errorf(ctx, "当前数据错误: %v", cacheKey)
+		return
+	}
+
+	//如果没有数据，添加
+	actionData := cacheGet.String()
+	if data == nil {
+		//add = append(add, &entity.GameAct{
+		//	ActId:  actId,
+		//	Uid:    uid,
+		//	Action: actionData,
+		//})
+		addChan <- &entity.GameAct{
+			ActId:  actId,
+			Uid:    uid,
+			Action: actionData,
+		}
+	} else {
+		//覆盖数据
+		data.ActId = actId
+		data.Uid = uid
+		data.Action = actionData
+		//update = append(update, data)
+		updateChan <- data
+	}
+
+	return
+}
+
+// Cache2Sql 缓存持久化到数据库
+// @Description: 缓存持久化到数据库
+// @receiver s *sGameAct: 游戏活动服务结构体指针
+// @param ctx context.Context: 上下文对象
+// @param add []*entity.GameAct: 添加数据
+// @param update []*entity.GameAct: 更新数据
+// @return err error: 返回错误信息
+func (s *sGameAct) Cache2Sql(ctx context.Context, add, update []*entity.GameAct) {
+	tx, err := g.DB().Begin(ctx)
+	if err != nil {
+		g.Log().Error(ctx, err)
+		return
+	}
+
+	//批量写入数据库
+	var updateCount int64
+	if len(update) > 0 {
+		for _, v := range update {
+			v.UpdatedAt = gtime.Now()
+			updateRes, err2 := tx.Model(Name).Where(do.GameAct{
+				Uid:   v.Uid,
+				ActId: v.ActId,
+			}).Data(v).Update()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := updateRes.RowsAffected(); row == 0 {
+				g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+				continue
+			}
+
+			updateCount++
+			if updateCount > TaskMax {
+				g.Log().Debugf(ctx, "act当前更新数据库: %v 条", updateCount)
+				err = tx.Commit()
+				if err != nil {
+					g.Log().Debugf(ctx, "act当前更新数据库失败:%v", err)
+					return
+				}
+				updateCount = 0
+				tx, err = g.DB().Begin(ctx)
+			}
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+		}
+		//循环结束了，最后写入一波
+		g.Log().Debugf(ctx, "Cache2Sql运行结束，act当前更新数据库: %v 条", updateCount)
+		update = (update)[:0]
+	}
+
+	var addCount int64
+	if len(add) > 0 {
+		for _, v := range add {
+			addRes, err2 := tx.Model(Name).Data(v).Insert()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := addRes.RowsAffected(); row == 0 {
+				g.Log().Error(ctx, "本次新增为0，新增数据失败: %v", v)
+				continue
+			}
+			addCount++
+			if addCount > TaskMax {
+				g.Log().Debugf(ctx, "超过%v条，act当前写入数据库: %v 条", TaskMax, addCount)
+				err = tx.Commit()
+				if err != nil {
+					g.Log().Debugf(ctx, "act当前写入数据库失败:%v", err)
+					return
+				}
+				addCount = 0
+				tx, err = g.DB().Begin(ctx)
+			}
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+		}
+
+		//循环结束了，最后写入一波
+		g.Log().Debugf(ctx, "Cache2Sql运行结束，act当前写入数据库: %v 条", addCount)
+		add = (add)[:0]
+	}
+
+	err = tx.Commit()
+	return
+}
+
+// Cache2AddChan 批量添加数据库
+func (s *sGameAct) Cache2SqlChan(ctx context.Context, addChan, updateChan chan *entity.GameAct) {
+	//批量写入数据库计数
+	var addCount int64
+	//批量更新数据库计数
+	var updateCount int64
+	//通道关闭标志
+	addClosed := false
+	updateClosed := false
+	//写入总数
+	var addAllCount, updateAllCount int64
+
+	tx, err := g.DB().Begin(ctx)
+	if err != nil {
+		g.Log().Error(ctx, err)
+		return
+	}
+
+	// 使用链式安全模式
+	//var db = tx.Model(Name).Safe()
+
+	for {
+		//检查是否两个通道都已关闭且为空
+		if addClosed && updateClosed {
+			break
+		}
+
+		select {
+		case v, ok := <-addChan:
+			if !ok {
+				addClosed = true // 仅标记关闭，不立即日志
+				continue
+			}
+			addRes, err2 := tx.Model(Name).Data(v).Insert()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := addRes.RowsAffected(); row == 0 {
+				//g.Log().Error(ctx, "本次新增为0，新增数据失败: %v", v)
+				continue
+			}
+			row, _ := addRes.RowsAffected()
+			addCount += row
+
+			if addCount > TaskMax {
+				// g.Log().Debugf(ctx, "超过%v条，act当前写入数据库: %v 条", TaskMax, addCount)
+				err = tx.Commit()
+				if err != nil {
+					g.Log().Debugf(ctx, "act当前写入数据库失败:%v", err)
+					return
+				}
+				//清空数量前累加一下
+				addAllCount += addCount
+				addCount = 0
+				tx, err = g.DB().Begin(ctx)
+			}
+
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+
+		case v, ok := <-updateChan:
+			if !ok {
+				updateClosed = true // 仅标记关闭，不立即日志
+				continue
+			}
+			v.UpdatedAt = gtime.Now()
+			updateRes, err2 := tx.Model(Name).Where(do.GameAct{
+				Uid:   v.Uid,
+				ActId: v.ActId,
+			}).Data(v).Update()
+			if err2 != nil {
+				g.Log().Error(ctx, err2)
+				continue
+			}
+			if row, _ := updateRes.RowsAffected(); row == 0 {
+				//g.Log().Error(ctx, "本次更新为0，更新数据失败: %v", v)
+				continue
+			}
+			updateCount++
+
+			if updateCount > TaskMax {
+				// g.Log().Debugf(ctx, "超过%v条，act当前更新数据库: %v 条", TaskMax, updateCount)
+				err = tx.Commit()
+				if err != nil {
+					g.Log().Debugf(ctx, "act当前更新数据库失败:%v", err)
+					return
+				}
+				//清空数量前累加一下
+				updateAllCount += updateCount
+				updateCount = 0
+				tx, err = g.DB().Begin(ctx)
+			}
+
+			//删除缓存
+			s.DelCacheKey(ctx, v.ActId, v.Uid)
+
+		case <-ctx.Done():
+			g.Log().Debug(ctx, "act协程被上下文取消")
+			return
+		}
+	}
+
+	err = tx.Commit()
+	addAllCount += addCount
+	updateAllCount += updateCount
+	// 仅在所有通道处理完毕后打印最终计数（移除中间冗余日志）
+	g.Log().Debugf(ctx, "运行结束act当前写入数据库: %v 条", addAllCount)
+	g.Log().Debugf(ctx, "运行结束act当前更新数据库: %v 条", updateAllCount)
+	return
+}
+
+// 删除缓存key
+func (s *sGameAct) DelCacheKey(ctx context.Context, aid int, uid int64) {
+	go func() {
+		//如果有活跃，跳过删除
+		if getBool, _ := pkg.Cache("redis").
+			Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+			return
+		}
+
+		cacheKey := fmt.Sprintf("act:%v:%v", aid, uid)
+		_, err := g.Redis().Del(ctx, cacheKey)
+		if err != nil {
+			g.Log().Error(ctx, err)
+		}
+	}()
+}
+
 // 清空GetRedDot缓存
 func (s *sGameAct) RefreshGetRedDotCache(uid int64) {
 	cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("d"), uid)
 	_, err := pkg.Cache("redis").Remove(gctx.New(), cacheKey)
 	if err != nil {
-		g.Log().Error(ctx, err)
+		g.Log().Error(gctx.New(), err)
 		g.Dump(err)
 	}
 }
 
 func (s *sGameAct) Del(uid int64, actId int) {
+	var ctx = gctx.New()
 	if uid == 0 || actId == 0 {
 		g.Log().Error(ctx, "当前参数为空")
 		return

internal/logic/gameKv/gameKv.go

@@ -1,22 +1,25 @@
 package gameKv
 
 import (
+	"context"
+	"errors"
 	"fmt"
+	"strings"
+	"sync"
+	"time"
+
 	"github.com/ayflying/utility_go/pkg"
 	"github.com/ayflying/utility_go/service"
 	"github.com/ayflying/utility_go/tools"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
-	"strconv"
+	"github.com/gogf/gf/v2/util/gconv"
-	"strings"
-	"sync"
-	"time"
 )
 
 var (
-	ctx  = gctx.New()
+	Name       = "game_kv"
-	Name = "game_kv"
+	RunTimeMax *gtime.Time
 )
 
 type sGameKv struct {
@@ -37,46 +40,49 @@ func init() {
 // @receiver s: sGameKv的实例。
 // @return err: 错误信息，如果操作成功，则为nil。
 func (s *sGameKv) SavesV1() (err error) {
-	getCache, err := pkg.Cache("redis").Get(nil, "cron:game_kv")
+	var ctx = gctx.New()
-	//如果没有执行过，设置时间戳
+	// 最大允许执行时间
-	if getCache.Int64() > 0 {
+	RunTimeMax = gtime.Now().Add(time.Minute * 30)
-		return
+	g.Log().Debug(ctx, "开始执行游戏kv数据保存")
-	} else {
+
-		pkg.Cache("redis").Set(nil, "cron:game_kv", gtime.Now().Unix(), time.Hour)
+	// 定义用于存储用户数据的结构体
+	type ListData struct {
+		Uid int64       `json:"uid"`
+		Kv  interface{} `json:"kv"`
 	}
+	var list []*ListData
+	// 初始化列表，长度与keys数组一致
+	list = make([]*ListData, 0)
 
 	// 从Redis列表中获取所有用户KV索引的键
 	//keys, err := utils.RedisScan("user:kv:*")
 	err = tools.Redis.RedisScanV2("user:kv:*", func(keys []string) (err error) {
-		// 定义用于存储用户数据的结构体
+		//判断是否超时
-		type ListData struct {
+		if gtime.Now().After(RunTimeMax) {
-			Uid int64       `json:"uid"`
+			g.Log().Error(ctx, "kv执行超时了,停止执行！")
-			Kv  interface{} `json:"kv"`
+			err = errors.New("kv执行超时了,停止执行！")
+			return
 		}
-		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
+			var uid = gconv.Int64(result[2])
-			uid, err = strconv.ParseInt(result[2], 10, 64)
+			if uid == 0 {
+				continue
+			}
+			//uid, err = strconv.ParseInt(result[2], 10, 64)
 			if err != nil {
 				g.Log().Error(ctx, err)
 				g.Redis().Del(ctx, cacheKey)
 				continue
 			}
 
-			////如果1天没有活跃，跳过
-			//user, _ := service.MemberUser().Info(uid)
-			//if user.UpdatedAt.Seconds < gtime.Now().Add(consts.ActSaveTime).Unix() {
-			//	continue
-			//}
 			//如果有活跃，跳过持久化
 			if getBool, _ := pkg.Cache("redis").
 				Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
@@ -86,53 +92,46 @@ func (s *sGameKv) SavesV1() (err error) {
 			get, _ := g.Redis().Get(ctx, cacheKey)
 			var data interface{}
 			get.Scan(&data)
+			if data == nil {
+				continue
+			}
 			list = append(list, &ListData{
 				Uid: uid,
 				Kv:  data,
 			})
-
-			delKey = append(delKey, cacheKey)
 		}
 
 		// 将列表数据保存到数据库
-		if len(list) > 0 {
+		if len(list) > 100 {
-			_, err2 := g.Model("game_kv").Batch(30).Data(list).Save()
+			_, err2 := g.Model("game_kv").Data(list).Save()
-			list = make([]*ListData, 0)
 			if err2 != nil {
-				g.Log().Error(ctx, err2)
+				g.Log().Error(ctx, "当前kv数据入库失败: %v", err2)
+				err = err2
 				return
 			}
-
+			//删除当前key
-			//批量删除key
+			for _, v := range list {
-			for _, v := range delKey {
+				s.DelCacheKey(ctx, v.Uid)
-				_, err2 = g.Redis().Del(ctx, v)
-				if err2 != nil {
-					g.Log().Errorf(ctx, "删除存档错误：%v,err=%v", v, err2)
-					return
-				}
 			}
-
+			list = make([]*ListData, 0)
-			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
 }
+
+// 删除缓存key
+func (s *sGameKv) DelCacheKey(ctx context.Context, uid int64) {
+	//如果有活跃，跳过删除
+	if getBool, _ := pkg.Cache("redis").
+		Contains(ctx, fmt.Sprintf("act:update:%d", uid)); getBool {
+		return
+	}
+
+	cacheKey := fmt.Sprintf("user:kv:%v", uid)
+	_, err := g.Redis().Del(ctx, cacheKey)
+	if err != nil {
+		g.Log().Error(ctx, err)
+	}
+}

internal/logic/ip2region/ip2region.go

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

internal/logic/logic.go

@@ -5,10 +5,12 @@
 package logic
 
 import (
+	_ "github.com/ayflying/utility_go/internal/logic/casdoor"
 	_ "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/os"
 	_ "github.com/ayflying/utility_go/internal/logic/systemCron"
 	_ "github.com/ayflying/utility_go/internal/logic/systemLog"
 )

internal/logic/os/linux.go

@@ -0,0 +1,7 @@
+//go:build !windows
+
+package os
+
+func (s *sOS) start() {
+
+}

internal/logic/os/os.go

@@ -0,0 +1,41 @@
+package os
+
+import (
+	"github.com/ayflying/utility_go/service"
+	"github.com/gogf/gf/v2/os/gcmd"
+)
+
+type systrayType struct {
+	Icon    string `json:"icon" dc:"图标"`
+	Title   string `json:"title" dc:"标题"`
+	Tooltip string `json:"tooltip" dc:"提示"`
+}
+
+type sOS struct {
+	systray *systrayType
+}
+
+func New() *sOS {
+	return &sOS{
+		systray: &systrayType{},
+	}
+}
+func init() {
+	service.RegisterOS(New())
+}
+
+func (s *sOS) Load(title string, tooltip string, ico string) {
+	if title == "" {
+		title = gcmd.GetArg(0).String()
+	}
+	if tooltip == "" {
+		tooltip = gcmd.GetArg(0).String()
+	}
+
+	s.systray = &systrayType{
+		Icon:    ico,
+		Title:   title,
+		Tooltip: tooltip,
+	}
+	s.start()
+}

internal/logic/os/windows.go

@@ -0,0 +1,43 @@
+//go:build windows
+
+package os
+
+import (
+	"os"
+
+	"github.com/getlantern/systray"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gfile"
+)
+
+func (s *sOS) start() {
+
+	// 系统托盘初始化（设置图标、右键菜单）
+	go systray.Run(s.onSystrayReady, s.onSystrayExit)
+}
+
+// 系统托盘初始化（设置图标、右键菜单）
+func (s *sOS) onSystrayReady() {
+
+	iconByte := gfile.GetBytes(s.systray.Icon)
+	systray.SetIcon(iconByte)
+	systray.SetTitle(s.systray.Title)
+	systray.SetTooltip(s.systray.Tooltip)
+
+	mQuit := systray.AddMenuItem("退出", "退出应用")
+	// Sets the icon of a menu item. Only available on Mac and Windows.
+	//mQuit.SetIcon(iconByte)
+	go func() {
+		<-mQuit.ClickedCh
+		systray.Quit()
+	}()
+
+}
+
+func (s *sOS) onSystrayExit() {
+	// clean up here
+	g.Log().Debugf(gctx.New(), "系统托盘退出")
+	defer os.Exit(0)
+
+}

internal/logic/systemCron/listener.go

@@ -26,7 +26,7 @@ func (s *sSystemCron) Guardian(DingTalkWebHook string) {
 	cfg, _ := g.Cfg().Get(gctx.New(), "serverList")
 	cfg.Scan(&list)
 	for _, v := range list {
-		get, err := g.Client().Discovery(nil).Get(gctx.New(), v.Address+"/callback/status")
+		get, err := g.Client().Get(gctx.New(), v.Address+"/callback/status")
 
 		defer get.Close()
 		if err != nil {

internal/logic/systemCron/systemCron.go

@@ -2,15 +2,18 @@ package systemCron
 
 import (
 	"context"
-	"github.com/ayflying/utility_go/api/system/v1"
+	"reflect"
+	"runtime"
+	"sync"
+	"time"
+
+	v1 "github.com/ayflying/utility_go/api/system/v1"
 	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/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 (
@@ -18,12 +21,18 @@ var (
 	startTime *gtime.Time
 )
 
+type TaskWithParams struct {
+	// TaskFunc 原有任务函数，保持签名不变
+	TaskFunc func(context.Context) error
+	CronType v1.CronType
+}
+
 // sSystemCron 结构体定义了系统定时任务的秒计时器。
 // 它包含了不同时间周期的任务，如秒、分钟、小时、天、周、月、年以及特定的工作日任务。
 type sSystemCron struct {
 	//互斥锁
 	Lock        sync.Mutex
-	taskChan    chan func(context.Context) error
+	taskChan    chan TaskWithParams
 	TaskTimeout time.Duration
 
 	// 每秒执行的任务
@@ -58,8 +67,8 @@ type sSystemCron struct {
 
 func New() *sSystemCron {
 	return &sSystemCron{
-		taskChan:    make(chan func(context.Context) error, 2),
+		taskChan:    make(chan TaskWithParams, 2),
-		TaskTimeout: time.Minute * 30,
+		TaskTimeout: time.Minute * 60,
 	}
 }
 
@@ -80,7 +89,8 @@ func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
 	var _func2 = func(ctx context.Context) error {
 		return _func()
 	}
-	s.AddCronV2(typ, _func2)
+	// 老版本计划任务全都是主服务器唯一执行
+	s.AddCronV2(typ, _func2, true)
 }
 
 // AddCronV2  添加一个定时任务到相应的调度列表中。
@@ -89,7 +99,16 @@ func (s *sSystemCron) AddCron(typ v1.CronType, _func func() error) {
 // @receiver s: sSystemCron的实例，代表一个调度系统。
 // @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
 // @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
-func (s *sSystemCron) AddCronV2(typ v1.CronType, _func func(context.Context) error) {
+// @param _onlyMain: 是否只在主服务器上执行一次,true 唯一执行，false 全局执行不判断唯一
+func (s *sSystemCron) AddCronV2(typ v1.CronType, _func func(context.Context) error, _onlyMain ...bool) {
+	//如果传过来的任务是需要主服务器执行一次
+	if len(_onlyMain) > 0 && _onlyMain[0] {
+		//判断当前是否为主服务器
+		if !g.Cfg().MustGet(gctx.New(), "game.cron_main").Bool() {
+			return
+		}
+	}
+
 	//加锁
 	s.Lock.Lock()
 	defer s.Lock.Unlock()
@@ -229,7 +248,7 @@ func (s *sSystemCron) secondlyTask() {
 	if len(s.SecondlyTask) == 0 {
 		return
 	}
-	s.AddFuncChan(s.SecondlyTask)
+	s.AddFuncChan(s.SecondlyTask, v1.CronType_SECOND)
 	return
 }
 
@@ -238,7 +257,7 @@ func (s *sSystemCron) minutelyTask() {
 	if len(s.MinutelyTask) == 0 {
 		return
 	}
-	s.AddFuncChan(s.MinutelyTask)
+	s.AddFuncChan(s.MinutelyTask, v1.CronType_MINUTE)
 	return
 }
 
@@ -247,7 +266,7 @@ func (s *sSystemCron) hourlyTask() {
 	if len(s.HourlyTask) == 0 {
 		return
 	}
-	s.AddFuncChan(s.HourlyTask)
+	s.AddFuncChan(s.HourlyTask, v1.CronType_HOUR)
 	return
 }
 
@@ -256,37 +275,46 @@ func (s *sSystemCron) dailyTask() {
 	if len(s.DailyTask) == 0 {
 		return
 	}
-	s.AddFuncChan(s.DailyTask)
+	s.AddFuncChan(s.DailyTask, v1.CronType_DAILY)
 	return
 }
 
 // 每周任务
 func (s *sSystemCron) weeklyTask(day int) {
 	var arr []func(context.Context) error
+	var cronType v1.CronType
 	switch day {
 	case 1:
 		arr = s.MondayTask
+		cronType = v1.CronType_MONDAY
 	case 2:
 		arr = s.TuesdayTask
+		cronType = v1.CronType_TUESDAY
 	case 3:
 		arr = s.WednesdayTask
+		cronType = v1.CronType_WEDNESDAY
 	case 4:
 		arr = s.ThursdayTask
+		cronType = v1.CronType_THURSDAY
 	case 5:
 		arr = s.FridayTask
+		cronType = v1.CronType_FRIDAY
 	case 6:
 		arr = s.SaturdayTask
+		cronType = v1.CronType_SATURDAY
 	case 7:
 		arr = s.SundayTask
+		cronType = v1.CronType_SUNDAY
 	default:
 		arr = s.WeeklyTask
+		cronType = v1.CronType_WEEK
 		return
 	}
 
 	if len(arr) == 0 {
 		return
 	}
-	s.AddFuncChan(arr)
+	s.AddFuncChan(arr, cronType)
 	return
 }
 
@@ -295,7 +323,7 @@ func (s *sSystemCron) monthlyTask() {
 	if len(s.MonthlyTask) == 0 {
 		return
 	}
-	s.AddFuncChan(s.MonthlyTask)
+	s.AddFuncChan(s.MonthlyTask, v1.CronType_MONTH)
 	return
 }
 
@@ -304,14 +332,17 @@ func (s *sSystemCron) yearlyTask() {
 	if len(s.YearlyTask) == 0 {
 		return
 	}
-	s.AddFuncChan(s.YearlyTask)
+	s.AddFuncChan(s.YearlyTask, v1.CronType_YEAR)
 
 }
 
 // AddFuncChan 添加方法到通道
-func (s *sSystemCron) AddFuncChan(list []func(context.Context) error) {
+func (s *sSystemCron) AddFuncChan(list []func(context.Context) error, cronType v1.CronType) {
 	for _, v := range list {
-		s.taskChan <- v
+		s.taskChan <- TaskWithParams{
+			TaskFunc: v,
+			CronType: cronType,
+		}
 	}
 }
 
@@ -322,7 +353,7 @@ func (s *sSystemCron) RunFuncChan() {
 			//ctx := gctx.New()
 			func() {
 				//超时释放资源
-				ctx, cancel := context.WithTimeout(context.Background(), s.TaskTimeout)
+				ctx, cancel := context.WithTimeout(gctx.New(), s.TaskTimeout)
 				defer cancel()
 
 				// 使用匿名函数包裹来捕获 panic
@@ -331,10 +362,24 @@ func (s *sSystemCron) RunFuncChan() {
 						g.Log().Errorf(gctx.New(), "执行函数时发生 panic: %v", r)
 					}
 				}()
+				if task.CronType != v1.CronType_MINUTE && task.CronType != v1.CronType_SECOND {
+					if runtime.FuncForPC(reflect.ValueOf(task.TaskFunc).Pointer()) != nil {
+						g.Log().Debugf(gctx.New(), "开始执行任务: %v", runtime.FuncForPC(reflect.ValueOf(task.TaskFunc).Pointer()).Name())
+					} else {
+						g.Log().Debugf(gctx.New(), "开始执行任务: %v", "无法获取函数信息")
+					}
+				}
 
 				done := make(chan error)
 				go func() {
-					done <- task(ctx)
+					done <- task.TaskFunc(ctx)
+					if task.CronType != v1.CronType_MINUTE && task.CronType != v1.CronType_SECOND {
+						if runtime.FuncForPC(reflect.ValueOf(task.TaskFunc).Pointer()) != nil {
+							g.Log().Debugf(gctx.New(), "结束执行任务: %v", runtime.FuncForPC(reflect.ValueOf(task.TaskFunc).Pointer()).Name())
+						} else {
+							g.Log().Debugf(gctx.New(), "结束执行任务: %v", "无法获取函数信息")
+						}
+					}
 				}()
 				//err := task()
 				//if err != nil {

internal/logic/systemLog/systemLog.go

@@ -2,6 +2,7 @@ package systemLog
 
 import (
 	"context"
+
 	v1 "github.com/ayflying/utility_go/api/admin/v1"
 	"github.com/ayflying/utility_go/service"
 	"github.com/gogf/gf/v2/frame/g"

package/gamelog/export.go

@@ -0,0 +1,46 @@
+package gamelog
+
+import (
+	"encoding/json"
+	"time"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+// 获取日志行
+func (sdk *SDK) GetLogItem(uid, event string, property map[string]any, timezone string, customEventTime ...time.Time) string {
+	loc := time.Local
+	if _loc := getLocationMapValue(timezone); _loc != nil {
+		loc = _loc
+	}
+	if len(property) == 0 {
+		property = map[string]any{"ts": gtime.Now().Timestamp()}
+	}
+	var et *gtime.Time
+	if len(customEventTime) > 0 {
+		et = gtime.NewFromTime(customEventTime[0])
+	} else {
+		et = gtime.Now()
+	}
+	safeProperty(property)
+	pstr, err := json.Marshal(property)
+	if err != nil {
+		g.Log().Errorf(ctx, "GetLogItem Fail ! json marshal property err: %v", err)
+		return ""
+	}
+	item := []any{
+		uid,
+		event,
+		gconv.String(pstr),
+		et.TimestampMilli(),
+		et.In(loc).Format(datetimeFmt),
+	}
+	itemstr, err := json.Marshal(item)
+	if err != nil {
+		g.Log().Errorf(ctx, "GetLogItem Fail ! json marshal item err: %v", err)
+		return ""
+	}
+	return gconv.String(itemstr)
+}

package/gamelog/sdk.go

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

package/gamelog/test/gamelog_test.go

@@ -0,0 +1,118 @@
+package test
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/ayflying/utility_go/package/gamelog"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/grand"
+	"github.com/google/uuid"
+)
+
+func TestGamelog(t *testing.T) {
+	glsdk, err := gamelog.INIT(&gamelog.SDKConfig{
+		// 必填
+		Pid: "test5", // 项目ID
+		// BaseUrl: "http://47.76.178.47:10101", // 香港测试服上报地址
+		// BaseUrl: "http://101.37.28.111:10101", // 香港测试服上报地址
+		BaseUrl: "http://47.77.200.131:10101", // 美国BIDB服务器
+		// BaseUrl:       "http://127.0.0.1:10101", // 本次测试上报地址
+		ReportSk:      "sngame2025", // xor混淆key
+		FlushInterval: 5,            // 上报间隔
+		DiskBakPath:   "gamelog",    // 本地磁盘备份, 用于意外情况下临时保存日志, 请确保该目录持久化(容器内要挂载). 每次启动时或每N次上报时加载到失败队列
+		// 可填
+		RetryN:       2,   // 默认每10次, 上传检查一次磁盘的失败数据
+		ChanSize:     500, // 默认1000, 信道size
+		SendSaveType: 2,   // 发送存储类型, 默认不设置为0代表文件存储, 2代表走kafka可实同步日志
+	})
+
+	// 随机测试事件和属性
+	events := []string{"e1", "e2", "e3", "e4"}
+	pms := []map[string]any{
+		{"a": "1"},
+		{"a": "2"},
+		{"a": "3"},
+		{"a": "4"},
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	gtest.C(t, func(t *gtest.T) {
+		go func() {
+			for {
+				uuidval, _ := uuid.NewUUID()
+				randUid := strings.ReplaceAll(uuidval.String(), "-", "")
+				glsdk.LogLtz(randUid, events[grand.Intn(len(events))], pms[grand.Intn(len(pms))])
+				time.Sleep(time.Millisecond * 100)
+			}
+		}()
+		time.Sleep(time.Second * 14)
+		// 模拟等待信号后优雅关闭
+		glsdk.Shutdown()
+	})
+}
+
+func TestPressMQ(t *testing.T) {
+	glsdk, err := gamelog.INIT(&gamelog.SDKConfig{
+		// 必填
+		Pid: "ydspress", // 项目ID
+		// BaseUrl:       "http://47.77.200.131:10101", // 美国BIDB服务器
+		// BaseUrl:       "http://101.37.28.111:10101", // 国内yoyatime服务器BIDB服务器
+		BaseUrl:       "http://47.77.206.131:10201", // 压测服务器
+		ReportSk:      "sngame2025",                 // xor混淆key
+		FlushInterval: 6,                            // 上报间隔
+		DiskBakPath:   "gamelog",                    // 本地磁盘备份, 用于意外情况下临时保存日志, 请确保该目录持久化(容器内要挂载). 每次启动时或每N次上报时加载到失败队列
+		// 可填
+		RetryN:       2,   // 默认每10次, 上传检查一次磁盘的失败数据
+		ChanSize:     500, // 默认1000, 信道size
+		SendSaveType: 2,   // 发送存储类型, 默认不设置为0代表文件存储, 2代表走kafka可实同步日志
+	})
+
+	// 随机测试事件和属性
+	// events := []string{"e1", "e2", "e3", "e4"}
+	// pms := []map[string]any{
+	// 	{"s1": gconv.String(grand.Intn(100))},
+	// 	{"s2": gconv.String(grand.Intn(300))},
+	// 	{"s3": gconv.String(grand.Intn(500))},
+	// 	{"i1": grand.Intn(1000000)},
+	// 	{"i2": grand.Intn(9000000)},
+	// 	{"f1": gconv.Float64(grand.Intn(1000)) + (gconv.Float64(grand.Intn(1000000)) / 1000.0)},
+	// 	{"f2": gconv.Float64(grand.Intn(9000)) + (gconv.Float64(grand.Intn(1000000)) / 1000.0)},
+	// 	{"b1": true},
+	// 	{"b2": false},
+	// }
+
+	testProp := map[string]any{
+		"version": "1.18",
+		"country": "ZH-CN",
+	}
+	uuids := []string{}
+	for i := 0; i < 100; i++ {
+		uuidval, _ := uuid.NewUUID()
+		randUid := strings.ReplaceAll(uuidval.String(), "-", "")
+		uuids = append(uuids, randUid)
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	n := 0
+	const limit = 20000
+	gtest.C(t, func(t *gtest.T) {
+		go func() {
+			for {
+				// glsdk.LogLtz(uuids[grand.Intn(len(uuids))], events[grand.Intn(len(events))], pms[grand.Intn(len(pms))])
+				glsdk.LogLtz(uuids[grand.Intn(len(uuids))], "PKGame:Default:StepComplete:1:1010", testProp)
+				// 并发控制
+				n++
+				if n%limit == 0 {
+					time.Sleep(time.Second * 1)
+				}
+			}
+		}()
+		time.Sleep(time.Second * 1200)
+		// 模拟等待信号后优雅关闭
+		glsdk.Shutdown()
+	})
+}

package/pay/chongchong/chongchong.go

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

package/pay/chongchong/model.go

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

package/pay/common/func.go

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

package/pay/honor/const.go

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

package/pay/honor/honor.go

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

package/pay/honor/model.go

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

package/pay/honor/notification.go

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

package/pay/huawei/consts.go

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

package/pay/huawei/huawei.go

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

package/pay/huawei/model.go

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

package/pay/huawei/notification.go

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

package/pay/oppo/const.go

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

package/pay/oppo/login.go

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

package/pay/oppo/model.go

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

package/pay/oppo/notify.go

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

package/pay/oppo/oppo.go

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

package/pay/oppo/sign.go

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

package/pay/taptap/sign.go

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

package/pay/taptap/taptap.go

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

package/pay/vivo/client.go

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

package/pay/vivo/const.go

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

package/pay/vivo/model.go

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

package/pay/vivo/payment_api.go

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

package/pay/vivo/sign.go

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

package/pay/vivo/sign_test.go

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

package/pay/vivo/user_api.go

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

package/pay/vivo/user_api_test.go

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

package/pay/xiaomi/helper.go

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

package/pay/xiaomi/model.go

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

package/pay/xiaomi/xiaomi.go

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

package/s3/s3.go

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

pkg/aycache/cache.go

@@ -1,6 +1,9 @@
 package aycache
 
 import (
+	"context"
+	"math"
+
 	v1 "github.com/ayflying/utility_go/api/system/v1"
 	"github.com/ayflying/utility_go/internal/boot"
 	"github.com/ayflying/utility_go/pkg/aycache/drive"
@@ -9,7 +12,6 @@ import (
 	"github.com/gogf/gf/v2/os/gcache"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"math"
 )
 
 // Mod 定义缓存模块结构体，包含一个 gcache.Cache 客户端实例
@@ -19,6 +21,7 @@ type Mod struct {
 
 // QPSCount 记录缓存的 QPS 计数
 var QPSCount int
+
 // QPS 是一个 Prometheus 指标，用于记录当前缓存的 QPS 数量
 var QPS = promauto.NewGauge(
 	prometheus.GaugeOpts{
@@ -31,7 +34,7 @@ var QPS = promauto.NewGauge(
 func init() {
 	boot.AddFunc(func() {
 		// 初始化指标，每分钟计算一次平均 QPS 并重置计数器
-		service.SystemCron().AddCron(v1.CronType_MINUTE, func() error {
+		service.SystemCron().AddCronV2(v1.CronType_MINUTE, func(context.Context) error {
 			QPS.Set(math.Round(float64(QPSCount) / 60))
 			QPSCount = 0
 			return nil
@@ -53,8 +56,13 @@ func New(_name ...string) gcache.Adapter {
 		// 创建内存缓存适配器
 		cacheAdapterObj = drive2.NewAdapterMemory()
 	case "redis":
+		//第二个参数为配置名称，默认为default
+		var typ = "default"
+		if len(_name) >= 2 {
+			typ = _name[1]
+		}
 		// 创建 Redis 缓存适配器
-		cacheAdapterObj = drive2.NewAdapterRedis()
+		cacheAdapterObj = drive2.NewAdapterRedis(typ)
 	case "file":
 		// 创建文件缓存适配器，指定缓存目录为 "runtime/cache"
 		cacheAdapterObj = drive2.NewAdapterFile("runtime/cache")

pkg/aycache/drive/file.go

@@ -185,11 +185,12 @@ func (a *AdapterFile) Data(ctx context.Context) (data map[interface{}]interface{
 }
 
 func (a *AdapterFile) Keys(ctx context.Context) (keys []interface{}, err error) {
+	keys = make([]interface{}, 0)
 	gfile.ReadLines(fileIndex, func(text string) (err error) {
-
+		arr := strings.Split(text, "|")
+		keys = append(keys, arr[0])
 		return
 	})
-
 	return
 }
 

pkg/aycache/drive/redis.go

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

pkg/config/config.go

@@ -1,7 +1,10 @@
 package config
 
 import (
+	"context"
 	"fmt"
+	"sync"
+
 	"github.com/apolloconfig/agollo/v4"
 	apolloConfig "github.com/apolloconfig/agollo/v4/env/config"
 	"github.com/apolloconfig/agollo/v4/storage"
@@ -9,11 +12,15 @@ import (
 	"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/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gres"
 	"github.com/gogf/gf/v2/text/gstr"
-	"sync"
+
+	"github.com/gogf/gf/contrib/config/consul/v2"
+	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/go-cleanhttp"
 )
 
 var (
@@ -23,6 +30,8 @@ var (
 	ApolloListener []string
 	// Item2Obj 存储配置项名称和对应的加载器对象的映射
 	Item2Obj = map[string]Load{}
+
+	ConsulIsWatcher = map[string]bool{}
 )
 
 // Load 接口定义了 Load 方法，用于加载数据
@@ -118,7 +127,7 @@ func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
 	// 拼接远程配置文件的 URL
 	urlStr := fmt.Sprintf("http://sdf.sdfs.sdf/%s.json", name)
 	// 发送 HTTP 请求获取远程配置数据
-	getUrl, err := g.Client().Discovery(nil).Get(nil, urlStr)
+	getUrl, err := g.Client().Get(nil, urlStr)
 	// 读取响应内容
 	bytes := getUrl.ReadAll()
 	// 解析 JSON 内容并返回结果
@@ -126,6 +135,51 @@ func (c *Cfg) GetUrlFile(name string) (jsonObj *gjson.Json, err error) {
 	return
 }
 
+func (c *Cfg) GetConsul(name string, obj Load) (jsonObj *gjson.Json, err error) {
+	ctx := gctx.New()
+	// 加载在线配置
+	getCfg := g.Cfg().MustGet(ctx, "cfg")
+	if getCfg.IsNil() {
+		return
+	}
+	g.Log().Info(ctx, " - 初始化consul在线配置")
+	var cfg = getCfg.MapStrStr()
+	var consulConfig = api.Config{
+		Address:    cfg["address"],                     // Consul server address
+		Scheme:     "http",                             // Connection scheme (http/https)
+		Datacenter: "dc1",                              // Datacenter name
+		Transport:  cleanhttp.DefaultPooledTransport(), // HTTP transport with connection pooling
+		Token:      cfg["token"],                       // ACL token for authentication
+	}
+	var configPath = name + ".json"
+
+	adapter, err := consul.New(ctx, consul.Config{
+		ConsulConfig: consulConfig, // Consul client configuration
+		Path:         configPath,   // Configuration path in KV store
+		Watch:        true,         // Enable configuration watching for updates
+	})
+	// 更改默认配置实例的适配器
+	g.Cfg(name).SetAdapter(adapter)
+
+	getCfg, err = g.Cfg(name).Get(nil, ".")
+	// 将配置值扫描到 jsonObj 中
+	getCfg.Scan(&jsonObj)
+
+	// 添加观察者到配置实例的适配器
+	if ok, _ := ConsulIsWatcher[name]; !ok {
+		if adapter2, ok2 := g.Cfg(name).GetAdapter().(gcfg.WatcherAdapter); ok2 {
+			ConsulIsWatcher[name] = true
+			adapter2.AddWatcher("config-watcher", func(ctx context.Context) {
+				fmt.Println("配置发生了变化")
+				//cfg3 := g.Cfg(name).MustGet(ctx, ".")
+				obj.Load()
+			})
+		}
+	}
+
+	return
+}
+
 // GetApollo 从 Apollo 配置中心获取指定名称的配置
 // 参数:
 //   name - 配置文件的名称

pkg/elasticsearch/elasticsearch.go

@@ -3,7 +3,9 @@ package elasticsearch
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
+
 	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/core/bulk"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/core/delete"
@@ -12,6 +14,7 @@ import (
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 var (
@@ -23,6 +26,13 @@ type Elastic struct {
 	name   string
 }
 
+type elkBulk struct {
+	Index struct {
+		Index string `json:"_index"`
+		Id    string `json:"_id"`
+	} `json:"index"`
+}
+
 func NewV1(name string) *Elastic {
 	var cfg elasticsearch.Config
 	_cfg := g.Cfg().MustGetWithEnv(gctx.New(), "elasticsearch")
@@ -52,7 +62,7 @@ func NewV1(name string) *Elastic {
 //	fmt.Printf("index:%#v\n", resp.Index)
 //}
 
-// Set 索引文档
+// 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)
@@ -61,11 +71,43 @@ func (s *Elastic) Set(ctx context.Context, key string, data interface{}) (err er
 
 // SetBulk 批量添加文档
 func (s *Elastic) SetBulk(ctx context.Context, data []any) (err error) {
-	var save *bulk.Request
+	var save bulk.Request
-	save = &bulk.Request{
+	save = make(bulk.Request, 0)
-		data,
+	for _, v := range data {
+		val := gconv.Map(v)
+		var saveIndex = elkBulk{}
+		saveIndex.Index.Index = s.name
+		if _, ok := val["uuid"]; ok {
+			saveIndex.Index.Id = val["uuid"].(string)
+		}
+		save = append(save, saveIndex)
+		save = append(save, v)
+	}
+	//save = data
+	response, err2 := s.client.Bulk().Index(s.name).Request(&save).Do(ctx)
+	if err2 != nil {
+		err = err2
+		return
+	}
+	//需要接收返回信息，判断是否全部执行成功
+	if response.Errors { //未全部完成
+		//是否需要删除已成功导入的部分数据
+		for _, item := range response.Items {
+			for _, v := range item {
+				if v.Error != nil { //失败
+					g.Log().Errorf(ctx, "导入数据出错 err: %v", *v.Error.Reason)
+
+				} else {
+					//删除已导入成功的数据
+					_, err = s.Delete(ctx, *v.Id_)
+					if err != nil {
+						g.Log().Errorf(ctx, "删除数据错误, err:%v\n", err)
+					}
+				}
+			}
+		}
+		return errors.New("部分数据导入失败")
 	}
-	s.client.Bulk().Index(s.name).Request(save).Do(ctx)
 	return
 }
 
@@ -97,7 +139,7 @@ func (s *Elastic) Delete(ctx context.Context, key string) (res *delete.Response,
 // 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{
+					Request(&search.Request{
 			Query: &types.Query{
 				MatchAll: &types.MatchAllQuery{},
 			},

pkg/notice/drive/dingtalk.go

@@ -34,7 +34,7 @@ func (m DingTalkMod) Send(value string) {
 	}
 
 	// 构建发送的消息体，包含消息类型和内容
-	_, err := g.Client().Discovery(nil).ContentJson().Post(ctx, url, post)
+	_, err := g.Client().ContentJson().Post(ctx, url, post)
 	if err != nil {
 		g.Log().Info(ctx, err)
 	}

pkg/rank/rank.go

@@ -2,9 +2,10 @@ package rank
 
 import (
 	"fmt"
-	v1 "github.com/ayflying/utility_go/api/pkg/v1"
 	"time"
 
+	v1 "github.com/ayflying/utility_go/api/pkg/v1"
+
 	"github.com/gogf/gf/v2/database/gredis"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -98,6 +99,53 @@ func (r *F64CountRank) IncrScore(id int64, score int64) (curScore float64, err e
 	return
 }
 
+// SetScore 对指定ID的分数进行赋值,这样同分情况下先完成的在前面。
+// 该方法首先更新成员的更新时间戳，然后更新成员的分数。
+//
+// 参数:
+//
+//	id - 要操作的成员ID。
+//	score - 要更新的分数。
+//
+// 返回值:
+//
+//	err - 操作过程中可能发生的错误。
+//
+//	@Description:
+//	@receiver r
+//	@param id
+//	@param score
+//	@return err
+func (r *F64CountRank) SetScore(id int64, score int) (err error) {
+	//如果分数小于0，则删除
+	if score <= 0 {
+		err = r.DelScore(id)
+		if err != nil {
+			return
+		}
+		return
+	}
+	// 记录当前时间戳，用于更新成员的最新活动时间。
+	now := time.Now().UnixMilli()
+	
+	// 将成员的更新时间戳加入到Redis的有序集合中，确保成员的排序依据是最新的活动时间。
+	_, err = g.Redis().ZAdd(ctx, r.updateTs, &gredis.ZAddOption{}, gredis.ZAddMember{
+		Score:  float64(now),
+		Member: id,
+	})
+	if err != nil {
+		return
+	}
+
+	// 覆盖成员的分数
+	_, err = g.Redis().ZAdd(ctx, r.name, &gredis.ZAddOption{}, gredis.ZAddMember{
+		Score:  float64(score) + (3*1e13-float64(now))/1e14,
+		Member: id,
+	})
+
+	return
+}
+
 // todo暂时未使用
 func (r *F64CountRank) GetCount() {
 	count, _ := g.Redis().ZCard(ctx, r.name)
@@ -141,6 +189,35 @@ func (r *F64CountRank) DelScore(id int64) (err error) {
 	return
 }
 
+// DelByStopRank 删除指定名次后的元素
+func (r *F64CountRank) DelByStopRank(stop int64) (err error) {
+	// 初始化一个空的int64切片，用于存储指定排名范围内的元素。
+	var members []int64
+
+	// 使用Redis的ZRange命令获取指定排名范围内的元素。
+	// 选项Rev设置为true，表示按照分数从高到低的顺序返回元素。
+	get, err := g.Redis().ZRange(ctx, r.name, stop, 9999999,
+		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也不会返回错误。
+	}
+	//删除超过9999的数据
+	g.Redis().ZRemRangeByRank(ctx, r.name, 0, -(stop + 1))
+	return
+}
+
 // DelByRank 根据排名范围删除元素。
 // 该方法使用了Redis的有序集合数据结构，通过ZRange和ZRemRangeByRank命令来实现。
 // 参数start和stop定义了要删除的排名范围，从start到stop（包括start和stop）。

pkg/s3/s3.go

@@ -24,13 +24,14 @@ var (
 
 // DataType 定义了 S3 配置的数据结构，用于存储访问 S3 所需的各种信息
 type DataType struct {
-	AccessKey     string `json:"access_key"` // 访问 S3 的密钥 ID
+	AccessKey     string `json:"access_key"`      // 访问 S3 的密钥 ID
-	SecretKey     string `json:"secret_key"` // 访问 S3 的密钥
+	SecretKey     string `json:"secret_key"`      // 访问 S3 的密钥
-	Address       string `json:"address"`    // S3 服务的地址
+	Address       string `json:"address"`         // S3 服务的地址
-	Ssl           bool   `json:"ssl"`        // 是否使用 SSL 加密连接
+	Ssl           bool   `json:"ssl"`             // 是否使用 SSL 加密连接
-	Url           string `json:"url"`        // S3 服务的访问 URL
+	Url           string `json:"url"`             // S3 服务的访问 URL
-	BucketName    string `json:"bucket_name"` // 默认存储桶名称
+	BucketName    string `json:"bucket_name"`     // 默认存储桶名称
 	BucketNameCdn string `json:"bucket_name_cdn"` // CDN 存储桶名称
+	//Provider      string `json:"provider"`        // S3 服务的提供方
 }
 
 // Mod 定义了 S3 模块的结构体，包含一个 S3 客户端实例和配置信息
@@ -64,6 +65,7 @@ func New(_name ...string) *Mod {
 		&minio.Options{
 			Creds:  credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
 			Secure: cfg.Ssl,
+			//BucketLookup: minio.BucketLookupPath,
 		},
 	)
 	if err != nil {
@@ -133,11 +135,13 @@ func (s *Mod) ListBuckets() []minio.BucketInfo {
 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 {
+	//if len(_size) > 0 {
-		size = _size[0]
+	//	size = _size[0]
-	}
+	//}
 	// 调用 S3 客户端上传文件，设置内容类型为 "application/octet-stream"
-	res, err = s.client.PutObject(ctx, bucketName, name, f, size, minio.PutObjectOptions{ContentType: "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)
@@ -146,8 +150,22 @@ func (s *Mod) PutObject(f io.Reader, name string, bucketName string, _size ...in
 }
 
 // RemoveObject 从指定存储桶中删除指定名称的文件
+// Deprecation: to新方法 RemoveObjectV2
 func (s *Mod) RemoveObject(name string, bucketName string) (err error) {
 	opts := minio.RemoveObjectOptions{
+		ForceDelete: true,
+		//GovernanceBypass: true,
+		//VersionID:        "myversionid",
+	}
+	// 调用 S3 客户端删除文件
+	err = s.client.RemoveObject(ctx, bucketName, name, opts)
+	return
+}
+
+// RemoveObjectV2 从指定存储桶中删除指定名称的文件
+func (s *Mod) RemoveObjectV2(bucketName string, name string) (err error) {
+	opts := minio.RemoveObjectOptions{
+		ForceDelete: true,
 		//GovernanceBypass: true,
 		//VersionID:        "myversionid",
 	}
@@ -166,6 +184,12 @@ func (s *Mod) ListObjects(bucketName string, prefix string) (res <-chan minio.Ob
 	return
 }
 
+// StatObject 获取指定存储桶中指定文件的元数据信息
+func (s *Mod) StatObject(bucketName string, objectName string) (res minio.ObjectInfo, err error) {
+	res, err = s.client.StatObject(ctx, bucketName, objectName, minio.StatObjectOptions{})
+	return
+}
+
 // SetBucketPolicy 设置指定存储桶或对象前缀的访问策略
 // 目前使用固定的策略，可根据需求修改
 func (s *Mod) SetBucketPolicy(bucketName string, prefix string) (err error) {
@@ -187,9 +211,15 @@ func (s *Mod) GetUrl(filePath string, defaultFile ...string) (url string) {
 		filePath = defaultFile[0]
 	}
 
-	if s.cfg.Ssl {
+	//switch s.cfg.Provider {
-		url = get + filePath
+	//case "qiniu":
-	} else {
+	//	url = get + path.Join(bucketName, filePath)
+	//default:
+	//	url = get + filePath
+	//}
+	url = get + filePath
+
+	if !s.cfg.Ssl {
 		url = get + path.Join(bucketName, filePath)
 	}
 
@@ -205,21 +235,43 @@ func (s *Mod) GetPath(url string) (filePath string) {
 }
 
 // CopyObject 在指定存储桶内复制文件
-// 支持指定源文件和目标文件路径
+// bucketName 存储桶名称
+// dstStr 目标文件路径
+// srcStr 源文件路径
+// 返回操作过程中可能出现的错误
 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,
 	}
 
-	// 调用 S3 客户端复制文件
+	// 调用 S3 客户端的 CopyObject 方法，将源文件复制到目标位置
+	// 忽略返回的复制信息，仅关注是否发生错误
 	_, err = s.client.CopyObject(ctx, dst, src)
 	return
 }
+
+// Rename 重命名文件
+func (s *Mod) Rename(bucketName string, oldName string, newName string) (err error) {
+	// 复制文件到新的名称
+	g.Log().Debugf(nil, "仓库=%v,rename %s to %s", bucketName, oldName, newName)
+	err = s.CopyObject(bucketName, newName, oldName)
+	if err != nil {
+		g.Log().Error(ctx, err)
+		return
+	}
+	// 删除原始文件
+	err = s.RemoveObjectV2(bucketName, oldName)
+	if err != nil {
+		g.Log().Error(ctx, err)
+		return
+	}
+	return
+}

service/casdoor.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
+
+import (
+	"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
+)
+
+type (
+	ICasdoor interface {
+		Load(endpoint string, clientId string, clientSecret string, certificate string, organizationName string, applicationName string)
+		New() *casdoorsdk.Client
+	}
+)
+
+var (
+	localCasdoor ICasdoor
+)
+
+func Casdoor() ICasdoor {
+	if localCasdoor == nil {
+		panic("implement not found for interface ICasdoor, forgot register?")
+	}
+	return localCasdoor
+}
+
+func RegisterCasdoor(i ICasdoor) {
+	localCasdoor = i
+}

service/game_act.go

@@ -8,6 +8,7 @@ package service
 import (
 	"context"
 
+	"github.com/ayflying/utility_go/internal/model/entity"
 	"github.com/gogf/gf/v2/frame/g"
 )
 
@@ -31,8 +32,51 @@ type (
 		// @param data interface{}: 要存储的活动信息数据。
 		// @return err error: 返回错误信息，如果操作成功，则返回nil。
 		Set(uid int64, actId int, data interface{}) (err error)
-		Saves(ctx context.Context) (err error)
+		// Saves 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @return err error: 返回错误信息
+		// Deprecated: 该方法已被弃用，建议使用SavesV2方法
+		Saves() (err error)
+		// Save 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @param ctx context.Context: 上下文对象
+		// @param actId int: 活动ID
+		// @return err error: 返回错误信息
+		// deprecated: 该方法已被弃用，建议使用SaveV2方法
 		Save(ctx context.Context, actId int) (err error)
+		// SavesV2 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @return err error: 返回错误信息
+		// SavesV2 保存游戏活动数据
+		SavesV2() (err error)
+		// SaveV2 保存游戏活动数据
+		//
+		// @Description: 保存游戏活动数据
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @param ctx context.Context: 上下文对象
+		// @param cacheKey string: 缓存键
+		// @param add []*entity.GameAct: 添加数据
+		// @param update []*entity.GameAct: 更新数据
+		// @return err error: 返回错误信息
+		SaveV2(ctx context.Context, cacheKey string, addChan chan *entity.GameAct, updateChan chan *entity.GameAct) (err error)
+		// Cache2Sql 缓存持久化到数据库
+		// @Description: 缓存持久化到数据库
+		// @receiver s *sGameAct: 游戏活动服务结构体指针
+		// @param ctx context.Context: 上下文对象
+		// @param add []*entity.GameAct: 添加数据
+		// @param update []*entity.GameAct: 更新数据
+		// @return err error: 返回错误信息
+		Cache2Sql(ctx context.Context, add []*entity.GameAct, update []*entity.GameAct)
+		// Cache2AddChan 批量添加数据库
+		Cache2SqlChan(ctx context.Context, addChan chan *entity.GameAct, updateChan chan *entity.GameAct)
+		// 删除缓存key
+		DelCacheKey(ctx context.Context, aid int, uid int64)
 		// 清空GetRedDot缓存
 		RefreshGetRedDotCache(uid int64)
 		Del(uid int64, actId int)

service/game_kv.go

@@ -5,6 +5,10 @@
 
 package service
 
+import (
+	"context"
+)
+
 type (
 	IGameKv interface {
 		// SavesV1 方法
@@ -13,6 +17,8 @@ type (
 		// @receiver s: sGameKv的实例。
 		// @return err: 错误信息，如果操作成功，则为nil。
 		SavesV1() (err error)
+		// 删除缓存key
+		DelCacheKey(ctx context.Context, uid int64)
 	}
 )
 

service/ip_2_region.go

@@ -5,13 +5,14 @@
 
 package service
 
+import (
+	"github.com/lionsoul2014/ip2region/binding/golang/xdb"
+)
+
 type (
 	IIp2Region interface {
-		// Load 加载到内存中
-		//
-		//	@Description: 加载ip2region数据库到内存中。
 		//	@receiver s *sIp2region: sIp2region的实例。
-		Load()
+		Load(t *xdb.Version)
 		GetIp(ip string) (res []string)
 	}
 )

service/os.go

@@ -0,0 +1,27 @@
+// ================================================================================
+// 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 (
+	IOS interface {
+		Load(title string, tooltip string, ico string)
+	}
+)
+
+var (
+	localOS IOS
+)
+
+func OS() IOS {
+	if localOS == nil {
+		panic("implement not found for interface IOS, forgot register?")
+	}
+	return localOS
+}
+
+func RegisterOS(i IOS) {
+	localOS = i
+}

service/system_cron.go

@@ -38,7 +38,8 @@ type (
 		// @receiver s: sSystemCron的实例，代表一个调度系统。
 		// @param typ: 任务的类型，决定该任务将被添加到哪个列表中。对应不同的时间间隔。
 		// @param _func: 要添加的任务函数，该函数执行时应该返回一个error。
-		AddCronV2(typ v1.CronType, _func func(context.Context) error)
+		// @param _onlyMain: 是否只在主服务器上执行一次,true 唯一执行，false 全局执行不判断唯一
+		AddCronV2(typ v1.CronType, _func func(context.Context) error, _onlyMain ...bool)
 		// StartCron 开始计划任务执行
 		//
 		//	@Description:
@@ -46,7 +47,7 @@ type (
 		//	@return err
 		StartCron() (err error)
 		// AddFuncChan 添加方法到通道
-		AddFuncChan(list []func(context.Context) error)
+		AddFuncChan(list []func(context.Context) error, cronType v1.CronType)
 		// RunFuncChan 统一执行方法
 		RunFuncChan()
 		// RunFunc 统一执行方法

tools/redis.go

@@ -48,7 +48,6 @@ func (r *redis) RedisScan(cacheKey string, _key ...string) (keys []string, err e
 
 // redis 批量获取大量数据
 func (r *redis) RedisScanV2(cacheKey string, _func func([]string) error, _key ...string) error {
-
 	//var keys []string
 	var err error
 
@@ -67,9 +66,11 @@ func (r *redis) RedisScanV2(cacheKey string, _func func([]string) error, _key ..
 			g.Log().Errorf(ctx, "Scan failed: %v", err)
 			break
 		}
-
 		if len(newKeys) > 0 {
 			err = _func(newKeys)
+			if err != nil {
+				return err
+			}
 		}
 
 		//这个要放在最后

tools/time.go

@@ -1,8 +1,9 @@
 package tools
 
 import (
-	"github.com/gogf/gf/v2/os/gtime"
 	"time"
+
+	"github.com/gogf/gf/v2/os/gtime"
 )
 
 type timeMod struct {
@@ -128,3 +129,31 @@ func (m *timeMod) ExcelTime2Time(excelTime string) time.Time {
 	timeNew, _ := time.ParseInLocation(layout, excelTime, time.Local)
 	return timeNew
 }
+
+// 指定时刻刷新
+// 判断当前是否可领取
+// createdTime 刷新时刻
+// lastRwdTime 上次领取时间
+// now 当前时间
+func (m *timeMod) CheckIsBeRwd(createdTime, lastRwdTime time.Time, _now ...time.Time) bool {
+	now := time.Now()
+	if len(_now) > 0 {
+		now = _now[0]
+	}
+	//今天的刷新时间
+	refreshToday := time.Date(now.Year(), now.Month(), now.Day(),
+		createdTime.Hour(), createdTime.Minute(), createdTime.Second(),
+		0, createdTime.Location())
+	// 如果今天还没到刷新时间，则刷新时间应是昨天
+	if now.Before(refreshToday) {
+		refreshToday = refreshToday.AddDate(0, 0, -1)
+	}
+	// 判断上次领取时间是否在刷新时间之前
+	// 如果是，则说明还没领过，可以领取
+	return lastRwdTime.Before(refreshToday)
+}
+
+// 获取指定时间的本月最后一刻
+func (m *timeMod) EndOfMonth(t time.Time) time.Time {
+	return time.Date(t.Year(), t.Month()+1, 1, 0, 0, 0, 0, t.Location()).Add(-time.Second)
+}

utility.go

@@ -1,11 +1,15 @@
 package utility_go
 
 import (
+	"context"
+	"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/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtimer"
 )
 
 var (
@@ -14,9 +18,12 @@ var (
 )
 
 func init() {
+	var err error
 	g.Log().Debug(ctx, "utility_go init启动完成")
 	// 初始化配置
-	var err = boot.Boot()
+	gtimer.SetTimeout(ctx, time.Second*5, func(ctx context.Context) {
+		err = boot.Boot()
+	})
 
 	if err != nil {
 		panic(err)