- update

- add task_receive_record

.gitignore

@@ -6,6 +6,5 @@
 *.log
 gomod.sh
 grpc_build.sh
-etcd_server_test.go
-etcd_worker_test.go
-grpc_server_test.go
+*_test.go
+/vendor/

client.go

@@ -0,0 +1,130 @@
+package gojobs
+
+import (
+	"context"
+	"go.dtapp.net/dorm"
+	"go.dtapp.net/goip"
+	"go.dtapp.net/golog"
+)
+
+// 前缀
+// lockKeyPrefix 锁Key前缀 xxx_lock
+// lockKeySeparator 锁Key分隔符 :
+// cornKeyPrefix 任务Key前缀 xxx_cron
+// cornKeyCustom 任务Key自定义 xxx_cron_自定义  xxx_cron_自定义_*
+type redisPrefixFun func() (lockKeyPrefix, lockKeySeparator, cornKeyPrefix, cornKeyCustom string)
+
+// ClientConfig 实例配置
+type ClientConfig struct {
+	GormClientFun  dorm.GormClientFun  // 数据库驱动
+	MongoClientFun dorm.MongoClientFun // 数据库驱动
+	RedisClientFun dorm.RedisClientFun // 数据库驱动
+	RedisPrefixFun redisPrefixFun      // 前缀
+	ZapLog         *golog.ZapLog       // 日志服务
+	CurrentIp      string              // 当前ip
+}
+
+// Client 实例
+type Client struct {
+	gormClient  *dorm.GormClient  // 数据库
+	mongoClient *dorm.MongoClient // 数据库
+	zapLog      *golog.ZapLog     // 日志服务
+	config      struct {
+		systemHostname      string  // 主机名
+		systemOs            string  // 系统类型
+		systemVersion       string  // 系统版本
+		systemKernel        string  // 系统内核
+		systemKernelVersion string  // 系统内核版本
+		systemBootTime      uint64  // 系统开机时间
+		cpuCores            int     // CPU核数
+		cpuModelName        string  // CPU型号名称
+		cpuMhz              float64 // CPU兆赫
+		systemInsideIp      string  // 内网ip
+		systemOutsideIp     string  // 外网ip
+		goVersion           string  // go版本
+		sdkVersion          string  // sdk版本
+		mongoVersion        string  // mongo版本
+		mongoSdkVersion     string  // mongo sdk版本
+		redisVersion        string  // redis版本
+		redisSdkVersion     string  // redis sdk版本
+		logVersion          string  // log版本
+	}
+	cache struct {
+		redisClient      *dorm.RedisClient     // 数据库
+		redisLockClient  *dorm.RedisClientLock // 锁服务
+		lockKeyPrefix    string                // 锁Key前缀 xxx_lock
+		lockKeySeparator string                // 锁Key分隔符 :
+		cornKeyPrefix    string                // 任务Key前缀 xxx_cron
+		cornKeyCustom    string                // 任务Key自定义
+	}
+	mongoConfig struct {
+		stats        bool   // 状态
+		databaseName string // 库名
+	}
+}
+
+// NewClient 创建实例
+func NewClient(config *ClientConfig) (*Client, error) {
+
+	var ctx = context.Background()
+
+	c := &Client{}
+
+	c.zapLog = config.ZapLog
+
+	if config.CurrentIp != "" && config.CurrentIp != "0.0.0.0" {
+		c.config.systemOutsideIp = config.CurrentIp
+	}
+	c.config.systemOutsideIp = goip.IsIp(c.config.systemOutsideIp)
+	if c.config.systemOutsideIp == "" {
+		return nil, currentIpNoConfig
+	}
+
+	// 配置缓存
+	redisClient := config.RedisClientFun()
+	if redisClient != nil && redisClient.GetDb() != nil {
+		c.cache.redisClient = redisClient
+		c.cache.redisLockClient = c.cache.redisClient.NewLock()
+	} else {
+		return nil, redisPrefixFunNoConfig
+	}
+
+	// 配置缓存前缀
+	c.cache.lockKeyPrefix, c.cache.lockKeySeparator, c.cache.cornKeyPrefix, c.cache.cornKeyCustom = config.RedisPrefixFun()
+	if c.cache.lockKeyPrefix == "" || c.cache.lockKeySeparator == "" || c.cache.cornKeyPrefix == "" || c.cache.cornKeyCustom == "" {
+		return nil, redisPrefixFunNoConfig
+	}
+
+	// 配置信息
+	c.setConfig(ctx)
+
+	// 配置关系数据库
+	gormClient := config.GormClientFun()
+	if gormClient != nil && gormClient.GetDb() != nil {
+		c.gormClient = gormClient
+
+		c.autoMigrateTask(ctx)
+		c.autoMigrateTaskLog(ctx)
+	} else {
+		return nil, gormClientFunNoConfig
+	}
+
+	// 配置非关系数据库
+	mongoClient, databaseName := config.MongoClientFun()
+	if mongoClient != nil && mongoClient.GetDb() != nil {
+		c.mongoClient = mongoClient
+
+		if databaseName == "" {
+			return nil, mongoClientFunNoConfig
+		} else {
+			c.mongoConfig.databaseName = databaseName
+		}
+
+		TaskLog{}.createCollection(ctx, c.zapLog, c.mongoClient, c.mongoConfig.databaseName)
+		TaskLog{}.createIndexes(ctx, c.zapLog, c.mongoClient, c.mongoConfig.databaseName)
+
+		c.mongoConfig.stats = true
+	}
+
+	return c, nil
+}

cofing.go

@@ -0,0 +1,88 @@
+package gojobs
+
+import (
+	"context"
+	"github.com/go-redis/redis/v9"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/host"
+	"go.dtapp.net/goip"
+	"go.dtapp.net/golog"
+	"go.mongodb.org/mongo-driver/version"
+	"log"
+	"runtime"
+)
+
+type systemResult struct {
+	SystemHostname      string  // 主机名
+	SystemOs            string  // 系统类型
+	SystemVersion       string  // 系统版本
+	SystemKernel        string  // 系统内核
+	SystemKernelVersion string  // 系统内核版本
+	SystemUpTime        uint64  // 系统运行时间
+	SystemBootTime      uint64  // 系统开机时间
+	CpuCores            int     // CPU核数
+	CpuModelName        string  // CPU型号名称
+	CpuMhz              float64 // CPU兆赫
+}
+
+func getSystem() (result systemResult) {
+
+	hInfo, err := host.Info()
+	if err != nil {
+		log.Printf("getSystem.host.Info：%s\n", err)
+	}
+
+	result.SystemHostname = hInfo.Hostname
+	result.SystemOs = hInfo.OS
+	result.SystemVersion = hInfo.PlatformVersion
+	result.SystemKernel = hInfo.KernelArch
+	result.SystemKernelVersion = hInfo.KernelVersion
+	result.SystemUpTime = hInfo.Uptime
+	if hInfo.BootTime != 0 {
+		result.SystemBootTime = hInfo.BootTime
+	}
+
+	hCpu, err := cpu.Times(true)
+	if err != nil {
+		log.Printf("getSystem.cpu.Times：%s\n", err)
+	}
+
+	result.CpuCores = len(hCpu)
+
+	cInfo, err := cpu.Info()
+	if err != nil {
+		log.Printf("getSystem.cpu.Info：%s\n", err)
+	}
+	if len(cInfo) > 0 {
+		result.CpuModelName = cInfo[0].ModelName
+		result.CpuMhz = cInfo[0].Mhz
+	}
+
+	return result
+}
+
+func (c *Client) setConfig(ctx context.Context) {
+
+	info := getSystem()
+
+	c.config.systemHostname = info.SystemHostname
+	c.config.systemOs = info.SystemOs
+	c.config.systemVersion = info.SystemVersion
+	c.config.systemKernel = info.SystemKernel
+	c.config.systemKernelVersion = info.SystemKernelVersion
+	c.config.systemBootTime = info.SystemBootTime
+	c.config.cpuCores = info.CpuCores
+	c.config.cpuModelName = info.CpuModelName
+	c.config.cpuMhz = info.CpuMhz
+
+	c.config.systemInsideIp = goip.GetInsideIp(ctx)
+
+	c.config.sdkVersion = Version
+	c.config.goVersion = runtime.Version()
+
+	c.config.mongoSdkVersion = version.Driver
+
+	c.config.redisSdkVersion = redis.Version()
+
+	c.config.logVersion = golog.Version
+}

const.go

@@ -1,3 +1,6 @@
 package gojobs
 
-const Version = "1.0.55"
+const (
+	Version       = "1.0.113"
+	SpecifyIpNull = "0.0.0.0"
+)

create_in.go

@@ -1,113 +1,15 @@
 package gojobs
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"go.dtapp.net/gojobs/jobs_gorm_model"
 	"go.dtapp.net/gostring"
+	"go.dtapp.net/gotime"
 	"gorm.io/gorm"
-	"log"
 )
 
-// Run 运行
-func (j *JobsGorm) Run(info jobs_gorm_model.Task, status int, desc string) {
-	// 请求函数记录
-	err := j.gormClient.Db.Create(&jobs_gorm_model.TaskLog{
-		TaskId:     info.Id,
-		StatusCode: status,
-		Desc:       desc,
-		Version:    j.config.runVersion,
-	}).Error
-	if err != nil {
-		log.Println("statusCreate", err.Error())
-	}
-	if status == 0 {
-		err = j.EditTask(j.gormClient.Db, info.Id).
-			Select("run_id").
-			Updates(jobs_gorm_model.Task{
-				RunId: gostring.GetUuId(),
-			}).Error
-		if err != nil {
-			log.Println("statusEdit", err.Error())
-		}
-		return
-	}
-	// 任务
-	if status == CodeSuccess {
-		// 执行成功
-		err = j.EditTask(j.gormClient.Db, info.Id).
-			Select("status_desc", "number", "run_id", "updated_ip", "result").
-			Updates(jobs_gorm_model.Task{
-				StatusDesc: "执行成功",
-				Number:     info.Number + 1,
-				RunId:      gostring.GetUuId(),
-				UpdatedIp:  j.config.outsideIp,
-				Result:     desc,
-			}).Error
-		if err != nil {
-			log.Println("statusEdit", err.Error())
-		}
-	}
-	if status == CodeEnd {
-		// 执行成功、提前结束
-		err = j.EditTask(j.gormClient.Db, info.Id).
-			Select("status", "status_desc", "number", "updated_ip", "result").
-			Updates(jobs_gorm_model.Task{
-				Status:     TASK_SUCCESS,
-				StatusDesc: "结束执行",
-				Number:     info.Number + 1,
-				UpdatedIp:  j.config.outsideIp,
-				Result:     desc,
-			}).Error
-		if err != nil {
-			log.Println("statusEdit", err.Error())
-		}
-	}
-	if status == CodeError {
-		// 执行失败
-		err = j.EditTask(j.gormClient.Db, info.Id).
-			Select("status_desc", "number", "run_id", "updated_ip", "result").
-			Updates(jobs_gorm_model.Task{
-				StatusDesc: "执行失败",
-				Number:     info.Number + 1,
-				RunId:      gostring.GetUuId(),
-				UpdatedIp:  j.config.outsideIp,
-				Result:     desc,
-			}).Error
-		if err != nil {
-			log.Println("statusEdit", err.Error())
-		}
-	}
-	if info.MaxNumber != 0 {
-		if info.Number+1 >= info.MaxNumber {
-			// 关闭执行
-			err = j.EditTask(j.gormClient.Db, info.Id).
-				Select("status").
-				Updates(jobs_gorm_model.Task{
-					Status: TASK_TIMEOUT,
-				}).Error
-			if err != nil {
-				log.Println("statusEdit", err.Error())
-			}
-		}
-	}
-}
-
-// RunAddLog 任务执行日志
-func (j *JobsGorm) RunAddLog(id uint, runId string) error {
-	return j.gormClient.Db.Create(&jobs_gorm_model.TaskLogRun{
-		TaskId:     id,
-		RunId:      runId,
-		InsideIp:   j.config.insideIp,
-		OutsideIp:  j.config.outsideIp,
-		Os:         j.config.os,
-		Arch:       j.config.arch,
-		Gomaxprocs: j.config.maxProCs,
-		GoVersion:  j.config.version,
-		MacAddrs:   j.config.macAddrS,
-	}).Error
-}
-
 // ConfigCreateInCustomId 创建正在运行任务
 type ConfigCreateInCustomId struct {
 	Tx             *gorm.DB // 驱动
@@ -118,13 +20,13 @@ type ConfigCreateInCustomId struct {
 	Type           string   // 类型
 	TypeName       string   // 类型名称
 	SpecifyIp      string   // 指定外网IP
-	CurrentIp      string   // 当前ip
+	CurrentIp      string   // 当前外网IP
 }
 
 // CreateInCustomId 创建正在运行任务
-func (j *JobsGorm) CreateInCustomId(config *ConfigCreateInCustomId) error {
+func (c *Client) CreateInCustomId(ctx context.Context, config *ConfigCreateInCustomId) error {
 	if config.CurrentIp == "" {
-		config.CurrentIp = j.config.outsideIp
+		config.CurrentIp = c.config.systemOutsideIp
 	}
 	err := config.Tx.Create(&jobs_gorm_model.Task{
 		Status:         TASK_IN,
@@ -139,6 +41,7 @@ func (j *JobsGorm) CreateInCustomId(config *ConfigCreateInCustomId) error {
 		CreatedIp:      config.CurrentIp,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      config.CurrentIp,
+		NextRunTime:    gotime.Current().AfterSeconds(config.Frequency).Time,
 	}).Error
 	if err != nil {
 		return errors.New(fmt.Sprintf("创建[%s@%s]任务失败：%s", config.CustomId, config.Type, err.Error()))
@@ -156,17 +59,17 @@ type ConfigCreateInCustomIdOnly struct {
 	Type           string   // 类型
 	TypeName       string   // 类型名称
 	SpecifyIp      string   // 指定外网IP
-	CurrentIp      string   // 当前ip
+	CurrentIp      string   // 当前外网IP
 }
 
 // CreateInCustomIdOnly 创建正在运行唯一任务
-func (j *JobsGorm) CreateInCustomIdOnly(config *ConfigCreateInCustomIdOnly) error {
-	query := j.TaskTypeTakeIn(config.Tx, config.CustomId, config.Type)
+func (c *Client) CreateInCustomIdOnly(ctx context.Context, config *ConfigCreateInCustomIdOnly) error {
+	query := c.TaskTypeTakeIn(ctx, config.Tx, config.CustomId, config.Type)
 	if query.Id != 0 {
-		return errors.New(fmt.Sprintf("%d:[%s@%s]任务已存在", query.Id, config.CustomId, config.Type))
+		return TaskIsExist
 	}
 	if config.CurrentIp == "" {
-		config.CurrentIp = j.config.outsideIp
+		config.CurrentIp = c.config.systemOutsideIp
 	}
 	err := config.Tx.Create(&jobs_gorm_model.Task{
 		Status:         TASK_IN,
@@ -181,6 +84,7 @@ func (j *JobsGorm) CreateInCustomIdOnly(config *ConfigCreateInCustomIdOnly) erro
 		CreatedIp:      config.CurrentIp,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      config.CurrentIp,
+		NextRunTime:    gotime.Current().AfterSeconds(config.Frequency).Time,
 	}).Error
 	if err != nil {
 		return errors.New(fmt.Sprintf("创建[%s@%s]任务失败：%s", config.CustomId, config.Type, err.Error()))
@@ -199,13 +103,13 @@ type ConfigCreateInCustomIdMaxNumber struct {
 	Type           string   // 类型
 	TypeName       string   // 类型名称
 	SpecifyIp      string   // 指定外网IP
-	CurrentIp      string   // 当前ip
+	CurrentIp      string   // 当前外网IP
 }
 
 // CreateInCustomIdMaxNumber 创建正在运行任务并限制数量
-func (j *JobsGorm) CreateInCustomIdMaxNumber(config *ConfigCreateInCustomIdMaxNumber) error {
+func (c *Client) CreateInCustomIdMaxNumber(ctx context.Context, config *ConfigCreateInCustomIdMaxNumber) error {
 	if config.CurrentIp == "" {
-		config.CurrentIp = j.config.outsideIp
+		config.CurrentIp = c.config.systemOutsideIp
 	}
 	err := config.Tx.Create(&jobs_gorm_model.Task{
 		Status:         TASK_IN,
@@ -221,6 +125,7 @@ func (j *JobsGorm) CreateInCustomIdMaxNumber(config *ConfigCreateInCustomIdMaxNu
 		CreatedIp:      config.CurrentIp,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      config.CurrentIp,
+		NextRunTime:    gotime.Current().AfterSeconds(config.Frequency).Time,
 	}).Error
 	if err != nil {
 		return errors.New(fmt.Sprintf("创建[%s@%s]任务失败：%s", config.CustomId, config.Type, err.Error()))
@@ -239,17 +144,17 @@ type ConfigCreateInCustomIdMaxNumberOnly struct {
 	Type           string   // 类型
 	TypeName       string   // 类型名称
 	SpecifyIp      string   // 指定外网IP
-	CurrentIp      string   // 当前ip
+	CurrentIp      string   // 当前外网IP
 }
 
 // CreateInCustomIdMaxNumberOnly 创建正在运行唯一任务并限制数量
-func (j *JobsGorm) CreateInCustomIdMaxNumberOnly(config *ConfigCreateInCustomIdMaxNumberOnly) error {
-	query := j.TaskTypeTakeIn(config.Tx, config.CustomId, config.Type)
+func (c *Client) CreateInCustomIdMaxNumberOnly(ctx context.Context, config *ConfigCreateInCustomIdMaxNumberOnly) error {
+	query := c.TaskTypeTakeIn(ctx, config.Tx, config.CustomId, config.Type)
 	if query.Id != 0 {
-		return errors.New(fmt.Sprintf("%d:[%s@%s]任务已存在", query.Id, config.CustomId, config.Type))
+		return TaskIsExist
 	}
 	if config.CurrentIp == "" {
-		config.CurrentIp = j.config.outsideIp
+		config.CurrentIp = c.config.systemOutsideIp
 	}
 	err := config.Tx.Create(&jobs_gorm_model.Task{
 		Status:         TASK_IN,
@@ -265,6 +170,7 @@ func (j *JobsGorm) CreateInCustomIdMaxNumberOnly(config *ConfigCreateInCustomIdM
 		CreatedIp:      config.CurrentIp,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      config.CurrentIp,
+		NextRunTime:    gotime.Current().AfterSeconds(config.Frequency).Time,
 	}).Error
 	if err != nil {
 		return errors.New(fmt.Sprintf("创建[%s@%s]任务失败：%s", config.CustomId, config.Type, err.Error()))

create_wait.go

@@ -0,0 +1,50 @@
+package gojobs
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gostring"
+	"go.dtapp.net/gotime"
+	"gorm.io/gorm"
+)
+
+// ConfigCreateWaitCustomId 创建正在运行任务
+type ConfigCreateWaitCustomId struct {
+	Tx             *gorm.DB // 驱动
+	Params         string   // 参数
+	Frequency      int64    // 频率(秒单位)
+	CustomId       string   // 自定义编号
+	CustomSequence int64    // 自定义顺序
+	Type           string   // 类型
+	TypeName       string   // 类型名称
+	SpecifyIp      string   // 指定外网IP
+	CurrentIp      string   // 当前外网IP
+}
+
+// CreateWaitCustomId 创建正在运行任务
+func (c *Client) CreateWaitCustomId(ctx context.Context, config *ConfigCreateWaitCustomId) error {
+	if config.CurrentIp == "" {
+		config.CurrentIp = c.config.systemOutsideIp
+	}
+	err := config.Tx.Create(&jobs_gorm_model.Task{
+		Status:         TASK_WAIT,
+		Params:         config.Params,
+		StatusDesc:     "首次添加等待任务",
+		Frequency:      config.Frequency,
+		RunId:          gostring.GetUuId(),
+		CustomId:       config.CustomId,
+		CustomSequence: config.CustomSequence,
+		Type:           config.Type,
+		TypeName:       config.TypeName,
+		CreatedIp:      config.CurrentIp,
+		SpecifyIp:      config.SpecifyIp,
+		UpdatedIp:      config.CurrentIp,
+		NextRunTime:    gotime.Current().AfterSeconds(config.Frequency).Time,
+	}).Error
+	if err != nil {
+		return errors.New(fmt.Sprintf("创建[%s@%s]任务失败：%s", config.CustomId, config.Type, err.Error()))
+	}
+	return nil
+}

cron_spec_test.go

@@ -1,26 +0,0 @@
-package gojobs
-
-import "testing"
-
-func TestSpec(t *testing.T) {
-	t.Log("每隔10秒执行一次：", GetSeconds(10).Spec())
-	t.Log("每隔10秒执行一次：", GetSeconds(10).Frequency())
-
-	t.Log("每隔60秒执行一次：", GetSeconds(60).Spec())
-	t.Log("每隔60秒执行一次：", GetSeconds(60).Frequency())
-
-	t.Log("每隔5分钟执行一次：", GetMinutes(5).Spec())
-	t.Log("每隔5分钟执行一次：", GetMinutes(5).Frequency())
-
-	t.Log("每隔10分钟执行一次：", GetMinutes(10).Spec())
-	t.Log("每隔10分钟执行一次：", GetMinutes(10).Frequency())
-
-	t.Log("每隔60分钟执行一次：", GetMinutes(60).Spec())
-	t.Log("每隔60分钟执行一次：", GetMinutes(60).Frequency())
-
-	t.Log("每天n点执行一次：", GetHour(10).Spec())
-	t.Log("每天n点执行一次：", GetHour(10).Frequency())
-
-	t.Log("每隔n小时执行一次：", GetHourInterval(1).Spec())
-	t.Log("每隔n小时执行一次：", GetHourInterval(1).Frequency())
-}

cron_test.go

@@ -1,45 +0,0 @@
-package gojobs
-
-import (
-	"fmt"
-	"github.com/jasonlvhit/gocron"
-	"log"
-	"testing"
-)
-
-func TestCron1(t *testing.T) {
-
-	// 创建一个cron实例 精确到秒
-	crontab := NewCron()
-
-	log.Println(crontab)
-
-	err := crontab.AddJobByFunc("1", "*/1 * * * * *", func() {
-		log.Println("哈哈哈哈")
-	})
-	if err != nil {
-		fmt.Printf("添加任务时出错：%s", err)
-		return
-	}
-
-	err = crontab.AddJobByFunc("2", "*/2 * * * * *", func() {
-		log.Println("啊啊啊啊")
-	})
-	if err != nil {
-		fmt.Printf("添加任务时出错：%s", err)
-		return
-	}
-
-	crontab.Start()
-	select {}
-}
-
-func TestCron2(t *testing.T) {
-	i := 0
-	s := gocron.NewScheduler()
-	s.Every(5).Seconds().Do(func() {
-		i++
-		log.Println("execute per 5 seconds", i)
-	})
-	<-s.Start()
-}

error.go

@@ -0,0 +1,11 @@
+package gojobs
+
+import "errors"
+
+var (
+	currentIpNoConfig      = errors.New("请配置 CurrentIp")
+	redisPrefixFunNoConfig = errors.New("请配置 RedisPrefixFun")
+	gormClientFunNoConfig  = errors.New("请配置 GormClientFun")
+	mongoClientFunNoConfig = errors.New("请配置 MongoClientFun")
+	TaskIsExist            = errors.New("任务已存在")
+)

get.go

@@ -0,0 +1,32 @@
+package gojobs
+
+import (
+	"github.com/go-redis/redis/v9"
+	"go.mongodb.org/mongo-driver/mongo"
+	"gorm.io/gorm"
+)
+
+// GetDb 获取数据库驱动
+func (c *Client) GetDb() *gorm.DB {
+	return c.gormClient.GetDb()
+}
+
+// GetMongoDb 获取数据库驱动
+func (c *Client) GetMongoDb() *mongo.Client {
+	return c.mongoClient.GetDb()
+}
+
+// GetRedis 获取缓存数据库驱动
+func (c *Client) GetRedis() *redis.Client {
+	return c.cache.redisClient.GetDb()
+}
+
+// GetCurrentIp 获取当前ip
+func (c *Client) GetCurrentIp() string {
+	return c.config.systemOutsideIp
+}
+
+// GetSubscribeAddress 获取订阅地址
+func (c *Client) GetSubscribeAddress() string {
+	return c.cache.cornKeyPrefix + "_" + c.cache.cornKeyCustom
+}

go.mod

@@ -3,19 +3,18 @@ module go.dtapp.net/gojobs
 go 1.19
 
 require (
-	github.com/go-redis/redis/v9 v9.0.0-beta.2
+	github.com/go-redis/redis/v9 v9.0.0-rc.2
 	github.com/jasonlvhit/gocron v0.0.1
 	github.com/robfig/cron/v3 v3.0.1
-	go.dtapp.net/dorm v1.0.17
-	go.dtapp.net/goarray v1.0.1
-	go.dtapp.net/goip v1.0.25
-	go.dtapp.net/golock v1.0.3
-	go.dtapp.net/gostring v1.0.6
+	github.com/shirou/gopsutil v3.21.11+incompatible
+	go.dtapp.net/dorm v1.0.54
+	go.dtapp.net/goip v1.0.39
+	go.dtapp.net/golog v1.0.102
+	go.dtapp.net/gostring v1.0.10
 	go.dtapp.net/gotime v1.0.5
-	google.golang.org/grpc v1.48.0
-	google.golang.org/protobuf v1.28.1
-	gorm.io/gorm v1.23.8
-	xorm.io/xorm v1.3.1
+	go.dtapp.net/gotrace_id v1.0.6
+	go.mongodb.org/mongo-driver v1.11.0
+	gorm.io/gorm v1.24.2
 )
 
 require (
@@ -25,12 +24,12 @@ require (
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/gin-gonic/gin v1.8.1 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-playground/validator/v10 v10.11.0 // indirect
+	github.com/go-playground/validator/v10 v10.11.1 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/goccy/go-json v0.9.10 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.13.0 // indirect
@@ -39,54 +38,62 @@ require (
 	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
 	github.com/jackc/pgtype v1.12.0 // indirect
-	github.com/jackc/pgx/v4 v4.17.0 // indirect
+	github.com/jackc/pgx/v4 v4.17.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.15.9 // indirect
+	github.com/klauspost/compress v1.15.12 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/lib/pq v1.10.6 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
+	github.com/lib/pq v1.10.7 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.6.6 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
+	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
+	github.com/oschwald/geoip2-golang v1.8.0 // indirect
+	github.com/oschwald/maxminddb-golang v1.10.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda // indirect
 	github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f // indirect
+	github.com/segmentio/fasthash v1.0.3 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
-	github.com/upper/db/v4 v4.5.4 // indirect
-	github.com/uptrace/bun v1.1.7 // indirect
-	github.com/uptrace/bun/dialect/mysqldialect v1.1.7 // indirect
-	github.com/uptrace/bun/dialect/pgdialect v1.1.7 // indirect
-	github.com/uptrace/bun/driver/pgdriver v1.1.7 // indirect
+	github.com/upper/db/v4 v4.6.0 // indirect
+	github.com/uptrace/bun v1.1.9 // indirect
+	github.com/uptrace/bun/dialect/mysqldialect v1.1.9 // indirect
+	github.com/uptrace/bun/dialect/pgdialect v1.1.9 // indirect
+	github.com/uptrace/bun/driver/pgdriver v1.1.9 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.dtapp.net/gorandom v1.0.1 // indirect
-	go.dtapp.net/gorequest v1.0.26 // indirect
-	go.dtapp.net/gotrace_id v1.0.0 // indirect
-	go.mongodb.org/mongo-driver v1.10.1 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 // indirect
+	go.dtapp.net/gorequest v1.0.36 // indirect
+	go.dtapp.net/gourl v1.0.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+	golang.org/x/crypto v0.3.0 // indirect
+	golang.org/x/mod v0.7.0 // indirect
+	golang.org/x/net v0.2.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gorm.io/driver/mysql v1.3.5 // indirect
-	gorm.io/driver/postgres v1.3.8 // indirect
-	mellium.im/sasl v0.2.1 // indirect
+	gorm.io/driver/mysql v1.4.4 // indirect
+	gorm.io/driver/postgres v1.4.5 // indirect
+	mellium.im/sasl v0.3.0 // indirect
 	modernc.org/ccgo/v3 v3.16.8 // indirect
-	modernc.org/libc v1.16.17 // indirect
 	xorm.io/builder v0.3.12 // indirect
+	xorm.io/xorm v1.3.2 // indirect
 )

go.sum

@@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 gitee.com/travelliu/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4LxihRxShkE=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
@@ -15,7 +16,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 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/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@@ -27,6 +27,7 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUKVw=
 github.com/basgys/goxml2json v1.1.0/go.mod h1:wH7a5Np/Q4QoECFIU8zTQlZwZkrilY0itPfecMw41Dw=
+github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 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/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -40,12 +41,6 @@ github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cb
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
@@ -73,11 +68,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
-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=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 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/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
@@ -97,24 +88,26 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 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-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
 github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw=
-github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ=
+github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
 github.com/go-redis/redis v6.15.5+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-redis/redis/v9 v9.0.0-beta.2 h1:ZSr84TsnQyKMAg8gnV+oawuQezeJR11/09THcWCQzr4=
-github.com/go-redis/redis/v9 v9.0.0-beta.2/go.mod h1:Bldcd/M/bm9HbnNPi/LUtYBSD8ttcZYBMupwMXhdU0o=
+github.com/go-redis/redis/v9 v9.0.0-rc.2 h1:IN1eI8AvJJeWHjMW/hlFAv2sAfvTun2DVksDDJ3a6a0=
+github.com/go-redis/redis/v9 v9.0.0-rc.2/go.mod h1:cgBknjwcBJa2prbnuHH/4k/Mlj4r0pWNV2HBanHujfY=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.9.10 h1:hCeNmprSNLB8B8vQKWl6DpuH0t60oEs+TAk9a7CScKc=
-github.com/goccy/go-json v0.9.10/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
+github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
@@ -130,18 +123,7 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -152,18 +134,14 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
 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=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/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.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -174,7 +152,6 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -216,7 +193,6 @@ github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/
 github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
 github.com/jackc/pgconn v1.11.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
-github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono=
 github.com/jackc/pgconn v1.13.0 h1:3L1XMNV2Zvca/8BYhzcRFS70Lr0WlDg16Di6SFGAbys=
 github.com/jackc/pgconn v1.13.0/go.mod h1:AnowpAqO4CMIIJNZl2VJp+KrkAZciAkhEl0W0JIobpI=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
@@ -236,7 +212,6 @@ github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwX
 github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.3.1 h1:nwj7qwf0S+Q7ISFfBndqeLwSwxs+4DPsbRFjECT1Y4Y=
 github.com/jackc/pgproto3/v2 v2.3.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
@@ -252,7 +227,6 @@ github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI
 github.com/jackc/pgtype v1.8.0/go.mod h1:PqDKcEBtllAtk/2p6z6SHdXW5UB+MhE75tUol2OKexE=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
 github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
-github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w=
 github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
@@ -265,15 +239,15 @@ github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CI
 github.com/jackc/pgx/v4 v4.12.0/go.mod h1:fE547h6VulLPA3kySjfnSG/e2D861g/50JlVUa/ub60=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw=
-github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ=
-github.com/jackc/pgx/v4 v4.17.0 h1:Hsx+baY8/zU2WtPLQyZi8WbecgcsWEeyoK1jvg/WgIo=
-github.com/jackc/pgx/v4 v4.17.0/go.mod h1:Gd6RmOhtFLTu8cp/Fhq4kP195KrshxYJH3oW8AWJ1pw=
+github.com/jackc/pgx/v4 v4.17.2 h1:0Ut0rpeKwvIVbMQ1KbMBU4h6wxehBI535LK6Flheh8E=
+github.com/jackc/pgx/v4 v4.17.2/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jasonlvhit/gocron v0.0.1 h1:qTt5qF3b3srDjeOIR4Le1LfeyvoYzJlYpqvG7tJX5YU=
 github.com/jasonlvhit/gocron v0.0.1/go.mod h1:k9a3TV8VcU73XZxfVHCHWMWF9SOqgoku0/QlY2yvlA4=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -295,8 +269,8 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
+github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -317,8 +291,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
-github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
@@ -333,18 +307,18 @@ github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 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/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 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=
@@ -359,6 +333,8 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/montanaflynn/stats v0.6.6 h1:Duep6KMIDpY4Yo11iFsvyqJDyfzLF9+sndUKT+v64GQ=
 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=
+github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
@@ -376,7 +352,7 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
+github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -386,11 +362,15 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
+github.com/oschwald/geoip2-golang v1.8.0 h1:KfjYB8ojCEn/QLqsDU0AzrJ3R5Qa9vFlx3z6SLNcKTs=
+github.com/oschwald/geoip2-golang v1.8.0/go.mod h1:R7bRvYjOeaoenAp9sKRS8GX5bJWcZ0laWO5+DauEktw=
+github.com/oschwald/maxminddb-golang v1.10.0 h1:Xp1u0ZhqkSuopaKmk1WwHtjF0H9Hd9181uj2MQ5Vndg=
+github.com/oschwald/maxminddb-golang v1.10.0/go.mod h1:Y2ELenReaLAZ0b400URyGwvYxHV1dLIxBuyOsyYjHK0=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
-github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
+github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
+github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -426,7 +406,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qq
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-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.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
@@ -444,6 +423,10 @@ github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f h1:1cJITU3JUI8q
 github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f/go.mod h1:LyBTue+RWeyIfN3ZJ4wVxvDuvlGJtDgCLgCb6HCPgps=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM=
+github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
+github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
@@ -468,6 +451,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+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=
@@ -475,13 +459,17 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 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.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
+github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
+github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
+github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
@@ -490,16 +478,16 @@ github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
 github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
 github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/upper/db/v4 v4.5.4 h1:Hxho4jSx4E+3fxlFgdH4wQTRKygtL0YQPDLQPCUu9wg=
-github.com/upper/db/v4 v4.5.4/go.mod h1:wyu5BM5Y2gowOt4i6C4LbxftH9QeUF338XVGH4uk+Eo=
-github.com/uptrace/bun v1.1.7 h1:biOoh5dov69hQPBlaRsXSHoEOIEnCxFzQvUmbscSNJI=
-github.com/uptrace/bun v1.1.7/go.mod h1:Z2Pd3cRvNKbrYuL6Gp1XGjA9QEYz+rDz5KkEi9MZLnQ=
-github.com/uptrace/bun/dialect/mysqldialect v1.1.7 h1:eMDtsuu5BRuh0P2l0/j0Qv5UBmcqJE0u3F8Zy//klNM=
-github.com/uptrace/bun/dialect/mysqldialect v1.1.7/go.mod h1:cCSZH3IULSGaG76Z96mAC7O74MeIYGfDX7CWGanGc0s=
-github.com/uptrace/bun/dialect/pgdialect v1.1.7 h1:94GPc8RRC9AVoQ+4KCqRX2zScevsVfOttk13wm60/P8=
-github.com/uptrace/bun/dialect/pgdialect v1.1.7/go.mod h1:kKHFmQIyBl0kvQDsoyrlXaKsceTH2TJnbCUFlK9QAmE=
-github.com/uptrace/bun/driver/pgdriver v1.1.7 h1:WExzNbsMBWmkjcylV8kKzcbA7pKWZ5UhPflknzUP2PA=
-github.com/uptrace/bun/driver/pgdriver v1.1.7/go.mod h1:ZswdiMQOKmY5OBR84YGzaNddbpDo/kkhCzQXm5E2ZqA=
+github.com/upper/db/v4 v4.6.0 h1:0VmASnqrl/XN8Ehoq++HBgZ4zRD5j3GXygW8FhP0C5I=
+github.com/upper/db/v4 v4.6.0/go.mod h1:2mnRcPf+RcCXmVcD+o04LYlyu3UuF7ubamJia7CkN6s=
+github.com/uptrace/bun v1.1.9 h1:6zs+YJcgw8oj67c+YmI8edQokDFeyR4BE/ykNWjGYYs=
+github.com/uptrace/bun v1.1.9/go.mod h1:fpYRCGyruLCyP7dNjMfqulYn4VBP/fH0enc0j0yW/Cs=
+github.com/uptrace/bun/dialect/mysqldialect v1.1.9 h1:TPK14lATldiJiIpwAVl4RzgoNkY+wo+7RVbNmGdYVsc=
+github.com/uptrace/bun/dialect/mysqldialect v1.1.9/go.mod h1:C7tZ3CSfWNsjr9ujTedyeI8Zy5iCcaqnCGYObY9MFz0=
+github.com/uptrace/bun/dialect/pgdialect v1.1.9 h1:V23SU89WfjqtePLFPRXVXCwmSyYb0XKeg8Z6BMXgyHg=
+github.com/uptrace/bun/dialect/pgdialect v1.1.9/go.mod h1:+ux7PjC4NYsNMdGE9b2ERxCi2jJai8Z8zniXFExq0Ns=
+github.com/uptrace/bun/driver/pgdriver v1.1.9 h1:Dy9g/EpgOG15RP3mDAuJd/hnfXAUdBsfxpg9On27M+Y=
+github.com/uptrace/bun/driver/pgdriver v1.1.9/go.mod h1:YnPHzR4fT24PXrBTcadclXfdtkR9dYouqk2HwOiKf2g=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
@@ -517,47 +505,55 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul
 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
-go.dtapp.net/dorm v1.0.17 h1:3VQKUl05CDxFg3T1c/M8wYf2I+H+oVGBDh4NCV30nn0=
-go.dtapp.net/dorm v1.0.17/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM=
-go.dtapp.net/goarray v1.0.1 h1:cHNHaJ2MFcuJPA1WKU2PM1EUZShS1vQqEH7n6YXsQVU=
-go.dtapp.net/goarray v1.0.1/go.mod h1:/MPhlFCAhQyeNV1M0v1PAOOX33Sg705fVjUgMO12IBQ=
-go.dtapp.net/goip v1.0.25 h1:GSgQkR7dc28TX8E1mF3wAy+EEGZ++tgqc8Q85OKZPEY=
-go.dtapp.net/goip v1.0.25/go.mod h1:dKeNuWJttH4AvvYVHV0FagB6BVvFM1HGDKFxLKr+hkQ=
-go.dtapp.net/golock v1.0.3 h1:9s8DlO6ygNzT2czwpmk6Zf3szMxd3UH+r0m0sf1IIrU=
-go.dtapp.net/golock v1.0.3/go.mod h1:GiKLG8gnwHgdP8/g+jn8HCv3HP4iB5Tjj2tnhWNB+Jg=
+go.dtapp.net/dorm v1.0.54 h1:yY3NqVSPKDsoLUrEkVzyM9hiZO95jLT1BALXErt+DAw=
+go.dtapp.net/dorm v1.0.54/go.mod h1:9QRNnXLkHev7MllwpPq6OYusP8khujurXfMZv6p7CYo=
+go.dtapp.net/goip v1.0.39 h1:6fEV0yrY3PNUK3lhEuMqxZJYEXzhbHannvsgZA7s7hE=
+go.dtapp.net/goip v1.0.39/go.mod h1:9o6uaw0JCPvTwGFWRkznI8EidQ9bwWJ5dx02/7ZUnEM=
+go.dtapp.net/golog v1.0.102 h1:WVfx+vxWODqPkYJNeLfxIENyQO3RCCWr5xLhhPauOpM=
+go.dtapp.net/golog v1.0.102/go.mod h1:doXs2CQmQOMGhrZD7bRRzdUh+cYWfiugJEmpJWBeXDw=
 go.dtapp.net/gorandom v1.0.1 h1:IWfMClh1ECPvyUjlqD7MwLq4mZdUusD1qAwAdsvEJBs=
 go.dtapp.net/gorandom v1.0.1/go.mod h1:ZPdgalKpvFV/ATQqR0k4ns/F/IpITAZpx6WkWirr5Y8=
-go.dtapp.net/gorequest v1.0.26 h1:t+rMW7liLHz1RgY60ztWIghSkTeQePKWM0EsDG1IqMI=
-go.dtapp.net/gorequest v1.0.26/go.mod h1:sDhiEPwdZnUbyDuq/3OAzA1qvpU5yo49v1fY5sVgj18=
-go.dtapp.net/gostring v1.0.6 h1:XqNaThEfHpweLofru5sBqm1UUzc9JWsXyB/M/rTk29w=
-go.dtapp.net/gostring v1.0.6/go.mod h1:AMnnLjyNxH+cphxyASJGYCzWpVrkP5RncuVo8xL8s3E=
+go.dtapp.net/gorequest v1.0.36 h1:c3DqlQ1bvTwCOJ3gRnDE5nsg8iqnjEYmVAFHn3d8rpY=
+go.dtapp.net/gorequest v1.0.36/go.mod h1:IbhBN1ID6CqMitHjAYdEBmhK1P5FVDLUeMl1JqxE3qY=
+go.dtapp.net/gostring v1.0.10 h1:eG+1kQehdJUitj9Hfwy79SndMHYOB7ABpWkTs7mDGeQ=
+go.dtapp.net/gostring v1.0.10/go.mod h1:L4kREy89a9AraMHB5tUjjl+5rxP1gpXkDouRKKuzT50=
 go.dtapp.net/gotime v1.0.5 h1:12aNgB2ULpP6QgQHEUkLilZ4ASvhpFxMFQkBwn0par8=
 go.dtapp.net/gotime v1.0.5/go.mod h1:Gq7eNLr2iMLP18UNWONRq4V3Uhf/ADp4bIrS+Tc6ktY=
-go.dtapp.net/gotrace_id v1.0.0 h1:nlI8KEEf2l394SCzmJxffEIiOBfR4kIOuobBhpRSV3g=
-go.dtapp.net/gotrace_id v1.0.0/go.mod h1:HDwMY1vLoC759z6VGKVgCpIqwKQTDYV9DNdxiyN1OeQ=
+go.dtapp.net/gotrace_id v1.0.6 h1:q6s8jy50vt1820b69JKQaFqbhGS5yJGMVtocwOGOPO0=
+go.dtapp.net/gotrace_id v1.0.6/go.mod h1:o5kSzNK4s3GrrKpkRKXtAhArtBG1e5N5O5KGPlBlWG4=
+go.dtapp.net/gourl v1.0.0 h1:Zbe0GiMFyyRy2+bjbVsYulakH5d58w3CDZkUPonlMoQ=
+go.dtapp.net/gourl v1.0.0/go.mod h1:x9A/pJ3iKDTb6Gu2RtJy2iHg56IowXIcIGQdogqpGjs=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4=
-go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8=
+go.mongodb.org/mongo-driver v1.11.0 h1:FZKhBSTydeuffHj9CBjXlR8vQLee1cQyTWYPA6/tqiE=
+go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
+go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
+go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/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-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -574,12 +570,12 @@ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
+golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -590,8 +586,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -609,15 +605,13 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 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-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 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=
@@ -626,8 +620,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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=
@@ -645,15 +639,14 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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=
@@ -663,8 +656,9 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -672,8 +666,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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -693,7 +688,7 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -709,10 +704,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 h1:zZnTt15U44/Txe/9cN/tVbteBkPMiyXK48hPsKRmqj4=
-google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
@@ -721,25 +712,8 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij
 google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
-google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-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=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-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.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -754,6 +728,7 @@ gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -761,28 +736,28 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 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.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=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.3.5 h1:iWBTVW/8Ij5AG4e0G/zqzaJblYkBI1VIL1LG2HUGsvY=
-gorm.io/driver/mysql v1.3.5/go.mod h1:sSIebwZAVPiT+27jK9HIwvsqOGKx3YMPmrA3mBJR10c=
-gorm.io/driver/postgres v1.3.8 h1:8bEphSAB69t3odsCR4NDzt581iZEWQuRM27Cg6KgfPY=
-gorm.io/driver/postgres v1.3.8/go.mod h1:qB98Aj6AhRO/oyu/jmZsi/YM9g6UzVCjMxO/6frFvcA=
-gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE=
+gorm.io/driver/mysql v1.4.4 h1:MX0K9Qvy0Na4o7qSC/YI7XxqUw5KDw01umqgID+svdQ=
+gorm.io/driver/mysql v1.4.4/go.mod h1:BCg8cKI+R0j/rZRQxeKis/forqRwRSYOR8OM3Wo6hOM=
+gorm.io/driver/postgres v1.4.5 h1:mTeXTTtHAgnS9PgmhN2YeUbazYpLhUI1doLnw42XUZc=
+gorm.io/driver/postgres v1.4.5/go.mod h1:GKNQYSJ14qvWkvPwXljMGehpKrhlDNsqYRr5HnYGncg=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/gorm v1.24.1-0.20221019064659-5dd2bb482755/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+gorm.io/gorm v1.24.2 h1:9wR6CFD+G8nOusLdvkZelOEhpJVwwHzpQOUM+REd6U0=
+gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
-mellium.im/sasl v0.2.1 h1:nspKSRg7/SyO0cRGY71OkfHab8tf9kCts6a6oTDut0w=
-mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ=
+mellium.im/sasl v0.3.0 h1:0qoaTCTo5Py7u/g0cBIQZcMOgG/5LM71nshbXwznBh8=
+mellium.im/sasl v0.3.0/go.mod h1:xm59PUYpZHhgQ9ZqoJ5QaCqzWMi8IeS49dhp6plPCzw=
 modernc.org/b v1.0.2/go.mod h1:fVGfCIzkZw5RsuF2A2WHbJmY7FiMIq30nP4s52uWsoY=
 modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
@@ -889,8 +864,8 @@ modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE=
 modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY=
 modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
 modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
-modernc.org/libc v1.16.17 h1:rXo8IZJvP+QSN1KrlV23dtkM3XfGYXjx3RbLLzBtndM=
 modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
+modernc.org/libc v1.16.19 h1:S8flPn5ZeXx6iw/8yNa986hwTQDrY8RXU7tObZuAozo=
 modernc.org/lldb v1.0.2/go.mod h1:ovbKqyzA9H/iPwHkAOH0qJbIQVT9rlijecenxDwVUi0=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
@@ -907,7 +882,7 @@ modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/ql v1.4.0/go.mod h1:q4c29Bgdx+iAtxx47ODW5Xo2X0PDkjSCK9NdQl6KFxc=
 modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k=
 modernc.org/sqlite v1.14.2/go.mod h1:yqfn85u8wVOE6ub5UT8VI9JjhrwBUUCNyTACN0h6Sx8=
-modernc.org/sqlite v1.17.3 h1:iE+coC5g17LtByDYDWKpR6m2Z9022YrSh3bumwOnIrI=
+modernc.org/sqlite v1.18.0 h1:ef66qJSgKeyLyrF4kQ2RHw/Ue3V89fyFNbGL073aDjI=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/strutil v1.1.2 h1:iFBDH6j1Z0bN/Q9udJnnFoFpENA4252qe/7/5woE5MI=
 modernc.org/tcl v1.8.13/go.mod h1:V+q/Ef0IJaNUSECieLU4o+8IScapxnMyFV6i/7uQlAY=
@@ -920,5 +895,5 @@ sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1
 xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
 xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
-xorm.io/xorm v1.3.1 h1:z5egKrDoOLqZFhMjcGF4FBHiTmE5/feQoHclfhNidfM=
-xorm.io/xorm v1.3.1/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
+xorm.io/xorm v1.3.2 h1:uTRRKF2jYzbZ5nsofXVUx6ncMaek+SHjWYtCXyZo1oM=
+xorm.io/xorm v1.3.2/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=

gorm_model.go

@@ -0,0 +1,196 @@
+package gojobs
+
+import (
+	"context"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gotime"
+	"gorm.io/gorm"
+)
+
+// TaskTakeId 编号查询任务
+func (c *Client) TaskTakeId(ctx context.Context, tx *gorm.DB, id uint) (result jobs_gorm_model.Task) {
+	err := tx.Where("id = ?", id).Take(&result).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("编号查询任务：%v", err)
+	}
+	return result
+}
+
+// TaskTake 自定义编号查询任务
+func (c *Client) TaskTake(ctx context.Context, tx *gorm.DB, customId string) (result jobs_gorm_model.Task) {
+	err := tx.Where("custom_id = ?", customId).Take(&result).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("自定义编号查询任务：%v", err)
+	}
+	return result
+}
+
+// 自定义编号加状态查询任务
+func (c *Client) taskTake(ctx context.Context, tx *gorm.DB, customId, status string) (result jobs_gorm_model.Task) {
+	err := tx.Where("custom_id = ?", customId).Where("status = ?", status).Take(&result).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("自定义编号加状态查询任务：%v", err)
+	}
+	return result
+}
+
+// TaskTakeIn 查询单任务 - 任务运行
+func (c *Client) TaskTakeIn(ctx context.Context, tx *gorm.DB, customId string) jobs_gorm_model.Task {
+	return c.taskTake(ctx, tx, customId, TASK_IN)
+}
+
+// TaskTakeSuccess 查询单任务 - 任务完成
+func (c *Client) TaskTakeSuccess(ctx context.Context, tx *gorm.DB, customId string) jobs_gorm_model.Task {
+	return c.taskTake(ctx, tx, customId, TASK_SUCCESS)
+}
+
+// TaskTakeError 查询单任务 - 任务异常
+func (c *Client) TaskTakeError(ctx context.Context, tx *gorm.DB, customId string) jobs_gorm_model.Task {
+	return c.taskTake(ctx, tx, customId, TASK_ERROR)
+}
+
+// TaskTakeTimeout 查询单任务 - 任务超时
+func (c *Client) TaskTakeTimeout(ctx context.Context, tx *gorm.DB, customId string) jobs_gorm_model.Task {
+	return c.taskTake(ctx, tx, customId, TASK_TIMEOUT)
+}
+
+// TaskTakeWait 查询单任务 - 任务等待
+func (c *Client) TaskTakeWait(ctx context.Context, tx *gorm.DB, customId string) jobs_gorm_model.Task {
+	return c.taskTake(ctx, tx, customId, TASK_WAIT)
+}
+
+// TaskTypeTake 查询单任务
+func (c *Client) TaskTypeTake(ctx context.Context, tx *gorm.DB, customId, Type string) (result jobs_gorm_model.Task) {
+	err := tx.Where("custom_id = ?", customId).Where("type = ?", Type).Take(&result).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("查询单任务：%v", err)
+	}
+	return result
+}
+
+// 查询单任务
+func (c *Client) taskTypeTake(ctx context.Context, tx *gorm.DB, customId, Type, status string) (result jobs_gorm_model.Task) {
+	err := tx.Where("custom_id = ?", customId).Where("type = ?", Type).Where("status = ?", status).Take(&result).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("查询单任务：%v", err)
+	}
+	return result
+}
+
+// TaskTypeTakeIn 查询单任务 - 任务运行
+func (c *Client) TaskTypeTakeIn(ctx context.Context, tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
+	return c.taskTypeTake(ctx, tx, customId, Type, TASK_IN)
+}
+
+// TaskTypeTakeSuccess 查询单任务 - 任务完成
+func (c *Client) TaskTypeTakeSuccess(ctx context.Context, tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
+	return c.taskTypeTake(ctx, tx, customId, Type, TASK_SUCCESS)
+}
+
+// TaskTypeTakeError 查询单任务 - 任务异常
+func (c *Client) TaskTypeTakeError(ctx context.Context, tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
+	return c.taskTypeTake(ctx, tx, customId, Type, TASK_ERROR)
+}
+
+// TaskTypeTakeTimeout 查询单任务 - 任务超时
+func (c *Client) TaskTypeTakeTimeout(ctx context.Context, tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
+	return c.taskTypeTake(ctx, tx, customId, Type, TASK_TIMEOUT)
+}
+
+// TaskTypeTakeWait 查询单任务 - 任务等待
+func (c *Client) TaskTypeTakeWait(ctx context.Context, tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
+	return c.taskTypeTake(ctx, tx, customId, Type, TASK_WAIT)
+}
+
+// TaskFindAll 查询多任务
+func (c *Client) TaskFindAll(ctx context.Context, tx *gorm.DB, frequency int64) (results []jobs_gorm_model.Task) {
+	err := tx.Where("frequency = ?", frequency).Order("id asc").Find(&results).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("查询多任务：%v", err)
+	}
+	return results
+}
+
+// 查询多任务
+func (c *Client) taskFindAll(ctx context.Context, tx *gorm.DB, frequency int64, status string) (results []jobs_gorm_model.Task) {
+	err := tx.Where("frequency = ?", frequency).Where("status = ?", status).Order("id asc").Find(&results).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("查询多任务：%v", err)
+	}
+	return results
+}
+
+// TaskFindAllIn 查询多任务 - 任务运行
+func (c *Client) TaskFindAllIn(ctx context.Context, tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
+	return c.taskFindAll(ctx, tx, frequency, TASK_IN)
+}
+
+// TaskFindAllSuccess 查询多任务 - 任务完成
+func (c *Client) TaskFindAllSuccess(ctx context.Context, tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
+	return c.taskFindAll(ctx, tx, frequency, TASK_SUCCESS)
+}
+
+// TaskFindAllError 查询多任务 - 任务异常
+func (c *Client) TaskFindAllError(ctx context.Context, tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
+	return c.taskFindAll(ctx, tx, frequency, TASK_ERROR)
+}
+
+// TaskFindAllTimeout 查询多任务 - 任务超时
+func (c *Client) TaskFindAllTimeout(ctx context.Context, tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
+	return c.taskFindAll(ctx, tx, frequency, TASK_TIMEOUT)
+}
+
+// TaskFindAllWait 查询多任务 - 任务等待
+func (c *Client) TaskFindAllWait(ctx context.Context, tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
+	return c.taskFindAll(ctx, tx, frequency, TASK_WAIT)
+}
+
+// StartTask 任务启动
+func (c *Client) StartTask(ctx context.Context, tx *gorm.DB, id uint) error {
+	err := c.EditTask(tx, id).
+		Select("status", "status_desc").
+		Updates(jobs_gorm_model.Task{
+			Status:     TASK_IN,
+			StatusDesc: "启动任务",
+		}).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("任务启动失败：%v", err)
+	}
+	return err
+}
+
+// StartTaskCustom 任务启动自定义
+func (c *Client) StartTaskCustom(ctx context.Context, tx *gorm.DB, customId string, customSequence int64) error {
+	err := tx.Model(&jobs_gorm_model.Task{}).
+		Where("custom_id = ?", customId).
+		Where("custom_sequence = ?", customSequence).
+		Where("status = ?", TASK_WAIT).
+		Select("status", "status_desc").
+		Updates(jobs_gorm_model.Task{
+			Status:     TASK_IN,
+			StatusDesc: "启动任务",
+		}).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("任务启动自定义失败：%v", err)
+	}
+	return err
+}
+
+// EditTask 任务修改
+func (c *Client) EditTask(tx *gorm.DB, id uint) *gorm.DB {
+	return tx.Model(&jobs_gorm_model.Task{}).Where("id = ?", id)
+}
+
+// UpdateFrequency 更新任务频率
+func (c *Client) UpdateFrequency(ctx context.Context, tx *gorm.DB, id uint, frequency int64) error {
+	err := c.EditTask(tx, id).
+		Select("frequency", "next_run_time").
+		Updates(jobs_gorm_model.Task{
+			Frequency:   frequency,
+			NextRunTime: gotime.Current().AfterSeconds(frequency).Time,
+		}).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("更新任务频率失败：%v", err)
+	}
+	return err
+}

grpc.go

@@ -1,21 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"fmt"
-	"go.dtapp.net/goip"
-)
-
-var ip string
-
-func configIp() {
-	ip = goip.GetOutsideIp(context.Background())
-}
-
-const prefix = "cron:"
-
-const prefixIp = "cron_%s:"
-
-func prefixSprintf(str string) string {
-	return fmt.Sprintf(prefixIp, str)
-}

grpc_client.go

@@ -1,38 +0,0 @@
-package gojobs
-
-import (
-	"google.golang.org/grpc"
-)
-
-// ClientConfig 客户端配置
-type ClientConfig struct {
-	Address string // 服务端口 127.0.0.1:8888
-}
-
-// Client 定时任务
-type Client struct {
-	ClientConfig                  // 配置
-	Conn         *grpc.ClientConn // 链接信息
-}
-
-// NewClient 创建客户端
-func NewClient(config *ClientConfig) *Client {
-
-	if config.Address == "" {
-		panic("[客户端]请填写服务端口")
-	}
-
-	c := &Client{}
-
-	c.Address = config.Address
-
-	var err error
-
-	// 建立连接 获取client
-	c.Conn, err = grpc.Dial(c.Address, grpc.WithInsecure())
-	if err != nil {
-		panic("[客户端]{连接失败}" + err.Error())
-	}
-
-	return c
-}

grpc_cron.go

@@ -1,56 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"go.dtapp.net/gojobs/pb"
-	"google.golang.org/grpc"
-	"log"
-)
-
-// CronConfig 定时任务配置
-type CronConfig struct {
-	Address string // 服务端口 127.0.0.1:8888
-}
-
-// GrpcCron 定时任务
-type GrpcCron struct {
-	CronConfig                  // 配置
-	Pub        pb.PubSubClient  // 订阅
-	Conn       *grpc.ClientConn // 链接信息
-}
-
-// NewGrpcCron 创建定时任务
-func NewGrpcCron(config *CronConfig) *GrpcCron {
-
-	if config.Address == "" {
-		panic("[定时任务]请填写服务端口")
-	}
-
-	c := &GrpcCron{}
-
-	c.Address = config.Address
-
-	var err error
-
-	// 建立连接 获取client
-	c.Conn, err = grpc.Dial(c.Address, grpc.WithInsecure())
-	if err != nil {
-		panic("[定时任务]{连接失败}" + err.Error())
-	}
-
-	// 新建一个客户端
-	c.Pub = pb.NewPubSubClient(c.Conn)
-
-	return c
-}
-
-// Send 发送
-func (c *GrpcCron) Send(in *pb.PublishRequest) (*pb.PublishResponse, error) {
-	log.Printf("[定时任务]{广播开始}编号：%s 类型：%s ip：%s\n", in.GetId(), in.GetValue(), in.GetIp())
-	stream, err := c.Pub.Publish(context.Background(), in)
-	if err != nil {
-		log.Printf("[定时任务]{广播失败}编号：%s %v\n", in.GetId(), err)
-	}
-	log.Printf("[定时任务]{广播成功}编号：%s 类型：%s ip：%s\n", in.GetId(), in.GetValue(), in.GetIp())
-	return stream, err
-}

grpc_server.go

@@ -1,84 +0,0 @@
-package gojobs
-
-import (
-	"errors"
-	"go.dtapp.net/gojobs/pb"
-	"go.dtapp.net/gojobs/pubsub"
-	"google.golang.org/grpc"
-	"log"
-	"net"
-	"strings"
-	"time"
-)
-
-// ServerConfig 服务配置
-type ServerConfig struct {
-	PublishTimeout time.Duration // 控制发布时最大阻塞时间
-	PubBuffer      int           // 缓冲区大小，控制每个订阅者的chan缓冲区大小
-	Address        string        // 服务端口 0.0.0.0:8888
-}
-
-// Server 服务
-type Server struct {
-	ServerConfig                   // 配置
-	Pub          *pubsub.Publisher // 订阅
-	Conn         *grpc.Server      // 链接信息
-}
-
-// NewServer 创建服务和注册
-func NewServer(config *ServerConfig) *Server {
-
-	if config.Address == "" {
-		panic("[服务中转]请填写服务端口")
-	}
-
-	s := &Server{}
-
-	s.PublishTimeout = config.PublishTimeout
-	s.PubBuffer = config.PubBuffer
-	s.Address = config.Address
-
-	s.Pub = pubsub.NewPublisher(config.PublishTimeout, config.PubBuffer)
-
-	// 创建gRPC服务器
-	s.Conn = grpc.NewServer()
-
-	// 注册
-	pb.RegisterPubSubServer(s.Conn, pb.NewPubSubServerService())
-
-	return s
-}
-
-// StartCron 启动定时任务
-func (s *Server) StartCron() {
-	cron := s.Pub.SubscribeTopic(func(v interface{}) bool {
-		if key, ok := v.(string); ok {
-			if strings.HasPrefix(key, prefix) {
-				return true
-			}
-		}
-		return false
-	})
-
-	go func() {
-		log.Println("cron：topic:", <-cron)
-	}()
-}
-
-// StartUp 启动服务
-func (s *Server) StartUp() {
-
-	// 监听本地端口
-	lis, err := net.Listen("tcp", s.Address)
-	if err != nil {
-		panic(errors.New("[服务中转]{创建监听失败}" + err.Error()))
-	}
-	log.Println("[服务中转]{监听}", lis.Addr())
-
-	// 启动grpc
-	err = s.Conn.Serve(lis)
-	if err != nil {
-		panic(errors.New("[服务中转]{创建服务失败}" + err.Error()))
-	}
-
-}

grpc_worker.go

@@ -1,76 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"go.dtapp.net/gojobs/pb"
-	"go.dtapp.net/gostring"
-	"google.golang.org/grpc"
-)
-
-// WorkerConfig 工作配置
-type WorkerConfig struct {
-	Address  string // 服务端口 127.0.0.1:8888
-	ClientIp string // 自己的ip地址
-}
-
-// Worker 工作
-type Worker struct {
-	WorkerConfig                  // 配置
-	Pub          pb.PubSubClient  // 订阅
-	Conn         *grpc.ClientConn // 链接信息
-}
-
-// NewWorker 创建工作
-func NewWorker(config *WorkerConfig) *Worker {
-
-	if config.Address == "" {
-		panic("[工作线]请填写服务端口")
-	}
-	if config.ClientIp == "" {
-		panic("[定时任务]请填写ip地址")
-	}
-
-	w := &Worker{}
-
-	w.Address = config.Address
-	w.ClientIp = config.ClientIp
-
-	var err error
-
-	// 建立连接 获取client
-	w.Conn, err = grpc.Dial(w.Address, grpc.WithInsecure())
-	if err != nil {
-		panic("[工作线]{连接失败}" + err.Error())
-	}
-
-	// 新建一个客户端
-	w.Pub = pb.NewPubSubClient(w.Conn)
-
-	return w
-}
-
-// SubscribeCron 订阅服务
-func (w *Worker) SubscribeCron() pb.PubSub_SubscribeClient {
-	stream, err := w.Pub.Subscribe(context.Background(), &pb.SubscribeRequest{
-		Id:    gostring.GetUuId(),
-		Value: prefix,
-		Ip:    w.ClientIp,
-	})
-	if err != nil {
-		panic("[工作线]{订阅服务失败}" + err.Error())
-	}
-	return stream
-}
-
-// StartCron 启动任务
-func (w *Worker) StartCron() pb.PubSub_SubscribeClient {
-	stream, err := w.Pub.Subscribe(context.Background(), &pb.SubscribeRequest{
-		Id:    gostring.GetUuId(),
-		Value: prefixSprintf(w.ClientIp),
-		Ip:    w.ClientIp,
-	})
-	if err != nil {
-		panic("[工作线]{启动任务失败}" + err.Error())
-	}
-	return stream
-}

jobs.go

@@ -1,5 +1,10 @@
 package gojobs
 
+import (
+	"context"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+)
+
 const (
 	TASK_IN      = "IN"      // 任务运行
 	TASK_SUCCESS = "SUCCESS" // 任务完成
@@ -11,15 +16,15 @@ const (
 // Cron
 type jobs interface {
 	// Run 运行
-	Run(info interface{}, status int, desc string)
-	// RunAddLog 任务执行日志
-	RunAddLog(id uint, runId string)
+	Run(ctx context.Context, info jobs_gorm_model.Task, status int, result string)
 	// CreateInCustomId 创建正在运行任务
-	CreateInCustomId()
+	CreateInCustomId(ctx context.Context, config *ConfigCreateInCustomId) error
 	// CreateInCustomIdOnly 创建正在运行唯一任务
-	CreateInCustomIdOnly()
+	CreateInCustomIdOnly(ctx context.Context, config *ConfigCreateInCustomIdOnly) error
 	// CreateInCustomIdMaxNumber 创建正在运行任务并限制数量
-	CreateInCustomIdMaxNumber()
+	CreateInCustomIdMaxNumber(ctx context.Context, config *ConfigCreateInCustomIdMaxNumber) error
 	// CreateInCustomIdMaxNumberOnly 创建正在运行唯一任务并限制数量
-	CreateInCustomIdMaxNumberOnly()
+	CreateInCustomIdMaxNumberOnly(ctx context.Context, config *ConfigCreateInCustomIdMaxNumberOnly) error
+	// CreateWaitCustomId 创建正在运行任务
+	CreateWaitCustomId(ctx context.Context, config *ConfigCreateWaitCustomId) error
 }

jobs_gorm.go

@@ -1,113 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"go.dtapp.net/dorm"
-	"go.dtapp.net/goarray"
-	"go.dtapp.net/goip"
-	"go.dtapp.net/gojobs/jobs_gorm_model"
-	"go.dtapp.net/golock"
-	"log"
-	"runtime"
-)
-
-type JobsGormConfig struct {
-	GormClient       *dorm.GormClient  // 数据库驱动
-	RedisClient      *dorm.RedisClient // 缓存数据库驱动
-	CurrentIp        string            // 当前ip
-	LockKeyPrefix    string            // 锁Key前缀 xxx_lock
-	LockKeySeparator string            // 锁Key分隔符 :
-	CornKeyPrefix    string            // 任务Key前缀 xxx_cron
-	CornKeyCustom    string            // 任务Key自定义 xxx_cron_自定义  xxx_cron_自定义_*
-	Debug            bool              // 调试
-}
-
-// JobsGorm Gorm数据库驱动
-type JobsGorm struct {
-	gormClient  *dorm.GormClient  // 数据库驱动
-	redisClient *dorm.RedisClient // 缓存驱动
-	lockClient  *golock.LockRedis // 锁驱动
-	config      struct {
-		debug            bool   // 调试
-		runVersion       string // 运行版本
-		os               string // 系统类型
-		arch             string // 系统架构
-		maxProCs         int    // CPU核数
-		version          string // GO版本
-		macAddrS         string // Mac地址
-		insideIp         string // 内网ip
-		outsideIp        string // 外网ip
-		lockKeyPrefix    string // 锁Key前缀 xxx_lock
-		lockKeySeparator string // 锁Key分隔符 :
-		cornKeyPrefix    string // 任务Key前缀 xxx_cron
-		cornKeyCustom    string // 任务Key自定义
-	}
-}
-
-// NewJobsGorm 初始化
-func NewJobsGorm(config *JobsGormConfig) (*JobsGorm, error) {
-
-	// 判断
-	if config.LockKeyPrefix == "" {
-		return nil, errors.New("需要配置锁Key前缀")
-	}
-	if config.LockKeySeparator == "" {
-		return nil, errors.New("需要配置锁Key分隔符")
-	}
-	if config.CornKeyPrefix == "" {
-		return nil, errors.New("需要配置任务Key前缀")
-	}
-	if config.CornKeyCustom == "" {
-		return nil, errors.New("需要配置任务Key自定义")
-	}
-	if config.CurrentIp == "" {
-		return nil, errors.New("需要配置当前的IP")
-	}
-	if config.GormClient == nil {
-		return nil, errors.New("需要配置数据库驱动")
-	}
-	if config.RedisClient == nil {
-		return nil, errors.New("需要配置缓存数据库驱动")
-	}
-
-	c := &JobsGorm{}
-	c.gormClient = config.GormClient
-	c.redisClient = config.RedisClient
-	c.config.outsideIp = config.CurrentIp
-	c.config.lockKeyPrefix = config.LockKeyPrefix
-	c.config.lockKeySeparator = config.LockKeySeparator
-	c.config.cornKeyPrefix = config.CornKeyPrefix
-	c.config.cornKeyCustom = config.CornKeyCustom
-	c.config.debug = config.Debug
-
-	// 锁
-	c.lockClient = golock.NewLockRedis(c.redisClient)
-
-	// 配置信息
-	c.config.runVersion = Version
-	c.config.os = runtime.GOOS
-	c.config.arch = runtime.GOARCH
-	c.config.maxProCs = runtime.GOMAXPROCS(0)
-	c.config.version = runtime.Version()
-	c.config.macAddrS = goarray.TurnString(goip.GetMacAddr(context.Background()))
-	c.config.insideIp = goip.GetInsideIp(context.Background())
-
-	// 创建模型
-	err := c.gormClient.Db.AutoMigrate(
-		&jobs_gorm_model.Task{},
-		&jobs_gorm_model.TaskLog{},
-		&jobs_gorm_model.TaskLogRun{},
-		&jobs_gorm_model.TaskIp{},
-	)
-	if err != nil {
-		return nil, errors.New(fmt.Sprintf("创建任务模型失败：%v\n", err))
-	}
-
-	if c.config.debug == true {
-		log.Printf("JOBS配置：%+v\n", c.config)
-	}
-
-	return c, nil
-}

jobs_gorm_check_task.go

@@ -1,40 +0,0 @@
-package gojobs
-
-import (
-	"go.dtapp.net/gojobs/jobs_gorm_model"
-	"go.dtapp.net/gotime"
-	"gorm.io/gorm"
-	"log"
-)
-
-// CheckManyTask 多任务检查
-func (j *JobsGorm) CheckManyTask(tx *gorm.DB, vs []jobs_gorm_model.Task) {
-	if len(vs) > 0 {
-		for _, v := range vs {
-			diffInSecondWithAbs := gotime.Current().DiffInSecondWithAbs(gotime.SetCurrent(v.UpdatedAt).Time)
-			if diffInSecondWithAbs >= v.Frequency*3 {
-				if j.config.debug == true {
-					log.Printf("每隔%v秒任务：%v相差%v秒\n", v.Frequency, v.Id, diffInSecondWithAbs)
-				}
-				err := tx.Where("task_id = ?", v.Id).Where("run_id = ?", v.RunId).Delete(&jobs_gorm_model.TaskLogRun{}).Error
-				if err != nil {
-					log.Println("删除失败", err.Error())
-				}
-			}
-		}
-	}
-}
-
-// CheckSingleTask 单任务检查
-func (j *JobsGorm) CheckSingleTask(tx *gorm.DB, v jobs_gorm_model.Task) {
-	diffInSecondWithAbs := gotime.Current().DiffInSecondWithAbs(gotime.SetCurrent(v.UpdatedAt).Time)
-	if diffInSecondWithAbs >= v.Frequency*3 {
-		if j.config.debug == true {
-			log.Printf("每隔%v秒任务：%v相差%v秒\n", v.Frequency, v.Id, diffInSecondWithAbs)
-		}
-		err := tx.Where("task_id = ?", v.Id).Where("run_id = ?", v.RunId).Delete(&jobs_gorm_model.TaskLogRun{}).Error
-		if err != nil {
-			log.Println("删除失败", err.Error())
-		}
-	}
-}

jobs_gorm_get.go

@@ -1,21 +0,0 @@
-package gojobs
-
-import (
-	"github.com/go-redis/redis/v9"
-	"gorm.io/gorm"
-)
-
-// GetDb 获取数据库驱动
-func (j *JobsGorm) GetDb() *gorm.DB {
-	return j.gormClient.Db
-}
-
-// GetRedis 获取缓存数据库驱动
-func (j *JobsGorm) GetRedis() *redis.Client {
-	return j.redisClient.Db
-}
-
-// GetCurrentIp 获取当前ip
-func (j *JobsGorm) GetCurrentIp() string {
-	return j.config.outsideIp
-}

jobs_gorm_ip.go

@@ -1,21 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"go.dtapp.net/goip"
-	"go.dtapp.net/gojobs/jobs_gorm_model"
-	"gorm.io/gorm"
-)
-
-// RefreshIp 刷新Ip
-func (j *JobsGorm) RefreshIp(ctx context.Context, tx *gorm.DB) {
-	xip := goip.GetOutsideIp(ctx)
-	if j.config.outsideIp == "" || j.config.outsideIp == "0.0.0.0" {
-		return
-	}
-	if j.config.outsideIp == xip {
-		return
-	}
-	tx.Where("ips = ?", j.config.outsideIp).Delete(&jobs_gorm_model.TaskIp{}) // 删除
-	j.config.outsideIp = xip
-}

jobs_gorm_lock.go

@@ -1,22 +0,0 @@
-package gojobs
-
-import (
-	"fmt"
-	"go.dtapp.net/gojobs/jobs_gorm_model"
-	"time"
-)
-
-// Lock 上锁
-func (j *JobsGorm) Lock(info jobs_gorm_model.Task, id any) (string, error) {
-	return j.lockClient.Lock(fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, id), fmt.Sprintf("已在%s@%s机器上锁成功", j.config.insideIp, j.config.outsideIp), time.Duration(info.Frequency)*3*time.Second)
-}
-
-// Unlock Lock 解锁
-func (j *JobsGorm) Unlock(info jobs_gorm_model.Task, id any) error {
-	return j.lockClient.Unlock(fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, id))
-}
-
-// LockForever 永远上锁
-func (j *JobsGorm) LockForever(info jobs_gorm_model.Task, id any) (string, error) {
-	return j.lockClient.LockForever(fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, id), fmt.Sprintf("已在%s@%s机器永远上锁成功", j.config.insideIp, j.config.outsideIp))
-}

jobs_gorm_model.go

@@ -1,196 +0,0 @@
-package gojobs
-
-import (
-	"go.dtapp.net/gojobs/jobs_gorm_model"
-	"gorm.io/gorm"
-	"log"
-	"strings"
-)
-
-// TaskTakeId 查询单任务
-func (j *JobsGorm) TaskTakeId(tx *gorm.DB, id uint) (result jobs_gorm_model.Task) {
-	tx.Where("id = ?", id).Take(&result)
-	return result
-}
-
-// TaskTake 查询单任务
-func (j *JobsGorm) TaskTake(tx *gorm.DB, customId string) (result jobs_gorm_model.Task) {
-	tx.Where("custom_id = ?", customId).Take(&result)
-	return result
-}
-
-// 查询单任务
-func (j *JobsGorm) taskTake(tx *gorm.DB, customId, status string) (result jobs_gorm_model.Task) {
-	tx.Where("custom_id = ?", customId).Where("status = ?", status).Take(&result)
-	return result
-}
-
-// TaskTakeIn 查询单任务 - 任务运行
-func (j *JobsGorm) TaskTakeIn(tx *gorm.DB, customId string) jobs_gorm_model.Task {
-	return j.taskTake(tx, customId, TASK_IN)
-}
-
-// TaskTakeSuccess 查询单任务 - 任务完成
-func (j *JobsGorm) TaskTakeSuccess(tx *gorm.DB, customId string) jobs_gorm_model.Task {
-	return j.taskTake(tx, customId, TASK_SUCCESS)
-}
-
-// TaskTakeError 查询单任务 - 任务异常
-func (j *JobsGorm) TaskTakeError(tx *gorm.DB, customId string) jobs_gorm_model.Task {
-	return j.taskTake(tx, customId, TASK_ERROR)
-}
-
-// TaskTakeTimeout 查询单任务 - 任务超时
-func (j *JobsGorm) TaskTakeTimeout(tx *gorm.DB, customId string) jobs_gorm_model.Task {
-	return j.taskTake(tx, customId, TASK_TIMEOUT)
-}
-
-// TaskTakeWait 查询单任务 - 任务等待
-func (j *JobsGorm) TaskTakeWait(tx *gorm.DB, customId string) jobs_gorm_model.Task {
-	return j.taskTake(tx, customId, TASK_WAIT)
-}
-
-// TaskTypeTake 查询单任务
-func (j *JobsGorm) TaskTypeTake(tx *gorm.DB, customId, Type string) (result jobs_gorm_model.Task) {
-	tx.Where("custom_id = ?", customId).Where("type = ?", Type).Take(&result)
-	return result
-}
-
-// 查询单任务
-func (j *JobsGorm) taskTypeTake(tx *gorm.DB, customId, Type, status string) (result jobs_gorm_model.Task) {
-	tx.Where("custom_id = ?", customId).Where("type = ?", Type).Where("status = ?", status).Take(&result)
-	return result
-}
-
-// TaskTypeTakeIn 查询单任务 - 任务运行
-func (j *JobsGorm) TaskTypeTakeIn(tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
-	return j.taskTypeTake(tx, customId, Type, TASK_IN)
-}
-
-// TaskTypeTakeSuccess 查询单任务 - 任务完成
-func (j *JobsGorm) TaskTypeTakeSuccess(tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
-	return j.taskTypeTake(tx, customId, Type, TASK_SUCCESS)
-}
-
-// TaskTypeTakeError 查询单任务 - 任务异常
-func (j *JobsGorm) TaskTypeTakeError(tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
-	return j.taskTypeTake(tx, customId, Type, TASK_ERROR)
-}
-
-// TaskTypeTakeTimeout 查询单任务 - 任务超时
-func (j *JobsGorm) TaskTypeTakeTimeout(tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
-	return j.taskTypeTake(tx, customId, Type, TASK_TIMEOUT)
-}
-
-// TaskTypeTakeWait 查询单任务 - 任务等待
-func (j *JobsGorm) TaskTypeTakeWait(tx *gorm.DB, customId, Type string) jobs_gorm_model.Task {
-	return j.taskTypeTake(tx, customId, Type, TASK_WAIT)
-}
-
-// TaskFindAll 查询多任务
-func (j *JobsGorm) TaskFindAll(tx *gorm.DB, frequency int64) (results []jobs_gorm_model.Task) {
-	tx.Where("frequency = ?", frequency).Order("id asc").Find(&results)
-	return results
-}
-
-// 查询多任务
-func (j *JobsGorm) taskFindAll(tx *gorm.DB, frequency int64, status string) (results []jobs_gorm_model.Task) {
-	tx.Where("frequency = ?", frequency).Where("status = ?", status).Order("id asc").Find(&results)
-	return results
-}
-
-// TaskFindAllIn 查询多任务 - 任务运行
-func (j *JobsGorm) TaskFindAllIn(tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
-	return j.taskFindAll(tx, frequency, TASK_IN)
-}
-
-// TaskFindAllSuccess 查询多任务 - 任务完成
-func (j *JobsGorm) TaskFindAllSuccess(tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
-	return j.taskFindAll(tx, frequency, TASK_SUCCESS)
-}
-
-// TaskFindAllError 查询多任务 - 任务异常
-func (j *JobsGorm) TaskFindAllError(tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
-	return j.taskFindAll(tx, frequency, TASK_ERROR)
-}
-
-// TaskFindAllTimeout 查询多任务 - 任务超时
-func (j *JobsGorm) TaskFindAllTimeout(tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
-	return j.taskFindAll(tx, frequency, TASK_TIMEOUT)
-}
-
-// TaskFindAllWait 查询多任务 - 任务等待
-func (j *JobsGorm) TaskFindAllWait(tx *gorm.DB, frequency int64) []jobs_gorm_model.Task {
-	return j.taskFindAll(tx, frequency, TASK_WAIT)
-}
-
-// EditTask 任务修改
-func (j *JobsGorm) EditTask(tx *gorm.DB, id uint) *gorm.DB {
-	return tx.Model(&jobs_gorm_model.Task{}).Where("id = ?", id)
-}
-
-// UpdateFrequency 更新任务频率
-func (j *JobsGorm) UpdateFrequency(tx *gorm.DB, id uint, frequency int64) *gorm.DB {
-	return j.EditTask(tx, id).
-		Select("frequency").
-		Updates(jobs_gorm_model.Task{
-			Frequency: frequency,
-		})
-}
-
-func (j *JobsGorm) taskIpTake(tx *gorm.DB, taskType, ips string) (result jobs_gorm_model.TaskIp) {
-	tx.Where("task_type = ?", taskType).Where("ips = ?", ips).Take(&result)
-	return result
-}
-
-// TaskIpUpdate 更新ip
-func (j *JobsGorm) TaskIpUpdate(tx *gorm.DB, taskType, ips string) *gorm.DB {
-	query := j.taskIpTake(tx, taskType, ips)
-	if query.Id != 0 {
-		return tx
-	}
-	updateStatus := tx.Create(&jobs_gorm_model.TaskIp{
-		TaskType: taskType,
-		Ips:      ips,
-	})
-	if updateStatus.RowsAffected == 0 {
-		log.Println("任务更新失败：", updateStatus.Error)
-	}
-	return updateStatus
-}
-
-// TaskIpInit 实例任务ip
-func (j *JobsGorm) TaskIpInit(tx *gorm.DB, ips map[string]string) bool {
-	if j.config.outsideIp == "" || j.config.outsideIp == "0.0.0.0" {
-		return false
-	}
-	tx.Where("ips = ?", j.config.outsideIp).Delete(&jobs_gorm_model.TaskIp{}) // 删除
-	for k, v := range ips {
-		if v == "" {
-			j.TaskIpUpdate(tx, k, j.config.outsideIp)
-		} else {
-			find := strings.Contains(v, ",")
-			if find == true {
-				// 包含
-				parts := strings.Split(v, ",")
-				for _, vv := range parts {
-					if vv == j.config.outsideIp {
-						j.TaskIpUpdate(tx, k, j.config.outsideIp)
-					}
-				}
-			} else {
-				// 不包含
-				if v == j.config.outsideIp {
-					j.TaskIpUpdate(tx, k, j.config.outsideIp)
-				}
-			}
-		}
-	}
-	return true
-}
-
-// TaskLogRunTake 查询任务执行日志
-func (j *JobsGorm) TaskLogRunTake(tx *gorm.DB, taskId uint, runId string) (result jobs_gorm_model.TaskLogRun) {
-	tx.Select("id", "os", "arch", "outside_ip", "created_at").Where("task_id = ?", taskId).Where("run_id = ?", runId).Take(&result)
-	return result
-}

jobs_gorm_model/task.go

@@ -7,28 +7,29 @@ import (
 
 // Task 任务
 type Task struct {
-	Id             uint           `gorm:"primaryKey;comment:记录编号" json:"id"`             // 记录编号
-	Status         string         `gorm:"index;comment:状态码" json:"status"`               // 状态码
-	Params         string         `gorm:"comment:参数" json:"params"`                      // 参数
-	ParamsType     string         `gorm:"comment:参数类型" json:"params_type"`               // 参数类型
-	StatusDesc     string         `gorm:"comment:状态描述" json:"status_desc"`               // 状态描述
-	Frequency      int64          `gorm:"index;comment:频率(秒单位)" json:"frequency"`        // 频率(秒单位)
-	Number         int64          `gorm:"comment:当前次数" json:"number"`                    // 当前次数
-	MaxNumber      int64          `gorm:"comment:最大次数" json:"max_number"`                // 最大次数
-	RunId          string         `gorm:"index;comment:执行编号" json:"run_id"`              // 执行编号
-	CustomId       string         `gorm:"index;comment:自定义编号" json:"custom_id"`          // 自定义编号
-	CustomSequence int64          `gorm:"index;comment:自定义顺序" json:"custom_sequence"`    // 自定义顺序
-	Type           string         `gorm:"index;comment:类型" json:"type"`                  // 类型
-	TypeName       string         `gorm:"comment:类型名称" json:"type_name"`                 // 类型名称
-	CreatedIp      string         `gorm:"comment:创建外网IP" json:"created_ip"`              // 创建外网IP
-	SpecifyIp      string         `gorm:"index;comment:指定外网IP" json:"specify_ip"`        // 指定外网IP
-	UpdatedIp      string         `gorm:"comment:更新外网IP" json:"updated_ip"`              // 更新外网IP
-	Result         string         `gorm:"comment:结果" json:"result"`                      // 结果
-	CreatedAt      time.Time      `gorm:"autoCreateTime;comment:创建时间" json:"created_at"` // 创建时间
-	UpdatedAt      time.Time      `gorm:"autoUpdateTime;comment:更新时间" json:"updated_at"` // 更新时间
-	DeletedAt      gorm.DeletedAt `gorm:"index;comment:删除时间" json:"deleted_at"`          // 删除时间
+	Id             uint           `gorm:"primaryKey;comment:记录编号" json:"id"`                      // 记录编号
+	Status         string         `gorm:"index;comment:状态码" json:"status"`                        // 状态码
+	Params         string         `gorm:"comment:参数" json:"params"`                               // 参数
+	ParamsType     string         `gorm:"comment:参数类型" json:"params_type"`                        // 参数类型
+	StatusDesc     string         `gorm:"comment:状态描述" json:"status_desc"`                        // 状态描述
+	Frequency      int64          `gorm:"index;comment:频率(秒单位)" json:"frequency"`                 // 频率(秒单位)
+	Number         int64          `gorm:"comment:当前次数" json:"number"`                             // 当前次数
+	MaxNumber      int64          `gorm:"comment:最大次数" json:"max_number"`                         // 最大次数
+	RunId          string         `gorm:"index;comment:执行编号" json:"run_id"`                       // 执行编号
+	CustomId       string         `gorm:"index;comment:自定义编号" json:"custom_id"`                   // 自定义编号
+	CustomSequence int64          `gorm:"index;comment:自定义顺序" json:"custom_sequence"`             // 自定义顺序
+	Type           string         `gorm:"index;comment:类型" json:"type"`                           // 类型
+	TypeName       string         `gorm:"comment:类型名称" json:"type_name"`                          // 类型名称
+	CreatedIp      string         `gorm:"default:0.0.0.0;comment:创建外网IP" json:"created_ip"`       // 创建外网IP
+	SpecifyIp      string         `gorm:"default:0.0.0.0;index;comment:指定外网IP" json:"specify_ip"` // 指定外网IP
+	UpdatedIp      string         `gorm:"default:0.0.0.0;comment:更新外网IP" json:"updated_ip"`       // 更新外网IP
+	Result         string         `gorm:"comment:结果" json:"result"`                               // 结果
+	NextRunTime    time.Time      `gorm:"comment:下次运行时间" json:"next_run_time"`                    // 下次运行时间
+	CreatedAt      time.Time      `gorm:"autoCreateTime;comment:创建时间" json:"created_at"`          // 创建时间
+	UpdatedAt      time.Time      `gorm:"autoUpdateTime;comment:更新时间" json:"updated_at"`          // 更新时间
+	DeletedAt      gorm.DeletedAt `gorm:"index;comment:删除时间" json:"deleted_at"`                   // 删除时间
 }
 
-func (m *Task) TableName() string {
+func (Task) TableName() string {
 	return "task"
 }

jobs_gorm_model/task_ip.go

@@ -1,12 +0,0 @@
-package jobs_gorm_model
-
-// TaskIp 任务Ip
-type TaskIp struct {
-	Id       int64  `gorm:"primaryKey;comment:记录编号" json:"id"` // 记录编号
-	TaskType string `gorm:"comment:任务编号" json:"task_type"`     // 任务编号
-	Ips      string `gorm:"comment:任务IP" json:"ips"`           // 任务IP
-}
-
-func (m *TaskIp) TableName() string {
-	return "task_ip"
-}

jobs_gorm_model/task_log.go

@@ -4,14 +4,21 @@ import "time"
 
 // TaskLog 任务日志模型
 type TaskLog struct {
-	Id         uint      `gorm:"primaryKey;comment:记录编号" json:"id"`             // 记录编号
-	TaskId     uint      `gorm:"index;comment:任务编号" json:"task_id"`             // 任务编号
-	StatusCode int       `gorm:"index;comment:状态码" json:"status_code"`          // 状态码
-	Desc       string    `gorm:"comment:结果" json:"desc"`                        // 结果
-	Version    string    `gorm:"comment:版本" json:"version"`                     // 版本
-	CreatedAt  time.Time `gorm:"autoCreateTime;comment:创建时间" json:"created_at"` // 创建时间
+	LogId           uint      `gorm:"primaryKey;comment:日志编号" json:"log_id"`                 // 日志编号
+	TaskId          uint      `gorm:"index;comment:任务编号" json:"task_id"`                     // 任务编号
+	TaskRunId       string    `gorm:"comment:执行编号" json:"task_run_id"`                       // 执行编号
+	TaskResultCode  int       `gorm:"index;comment:执行状态码" json:"task_result_code"`           // 执行状态码
+	TaskResultDesc  string    `gorm:"comment:执行结果" json:"task_result_desc"`                  // 执行结果
+	SystemHostName  string    `gorm:"comment:主机名" json:"system_host_name"`                   // 主机名
+	SystemInsideIp  string    `gorm:"default:0.0.0.0;comment:内网ip" json:"system_inside_ip"`  // 内网ip
+	SystemOs        string    `gorm:"comment:系统类型" json:"system_os"`                         // 系统类型
+	SystemArch      string    `gorm:"comment:系统架构" json:"system_arch"`                       // 系统架构
+	GoVersion       string    `gorm:"comment:go版本" json:"go_version"`                        // go版本
+	SdkVersion      string    `gorm:"comment:sdk版本" json:"sdk_version"`                      // sdk版本
+	SystemOutsideIp string    `gorm:"default:0.0.0.0;comment:外网ip" json:"system_outside_ip"` // 外网ip
+	LogTime         time.Time `gorm:"autoCreateTime;comment:日志时间" json:"log_time"`           // 日志时间
 }
 
-func (m *TaskLog) TableName() string {
+func (TaskLog) TableName() string {
 	return "task_log"
 }

jobs_gorm_model/task_log_run.go

@@ -1,22 +0,0 @@
-package jobs_gorm_model
-
-import "time"
-
-// TaskLogRun 任务执行日志模型
-type TaskLogRun struct {
-	Id         uint      `gorm:"primaryKey;comment:记录编号" json:"id"`             // 记录编号
-	TaskId     uint      `gorm:"index;comment:任务编号" json:"task_id"`             // 任务编号
-	RunId      string    `gorm:"comment:执行编号" json:"run_id"`                    // 执行编号
-	OutsideIp  string    `gorm:"comment:外网ip" json:"outside_ip"`                // 外网ip
-	InsideIp   string    `gorm:"comment:内网ip" json:"inside_ip"`                 // 内网ip
-	Os         string    `gorm:"comment:系统类型" json:"os"`                        // 系统类型
-	Arch       string    `gorm:"comment:系统架构" json:"arch"`                      // 系统架构
-	Gomaxprocs int       `gorm:"comment:CPU核数" json:"gomaxprocs"`               // CPU核数
-	GoVersion  string    `gorm:"comment:GO版本" json:"go_version"`                // GO版本
-	MacAddrs   string    `gorm:"comment:Mac地址" json:"mac_addrs"`                // Mac地址
-	CreatedAt  time.Time `gorm:"autoCreateTime;comment:创建时间" json:"created_at"` // 创建时间
-}
-
-func (m *TaskLogRun) TableName() string {
-	return "task_log_run"
-}

jobs_gorm_redis.go

@@ -1,38 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"github.com/go-redis/redis/v9"
-	"log"
-)
-
-// Publish 发布
-// ctx 上下文
-// channel 频道
-// message 消息
-func (j *JobsGorm) Publish(ctx context.Context, channel string, message interface{}) error {
-	publish, err := j.redisClient.Publish(ctx, channel, message).Result()
-	if j.config.debug == true {
-		log.Println("gojobs.Publish", channel, message, publish, err)
-	}
-	return err
-}
-
-type SubscribeResult struct {
-	err     error
-	Message *redis.PubSub
-}
-
-// Subscribe 订阅
-func (j *JobsGorm) Subscribe(ctx context.Context) SubscribeResult {
-	return SubscribeResult{
-		Message: j.redisClient.Subscribe(ctx, j.config.cornKeyPrefix+"_"+j.config.cornKeyCustom),
-	}
-}
-
-// PSubscribe 订阅，支持通配符匹配(ch_user_*)
-func (j *JobsGorm) PSubscribe(ctx context.Context) SubscribeResult {
-	return SubscribeResult{
-		Message: j.redisClient.PSubscribe(ctx, j.config.cornKeyPrefix+"_"+j.config.cornKeyCustom+"_*"),
-	}
-}

jobs_gorm_redis_get.go

@@ -1,96 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"go.dtapp.net/gojobs/jobs_gorm_model"
-	"go.dtapp.net/gostring"
-	"log"
-	"math/rand"
-	"time"
-)
-
-// GetIssueAddress 获取下发地址
-// workers 在线列表
-// v 任务信息
-// ---
-// address 下发地址
-// err 错误信息
-func (j *JobsGorm) GetIssueAddress(workers []string, v *jobs_gorm_model.Task) (address string, err error) {
-	var (
-		currentIp       = ""    // 当前Ip
-		appointIpStatus = false // 指定Ip状态
-	)
-
-	// 赋值ip
-	if v.SpecifyIp != "" {
-		currentIp = v.SpecifyIp
-		appointIpStatus = true
-	}
-
-	// 只有一个客户端在线
-	if len(workers) == 1 {
-		if appointIpStatus == true {
-			// 判断是否指定某ip执行
-			if gostring.Contains(workers[0], currentIp) == true {
-				return j.config.cornKeyPrefix + "_" + v.SpecifyIp, nil
-			}
-			return address, errors.New(fmt.Sprintf("需要执行的[%s]客户端不在线", currentIp))
-		}
-		return j.config.cornKeyPrefix + "_" + workers[0], nil
-	}
-
-	// 优先处理指定某ip执行
-	if appointIpStatus == true {
-		for wk, wv := range workers {
-			if gostring.Contains(wv, currentIp) == true {
-				return j.config.cornKeyPrefix + "_" + workers[wk], nil
-			}
-		}
-		return address, errors.New(fmt.Sprintf("需要执行的[%s]客户端不在线", currentIp))
-	} else {
-		// 随机返回一个
-		zxIp := workers[j.random(0, len(workers))]
-		if zxIp == "" {
-			return address, errors.New("获取执行的客户端异常")
-		}
-		address = j.config.cornKeyPrefix + "_" + zxIp
-		return address, err
-	}
-}
-
-// GetSubscribeClientList 获取在线的客户端
-func (j *JobsGorm) GetSubscribeClientList(ctx context.Context) ([]string, error) {
-
-	if j.config.debug == true {
-		log.Printf("获取在线的客户端：%s\n", j.config.cornKeyPrefix+"_*")
-	}
-
-	// 扫描
-	values, err := j.redisClient.Keys(ctx, j.config.cornKeyPrefix+"_*").Result()
-	if err != nil {
-		if err == errors.New("ERR wrong number of arguments for 'mget' command") {
-			return []string{}, nil
-		}
-		return nil, errors.New(fmt.Sprintf("获取失败：%s", err.Error()))
-	}
-
-	client := make([]string, 0, len(values))
-	for _, val := range values {
-		client = append(client, val.(string))
-	}
-
-	return client, nil
-}
-
-// 随机返回一个
-// min最小
-// max最大
-func (j *JobsGorm) random(min, max int) int {
-	if max-min <= 0 {
-		return 0
-	}
-	rand.Seed(time.Now().Unix())
-	return rand.Intn(max-min) + min
-}

jobs_gorm_redis_ping.go

@@ -1,22 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"github.com/robfig/cron/v3"
-	"log"
-	"time"
-)
-
-// Ping 心跳
-func (j *JobsGorm) Ping(ctx context.Context) {
-	c := cron.New(cron.WithSeconds())
-	_, _ = c.AddFunc(GetSeconds(2).Spec(), func() {
-		result, err := j.redisClient.Set(ctx, j.config.cornKeyPrefix+"_"+j.config.cornKeyCustom, j.config.cornKeyCustom, 3*time.Second).Result()
-		if j.config.debug == true {
-			log.Println("JOBS心跳", j.config.cornKeyPrefix+"_"+j.config.cornKeyCustom, j.config.cornKeyCustom, result, err)
-		}
-	})
-	c.Start()
-	defer c.Stop()
-	select {}
-}

jobs_gorm_redis_test.go

@@ -1,112 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"fmt"
-	"github.com/go-redis/redis/v9"
-	"go.dtapp.net/gotime"
-	"testing"
-)
-import "go.dtapp.net/dorm"
-
-// 下发
-func TestRedisPublish(t *testing.T) {
-	client, err := dorm.NewRedisClient(&dorm.ConfigRedisClient{
-		Addr:     "119.29.14.159:6379",
-		Password: "980202",
-		DB:       5,
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	publish, err := client.Db.Publish(context.Background(), "ch_user_1", "测试").Result()
-	t.Log(publish)
-	t.Log(err)
-}
-
-// 订阅
-func TestRedisPSubscribe(t *testing.T) {
-	client, err := dorm.NewRedisClient(&dorm.ConfigRedisClient{
-		Addr:     "119.29.14.159:6379",
-		Password: "980202",
-		DB:       5,
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	// 订阅channel1这个channel
-	sub := client.Db.PSubscribe(context.Background(), "ch_user_*")
-	t.Log(sub)
-	// sub.Channel() 返回go channel，可以循环读取redis服务器发过来的消息
-	for msg := range sub.Channel() {
-		// 打印收到的消息
-		t.Log(msg.Channel)
-		t.Log(msg.Payload)
-	}
-}
-
-// 添加一个或者多个元素到集合，如果元素已经存在则更新分数
-func TestRedisZAdd(t *testing.T) {
-	client, err := dorm.NewRedisClient(&dorm.ConfigRedisClient{
-		Addr:     "119.29.14.159:6379",
-		Password: "980202",
-		DB:       5,
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	// 删除小于当前时间的客户端
-	client.Db.ZRemRangeByScore(context.Background(), "cron_jobs", "0", fmt.Sprintf("(%v", gotime.Current().Timestamp())).Result()
-
-	// 添加客户端或者更新客户端
-	publish, err := client.Db.ZAdd(context.Background(), "cron_jobs", redis.Z{
-		Score:  float64(gotime.Current().AfterMinute(10).Timestamp()),
-		Member: "127.0.0.1",
-	}).Result()
-	t.Log(publish)
-	t.Log(err)
-}
-
-// 返回集合中某个索引范围的元素，根据分数从小到大排序
-func TestRedisZRange(t *testing.T) {
-	client, err := dorm.NewRedisClient(&dorm.ConfigRedisClient{
-		Addr:     "119.29.14.159:6379",
-		Password: "980202",
-		DB:       5,
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	vals, err := client.Db.ZRange(context.Background(), "cron_jobs", 0, -1).Result()
-	t.Log(err)
-
-	for _, val := range vals {
-		t.Log(val)
-	}
-
-}
-
-func TestRedisKeys(t *testing.T) {
-	client, err := dorm.NewRedisClient(&dorm.ConfigRedisClient{
-		Addr:     "119.29.14.159:6379",
-		Password: "980202",
-		DB:       5,
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	client.Db.Set(context.Background(), "cron_jobs_client_127.0.0.1", "127.0.0.1", 0)
-	client.Db.Set(context.Background(), "cron_jobs_client_43.135.79.235", "43.135.79.235", 0)
-
-	result, err := client.Keys(context.Background(), "cron_jobs_client_*").Result()
-	t.Log(result)
-	t.Log(err)
-	for _, val := range result {
-		t.Log(val)
-	}
-}

jobs_test.go

@@ -1,13 +0,0 @@
-package gojobs
-
-import "testing"
-
-func TestJobs1(t *testing.T) {
-	//t.Log(NewJobsGorm(&ConfigJobsGorm{
-	//	MainService: 0,
-	//	Db:          nil,
-	//	Redis:       nil,
-	//}).Run())
-	//t.Log(NewJobsXorm().Run())
-	//t.Log(NewJobsZorm().Run())
-}

jobs_xorm.go

@@ -1,21 +0,0 @@
-package gojobs
-
-import "xorm.io/xorm"
-
-// Xorm数据库驱动
-type jobsXorm struct {
-	db *xorm.Engine
-}
-
-// NewJobsXorm 初始化
-func NewJobsXorm(db *xorm.Engine) *jobsXorm {
-	var (
-		j = &jobsXorm{}
-	)
-	j.db = db
-	return j
-}
-
-func (j *jobsXorm) Run() {
-
-}

jobs_xorm_model/task.go

@@ -1,28 +0,0 @@
-package jobs_xorm_model
-
-// Task 任务
-type Task struct {
-	Id             uint   `xorm:"pk autoincr" json:"id"`     // 记录编号
-	Status         string `json:"status"`                    // 状态码
-	Params         string `json:"params"`                    // 参数
-	ParamsType     string `json:"params_type"`               // 参数类型
-	StatusDesc     string `json:"status_desc"`               // 状态描述
-	Frequency      int64  `json:"frequency"`                 // 频率（秒单位）
-	Number         int64  `json:"number"`                    // 当前次数
-	MaxNumber      int64  `json:"max_number"`                // 最大次数
-	RunId          string `json:"run_id"`                    // 执行编号
-	CustomId       string `json:"custom_id"`                 // 自定义编号
-	CustomSequence int64  `json:"custom_sequence"`           // 自定义顺序
-	Type           string `json:"type"`                      // 类型
-	CreatedIp      string `json:"created_ip"`                // 创建外网IP
-	SpecifyIp      string `json:"specify_ip"`                // 指定外网IP
-	UpdatedIp      string `json:"updated_ip"`                // 更新外网IP
-	Result         string `json:"result"`                    // 结果
-	CreatedAt      string `xorm:"created" json:"created_at"` // 创建时间
-	UpdatedAt      string `xorm:"created" json:"updated_at"` // 更新时间
-	DeletedAt      string `xorm:"deleted" json:"deleted_at"` // 删除时间
-}
-
-func (m *Task) TableName() string {
-	return "task"
-}

jobs_xorm_model/task_ip.go

@@ -1,12 +0,0 @@
-package jobs_xorm_model
-
-// TaskIp 任务Ip
-type TaskIp struct {
-	Id       int64  `xorm:"pk autoincr" json:"id"`
-	TaskType string `json:"task_type"` // 任务编号
-	Ips      string `json:"ips"`       // 任务IP
-}
-
-func (m *TaskIp) TableName() string {
-	return "task_ip"
-}

jobs_xorm_model/task_log.go

@@ -1,15 +0,0 @@
-package jobs_xorm_model
-
-// TaskLog 任务日志模型
-type TaskLog struct {
-	Id         uint   `xorm:"pk autoincr" json:"id"`     // 记录编号
-	TaskId     uint   `json:"task_id"`                   // 任务编号
-	StatusCode int    `json:"status_code"`               // 状态码
-	Desc       string `json:"desc"`                      // 结果
-	Version    int    `json:"version"`                   // 版本
-	CreatedAt  string `xorm:"created" json:"created_at"` // 创建时间
-}
-
-func (m *TaskLog) TableName() string {
-	return "task_log"
-}

jobs_xorm_model/task_log_run.go

@@ -1,20 +0,0 @@
-package jobs_xorm_model
-
-// TaskLogRun 任务执行日志模型
-type TaskLogRun struct {
-	Id         uint   `xorm:"pk autoincr" json:"id"`     // 记录编号
-	TaskId     uint   `json:"task_id"`                   // 任务编号
-	RunId      string `json:"run_id"`                    // 执行编号
-	OutsideIp  string `json:"outside_ip"`                // 外网ip
-	InsideIp   string `json:"inside_ip"`                 // 内网ip
-	Os         string `json:"os"`                        // 系统类型
-	Arch       string `json:"arch"`                      // 系统架构
-	Gomaxprocs int    `json:"gomaxprocs"`                // CPU核数
-	GoVersion  string `json:"go_version"`                // GO版本
-	MacAddrs   string `json:"mac_addrs"`                 // Mac地址
-	CreatedAt  string `xorm:"created" json:"created_at"` // 创建时间
-}
-
-func (m *TaskLogRun) TableName() string {
-	return "task_log_run"
-}

lock.go

@@ -0,0 +1,24 @@
+package gojobs
+
+import (
+	"context"
+	"fmt"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gotime"
+	"time"
+)
+
+// Lock 上锁
+func (c *Client) Lock(ctx context.Context, info jobs_gorm_model.Task, id any) (string, error) {
+	return c.cache.redisLockClient.Lock(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, id), fmt.Sprintf("[Lock] 已在%s@%s机器上锁成功，时间：%v", c.config.systemInsideIp, c.config.systemOutsideIp, gotime.Current().Format()), time.Duration(info.Frequency)*3*time.Second)
+}
+
+// Unlock Lock 解锁
+func (c *Client) Unlock(ctx context.Context, info jobs_gorm_model.Task, id any) error {
+	return c.cache.redisLockClient.Unlock(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, id))
+}
+
+// LockForever 永远上锁
+func (c *Client) LockForever(ctx context.Context, info jobs_gorm_model.Task, id any) (string, error) {
+	return c.cache.redisLockClient.LockForever(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, id), fmt.Sprintf("[LockForever] 已在%s@%s机器永远上锁成功，时间：%v", c.config.systemInsideIp, c.config.systemOutsideIp, gotime.Current().Format()))
+}

lock_custom_id.go

@@ -0,0 +1,24 @@
+package gojobs
+
+import (
+	"context"
+	"fmt"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gotime"
+	"time"
+)
+
+// LockCustomId 上锁
+func (c *Client) LockCustomId(ctx context.Context, info jobs_gorm_model.Task) (string, error) {
+	return c.cache.redisLockClient.Lock(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, info.CustomId), fmt.Sprintf("[LockCustomId] 已在%s@%s机器上锁成功，时间：%v", c.config.systemInsideIp, c.config.systemOutsideIp, gotime.Current().Format()), time.Duration(info.Frequency)*3*time.Second)
+}
+
+// UnlockCustomId 解锁
+func (c *Client) UnlockCustomId(ctx context.Context, info jobs_gorm_model.Task) error {
+	return c.cache.redisLockClient.Unlock(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, info.CustomId))
+}
+
+// LockForeverCustomId 永远上锁
+func (c *Client) LockForeverCustomId(ctx context.Context, info jobs_gorm_model.Task) (string, error) {
+	return c.cache.redisLockClient.LockForever(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, info.CustomId), fmt.Sprintf("[LockCustomId] 已在%s@%s机器永远上锁成功，时间：%v", c.config.systemInsideIp, c.config.systemOutsideIp, gotime.Current().Format()))
+}

lock_id.go

@@ -0,0 +1,24 @@
+package gojobs
+
+import (
+	"context"
+	"fmt"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gotime"
+	"time"
+)
+
+// LockId 上锁
+func (c *Client) LockId(ctx context.Context, info jobs_gorm_model.Task) (string, error) {
+	return c.cache.redisLockClient.Lock(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, info.Id), fmt.Sprintf("[LockId] 已在%s@%s机器上锁成功，时间：%v", c.config.systemInsideIp, c.config.systemOutsideIp, gotime.Current().Format()), time.Duration(info.Frequency)*3*time.Second)
+}
+
+// UnlockId 解锁
+func (c *Client) UnlockId(ctx context.Context, info jobs_gorm_model.Task) error {
+	return c.cache.redisLockClient.Unlock(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, info.Id))
+}
+
+// LockForeverId 永远上锁
+func (c *Client) LockForeverId(ctx context.Context, info jobs_gorm_model.Task) (string, error) {
+	return c.cache.redisLockClient.LockForever(ctx, fmt.Sprintf("%s%s%v%s%v", c.cache.lockKeyPrefix, c.cache.lockKeySeparator, info.Type, c.cache.lockKeySeparator, info.Id), fmt.Sprintf("[LockForeverId] 已在%s@%s机器永远上锁成功，时间：%v", c.config.systemInsideIp, c.config.systemOutsideIp, gotime.Current().Format()))
+}

master_test.go

@@ -1,51 +0,0 @@
-package gojobs
-
-import (
-	"context"
-	"github.com/robfig/cron/v3"
-	"go.dtapp.net/dorm"
-	"log"
-	"testing"
-)
-
-func TestMasterRedis(t *testing.T) {
-
-	client, err := dorm.NewRedisClient(&dorm.ConfigRedisClient{
-		Addr:     "119.29.14.159:6379",
-		Password: "980202",
-		DB:       5,
-	})
-	if err != nil {
-		t.Error(err)
-	}
-
-	// 创建一个cron实例 精确到秒
-	c := cron.New(cron.WithSeconds())
-
-	// 每隔5秒执行一次
-	_, _ = c.AddFunc(GetSeconds(5).Spec(), func() {
-
-		log.Println("每隔5秒执行一次")
-
-		publish, err := client.Db.Publish(context.Background(), "test_cron_127.0.0.1", "每隔5秒执行一次").Result()
-		t.Log(publish)
-		t.Log(err)
-	})
-
-	// 每隔10秒执行一次
-	_, _ = c.AddFunc(GetSeconds(10).Spec(), func() {
-
-		log.Println("每隔10秒执行一次")
-
-		publish, err := client.Db.Publish(context.Background(), "test_cron_127.0.0.1", "每隔10秒执行一次").Result()
-		t.Log(publish)
-		t.Log(err)
-	})
-
-	// 启动任务
-	c.Start()
-
-	// 关闭任务
-	defer c.Stop()
-	select {}
-}

model.go

@@ -0,0 +1,66 @@
+package gojobs
+
+import (
+	"context"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gotime"
+	"go.dtapp.net/gotrace_id"
+)
+
+// 创建模型
+func (c *Client) autoMigrateTask(ctx context.Context) {
+	err := c.gormClient.GetDb().AutoMigrate(&jobs_gorm_model.Task{})
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("创建模型：%s", err)
+	}
+}
+
+// 创建模型
+func (c *Client) autoMigrateTaskLog(ctx context.Context) {
+	err := c.gormClient.GetDb().AutoMigrate(&jobs_gorm_model.TaskLog{})
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("创建模型：%s", err)
+	}
+}
+
+// GormTaskLogDelete 删除
+func (c *Client) GormTaskLogDelete(ctx context.Context, hour int64) error {
+	err := c.gormClient.GetDb().Where("log_time < ?", gotime.Current().BeforeHour(hour).Format()).Delete(&jobs_gorm_model.TaskLog{}).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("删除失败：%s", err)
+	}
+	return err
+}
+
+// TaskLogRecord 记录
+func (c *Client) TaskLogRecord(ctx context.Context, task jobs_gorm_model.Task, taskResultCode int, taskResultDesc string) {
+	runId := gotrace_id.GetTraceIdContext(ctx)
+	c.GormTaskLogRecord(ctx, task, runId, taskResultCode, taskResultDesc)
+	if c.mongoConfig.stats {
+		c.MongoTaskLogRecord(ctx, task, runId, taskResultCode, taskResultDesc)
+	}
+}
+
+// GormTaskLogRecord 记录
+func (c *Client) GormTaskLogRecord(ctx context.Context, task jobs_gorm_model.Task, runId string, taskResultCode int, taskResultDesc string) {
+
+	taskLog := jobs_gorm_model.TaskLog{
+		TaskId:          task.Id,
+		TaskRunId:       runId,
+		TaskResultCode:  taskResultCode,
+		TaskResultDesc:  taskResultDesc,
+		SystemHostName:  c.config.systemHostname,
+		SystemInsideIp:  c.config.systemInsideIp,
+		SystemOs:        c.config.systemOs,
+		SystemArch:      c.config.systemKernel,
+		GoVersion:       c.config.goVersion,
+		SdkVersion:      c.config.sdkVersion,
+		SystemOutsideIp: c.config.systemOutsideIp,
+	}
+	err := c.gormClient.GetDb().Create(&taskLog).Error
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录失败：%s", err)
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录数据：%+v", taskLog)
+	}
+
+}

model_task_log.go

@@ -0,0 +1,118 @@
+package gojobs
+
+import (
+	"context"
+	"go.dtapp.net/dorm"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/golog"
+	"go.dtapp.net/gotime"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+// TaskLog 任务日志模型
+type TaskLog struct {
+	LogId   primitive.ObjectID `json:"log_id,omitempty" bson:"_id,omitempty"` //【记录】编号
+	LogTime primitive.DateTime `json:"log_time,omitempty" bson:"log_time"`    //【记录】时间
+	Task    struct {
+		Id         uint   `json:"id" bson:"id"`                   //【任务】编号
+		RunId      string `json:"run_id" bson:"run_id"`           //【任务】执行编号
+		ResultCode int    `json:"result_code" bson:"result_code"` //【任务】执行状态码
+		ResultDesc string `json:"result_desc" bson:"result_desc"` //【任务】执行结果
+		ResultTime string `json:"result_time" bson:"result_time"` //【任务】执行时间
+	} `json:"task,omitempty" bson:"task,omitempty"` //【任务】信息
+	System struct {
+		Hostname        string  `json:"hostname" bson:"hostname"`                                       //【系统】主机名
+		Os              string  `json:"os" bson:"os"`                                                   //【系统】系统类型
+		Version         string  `json:"version" bson:"version"`                                         //【系统】系统版本
+		Kernel          string  `json:"kernel" bson:"kernel"`                                           //【系统】系统内核
+		KernelVersion   string  `json:"kernel_version" bson:"kernel_version"`                           //【系统】系统内核版本
+		BootTime        string  `json:"boot_time" bson:"boot_time"`                                     //【系统】系统开机时间
+		CpuCores        int     `json:"cpu_cores,omitempty" bson:"cpu_cores,omitempty"`                 //【系统】CPU核数
+		CpuModelName    string  `json:"cpu_model_name,omitempty" bson:"cpu_model_name,omitempty"`       //【系统】CPU型号名称
+		CpuMhz          float64 `json:"cpu_mhz,omitempty" bson:"cpu_mhz,omitempty"`                     //【系统】CPU兆赫
+		InsideIp        string  `json:"inside_ip" bson:"inside_ip"`                                     //【系统】内网ip
+		OutsideIp       string  `json:"outside_ip" bson:"outside_ip"`                                   //【系统】外网ip
+		GoVersion       string  `json:"go_version,omitempty" bson:"go_version,omitempty"`               //【系统】go版本
+		SdkVersion      string  `json:"sdk_version,omitempty" bson:"sdk_version,omitempty"`             //【系统】sdk版本
+		MongoVersion    string  `json:"mongo_version,omitempty" bson:"mongo_version,omitempty"`         //【系统】mongo版本
+		MongoSdkVersion string  `json:"mongo_sdk_version,omitempty" bson:"mongo_sdk_version,omitempty"` //【系统】mongo sdk版本
+		RedisVersion    string  `json:"redis_version,omitempty" bson:"redis_version,omitempty"`         //【系统】redis版本
+		RedisSdkVersion string  `json:"redis_sdk_version,omitempty" bson:"redis_sdk_version,omitempty"` //【系统】redis sdk版本
+		LogVersion      string  `json:"log_version,omitempty" bson:"log_version,omitempty"`             //【系统】log版本
+	} `json:"system,omitempty" bson:"system,omitempty"` //【系统】信息
+}
+
+func (TaskLog) CollectionName() string {
+	return "task_log"
+}
+
+// 创建时间序列集合
+func (TaskLog) createCollection(ctx context.Context, zapLog *golog.ZapLog, db *dorm.MongoClient, databaseName string) {
+	err := db.Database(databaseName).CreateCollection(ctx, TaskLog{}.CollectionName(), options.CreateCollection().SetTimeSeriesOptions(options.TimeSeries().SetTimeField("log_time")))
+	if err != nil {
+		zapLog.WithTraceId(ctx).Sugar().Errorf("创建时间序列集合：%s", err)
+	}
+}
+
+// 创建索引
+func (TaskLog) createIndexes(ctx context.Context, zapLog *golog.ZapLog, db *dorm.MongoClient, databaseName string) {
+	_, err := db.Database(databaseName).Collection(TaskLog{}.CollectionName()).CreateManyIndexes(ctx, []mongo.IndexModel{{
+		Keys: bson.D{{
+			Key:   "log_time",
+			Value: -1,
+		}},
+	}})
+	if err != nil {
+		zapLog.WithTraceId(ctx).Sugar().Errorf("创建索引：%s", err)
+	}
+}
+
+// MongoTaskLogRecord 记录
+func (c *Client) MongoTaskLogRecord(ctx context.Context, task jobs_gorm_model.Task, runId string, taskResultCode int, taskResultDesc string) {
+
+	taskLog := TaskLog{
+		LogId:   primitive.NewObjectID(),
+		LogTime: primitive.NewDateTimeFromTime(gotime.Current().Time),
+	}
+
+	taskLog.Task.Id = task.Id
+	taskLog.Task.RunId = runId
+	taskLog.Task.ResultCode = taskResultCode
+	taskLog.Task.ResultDesc = taskResultDesc
+	taskLog.Task.ResultTime = gotime.Current().Format()
+
+	taskLog.System.Hostname = c.config.systemHostname                                                                //【系统】主机名
+	taskLog.System.Os = c.config.systemOs                                                                            //【系统】系统类型
+	taskLog.System.Version = c.config.systemVersion                                                                  //【系统】系统版本
+	taskLog.System.Kernel = c.config.systemKernel                                                                    //【系统】系统内核
+	taskLog.System.KernelVersion = c.config.systemKernelVersion                                                      //【系统】系统内核版本
+	taskLog.System.BootTime = gotime.SetCurrent(gotime.SetCurrentUnix(int64(c.config.systemBootTime)).Time).Format() //【系统】系统开机时间
+	taskLog.System.CpuCores = c.config.cpuCores                                                                      //【系统】CPU核数
+	taskLog.System.CpuModelName = c.config.cpuModelName                                                              //【程序】CPU型号名称
+	taskLog.System.CpuMhz = c.config.cpuMhz                                                                          //【系统】CPU兆赫
+	taskLog.System.InsideIp = c.config.systemInsideIp                                                                //【系统】内网ip
+	taskLog.System.OutsideIp = c.config.systemOutsideIp                                                              //【系统】外网ip
+	taskLog.System.GoVersion = c.config.goVersion                                                                    //【系统】Go版本
+	taskLog.System.SdkVersion = c.config.sdkVersion                                                                  //【系统】Sdk版本
+	taskLog.System.MongoVersion = c.config.mongoVersion                                                              //【系统】mongo版本
+	taskLog.System.MongoSdkVersion = c.config.mongoSdkVersion                                                        //【系统】mongo sdk版本
+	taskLog.System.RedisVersion = c.config.redisVersion                                                              //【系统】redis版本
+	taskLog.System.RedisSdkVersion = c.config.redisSdkVersion                                                        //【系统】redis sdk版本
+	taskLog.System.LogVersion = c.config.logVersion                                                                  //【系统】log版本
+
+	_, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(TaskLog{}.CollectionName()).InsertOne(ctx, taskLog)
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录失败：%s", err)
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录数据：%+v", taskLog)
+	}
+
+}
+
+// MongoTaskLogDelete 删除
+func (c *Client) MongoTaskLogDelete(ctx context.Context, hour int64) (*mongo.DeleteResult, error) {
+	filter := bson.D{{"log_time", bson.D{{"$lt", primitive.NewDateTimeFromTime(gotime.Current().BeforeHour(hour).Time)}}}}
+	return c.mongoClient.Database(c.mongoConfig.databaseName).Collection(TaskLog{}.CollectionName()).DeleteMany(ctx, filter)
+}

pb/basics.pb.go

@@ -1,221 +0,0 @@
-// 版本
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.4
-// source: pb/basics.proto
-
-// 包名
-
-package pb
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// 请求消息
-type BasicsRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
-}
-
-func (x *BasicsRequest) Reset() {
-	*x = BasicsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_basics_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BasicsRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BasicsRequest) ProtoMessage() {}
-
-func (x *BasicsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_basics_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BasicsRequest.ProtoReflect.Descriptor instead.
-func (*BasicsRequest) Descriptor() ([]byte, []int) {
-	return file_pb_basics_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *BasicsRequest) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-// 响应消息
-type BasicsResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
-}
-
-func (x *BasicsResponse) Reset() {
-	*x = BasicsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_basics_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BasicsResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BasicsResponse) ProtoMessage() {}
-
-func (x *BasicsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_basics_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BasicsResponse.ProtoReflect.Descriptor instead.
-func (*BasicsResponse) Descriptor() ([]byte, []int) {
-	return file_pb_basics_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *BasicsResponse) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-var File_pb_basics_proto protoreflect.FileDescriptor
-
-var file_pb_basics_proto_rawDesc = []byte{
-	0x0a, 0x0f, 0x70, 0x62, 0x2f, 0x62, 0x61, 0x73, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x29, 0x0a, 0x0d, 0x42, 0x61, 0x73, 0x69, 0x63, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x22, 0x2a, 0x0a, 0x0e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x6a, 0x0a, 0x06,
-	0x42, 0x61, 0x73, 0x69, 0x63, 0x73, 0x12, 0x2f, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x11,
-	0x2e, 0x70, 0x62, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x04, 0x50, 0x6f, 0x6e, 0x67, 0x12,
-	0x11, 0x2e, 0x70, 0x62, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2e, 0x2f, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pb_basics_proto_rawDescOnce sync.Once
-	file_pb_basics_proto_rawDescData = file_pb_basics_proto_rawDesc
-)
-
-func file_pb_basics_proto_rawDescGZIP() []byte {
-	file_pb_basics_proto_rawDescOnce.Do(func() {
-		file_pb_basics_proto_rawDescData = protoimpl.X.CompressGZIP(file_pb_basics_proto_rawDescData)
-	})
-	return file_pb_basics_proto_rawDescData
-}
-
-var file_pb_basics_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pb_basics_proto_goTypes = []interface{}{
-	(*BasicsRequest)(nil),  // 0: pb.BasicsRequest
-	(*BasicsResponse)(nil), // 1: pb.BasicsResponse
-}
-var file_pb_basics_proto_depIdxs = []int32{
-	0, // 0: pb.Basics.Ping:input_type -> pb.BasicsRequest
-	0, // 1: pb.Basics.Pong:input_type -> pb.BasicsRequest
-	1, // 2: pb.Basics.Ping:output_type -> pb.BasicsResponse
-	1, // 3: pb.Basics.Pong:output_type -> pb.BasicsResponse
-	2, // [2:4] is the sub-list for method output_type
-	0, // [0:2] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pb_basics_proto_init() }
-func file_pb_basics_proto_init() {
-	if File_pb_basics_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pb_basics_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BasicsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pb_basics_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BasicsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pb_basics_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_pb_basics_proto_goTypes,
-		DependencyIndexes: file_pb_basics_proto_depIdxs,
-		MessageInfos:      file_pb_basics_proto_msgTypes,
-	}.Build()
-	File_pb_basics_proto = out.File
-	file_pb_basics_proto_rawDesc = nil
-	file_pb_basics_proto_goTypes = nil
-	file_pb_basics_proto_depIdxs = nil
-}

pb/basics.proto

@@ -1,25 +0,0 @@
-// 版本
-syntax = "proto3";
-
-// 包名
-package pb;
-
-// 别名
-option go_package = "../pb";
-
-// 定义服务
-service Basics{
-  // 心跳
-  rpc Ping(BasicsRequest) returns (BasicsResponse){};
-  // 心跳
-  rpc Pong(BasicsRequest) returns (BasicsResponse){};
-}
-// 请求消息
-message BasicsRequest {
-  string message = 1;
-}
-
-// 响应消息
-message BasicsResponse {
-  string message = 1;
-}

pb/basics_grpc.pb.go

@@ -1,145 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.19.4
-// source: pb/basics.proto
-
-package pb
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// BasicsClient is the client API for Basics service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type BasicsClient interface {
-	// 心跳
-	Ping(ctx context.Context, in *BasicsRequest, opts ...grpc.CallOption) (*BasicsResponse, error)
-	// 心跳
-	Pong(ctx context.Context, in *BasicsRequest, opts ...grpc.CallOption) (*BasicsResponse, error)
-}
-
-type basicsClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewBasicsClient(cc grpc.ClientConnInterface) BasicsClient {
-	return &basicsClient{cc}
-}
-
-func (c *basicsClient) Ping(ctx context.Context, in *BasicsRequest, opts ...grpc.CallOption) (*BasicsResponse, error) {
-	out := new(BasicsResponse)
-	err := c.cc.Invoke(ctx, "/pb.Basics/Ping", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *basicsClient) Pong(ctx context.Context, in *BasicsRequest, opts ...grpc.CallOption) (*BasicsResponse, error) {
-	out := new(BasicsResponse)
-	err := c.cc.Invoke(ctx, "/pb.Basics/Pong", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// BasicsServer is the server API for Basics service.
-// All implementations must embed UnimplementedBasicsServer
-// for forward compatibility
-type BasicsServer interface {
-	// 心跳
-	Ping(context.Context, *BasicsRequest) (*BasicsResponse, error)
-	// 心跳
-	Pong(context.Context, *BasicsRequest) (*BasicsResponse, error)
-	mustEmbedUnimplementedBasicsServer()
-}
-
-// UnimplementedBasicsServer must be embedded to have forward compatible implementations.
-type UnimplementedBasicsServer struct {
-}
-
-func (UnimplementedBasicsServer) Ping(context.Context, *BasicsRequest) (*BasicsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Ping not implemented")
-}
-func (UnimplementedBasicsServer) Pong(context.Context, *BasicsRequest) (*BasicsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Pong not implemented")
-}
-func (UnimplementedBasicsServer) mustEmbedUnimplementedBasicsServer() {}
-
-// UnsafeBasicsServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to BasicsServer will
-// result in compilation errors.
-type UnsafeBasicsServer interface {
-	mustEmbedUnimplementedBasicsServer()
-}
-
-func RegisterBasicsServer(s grpc.ServiceRegistrar, srv BasicsServer) {
-	s.RegisterService(&Basics_ServiceDesc, srv)
-}
-
-func _Basics_Ping_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BasicsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BasicsServer).Ping(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.Basics/Ping",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BasicsServer).Ping(ctx, req.(*BasicsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Basics_Pong_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BasicsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BasicsServer).Pong(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.Basics/Pong",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BasicsServer).Pong(ctx, req.(*BasicsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// Basics_ServiceDesc is the grpc.ServiceDesc for Basics service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var Basics_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "pb.Basics",
-	HandlerType: (*BasicsServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Ping",
-			Handler:    _Basics_Ping_Handler,
-		},
-		{
-			MethodName: "Pong",
-			Handler:    _Basics_Pong_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "pb/basics.proto",
-}

pb/pubsub.pb.go

@@ -1,440 +0,0 @@
-// 版本
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.4
-// source: pb/pubsub.proto
-
-// 包名
-
-package pb
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// 请求消息
-type PublishRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id     string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Value  string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	Method string `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"`
-	Ip     string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"`
-}
-
-func (x *PublishRequest) Reset() {
-	*x = PublishRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_pubsub_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PublishRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PublishRequest) ProtoMessage() {}
-
-func (x *PublishRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_pubsub_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PublishRequest.ProtoReflect.Descriptor instead.
-func (*PublishRequest) Descriptor() ([]byte, []int) {
-	return file_pb_pubsub_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *PublishRequest) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *PublishRequest) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-func (x *PublishRequest) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-func (x *PublishRequest) GetIp() string {
-	if x != nil {
-		return x.Ip
-	}
-	return ""
-}
-
-// 响应消息
-type PublishResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id    string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	Ip    string `protobuf:"bytes,3,opt,name=ip,proto3" json:"ip,omitempty"`
-}
-
-func (x *PublishResponse) Reset() {
-	*x = PublishResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_pubsub_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PublishResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PublishResponse) ProtoMessage() {}
-
-func (x *PublishResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_pubsub_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PublishResponse.ProtoReflect.Descriptor instead.
-func (*PublishResponse) Descriptor() ([]byte, []int) {
-	return file_pb_pubsub_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *PublishResponse) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *PublishResponse) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-func (x *PublishResponse) GetIp() string {
-	if x != nil {
-		return x.Ip
-	}
-	return ""
-}
-
-// 请求消息
-type SubscribeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id     string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Value  string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	Method string `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"`
-	Ip     string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"`
-}
-
-func (x *SubscribeRequest) Reset() {
-	*x = SubscribeRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_pubsub_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SubscribeRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SubscribeRequest) ProtoMessage() {}
-
-func (x *SubscribeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_pubsub_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SubscribeRequest.ProtoReflect.Descriptor instead.
-func (*SubscribeRequest) Descriptor() ([]byte, []int) {
-	return file_pb_pubsub_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *SubscribeRequest) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetIp() string {
-	if x != nil {
-		return x.Ip
-	}
-	return ""
-}
-
-// 响应消息
-type SubscribeResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id     string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Value  string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	Method string `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"`
-}
-
-func (x *SubscribeResponse) Reset() {
-	*x = SubscribeResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_pubsub_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SubscribeResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SubscribeResponse) ProtoMessage() {}
-
-func (x *SubscribeResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_pubsub_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SubscribeResponse.ProtoReflect.Descriptor instead.
-func (*SubscribeResponse) Descriptor() ([]byte, []int) {
-	return file_pb_pubsub_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *SubscribeResponse) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *SubscribeResponse) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-func (x *SubscribeResponse) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-var File_pb_pubsub_proto protoreflect.FileDescriptor
-
-var file_pb_pubsub_proto_rawDesc = []byte{
-	0x0a, 0x0f, 0x70, 0x62, 0x2f, 0x70, 0x75, 0x62, 0x73, 0x75, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x5e, 0x0a, 0x0e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a,
-	0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0x47, 0x0a, 0x0f, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x0e,
-	0x0a, 0x02, 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0x60,
-	0x0a, 0x10, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70,
-	0x22, 0x51, 0x0a, 0x11, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x32, 0x78, 0x0a, 0x06, 0x50, 0x75, 0x62, 0x53, 0x75, 0x62, 0x12, 0x32, 0x0a,
-	0x07, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x75,
-	0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x70,
-	0x62, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x3a, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x14,
-	0x2e, 0x70, 0x62, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
-	0x69, 0x62, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x42, 0x07, 0x5a,
-	0x05, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pb_pubsub_proto_rawDescOnce sync.Once
-	file_pb_pubsub_proto_rawDescData = file_pb_pubsub_proto_rawDesc
-)
-
-func file_pb_pubsub_proto_rawDescGZIP() []byte {
-	file_pb_pubsub_proto_rawDescOnce.Do(func() {
-		file_pb_pubsub_proto_rawDescData = protoimpl.X.CompressGZIP(file_pb_pubsub_proto_rawDescData)
-	})
-	return file_pb_pubsub_proto_rawDescData
-}
-
-var file_pb_pubsub_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_pb_pubsub_proto_goTypes = []interface{}{
-	(*PublishRequest)(nil),    // 0: pb.PublishRequest
-	(*PublishResponse)(nil),   // 1: pb.PublishResponse
-	(*SubscribeRequest)(nil),  // 2: pb.SubscribeRequest
-	(*SubscribeResponse)(nil), // 3: pb.SubscribeResponse
-}
-var file_pb_pubsub_proto_depIdxs = []int32{
-	0, // 0: pb.PubSub.Publish:input_type -> pb.PublishRequest
-	2, // 1: pb.PubSub.Subscribe:input_type -> pb.SubscribeRequest
-	1, // 2: pb.PubSub.Publish:output_type -> pb.PublishResponse
-	3, // 3: pb.PubSub.Subscribe:output_type -> pb.SubscribeResponse
-	2, // [2:4] is the sub-list for method output_type
-	0, // [0:2] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pb_pubsub_proto_init() }
-func file_pb_pubsub_proto_init() {
-	if File_pb_pubsub_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pb_pubsub_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PublishRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pb_pubsub_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PublishResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pb_pubsub_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SubscribeRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pb_pubsub_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SubscribeResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pb_pubsub_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   4,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_pb_pubsub_proto_goTypes,
-		DependencyIndexes: file_pb_pubsub_proto_depIdxs,
-		MessageInfos:      file_pb_pubsub_proto_msgTypes,
-	}.Build()
-	File_pb_pubsub_proto = out.File
-	file_pb_pubsub_proto_rawDesc = nil
-	file_pb_pubsub_proto_goTypes = nil
-	file_pb_pubsub_proto_depIdxs = nil
-}

pb/pubsub.proto

@@ -1,46 +0,0 @@
-// 版本
-syntax = "proto3";
-
-// 包名
-package pb;
-
-// 别名
-option go_package = "../pb";
-
-// 定义服务
-service PubSub {
-  // [发布] 消息
-  rpc Publish (PublishRequest) returns (PublishResponse);
-  // [订阅] 消息
-  rpc Subscribe (SubscribeRequest) returns (stream SubscribeResponse);
-}
-
-// 请求消息
-message PublishRequest {
-  string id = 1;
-  string value = 2;
-  string method = 3;
-  string ip = 4;
-}
-
-// 响应消息
-message PublishResponse {
-  string id = 1;
-  string value = 2;
-  string ip = 3;
-}
-
-// 请求消息
-message SubscribeRequest {
-  string id = 1;
-  string value = 2;
-  string method = 3;
-  string ip = 4;
-}
-
-// 响应消息
-message SubscribeResponse {
-  string id = 1;
-  string value = 2;
-  string method = 3;
-}

pb/pubsub.server.go

@@ -1,77 +0,0 @@
-package pb
-
-import (
-	"context"
-	"go.dtapp.net/gojobs/pubsub"
-	"log"
-	"strings"
-	"time"
-)
-
-type PubSubServerService struct {
-	pub *pubsub.Publisher
-	UnimplementedPubSubServer
-}
-
-func NewPubSubServerService() *PubSubServerService {
-	return &PubSubServerService{
-		// 新建一个Publisher对象
-		pub: pubsub.NewPublisher(time.Millisecond*100, 10),
-	}
-}
-
-// Publish 实现发布方法
-func (p *PubSubServerService) Publish(ctx context.Context, req *PublishRequest) (*PublishResponse, error) {
-
-	log.Printf("[服务中转]{发布}编号：%s 类型：%s ip地址：%s\n", req.GetId(), req.GetValue(), req.GetIp())
-
-	// 发布消息
-	p.pub.Publish(req.GetValue())
-	return &PublishResponse{
-		Id:    req.GetId(),
-		Value: req.GetValue(),
-		Ip:    req.GetIp(),
-	}, nil
-}
-
-// Subscribe 实现订阅方法
-func (p *PubSubServerService) Subscribe(req *SubscribeRequest, stream PubSub_SubscribeServer) error {
-
-	// SubscribeTopic 增加一个使用函数过滤器的订阅者
-	// func(v interface{}) 定义函数过滤的规则
-	// SubscribeTopic 返回一个chan interface{}
-
-	ch := p.pub.SubscribeTopic(func(v interface{}) bool {
-
-		log.Printf("[服务中转]{订阅}主题：%v\n", v)
-
-		// 接收数据是string，并且key是以arg为前缀的
-		if key, ok := v.(string); ok {
-			if strings.HasPrefix(key, req.GetValue()) {
-				return true
-			}
-		}
-		return false
-	})
-
-	log.Printf("[服务中转]{订阅}编号：%s 类型：%s 方法：%s ip地址：%s\n", req.GetId(), req.GetValue(), req.GetMethod(), req.GetIp())
-	log.Println("[服务中转]{订阅}工作线：", ch)
-	log.Println("[服务中转]{订阅}当前工作线数量：", p.pub.Len())
-
-	// 服务器遍历chan，并将其中信息发送给订阅客户端
-	for v := range ch {
-		log.Println("[服务中转]{订阅}for ch：", ch)
-		log.Println("[服务中转]{订阅}for v：", v)
-		err := stream.Send(&SubscribeResponse{
-			Id:     req.GetId(),
-			Value:  req.GetValue(),
-			Method: req.GetMethod(),
-		})
-		if err != nil {
-			log.Println("[服务中转]{订阅}任务分配失败 ", err.Error())
-			return err
-		}
-	}
-
-	return nil
-}

pb/pubsub_grpc.pb.go

@@ -1,173 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.19.4
-// source: pb/pubsub.proto
-
-package pb
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// PubSubClient is the client API for PubSub service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type PubSubClient interface {
-	// [发布] 消息
-	Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error)
-	// [订阅] 消息
-	Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (PubSub_SubscribeClient, error)
-}
-
-type pubSubClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewPubSubClient(cc grpc.ClientConnInterface) PubSubClient {
-	return &pubSubClient{cc}
-}
-
-func (c *pubSubClient) Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error) {
-	out := new(PublishResponse)
-	err := c.cc.Invoke(ctx, "/pb.PubSub/Publish", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *pubSubClient) Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (PubSub_SubscribeClient, error) {
-	stream, err := c.cc.NewStream(ctx, &PubSub_ServiceDesc.Streams[0], "/pb.PubSub/Subscribe", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &pubSubSubscribeClient{stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-type PubSub_SubscribeClient interface {
-	Recv() (*SubscribeResponse, error)
-	grpc.ClientStream
-}
-
-type pubSubSubscribeClient struct {
-	grpc.ClientStream
-}
-
-func (x *pubSubSubscribeClient) Recv() (*SubscribeResponse, error) {
-	m := new(SubscribeResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// PubSubServer is the server API for PubSub service.
-// All implementations must embed UnimplementedPubSubServer
-// for forward compatibility
-type PubSubServer interface {
-	// [发布] 消息
-	Publish(context.Context, *PublishRequest) (*PublishResponse, error)
-	// [订阅] 消息
-	Subscribe(*SubscribeRequest, PubSub_SubscribeServer) error
-	mustEmbedUnimplementedPubSubServer()
-}
-
-// UnimplementedPubSubServer must be embedded to have forward compatible implementations.
-type UnimplementedPubSubServer struct {
-}
-
-func (UnimplementedPubSubServer) Publish(context.Context, *PublishRequest) (*PublishResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Publish not implemented")
-}
-func (UnimplementedPubSubServer) Subscribe(*SubscribeRequest, PubSub_SubscribeServer) error {
-	return status.Errorf(codes.Unimplemented, "method Subscribe not implemented")
-}
-func (UnimplementedPubSubServer) mustEmbedUnimplementedPubSubServer() {}
-
-// UnsafePubSubServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to PubSubServer will
-// result in compilation errors.
-type UnsafePubSubServer interface {
-	mustEmbedUnimplementedPubSubServer()
-}
-
-func RegisterPubSubServer(s grpc.ServiceRegistrar, srv PubSubServer) {
-	s.RegisterService(&PubSub_ServiceDesc, srv)
-}
-
-func _PubSub_Publish_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PublishRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(PubSubServer).Publish(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.PubSub/Publish",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PubSubServer).Publish(ctx, req.(*PublishRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _PubSub_Subscribe_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(SubscribeRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(PubSubServer).Subscribe(m, &pubSubSubscribeServer{stream})
-}
-
-type PubSub_SubscribeServer interface {
-	Send(*SubscribeResponse) error
-	grpc.ServerStream
-}
-
-type pubSubSubscribeServer struct {
-	grpc.ServerStream
-}
-
-func (x *pubSubSubscribeServer) Send(m *SubscribeResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-// PubSub_ServiceDesc is the grpc.ServiceDesc for PubSub service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var PubSub_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "pb.PubSub",
-	HandlerType: (*PubSubServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Publish",
-			Handler:    _PubSub_Publish_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "Subscribe",
-			Handler:       _PubSub_Subscribe_Handler,
-			ServerStreams: true,
-		},
-	},
-	Metadata: "pb/pubsub.proto",
-}

pb/task.pb.go

@@ -1,234 +0,0 @@
-// 版本
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.4
-// source: pb/task.proto
-
-// 包名
-
-package pb
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// 请求消息
-type TaskRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
-}
-
-func (x *TaskRequest) Reset() {
-	*x = TaskRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_task_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TaskRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TaskRequest) ProtoMessage() {}
-
-func (x *TaskRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_task_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TaskRequest.ProtoReflect.Descriptor instead.
-func (*TaskRequest) Descriptor() ([]byte, []int) {
-	return file_pb_task_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TaskRequest) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-// 响应消息
-type TaskResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
-}
-
-func (x *TaskResponse) Reset() {
-	*x = TaskResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_task_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TaskResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TaskResponse) ProtoMessage() {}
-
-func (x *TaskResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_task_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TaskResponse.ProtoReflect.Descriptor instead.
-func (*TaskResponse) Descriptor() ([]byte, []int) {
-	return file_pb_task_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *TaskResponse) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-var File_pb_task_proto protoreflect.FileDescriptor
-
-var file_pb_task_proto_rawDesc = []byte{
-	0x0a, 0x0d, 0x70, 0x62, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x02, 0x70, 0x62, 0x22, 0x27, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x28, 0x0a, 0x0c,
-	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0xfb, 0x01, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, 0x12,
-	0x30, 0x0a, 0x09, 0x55, 0x6e, 0x61, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0f, 0x2e, 0x70,
-	0x62, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e,
-	0x70, 0x62, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x3c, 0x0a, 0x13, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x61,
-	0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12,
-	0x3c, 0x0a, 0x13, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69,
-	0x6e, 0x67, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x61, 0x73, 0x6b,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x54, 0x61, 0x73,
-	0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x12, 0x45, 0x0a,
-	0x1a, 0x42, 0x69, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0f, 0x2e, 0x70, 0x62,
-	0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x70,
-	0x62, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x28, 0x01, 0x30, 0x01, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pb_task_proto_rawDescOnce sync.Once
-	file_pb_task_proto_rawDescData = file_pb_task_proto_rawDesc
-)
-
-func file_pb_task_proto_rawDescGZIP() []byte {
-	file_pb_task_proto_rawDescOnce.Do(func() {
-		file_pb_task_proto_rawDescData = protoimpl.X.CompressGZIP(file_pb_task_proto_rawDescData)
-	})
-	return file_pb_task_proto_rawDescData
-}
-
-var file_pb_task_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pb_task_proto_goTypes = []interface{}{
-	(*TaskRequest)(nil),  // 0: pb.TaskRequest
-	(*TaskResponse)(nil), // 1: pb.TaskResponse
-}
-var file_pb_task_proto_depIdxs = []int32{
-	0, // 0: pb.Task.UnaryTask:input_type -> pb.TaskRequest
-	0, // 1: pb.Task.ServerStreamingTask:input_type -> pb.TaskRequest
-	0, // 2: pb.Task.ClientStreamingTask:input_type -> pb.TaskRequest
-	0, // 3: pb.Task.BidirectionalStreamingTask:input_type -> pb.TaskRequest
-	1, // 4: pb.Task.UnaryTask:output_type -> pb.TaskResponse
-	1, // 5: pb.Task.ServerStreamingTask:output_type -> pb.TaskResponse
-	1, // 6: pb.Task.ClientStreamingTask:output_type -> pb.TaskResponse
-	1, // 7: pb.Task.BidirectionalStreamingTask:output_type -> pb.TaskResponse
-	4, // [4:8] is the sub-list for method output_type
-	0, // [0:4] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pb_task_proto_init() }
-func file_pb_task_proto_init() {
-	if File_pb_task_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pb_task_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TaskRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pb_task_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TaskResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pb_task_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_pb_task_proto_goTypes,
-		DependencyIndexes: file_pb_task_proto_depIdxs,
-		MessageInfos:      file_pb_task_proto_msgTypes,
-	}.Build()
-	File_pb_task_proto = out.File
-	file_pb_task_proto_rawDesc = nil
-	file_pb_task_proto_goTypes = nil
-	file_pb_task_proto_depIdxs = nil
-}

pb/task.proto

@@ -1,30 +0,0 @@
-// 版本
-syntax = "proto3";
-
-// 包名
-package pb;
-
-// 别名
-option go_package = "../pb";
-
-// 定义服务
-service Task{
-  // 普通一元方法
-  rpc UnaryTask(TaskRequest) returns (TaskResponse){};
-  // 服务端推送流
-  rpc ServerStreamingTask(TaskRequest) returns (stream TaskResponse){};
-  // 客户端推送流
-  rpc ClientStreamingTask(stream TaskRequest) returns (TaskResponse){};
-  // 双向推送流
-  rpc BidirectionalStreamingTask(stream TaskRequest) returns (stream TaskResponse){};
-}
-
-// 请求消息
-message TaskRequest {
-  string message = 1;
-}
-
-// 响应消息
-message TaskResponse {
-  string message = 1;
-}

pb/task_grpc.pb.go

@@ -1,315 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.19.4
-// source: pb/task.proto
-
-package pb
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// TaskClient is the client API for Task service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type TaskClient interface {
-	// 普通一元方法
-	UnaryTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (*TaskResponse, error)
-	// 服务端推送流
-	ServerStreamingTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (Task_ServerStreamingTaskClient, error)
-	// 客户端推送流
-	ClientStreamingTask(ctx context.Context, opts ...grpc.CallOption) (Task_ClientStreamingTaskClient, error)
-	// 双向推送流
-	BidirectionalStreamingTask(ctx context.Context, opts ...grpc.CallOption) (Task_BidirectionalStreamingTaskClient, error)
-}
-
-type taskClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewTaskClient(cc grpc.ClientConnInterface) TaskClient {
-	return &taskClient{cc}
-}
-
-func (c *taskClient) UnaryTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (*TaskResponse, error) {
-	out := new(TaskResponse)
-	err := c.cc.Invoke(ctx, "/pb.Task/UnaryTask", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *taskClient) ServerStreamingTask(ctx context.Context, in *TaskRequest, opts ...grpc.CallOption) (Task_ServerStreamingTaskClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Task_ServiceDesc.Streams[0], "/pb.Task/ServerStreamingTask", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &taskServerStreamingTaskClient{stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-type Task_ServerStreamingTaskClient interface {
-	Recv() (*TaskResponse, error)
-	grpc.ClientStream
-}
-
-type taskServerStreamingTaskClient struct {
-	grpc.ClientStream
-}
-
-func (x *taskServerStreamingTaskClient) Recv() (*TaskResponse, error) {
-	m := new(TaskResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *taskClient) ClientStreamingTask(ctx context.Context, opts ...grpc.CallOption) (Task_ClientStreamingTaskClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Task_ServiceDesc.Streams[1], "/pb.Task/ClientStreamingTask", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &taskClientStreamingTaskClient{stream}
-	return x, nil
-}
-
-type Task_ClientStreamingTaskClient interface {
-	Send(*TaskRequest) error
-	CloseAndRecv() (*TaskResponse, error)
-	grpc.ClientStream
-}
-
-type taskClientStreamingTaskClient struct {
-	grpc.ClientStream
-}
-
-func (x *taskClientStreamingTaskClient) Send(m *TaskRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *taskClientStreamingTaskClient) CloseAndRecv() (*TaskResponse, error) {
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	m := new(TaskResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *taskClient) BidirectionalStreamingTask(ctx context.Context, opts ...grpc.CallOption) (Task_BidirectionalStreamingTaskClient, error) {
-	stream, err := c.cc.NewStream(ctx, &Task_ServiceDesc.Streams[2], "/pb.Task/BidirectionalStreamingTask", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &taskBidirectionalStreamingTaskClient{stream}
-	return x, nil
-}
-
-type Task_BidirectionalStreamingTaskClient interface {
-	Send(*TaskRequest) error
-	Recv() (*TaskResponse, error)
-	grpc.ClientStream
-}
-
-type taskBidirectionalStreamingTaskClient struct {
-	grpc.ClientStream
-}
-
-func (x *taskBidirectionalStreamingTaskClient) Send(m *TaskRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *taskBidirectionalStreamingTaskClient) Recv() (*TaskResponse, error) {
-	m := new(TaskResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// TaskServer is the server API for Task service.
-// All implementations must embed UnimplementedTaskServer
-// for forward compatibility
-type TaskServer interface {
-	// 普通一元方法
-	UnaryTask(context.Context, *TaskRequest) (*TaskResponse, error)
-	// 服务端推送流
-	ServerStreamingTask(*TaskRequest, Task_ServerStreamingTaskServer) error
-	// 客户端推送流
-	ClientStreamingTask(Task_ClientStreamingTaskServer) error
-	// 双向推送流
-	BidirectionalStreamingTask(Task_BidirectionalStreamingTaskServer) error
-	mustEmbedUnimplementedTaskServer()
-}
-
-// UnimplementedTaskServer must be embedded to have forward compatible implementations.
-type UnimplementedTaskServer struct {
-}
-
-func (UnimplementedTaskServer) UnaryTask(context.Context, *TaskRequest) (*TaskResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UnaryTask not implemented")
-}
-func (UnimplementedTaskServer) ServerStreamingTask(*TaskRequest, Task_ServerStreamingTaskServer) error {
-	return status.Errorf(codes.Unimplemented, "method ServerStreamingTask not implemented")
-}
-func (UnimplementedTaskServer) ClientStreamingTask(Task_ClientStreamingTaskServer) error {
-	return status.Errorf(codes.Unimplemented, "method ClientStreamingTask not implemented")
-}
-func (UnimplementedTaskServer) BidirectionalStreamingTask(Task_BidirectionalStreamingTaskServer) error {
-	return status.Errorf(codes.Unimplemented, "method BidirectionalStreamingTask not implemented")
-}
-func (UnimplementedTaskServer) mustEmbedUnimplementedTaskServer() {}
-
-// UnsafeTaskServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to TaskServer will
-// result in compilation errors.
-type UnsafeTaskServer interface {
-	mustEmbedUnimplementedTaskServer()
-}
-
-func RegisterTaskServer(s grpc.ServiceRegistrar, srv TaskServer) {
-	s.RegisterService(&Task_ServiceDesc, srv)
-}
-
-func _Task_UnaryTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TaskRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(TaskServer).UnaryTask(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.Task/UnaryTask",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(TaskServer).UnaryTask(ctx, req.(*TaskRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Task_ServerStreamingTask_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(TaskRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(TaskServer).ServerStreamingTask(m, &taskServerStreamingTaskServer{stream})
-}
-
-type Task_ServerStreamingTaskServer interface {
-	Send(*TaskResponse) error
-	grpc.ServerStream
-}
-
-type taskServerStreamingTaskServer struct {
-	grpc.ServerStream
-}
-
-func (x *taskServerStreamingTaskServer) Send(m *TaskResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func _Task_ClientStreamingTask_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TaskServer).ClientStreamingTask(&taskClientStreamingTaskServer{stream})
-}
-
-type Task_ClientStreamingTaskServer interface {
-	SendAndClose(*TaskResponse) error
-	Recv() (*TaskRequest, error)
-	grpc.ServerStream
-}
-
-type taskClientStreamingTaskServer struct {
-	grpc.ServerStream
-}
-
-func (x *taskClientStreamingTaskServer) SendAndClose(m *TaskResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *taskClientStreamingTaskServer) Recv() (*TaskRequest, error) {
-	m := new(TaskRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func _Task_BidirectionalStreamingTask_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TaskServer).BidirectionalStreamingTask(&taskBidirectionalStreamingTaskServer{stream})
-}
-
-type Task_BidirectionalStreamingTaskServer interface {
-	Send(*TaskResponse) error
-	Recv() (*TaskRequest, error)
-	grpc.ServerStream
-}
-
-type taskBidirectionalStreamingTaskServer struct {
-	grpc.ServerStream
-}
-
-func (x *taskBidirectionalStreamingTaskServer) Send(m *TaskResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *taskBidirectionalStreamingTaskServer) Recv() (*TaskRequest, error) {
-	m := new(TaskRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Task_ServiceDesc is the grpc.ServiceDesc for Task service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var Task_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "pb.Task",
-	HandlerType: (*TaskServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "UnaryTask",
-			Handler:    _Task_UnaryTask_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "ServerStreamingTask",
-			Handler:       _Task_ServerStreamingTask_Handler,
-			ServerStreams: true,
-		},
-		{
-			StreamName:    "ClientStreamingTask",
-			Handler:       _Task_ClientStreamingTask_Handler,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "BidirectionalStreamingTask",
-			Handler:       _Task_BidirectionalStreamingTask_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-	Metadata: "pb/task.proto",
-}

pubsub/pubsub.go

@@ -1,125 +0,0 @@
-package pubsub
-
-import (
-	"sync"
-	"time"
-)
-
-// 等待组放在共享内存池中，减少GC
-var wgPool = sync.Pool{New: func() interface{} { return new(sync.WaitGroup) }}
-
-// NewPublisher
-// 第一个参数控制发布时最大阻塞时间
-// 第二个参数是缓冲区大小，控制每个订阅者的chan缓冲区大小
-func NewPublisher(publishTimeout time.Duration, buffer int) *Publisher {
-	return &Publisher{
-		buffer:      buffer,
-		timeout:     publishTimeout,
-		subscribers: make(map[subscriber]topicFunc),
-	}
-}
-
-type subscriber chan interface{}
-type topicFunc func(v interface{}) bool
-
-type Publisher struct {
-	m           sync.RWMutex  // 控制订阅者map并发读写安全
-	buffer      int           // 每个订阅者chan缓冲区大小
-	timeout     time.Duration // 发布阻塞超时时间
-	subscribers map[subscriber]topicFunc
-}
-
-// Len 返回订阅者数量
-func (p *Publisher) Len() int {
-	p.m.RLock()
-	i := len(p.subscribers)
-	p.m.RUnlock()
-	return i
-}
-
-// Subscribe 无Topic订阅
-func (p *Publisher) Subscribe() chan interface{} {
-	return p.SubscribeTopic(nil)
-}
-
-// SubscribeTopic 通过Topic订阅
-func (p *Publisher) SubscribeTopic(topic topicFunc) chan interface{} {
-	ch := make(chan interface{}, p.buffer)
-	p.m.Lock()
-	p.subscribers[ch] = topic
-	p.m.Unlock()
-	return ch
-}
-
-// SubscribeTopicWithBuffer 通过自定义chan缓冲区大小定义新的订阅者
-func (p *Publisher) SubscribeTopicWithBuffer(topic topicFunc, buffer int) chan interface{} {
-	ch := make(chan interface{}, buffer)
-	p.m.Lock()
-	p.subscribers[ch] = topic
-	p.m.Unlock()
-	return ch
-}
-
-// Evict 移除某个订阅者
-func (p *Publisher) Evict(sub chan interface{}) {
-	p.m.Lock()
-	_, exists := p.subscribers[sub]
-	if exists {
-		delete(p.subscribers, sub)
-		close(sub)
-	}
-	p.m.Unlock()
-}
-
-// Publish 发布消息
-func (p *Publisher) Publish(v interface{}) {
-	p.m.RLock()
-	if len(p.subscribers) == 0 {
-		p.m.RUnlock()
-		return
-	}
-
-	wg := wgPool.Get().(*sync.WaitGroup)
-	for sub, topic := range p.subscribers {
-		wg.Add(1)
-		go p.sendTopic(sub, topic, v, wg)
-	}
-	wg.Wait()
-	wgPool.Put(wg)
-	p.m.RUnlock()
-}
-
-// Close 关闭服务
-func (p *Publisher) Close() {
-	p.m.Lock()
-	for sub := range p.subscribers {
-		delete(p.subscribers, sub)
-		close(sub)
-	}
-	p.m.Unlock()
-}
-
-// 真正发布消息的逻辑，通过Timer，根据传入的timeout控制每次发布消息最大阻塞时长
-func (p *Publisher) sendTopic(sub subscriber, topic topicFunc, v interface{}, wg *sync.WaitGroup) {
-	defer wg.Done()
-	if topic != nil && !topic(v) {
-		return
-	}
-
-	// 如果接收器不可用，请在选择“不阻止”下发送
-	if p.timeout > 0 {
-		timeout := time.NewTimer(p.timeout)
-		defer timeout.Stop()
-
-		select {
-		case sub <- v:
-		case <-timeout.C:
-		}
-		return
-	}
-
-	select {
-	case sub <- v:
-	default:
-	}
-}

redis.go

@@ -0,0 +1,37 @@
+package gojobs
+
+import (
+	"context"
+	"github.com/go-redis/redis/v9"
+)
+
+// Publish 发布
+// ctx 上下文
+// channel 频道
+// message 消息
+func (c *Client) Publish(ctx context.Context, channel string, message interface{}) error {
+	publish, err := c.cache.redisClient.Publish(ctx, channel, message).Result()
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("发布失败：%s %s %v %s\n", channel, message, publish, err)
+	}
+	return err
+}
+
+type SubscribeResult struct {
+	err     error
+	Message *redis.PubSub
+}
+
+// Subscribe 订阅
+func (c *Client) Subscribe(ctx context.Context) SubscribeResult {
+	return SubscribeResult{
+		Message: c.cache.redisClient.Subscribe(ctx, c.cache.cornKeyPrefix+"_"+c.cache.cornKeyCustom),
+	}
+}
+
+// PSubscribe 订阅，支持通配符匹配(ch_user_*)
+func (c *Client) PSubscribe(ctx context.Context) SubscribeResult {
+	return SubscribeResult{
+		Message: c.cache.redisClient.PSubscribe(ctx, c.cache.cornKeyPrefix+"_"+c.cache.cornKeyCustom+"_*"),
+	}
+}

redis_get.go

@@ -0,0 +1,90 @@
+package gojobs
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"go.dtapp.net/goip"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gostring"
+	"math/rand"
+	"time"
+)
+
+// GetIssueAddress 获取下发地址
+// workers 在线列表
+// v 任务信息
+// ---
+// address 下发地址
+// err 错误信息
+func (c *Client) GetIssueAddress(ctx context.Context, workers []string, v *jobs_gorm_model.Task) (string, error) {
+	var (
+		currentIp       = ""    // 当前Ip
+		appointIpStatus = false // 指定Ip状态
+	)
+
+	if v.SpecifyIp != "" {
+		v.SpecifyIp = goip.IsIp(v.SpecifyIp)
+	}
+
+	// 赋值ip
+	if v.SpecifyIp != "" && v.SpecifyIp != SpecifyIpNull {
+		currentIp = v.SpecifyIp
+		appointIpStatus = true
+	}
+
+	// 只有一个客户端在线
+	if len(workers) == 1 {
+		if appointIpStatus {
+			// 判断是否指定某ip执行
+			if gostring.Contains(workers[0], currentIp) {
+				c.zapLog.WithTraceId(ctx).Sugar().Info("只有一个客户端在线，指定某ip执行：", workers[0], currentIp)
+				return workers[0], nil
+			}
+			return "", errors.New(fmt.Sprintf("需要执行的[%s]客户端不在线", currentIp))
+		}
+		return workers[0], nil
+	}
+
+	// 优先处理指定某ip执行
+	if appointIpStatus {
+		for wk, wv := range workers {
+			if gostring.Contains(wv, currentIp) {
+				c.zapLog.WithTraceId(ctx).Sugar().Info("优先处理指定某ip执行：", workers[wk], currentIp)
+				return workers[wk], nil
+			}
+		}
+		return "", errors.New(fmt.Sprintf("需要执行的[%s]客户端不在线", currentIp))
+	} else {
+		// 随机返回一个
+		address := workers[c.random(0, len(workers))]
+		if address == "" {
+			return address, errors.New("获取执行的客户端异常")
+		}
+		c.zapLog.WithTraceId(ctx).Sugar().Info("随机返回一个：", address, currentIp)
+		return address, nil
+	}
+}
+
+// GetSubscribeClientList 获取在线的客户端
+func (c *Client) GetSubscribeClientList(ctx context.Context) (client []string, err error) {
+
+	// 查询活跃的channel
+	client, err = c.cache.redisClient.PubSubChannels(ctx, c.cache.cornKeyPrefix+"_*").Result()
+	if err != nil {
+		c.zapLog.WithTraceId(ctx).Sugar().Errorf("获取在线的客户端失败：%s，%v", c.cache.cornKeyPrefix+"_*", err)
+	}
+
+	return client, err
+}
+
+// 随机返回一个
+// min最小
+// max最大
+func (c *Client) random(min, max int) int {
+	if max-min <= 0 {
+		return 0
+	}
+	rand.Seed(time.Now().Unix())
+	return rand.Intn(max-min) + min
+}

run.go

@@ -0,0 +1,98 @@
+package gojobs
+
+import (
+	"context"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gotime"
+	"go.dtapp.net/gotrace_id"
+)
+
+// Run 运行
+func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultCode int, taskResultDesc string) {
+
+	runId := gotrace_id.GetTraceIdContext(ctx)
+	if runId == "" {
+		c.zapLog.WithTraceId(ctx).Sugar().Error("上下文没有跟踪编号")
+		return
+	}
+
+	c.GormTaskLogRecord(ctx, task, runId, taskResultCode, taskResultDesc)
+	if c.mongoConfig.stats {
+		c.MongoTaskLogRecord(ctx, task, runId, taskResultCode, taskResultDesc)
+	}
+
+	switch taskResultCode {
+	case 0:
+		err := c.EditTask(c.gormClient.GetDb(), task.Id).
+			Select("run_id", "result", "next_run_time").
+			Updates(jobs_gorm_model.Task{
+				RunId:       runId,
+				Result:      taskResultDesc,
+				NextRunTime: gotime.Current().AfterSeconds(task.Frequency).Time,
+			}).Error
+		if err != nil {
+			c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存失败：%s", err.Error())
+		}
+		return
+	case CodeSuccess:
+		// 执行成功
+		err := c.EditTask(c.gormClient.GetDb(), task.Id).
+			Select("status_desc", "number", "run_id", "updated_ip", "result", "next_run_time").
+			Updates(jobs_gorm_model.Task{
+				StatusDesc:  "执行成功",
+				Number:      task.Number + 1,
+				RunId:       runId,
+				UpdatedIp:   c.config.systemOutsideIp,
+				Result:      taskResultDesc,
+				NextRunTime: gotime.Current().AfterSeconds(task.Frequency).Time,
+			}).Error
+		if err != nil {
+			c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存失败：%s", err.Error())
+		}
+	case CodeEnd:
+		// 执行成功、提前结束
+		err := c.EditTask(c.gormClient.GetDb(), task.Id).
+			Select("status", "status_desc", "number", "updated_ip", "result", "next_run_time").
+			Updates(jobs_gorm_model.Task{
+				Status:      TASK_SUCCESS,
+				StatusDesc:  "结束执行",
+				Number:      task.Number + 1,
+				UpdatedIp:   c.config.systemOutsideIp,
+				Result:      taskResultDesc,
+				NextRunTime: gotime.Current().Time,
+			}).Error
+		if err != nil {
+			c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存失败：%s", err.Error())
+		}
+	case CodeError:
+		// 执行失败
+		err := c.EditTask(c.gormClient.GetDb(), task.Id).
+			Select("status_desc", "number", "run_id", "updated_ip", "result", "next_run_time").
+			Updates(jobs_gorm_model.Task{
+				StatusDesc:  "执行失败",
+				Number:      task.Number + 1,
+				RunId:       runId,
+				UpdatedIp:   c.config.systemOutsideIp,
+				Result:      taskResultDesc,
+				NextRunTime: gotime.Current().AfterSeconds(task.Frequency).Time,
+			}).Error
+		if err != nil {
+			c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存失败：%s", err.Error())
+		}
+	}
+
+	if task.MaxNumber != 0 {
+		if task.Number+1 >= task.MaxNumber {
+			// 关闭执行
+			err := c.EditTask(c.gormClient.GetDb(), task.Id).
+				Select("status").
+				Updates(jobs_gorm_model.Task{
+					Status: TASK_TIMEOUT,
+				}).Error
+			if err != nil {
+				c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存失败：%s", err.Error())
+			}
+		}
+	}
+	return
+}

task_lock.go

@@ -0,0 +1,73 @@
+package gojobs
+
+import (
+	"context"
+	"errors"
+	"go.dtapp.net/gojobs/jobs_gorm_model"
+)
+
+type TaskLockOperation struct {
+	client *Client              // 实例
+	task   jobs_gorm_model.Task // 任务
+}
+
+func (c *Client) NewLock(task jobs_gorm_model.Task) (*TaskLockOperation, error) {
+	if task.Id == 0 {
+		return nil, errors.New("任务数据不正常")
+	}
+	return &TaskLockOperation{
+		client: c,
+		task:   task,
+	}, nil
+}
+
+// Lock 上锁
+func (tlo *TaskLockOperation) Lock(ctx context.Context, id any) error {
+	_, err := tlo.client.Lock(ctx, tlo.task, id)
+	return err
+}
+
+// Unlock 解锁
+func (tlo *TaskLockOperation) Unlock(ctx context.Context, id any) error {
+	return tlo.client.Unlock(ctx, tlo.task, id)
+}
+
+// LockForever 永远上锁
+func (tlo *TaskLockOperation) LockForever(ctx context.Context, id any) error {
+	_, err := tlo.client.LockForever(ctx, tlo.task, id)
+	return err
+}
+
+// LockId 上锁
+func (tlo *TaskLockOperation) LockId(ctx context.Context) error {
+	_, err := tlo.client.LockId(ctx, tlo.task)
+	return err
+}
+
+// UnlockId 解锁
+func (tlo *TaskLockOperation) UnlockId(ctx context.Context) error {
+	return tlo.client.UnlockId(ctx, tlo.task)
+}
+
+// LockForeverId 永远上锁
+func (tlo *TaskLockOperation) LockForeverId(ctx context.Context) error {
+	_, err := tlo.client.LockForeverId(ctx, tlo.task)
+	return err
+}
+
+// LockCustomId 上锁
+func (tlo *TaskLockOperation) LockCustomId(ctx context.Context) error {
+	_, err := tlo.client.LockCustomId(ctx, tlo.task)
+	return err
+}
+
+// UnlockCustomId 解锁
+func (tlo *TaskLockOperation) UnlockCustomId(ctx context.Context) error {
+	return tlo.client.UnlockCustomId(ctx, tlo.task)
+}
+
+// LockForeverCustomId 永远上锁
+func (tlo *TaskLockOperation) LockForeverCustomId(ctx context.Context) error {
+	_, err := tlo.client.LockForeverCustomId(ctx, tlo.task)
+	return err
+}

vendor/github.com/basgys/goxml2json/.gitignore

@@ -1,25 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-/.tags

vendor/github.com/basgys/goxml2json/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Bastien Gysler
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

vendor/github.com/basgys/goxml2json/README.md

@@ -1,82 +0,0 @@
-# goxml2json [![CircleCI](https://circleci.com/gh/basgys/goxml2json.svg?style=svg)](https://circleci.com/gh/basgys/goxml2json)
-
-Go package that converts XML to JSON
-
-### Install
-
-    go get -u github.com/basgys/goxml2json
-
-### Importing
-
-    import github.com/basgys/goxml2json
-
-### Usage
-
-**Code example**
-
-```go
-  package main
-
-  import (
-  	"fmt"
-  	"strings"
-
-  	xj "github.com/basgys/goxml2json"
-  )
-
-  func main() {
-  	// xml is an io.Reader
-  	xml := strings.NewReader(`<?xml version="1.0" encoding="UTF-8"?><hello>world</hello>`)
-  	json, err := xj.Convert(xml)
-  	if err != nil {
-  		panic("That's embarrassing...")
-  	}
-
-  	fmt.Println(json.String())
-  	// {"hello": "world"}
-  }
-
-```
-
-**Input**
-
-```xml
-  <?xml version="1.0" encoding="UTF-8"?>
-  <osm version="0.6" generator="CGImap 0.0.2">
-   <bounds minlat="54.0889580" minlon="12.2487570" maxlat="54.0913900" maxlon="12.2524800"/>
-   <foo>bar</foo>
-  </osm>
-```
-
-**Output**
-
-```json
-  {
-    "osm": {
-      "-version": "0.6",
-      "-generator": "CGImap 0.0.2",
-      "bounds": {
-        "-minlat": "54.0889580",
-        "-minlon": "12.2487570",
-        "-maxlat": "54.0913900",
-        "-maxlon": "12.2524800"
-      },
-      "foo": "bar"
-    }
-  }
-```
-
-### Contributing
-Feel free to contribute to this project if you want to fix/extend/improve it.
-
-### Contributors
-
-  - [DirectX](https://github.com/directx)
-  - [samuelhug](https://github.com/samuelhug)
-
-### TODO
-
-   * Extract data types in JSON (numbers, boolean, ...)
-   * Categorise errors
-   * Option to prettify the JSON output
-   * Benchmark

vendor/github.com/basgys/goxml2json/converter.go

@@ -1,25 +0,0 @@
-package xml2json
-
-import (
-	"bytes"
-	"io"
-)
-
-// Convert converts the given XML document to JSON
-func Convert(r io.Reader) (*bytes.Buffer, error) {
-	// Decode XML document
-	root := &Node{}
-	err := NewDecoder(r).Decode(root)
-	if err != nil {
-		return nil, err
-	}
-
-	// Then encode it in JSON
-	buf := new(bytes.Buffer)
-	err = NewEncoder(buf).Encode(root)
-	if err != nil {
-		return nil, err
-	}
-
-	return buf, nil
-}

vendor/github.com/basgys/goxml2json/decoder.go

@@ -1,140 +0,0 @@
-package xml2json
-
-import (
-	"encoding/xml"
-	"io"
-	"unicode"
-
-	"golang.org/x/net/html/charset"
-)
-
-const (
-	attrPrefix    = "-"
-	contentPrefix = "#"
-)
-
-// A Decoder reads and decodes XML objects from an input stream.
-type Decoder struct {
-	r               io.Reader
-	err             error
-	attributePrefix string
-	contentPrefix   string
-}
-
-type element struct {
-	parent *element
-	n      *Node
-	label  string
-}
-
-func (dec *Decoder) SetAttributePrefix(prefix string) {
-	dec.attributePrefix = prefix
-}
-
-func (dec *Decoder) SetContentPrefix(prefix string) {
-	dec.contentPrefix = prefix
-}
-
-func (dec *Decoder) DecodeWithCustomPrefixes(root *Node, contentPrefix string, attributePrefix string) error {
-	dec.contentPrefix = contentPrefix
-	dec.attributePrefix = attributePrefix
-	return dec.Decode(root)
-}
-
-// NewDecoder returns a new decoder that reads from r.
-func NewDecoder(r io.Reader) *Decoder {
-	return &Decoder{r: r}
-}
-
-// Decode reads the next JSON-encoded value from its
-// input and stores it in the value pointed to by v.
-func (dec *Decoder) Decode(root *Node) error {
-
-	if dec.contentPrefix == "" {
-		dec.contentPrefix = contentPrefix
-	}
-	if dec.attributePrefix == "" {
-		dec.attributePrefix = attrPrefix
-	}
-
-	xmlDec := xml.NewDecoder(dec.r)
-
-	// That will convert the charset if the provided XML is non-UTF-8
-	xmlDec.CharsetReader = charset.NewReaderLabel
-
-	// Create first element from the root node
-	elem := &element{
-		parent: nil,
-		n:      root,
-	}
-
-	for {
-		t, _ := xmlDec.Token()
-		if t == nil {
-			break
-		}
-
-		switch se := t.(type) {
-		case xml.StartElement:
-			// Build new a new current element and link it to its parent
-			elem = &element{
-				parent: elem,
-				n:      &Node{},
-				label:  se.Name.Local,
-			}
-
-			// Extract attributes as children
-			for _, a := range se.Attr {
-				elem.n.AddChild(dec.attributePrefix+a.Name.Local, &Node{Data: a.Value})
-			}
-		case xml.CharData:
-			// Extract XML data (if any)
-			elem.n.Data = trimNonGraphic(string(xml.CharData(se)))
-		case xml.EndElement:
-			// And add it to its parent list
-			if elem.parent != nil {
-				elem.parent.n.AddChild(elem.label, elem.n)
-			}
-
-			// Then change the current element to its parent
-			elem = elem.parent
-		}
-	}
-
-	return nil
-}
-
-// trimNonGraphic returns a slice of the string s, with all leading and trailing
-// non graphic characters and spaces removed.
-//
-// Graphic characters include letters, marks, numbers, punctuation, symbols,
-// and spaces, from categories L, M, N, P, S, Zs.
-// Spacing characters are set by category Z and property Pattern_White_Space.
-func trimNonGraphic(s string) string {
-	if s == "" {
-		return s
-	}
-
-	var first *int
-	var last int
-	for i, r := range []rune(s) {
-		if !unicode.IsGraphic(r) || unicode.IsSpace(r) {
-			continue
-		}
-
-		if first == nil {
-			f := i // copy i
-			first = &f
-			last = i
-		} else {
-			last = i
-		}
-	}
-
-	// If first is nil, it means there are no graphic characters
-	if first == nil {
-		return ""
-	}
-
-	return string([]rune(s)[*first : last+1])
-}

vendor/github.com/basgys/goxml2json/doc.go

@@ -1,2 +0,0 @@
-// Package xml2json is an XML to JSON converter
-package xml2json

vendor/github.com/basgys/goxml2json/encoder.go

@@ -1,197 +0,0 @@
-package xml2json
-
-import (
-	"bytes"
-	"io"
-	"unicode/utf8"
-)
-
-// An Encoder writes JSON objects to an output stream.
-type Encoder struct {
-	w               io.Writer
-	err             error
-	contentPrefix   string
-	attributePrefix string
-}
-
-// NewEncoder returns a new encoder that writes to w.
-func NewEncoder(w io.Writer) *Encoder {
-	return &Encoder{w: w}
-}
-
-func (enc *Encoder) SetAttributePrefix(prefix string) {
-	enc.attributePrefix = prefix
-}
-
-func (enc *Encoder) SetContentPrefix(prefix string) {
-	enc.contentPrefix = prefix
-}
-
-func (enc *Encoder) EncodeWithCustomPrefixes(root *Node, contentPrefix string, attributePrefix string) error {
-	enc.contentPrefix = contentPrefix
-	enc.attributePrefix = attributePrefix
-	return enc.Encode(root)
-}
-
-// Encode writes the JSON encoding of v to the stream
-func (enc *Encoder) Encode(root *Node) error {
-	if enc.err != nil {
-		return enc.err
-	}
-	if root == nil {
-		return nil
-	}
-	if enc.contentPrefix == "" {
-		enc.contentPrefix = contentPrefix
-	}
-	if enc.attributePrefix == "" {
-		enc.attributePrefix = attrPrefix
-	}
-
-	enc.err = enc.format(root, 0)
-
-	// Terminate each value with a newline.
-	// This makes the output look a little nicer
-	// when debugging, and some kind of space
-	// is required if the encoded value was a number,
-	// so that the reader knows there aren't more
-	// digits coming.
-	enc.write("\n")
-
-	return enc.err
-}
-
-func (enc *Encoder) format(n *Node, lvl int) error {
-	if n.IsComplex() {
-		enc.write("{")
-
-		// Add data as an additional attibute (if any)
-		if len(n.Data) > 0 {
-			enc.write("\"")
-			enc.write(enc.contentPrefix)
-			enc.write("content")
-			enc.write("\": ")
-			enc.write(sanitiseString(n.Data))
-			enc.write(", ")
-		}
-
-		i := 0
-		tot := len(n.Children)
-		for label, children := range n.Children {
-			enc.write("\"")
-			enc.write(label)
-			enc.write("\": ")
-
-			if len(children) > 1 {
-				// Array
-				enc.write("[")
-				for j, c := range children {
-					enc.format(c, lvl+1)
-
-					if j < len(children)-1 {
-						enc.write(", ")
-					}
-				}
-				enc.write("]")
-			} else {
-				// Map
-				enc.format(children[0], lvl+1)
-			}
-
-			if i < tot-1 {
-				enc.write(", ")
-			}
-			i++
-		}
-
-		enc.write("}")
-	} else {
-		// TODO : Extract data type
-		enc.write(sanitiseString(n.Data))
-	}
-
-	return nil
-}
-
-func (enc *Encoder) write(s string) {
-	enc.w.Write([]byte(s))
-}
-
-// https://golang.org/src/encoding/json/encode.go?s=5584:5627#L788
-var hex = "0123456789abcdef"
-
-func sanitiseString(s string) string {
-	var buf bytes.Buffer
-
-	buf.WriteByte('"')
-	start := 0
-	for i := 0; i < len(s); {
-		if b := s[i]; b < utf8.RuneSelf {
-			if 0x20 <= b && b != '\\' && b != '"' && b != '<' && b != '>' && b != '&' {
-				i++
-				continue
-			}
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			switch b {
-			case '\\', '"':
-				buf.WriteByte('\\')
-				buf.WriteByte(b)
-			case '\n':
-				buf.WriteByte('\\')
-				buf.WriteByte('n')
-			case '\r':
-				buf.WriteByte('\\')
-				buf.WriteByte('r')
-			case '\t':
-				buf.WriteByte('\\')
-				buf.WriteByte('t')
-			default:
-				// This encodes bytes < 0x20 except for \n and \r,
-				// as well as <, > and &. The latter are escaped because they
-				// can lead to security holes when user-controlled strings
-				// are rendered into JSON and served to some browsers.
-				buf.WriteString(`\u00`)
-				buf.WriteByte(hex[b>>4])
-				buf.WriteByte(hex[b&0xF])
-			}
-			i++
-			start = i
-			continue
-		}
-		c, size := utf8.DecodeRuneInString(s[i:])
-		if c == utf8.RuneError && size == 1 {
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			buf.WriteString(`\ufffd`)
-			i += size
-			start = i
-			continue
-		}
-		// U+2028 is LINE SEPARATOR.
-		// U+2029 is PARAGRAPH SEPARATOR.
-		// They are both technically valid characters in JSON strings,
-		// but don't work in JSONP, which has to be evaluated as JavaScript,
-		// and can lead to security holes there. It is valid JSON to
-		// escape them, so we do so unconditionally.
-		// See http://timelessrepo.com/json-isnt-a-javascript-subset for discussion.
-		if c == '\u2028' || c == '\u2029' {
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			buf.WriteString(`\u202`)
-			buf.WriteByte(hex[c&0xF])
-			i += size
-			start = i
-			continue
-		}
-		i += size
-	}
-	if start < len(s) {
-		buf.WriteString(s[start:])
-	}
-	buf.WriteByte('"')
-	return buf.String()
-}

vendor/github.com/basgys/goxml2json/struct.go

@@ -1,25 +0,0 @@
-package xml2json
-
-// Node is a data element on a tree
-type Node struct {
-	Children map[string]Nodes
-	Data     string
-}
-
-// Nodes is a list of nodes
-type Nodes []*Node
-
-// AddChild appends a node to the list of children
-func (n *Node) AddChild(s string, c *Node) {
-	// Lazy lazy
-	if n.Children == nil {
-		n.Children = map[string]Nodes{}
-	}
-
-	n.Children[s] = append(n.Children[s], c)
-}
-
-// IsComplex returns whether it is a complex type (has children)
-func (n *Node) IsComplex() bool {
-	return len(n.Children) > 0
-}

vendor/github.com/cespare/xxhash/v2/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2016 Caleb Spare
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/github.com/cespare/xxhash/v2/README.md

@@ -1,69 +0,0 @@
-# xxhash
-
-[![Go Reference](https://pkg.go.dev/badge/github.com/cespare/xxhash/v2.svg)](https://pkg.go.dev/github.com/cespare/xxhash/v2)
-[![Test](https://github.com/cespare/xxhash/actions/workflows/test.yml/badge.svg)](https://github.com/cespare/xxhash/actions/workflows/test.yml)
-
-xxhash is a Go implementation of the 64-bit
-[xxHash](http://cyan4973.github.io/xxHash/) algorithm, XXH64. This is a
-high-quality hashing algorithm that is much faster than anything in the Go
-standard library.
-
-This package provides a straightforward API:
-
-```
-func Sum64(b []byte) uint64
-func Sum64String(s string) uint64
-type Digest struct{ ... }
-    func New() *Digest
-```
-
-The `Digest` type implements hash.Hash64. Its key methods are:
-
-```
-func (*Digest) Write([]byte) (int, error)
-func (*Digest) WriteString(string) (int, error)
-func (*Digest) Sum64() uint64
-```
-
-This implementation provides a fast pure-Go implementation and an even faster
-assembly implementation for amd64.
-
-## Compatibility
-
-This package is in a module and the latest code is in version 2 of the module.
-You need a version of Go with at least "minimal module compatibility" to use
-github.com/cespare/xxhash/v2:
-
-* 1.9.7+ for Go 1.9
-* 1.10.3+ for Go 1.10
-* Go 1.11 or later
-
-I recommend using the latest release of Go.
-
-## Benchmarks
-
-Here are some quick benchmarks comparing the pure-Go and assembly
-implementations of Sum64.
-
-| input size | purego | asm |
-| --- | --- | --- |
-| 5 B   |  979.66 MB/s |  1291.17 MB/s  |
-| 100 B | 7475.26 MB/s | 7973.40 MB/s  |
-| 4 KB  | 17573.46 MB/s | 17602.65 MB/s |
-| 10 MB | 17131.46 MB/s | 17142.16 MB/s |
-
-These numbers were generated on Ubuntu 18.04 with an Intel i7-8700K CPU using
-the following commands under Go 1.11.2:
-
-```
-$ go test -tags purego -benchtime 10s -bench '/xxhash,direct,bytes'
-$ go test -benchtime 10s -bench '/xxhash,direct,bytes'
-```
-
-## Projects using this package
-
-- [InfluxDB](https://github.com/influxdata/influxdb)
-- [Prometheus](https://github.com/prometheus/prometheus)
-- [VictoriaMetrics](https://github.com/VictoriaMetrics/VictoriaMetrics)
-- [FreeCache](https://github.com/coocood/freecache)
-- [FastCache](https://github.com/VictoriaMetrics/fastcache)

vendor/github.com/cespare/xxhash/v2/xxhash.go

@@ -1,235 +0,0 @@
-// Package xxhash implements the 64-bit variant of xxHash (XXH64) as described
-// at http://cyan4973.github.io/xxHash/.
-package xxhash
-
-import (
-	"encoding/binary"
-	"errors"
-	"math/bits"
-)
-
-const (
-	prime1 uint64 = 11400714785074694791
-	prime2 uint64 = 14029467366897019727
-	prime3 uint64 = 1609587929392839161
-	prime4 uint64 = 9650029242287828579
-	prime5 uint64 = 2870177450012600261
-)
-
-// NOTE(caleb): I'm using both consts and vars of the primes. Using consts where
-// possible in the Go code is worth a small (but measurable) performance boost
-// by avoiding some MOVQs. Vars are needed for the asm and also are useful for
-// convenience in the Go code in a few places where we need to intentionally
-// avoid constant arithmetic (e.g., v1 := prime1 + prime2 fails because the
-// result overflows a uint64).
-var (
-	prime1v = prime1
-	prime2v = prime2
-	prime3v = prime3
-	prime4v = prime4
-	prime5v = prime5
-)
-
-// Digest implements hash.Hash64.
-type Digest struct {
-	v1    uint64
-	v2    uint64
-	v3    uint64
-	v4    uint64
-	total uint64
-	mem   [32]byte
-	n     int // how much of mem is used
-}
-
-// New creates a new Digest that computes the 64-bit xxHash algorithm.
-func New() *Digest {
-	var d Digest
-	d.Reset()
-	return &d
-}
-
-// Reset clears the Digest's state so that it can be reused.
-func (d *Digest) Reset() {
-	d.v1 = prime1v + prime2
-	d.v2 = prime2
-	d.v3 = 0
-	d.v4 = -prime1v
-	d.total = 0
-	d.n = 0
-}
-
-// Size always returns 8 bytes.
-func (d *Digest) Size() int { return 8 }
-
-// BlockSize always returns 32 bytes.
-func (d *Digest) BlockSize() int { return 32 }
-
-// Write adds more data to d. It always returns len(b), nil.
-func (d *Digest) Write(b []byte) (n int, err error) {
-	n = len(b)
-	d.total += uint64(n)
-
-	if d.n+n < 32 {
-		// This new data doesn't even fill the current block.
-		copy(d.mem[d.n:], b)
-		d.n += n
-		return
-	}
-
-	if d.n > 0 {
-		// Finish off the partial block.
-		copy(d.mem[d.n:], b)
-		d.v1 = round(d.v1, u64(d.mem[0:8]))
-		d.v2 = round(d.v2, u64(d.mem[8:16]))
-		d.v3 = round(d.v3, u64(d.mem[16:24]))
-		d.v4 = round(d.v4, u64(d.mem[24:32]))
-		b = b[32-d.n:]
-		d.n = 0
-	}
-
-	if len(b) >= 32 {
-		// One or more full blocks left.
-		nw := writeBlocks(d, b)
-		b = b[nw:]
-	}
-
-	// Store any remaining partial block.
-	copy(d.mem[:], b)
-	d.n = len(b)
-
-	return
-}
-
-// Sum appends the current hash to b and returns the resulting slice.
-func (d *Digest) Sum(b []byte) []byte {
-	s := d.Sum64()
-	return append(
-		b,
-		byte(s>>56),
-		byte(s>>48),
-		byte(s>>40),
-		byte(s>>32),
-		byte(s>>24),
-		byte(s>>16),
-		byte(s>>8),
-		byte(s),
-	)
-}
-
-// Sum64 returns the current hash.
-func (d *Digest) Sum64() uint64 {
-	var h uint64
-
-	if d.total >= 32 {
-		v1, v2, v3, v4 := d.v1, d.v2, d.v3, d.v4
-		h = rol1(v1) + rol7(v2) + rol12(v3) + rol18(v4)
-		h = mergeRound(h, v1)
-		h = mergeRound(h, v2)
-		h = mergeRound(h, v3)
-		h = mergeRound(h, v4)
-	} else {
-		h = d.v3 + prime5
-	}
-
-	h += d.total
-
-	i, end := 0, d.n
-	for ; i+8 <= end; i += 8 {
-		k1 := round(0, u64(d.mem[i:i+8]))
-		h ^= k1
-		h = rol27(h)*prime1 + prime4
-	}
-	if i+4 <= end {
-		h ^= uint64(u32(d.mem[i:i+4])) * prime1
-		h = rol23(h)*prime2 + prime3
-		i += 4
-	}
-	for i < end {
-		h ^= uint64(d.mem[i]) * prime5
-		h = rol11(h) * prime1
-		i++
-	}
-
-	h ^= h >> 33
-	h *= prime2
-	h ^= h >> 29
-	h *= prime3
-	h ^= h >> 32
-
-	return h
-}
-
-const (
-	magic         = "xxh\x06"
-	marshaledSize = len(magic) + 8*5 + 32
-)
-
-// MarshalBinary implements the encoding.BinaryMarshaler interface.
-func (d *Digest) MarshalBinary() ([]byte, error) {
-	b := make([]byte, 0, marshaledSize)
-	b = append(b, magic...)
-	b = appendUint64(b, d.v1)
-	b = appendUint64(b, d.v2)
-	b = appendUint64(b, d.v3)
-	b = appendUint64(b, d.v4)
-	b = appendUint64(b, d.total)
-	b = append(b, d.mem[:d.n]...)
-	b = b[:len(b)+len(d.mem)-d.n]
-	return b, nil
-}
-
-// UnmarshalBinary implements the encoding.BinaryUnmarshaler interface.
-func (d *Digest) UnmarshalBinary(b []byte) error {
-	if len(b) < len(magic) || string(b[:len(magic)]) != magic {
-		return errors.New("xxhash: invalid hash state identifier")
-	}
-	if len(b) != marshaledSize {
-		return errors.New("xxhash: invalid hash state size")
-	}
-	b = b[len(magic):]
-	b, d.v1 = consumeUint64(b)
-	b, d.v2 = consumeUint64(b)
-	b, d.v3 = consumeUint64(b)
-	b, d.v4 = consumeUint64(b)
-	b, d.total = consumeUint64(b)
-	copy(d.mem[:], b)
-	d.n = int(d.total % uint64(len(d.mem)))
-	return nil
-}
-
-func appendUint64(b []byte, x uint64) []byte {
-	var a [8]byte
-	binary.LittleEndian.PutUint64(a[:], x)
-	return append(b, a[:]...)
-}
-
-func consumeUint64(b []byte) ([]byte, uint64) {
-	x := u64(b)
-	return b[8:], x
-}
-
-func u64(b []byte) uint64 { return binary.LittleEndian.Uint64(b) }
-func u32(b []byte) uint32 { return binary.LittleEndian.Uint32(b) }
-
-func round(acc, input uint64) uint64 {
-	acc += input * prime2
-	acc = rol31(acc)
-	acc *= prime1
-	return acc
-}
-
-func mergeRound(acc, val uint64) uint64 {
-	val = round(0, val)
-	acc ^= val
-	acc = acc*prime1 + prime4
-	return acc
-}
-
-func rol1(x uint64) uint64  { return bits.RotateLeft64(x, 1) }
-func rol7(x uint64) uint64  { return bits.RotateLeft64(x, 7) }
-func rol11(x uint64) uint64 { return bits.RotateLeft64(x, 11) }
-func rol12(x uint64) uint64 { return bits.RotateLeft64(x, 12) }
-func rol18(x uint64) uint64 { return bits.RotateLeft64(x, 18) }
-func rol23(x uint64) uint64 { return bits.RotateLeft64(x, 23) }
-func rol27(x uint64) uint64 { return bits.RotateLeft64(x, 27) }
-func rol31(x uint64) uint64 { return bits.RotateLeft64(x, 31) }

vendor/github.com/cespare/xxhash/v2/xxhash_amd64.go

@@ -1,13 +0,0 @@
-// +build !appengine
-// +build gc
-// +build !purego
-
-package xxhash
-
-// Sum64 computes the 64-bit xxHash digest of b.
-//
-//go:noescape
-func Sum64(b []byte) uint64
-
-//go:noescape
-func writeBlocks(d *Digest, b []byte) int

vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s

@@ -1,215 +0,0 @@
-// +build !appengine
-// +build gc
-// +build !purego
-
-#include "textflag.h"
-
-// Register allocation:
-// AX	h
-// SI	pointer to advance through b
-// DX	n
-// BX	loop end
-// R8	v1, k1
-// R9	v2
-// R10	v3
-// R11	v4
-// R12	tmp
-// R13	prime1v
-// R14	prime2v
-// DI	prime4v
-
-// round reads from and advances the buffer pointer in SI.
-// It assumes that R13 has prime1v and R14 has prime2v.
-#define round(r) \
-	MOVQ  (SI), R12 \
-	ADDQ  $8, SI    \
-	IMULQ R14, R12  \
-	ADDQ  R12, r    \
-	ROLQ  $31, r    \
-	IMULQ R13, r
-
-// mergeRound applies a merge round on the two registers acc and val.
-// It assumes that R13 has prime1v, R14 has prime2v, and DI has prime4v.
-#define mergeRound(acc, val) \
-	IMULQ R14, val \
-	ROLQ  $31, val \
-	IMULQ R13, val \
-	XORQ  val, acc \
-	IMULQ R13, acc \
-	ADDQ  DI, acc
-
-// func Sum64(b []byte) uint64
-TEXT ·Sum64(SB), NOSPLIT, $0-32
-	// Load fixed primes.
-	MOVQ ·prime1v(SB), R13
-	MOVQ ·prime2v(SB), R14
-	MOVQ ·prime4v(SB), DI
-
-	// Load slice.
-	MOVQ b_base+0(FP), SI
-	MOVQ b_len+8(FP), DX
-	LEAQ (SI)(DX*1), BX
-
-	// The first loop limit will be len(b)-32.
-	SUBQ $32, BX
-
-	// Check whether we have at least one block.
-	CMPQ DX, $32
-	JLT  noBlocks
-
-	// Set up initial state (v1, v2, v3, v4).
-	MOVQ R13, R8
-	ADDQ R14, R8
-	MOVQ R14, R9
-	XORQ R10, R10
-	XORQ R11, R11
-	SUBQ R13, R11
-
-	// Loop until SI > BX.
-blockLoop:
-	round(R8)
-	round(R9)
-	round(R10)
-	round(R11)
-
-	CMPQ SI, BX
-	JLE  blockLoop
-
-	MOVQ R8, AX
-	ROLQ $1, AX
-	MOVQ R9, R12
-	ROLQ $7, R12
-	ADDQ R12, AX
-	MOVQ R10, R12
-	ROLQ $12, R12
-	ADDQ R12, AX
-	MOVQ R11, R12
-	ROLQ $18, R12
-	ADDQ R12, AX
-
-	mergeRound(AX, R8)
-	mergeRound(AX, R9)
-	mergeRound(AX, R10)
-	mergeRound(AX, R11)
-
-	JMP afterBlocks
-
-noBlocks:
-	MOVQ ·prime5v(SB), AX
-
-afterBlocks:
-	ADDQ DX, AX
-
-	// Right now BX has len(b)-32, and we want to loop until SI > len(b)-8.
-	ADDQ $24, BX
-
-	CMPQ SI, BX
-	JG   fourByte
-
-wordLoop:
-	// Calculate k1.
-	MOVQ  (SI), R8
-	ADDQ  $8, SI
-	IMULQ R14, R8
-	ROLQ  $31, R8
-	IMULQ R13, R8
-
-	XORQ  R8, AX
-	ROLQ  $27, AX
-	IMULQ R13, AX
-	ADDQ  DI, AX
-
-	CMPQ SI, BX
-	JLE  wordLoop
-
-fourByte:
-	ADDQ $4, BX
-	CMPQ SI, BX
-	JG   singles
-
-	MOVL  (SI), R8
-	ADDQ  $4, SI
-	IMULQ R13, R8
-	XORQ  R8, AX
-
-	ROLQ  $23, AX
-	IMULQ R14, AX
-	ADDQ  ·prime3v(SB), AX
-
-singles:
-	ADDQ $4, BX
-	CMPQ SI, BX
-	JGE  finalize
-
-singlesLoop:
-	MOVBQZX (SI), R12
-	ADDQ    $1, SI
-	IMULQ   ·prime5v(SB), R12
-	XORQ    R12, AX
-
-	ROLQ  $11, AX
-	IMULQ R13, AX
-
-	CMPQ SI, BX
-	JL   singlesLoop
-
-finalize:
-	MOVQ  AX, R12
-	SHRQ  $33, R12
-	XORQ  R12, AX
-	IMULQ R14, AX
-	MOVQ  AX, R12
-	SHRQ  $29, R12
-	XORQ  R12, AX
-	IMULQ ·prime3v(SB), AX
-	MOVQ  AX, R12
-	SHRQ  $32, R12
-	XORQ  R12, AX
-
-	MOVQ AX, ret+24(FP)
-	RET
-
-// writeBlocks uses the same registers as above except that it uses AX to store
-// the d pointer.
-
-// func writeBlocks(d *Digest, b []byte) int
-TEXT ·writeBlocks(SB), NOSPLIT, $0-40
-	// Load fixed primes needed for round.
-	MOVQ ·prime1v(SB), R13
-	MOVQ ·prime2v(SB), R14
-
-	// Load slice.
-	MOVQ b_base+8(FP), SI
-	MOVQ b_len+16(FP), DX
-	LEAQ (SI)(DX*1), BX
-	SUBQ $32, BX
-
-	// Load vN from d.
-	MOVQ d+0(FP), AX
-	MOVQ 0(AX), R8   // v1
-	MOVQ 8(AX), R9   // v2
-	MOVQ 16(AX), R10 // v3
-	MOVQ 24(AX), R11 // v4
-
-	// We don't need to check the loop condition here; this function is
-	// always called with at least one block of data to process.
-blockLoop:
-	round(R8)
-	round(R9)
-	round(R10)
-	round(R11)
-
-	CMPQ SI, BX
-	JLE  blockLoop
-
-	// Copy vN back to d.
-	MOVQ R8, 0(AX)
-	MOVQ R9, 8(AX)
-	MOVQ R10, 16(AX)
-	MOVQ R11, 24(AX)
-
-	// The number of bytes written is SI minus the old base pointer.
-	SUBQ b_base+8(FP), SI
-	MOVQ SI, ret+32(FP)
-
-	RET

vendor/github.com/cespare/xxhash/v2/xxhash_other.go

@@ -1,76 +0,0 @@
-// +build !amd64 appengine !gc purego
-
-package xxhash
-
-// Sum64 computes the 64-bit xxHash digest of b.
-func Sum64(b []byte) uint64 {
-	// A simpler version would be
-	//   d := New()
-	//   d.Write(b)
-	//   return d.Sum64()
-	// but this is faster, particularly for small inputs.
-
-	n := len(b)
-	var h uint64
-
-	if n >= 32 {
-		v1 := prime1v + prime2
-		v2 := prime2
-		v3 := uint64(0)
-		v4 := -prime1v
-		for len(b) >= 32 {
-			v1 = round(v1, u64(b[0:8:len(b)]))
-			v2 = round(v2, u64(b[8:16:len(b)]))
-			v3 = round(v3, u64(b[16:24:len(b)]))
-			v4 = round(v4, u64(b[24:32:len(b)]))
-			b = b[32:len(b):len(b)]
-		}
-		h = rol1(v1) + rol7(v2) + rol12(v3) + rol18(v4)
-		h = mergeRound(h, v1)
-		h = mergeRound(h, v2)
-		h = mergeRound(h, v3)
-		h = mergeRound(h, v4)
-	} else {
-		h = prime5
-	}
-
-	h += uint64(n)
-
-	i, end := 0, len(b)
-	for ; i+8 <= end; i += 8 {
-		k1 := round(0, u64(b[i:i+8:len(b)]))
-		h ^= k1
-		h = rol27(h)*prime1 + prime4
-	}
-	if i+4 <= end {
-		h ^= uint64(u32(b[i:i+4:len(b)])) * prime1
-		h = rol23(h)*prime2 + prime3
-		i += 4
-	}
-	for ; i < end; i++ {
-		h ^= uint64(b[i]) * prime5
-		h = rol11(h) * prime1
-	}
-
-	h ^= h >> 33
-	h *= prime2
-	h ^= h >> 29
-	h *= prime3
-	h ^= h >> 32
-
-	return h
-}
-
-func writeBlocks(d *Digest, b []byte) int {
-	v1, v2, v3, v4 := d.v1, d.v2, d.v3, d.v4
-	n := len(b)
-	for len(b) >= 32 {
-		v1 = round(v1, u64(b[0:8:len(b)]))
-		v2 = round(v2, u64(b[8:16:len(b)]))
-		v3 = round(v3, u64(b[16:24:len(b)]))
-		v4 = round(v4, u64(b[24:32:len(b)]))
-		b = b[32:len(b):len(b)]
-	}
-	d.v1, d.v2, d.v3, d.v4 = v1, v2, v3, v4
-	return n - len(b)
-}

vendor/github.com/cespare/xxhash/v2/xxhash_safe.go

@@ -1,15 +0,0 @@
-// +build appengine
-
-// This file contains the safe implementations of otherwise unsafe-using code.
-
-package xxhash
-
-// Sum64String computes the 64-bit xxHash digest of s.
-func Sum64String(s string) uint64 {
-	return Sum64([]byte(s))
-}
-
-// WriteString adds more data to d. It always returns len(s), nil.
-func (d *Digest) WriteString(s string) (n int, err error) {
-	return d.Write([]byte(s))
-}

vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go

@@ -1,57 +0,0 @@
-// +build !appengine
-
-// This file encapsulates usage of unsafe.
-// xxhash_safe.go contains the safe implementations.
-
-package xxhash
-
-import (
-	"unsafe"
-)
-
-// In the future it's possible that compiler optimizations will make these
-// XxxString functions unnecessary by realizing that calls such as
-// Sum64([]byte(s)) don't need to copy s. See https://golang.org/issue/2205.
-// If that happens, even if we keep these functions they can be replaced with
-// the trivial safe code.
-
-// NOTE: The usual way of doing an unsafe string-to-[]byte conversion is:
-//
-//   var b []byte
-//   bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
-//   bh.Data = (*reflect.StringHeader)(unsafe.Pointer(&s)).Data
-//   bh.Len = len(s)
-//   bh.Cap = len(s)
-//
-// Unfortunately, as of Go 1.15.3 the inliner's cost model assigns a high enough
-// weight to this sequence of expressions that any function that uses it will
-// not be inlined. Instead, the functions below use a different unsafe
-// conversion designed to minimize the inliner weight and allow both to be
-// inlined. There is also a test (TestInlining) which verifies that these are
-// inlined.
-//
-// See https://github.com/golang/go/issues/42739 for discussion.
-
-// Sum64String computes the 64-bit xxHash digest of s.
-// It may be faster than Sum64([]byte(s)) by avoiding a copy.
-func Sum64String(s string) uint64 {
-	b := *(*[]byte)(unsafe.Pointer(&sliceHeader{s, len(s)}))
-	return Sum64(b)
-}
-
-// WriteString adds more data to d. It always returns len(s), nil.
-// It may be faster than Write([]byte(s)) by avoiding a copy.
-func (d *Digest) WriteString(s string) (n int, err error) {
-	d.Write(*(*[]byte)(unsafe.Pointer(&sliceHeader{s, len(s)})))
-	// d.Write always returns len(s), nil.
-	// Ignoring the return output and returning these fixed values buys a
-	// savings of 6 in the inliner's cost model.
-	return len(s), nil
-}
-
-// sliceHeader is similar to reflect.SliceHeader, but it assumes that the layout
-// of the first two words is the same as the layout of a string.
-type sliceHeader struct {
-	s   string
-	cap int
-}

vendor/github.com/dgryski/go-rendezvous/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017-2020 Damian Gryski <damian@gryski.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

vendor/github.com/dgryski/go-rendezvous/rdv.go

@@ -1,79 +0,0 @@
-package rendezvous
-
-type Rendezvous struct {
-	nodes map[string]int
-	nstr  []string
-	nhash []uint64
-	hash  Hasher
-}
-
-type Hasher func(s string) uint64
-
-func New(nodes []string, hash Hasher) *Rendezvous {
-	r := &Rendezvous{
-		nodes: make(map[string]int, len(nodes)),
-		nstr:  make([]string, len(nodes)),
-		nhash: make([]uint64, len(nodes)),
-		hash:  hash,
-	}
-
-	for i, n := range nodes {
-		r.nodes[n] = i
-		r.nstr[i] = n
-		r.nhash[i] = hash(n)
-	}
-
-	return r
-}
-
-func (r *Rendezvous) Lookup(k string) string {
-	// short-circuit if we're empty
-	if len(r.nodes) == 0 {
-		return ""
-	}
-
-	khash := r.hash(k)
-
-	var midx int
-	var mhash = xorshiftMult64(khash ^ r.nhash[0])
-
-	for i, nhash := range r.nhash[1:] {
-		if h := xorshiftMult64(khash ^ nhash); h > mhash {
-			midx = i + 1
-			mhash = h
-		}
-	}
-
-	return r.nstr[midx]
-}
-
-func (r *Rendezvous) Add(node string) {
-	r.nodes[node] = len(r.nstr)
-	r.nstr = append(r.nstr, node)
-	r.nhash = append(r.nhash, r.hash(node))
-}
-
-func (r *Rendezvous) Remove(node string) {
-	// find index of node to remove
-	nidx := r.nodes[node]
-
-	// remove from the slices
-	l := len(r.nstr)
-	r.nstr[nidx] = r.nstr[l]
-	r.nstr = r.nstr[:l]
-
-	r.nhash[nidx] = r.nhash[l]
-	r.nhash = r.nhash[:l]
-
-	// update the map
-	delete(r.nodes, node)
-	moved := r.nstr[nidx]
-	r.nodes[moved] = nidx
-}
-
-func xorshiftMult64(x uint64) uint64 {
-	x ^= x >> 12 // a
-	x ^= x << 25 // b
-	x ^= x >> 27 // c
-	return x * 2685821657736338717
-}

vendor/github.com/go-redis/redis/v9/.gitignore

@@ -1,3 +0,0 @@
-*.rdb
-testdata/*/
-.idea/

vendor/github.com/go-redis/redis/v9/.golangci.yml

@@ -1,4 +0,0 @@
-run:
-  concurrency: 8
-  deadline: 5m
-  tests: false

vendor/github.com/go-redis/redis/v9/.prettierrc.yml

@@ -1,4 +0,0 @@
-semi: false
-singleQuote: true
-proseWrap: always
-printWidth: 100

vendor/github.com/go-redis/redis/v9/CHANGELOG.md

@@ -1,70 +0,0 @@
-# [9.0.0-beta.2](https://github.com/go-redis/redis/compare/v9.0.0-beta.1...v9.0.0-beta.2) (2022-07-28)
-
-
-### Bug Fixes
-
-* [#2114](https://github.com/go-redis/redis/issues/2114) for redis-server not support Hello ([b6d2a92](https://github.com/go-redis/redis/commit/b6d2a925297e3e516eb5c76c114c1c9fcd5b68c5))
-* additional node failures in clustered pipelined reads ([03376a5](https://github.com/go-redis/redis/commit/03376a5d9c7dfd7197b14ce13b24a0431a07a663))
-* disregard failed pings in updateLatency() for cluster nodes ([64f972f](https://github.com/go-redis/redis/commit/64f972fbeae401e52a2c066a0e1c922af617e15c))
-* don't panic when test cannot start ([9e16c79](https://github.com/go-redis/redis/commit/9e16c79951e7769621b7320f1ecdf04baf539b82))
-* handle panic in ringShards Hash function when Ring got closed ([a80b84f](https://github.com/go-redis/redis/commit/a80b84f01f9fc0d3e6f08445ba21f7e07880775e)), closes [#2126](https://github.com/go-redis/redis/issues/2126)
-* ignore Nil error when reading EntriesRead ([89d6dfe](https://github.com/go-redis/redis/commit/89d6dfe09a88321d445858c1c5b24d2757b95a3e))
-* log errors from cmdsInfoCache ([fa4d1ea](https://github.com/go-redis/redis/commit/fa4d1ea8398cd729ad5cbaaff88e4b8805393945))
-* provide a signal channel to end heartbeat goroutine ([f032c12](https://github.com/go-redis/redis/commit/f032c126db3e2c1a239ce1790b0ab81994df75cf))
-* remove conn reaper from the pool and uptrace option names ([f6a8adc](https://github.com/go-redis/redis/commit/f6a8adc50cdaec30527f50d06468f9176ee674fe))
-* replace heartbeat signal channel with context.WithCancel ([20d0ca2](https://github.com/go-redis/redis/commit/20d0ca235efff48ad48cc05b98790b825d4ba979))
-
-
-
-# [9.0.0-beta.1](https://github.com/go-redis/redis/compare/v8.11.5...v9.0.0-beta.1) (2022-06-04)
-
-### Bug Fixes
-
-- **#1943:** xInfoConsumer.Idle should be time.Duration instead of int64
-  ([#2052](https://github.com/go-redis/redis/issues/2052))
-  ([997ab5e](https://github.com/go-redis/redis/commit/997ab5e7e3ddf53837917013a4babbded73e944f)),
-  closes [#1943](https://github.com/go-redis/redis/issues/1943)
-- add XInfoConsumers test
-  ([6f1a1ac](https://github.com/go-redis/redis/commit/6f1a1ac284ea3f683eeb3b06a59969e8424b6376))
-- fix tests
-  ([3a722be](https://github.com/go-redis/redis/commit/3a722be81180e4d2a9cf0a29dc9a1ee1421f5859))
-- remove test(XInfoConsumer.idle), not a stable return value when tested.
-  ([f5fbb36](https://github.com/go-redis/redis/commit/f5fbb367e7d9dfd7f391fc535a7387002232fa8a))
-- update ChannelWithSubscriptions to accept options
-  ([c98c5f0](https://github.com/go-redis/redis/commit/c98c5f0eebf8d254307183c2ce702a48256b718d))
-- update COMMAND parser for Redis 7
-  ([b0bb514](https://github.com/go-redis/redis/commit/b0bb514059249e01ed7328c9094e5b8a439dfb12))
-- use redis over ssh channel([#2057](https://github.com/go-redis/redis/issues/2057))
-  ([#2060](https://github.com/go-redis/redis/issues/2060))
-  ([3961b95](https://github.com/go-redis/redis/commit/3961b9577f622a3079fe74f8fc8da12ba67a77ff))
-
-### Features
-
-- add ClientUnpause
-  ([91171f5](https://github.com/go-redis/redis/commit/91171f5e19a261dc4cfbf8706626d461b6ba03e4))
-- add NewXPendingResult for unit testing XPending
-  ([#2066](https://github.com/go-redis/redis/issues/2066))
-  ([b7fd09e](https://github.com/go-redis/redis/commit/b7fd09e59479bc6ed5b3b13c4645a3620fd448a3))
-- add WriteArg and Scan net.IP([#2062](https://github.com/go-redis/redis/issues/2062))
-  ([7d5167e](https://github.com/go-redis/redis/commit/7d5167e8624ac1515e146ed183becb97dadb3d1a))
-- **pool:** add check for badConnection
-  ([a8a7665](https://github.com/go-redis/redis/commit/a8a7665ddf8cc657c5226b1826a8ee83dab4b8c1)),
-  closes [#2053](https://github.com/go-redis/redis/issues/2053)
-- provide a username and password callback method, so that the plaintext username and password will
-  not be stored in the memory, and the username and password will only be generated once when the
-  CredentialsProvider is called. After the method is executed, the username and password strings on
-  the stack will be released. ([#2097](https://github.com/go-redis/redis/issues/2097))
-  ([56a3dbc](https://github.com/go-redis/redis/commit/56a3dbc7b656525eb88e0735e239d56e04a23bee))
-- upgrade to Redis 7
-  ([d09c27e](https://github.com/go-redis/redis/commit/d09c27e6046129fd27b1d275e5a13a477bd7f778))
-
-## v9 UNRELEASED
-
-- Added support for [RESP3](https://github.com/antirez/RESP3/blob/master/spec.md) protocol.
-- Removed `Pipeline.Close` since there is no real need to explicitly manage pipeline resources.
-  `Pipeline.Discard` is still available if you want to reset commands for some reason.
-- Replaced `*redis.Z` with `redis.Z` since it is small enough to be passed as value.
-- Renamed `MaxConnAge` to `ConnMaxLifetime`.
-- Renamed `IdleTimeout` to `ConnMaxIdleTime`.
-- Removed connection reaper in favor of `MaxIdleConns`.
-- Removed `WithContext`.

vendor/github.com/go-redis/redis/v9/LICENSE

@@ -1,25 +0,0 @@
-Copyright (c) 2013 The github.com/go-redis/redis Authors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

vendor/github.com/go-redis/redis/v9/Makefile

@@ -1,34 +0,0 @@
-PACKAGE_DIRS := $(shell find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; | sort)
-
-test: testdeps
-	go test ./...
-	go test ./... -short -race
-	go test ./... -run=NONE -bench=. -benchmem
-	env GOOS=linux GOARCH=386 go test ./...
-	go vet
-
-testdeps: testdata/redis/src/redis-server
-
-bench: testdeps
-	go test ./... -test.run=NONE -test.bench=. -test.benchmem
-
-.PHONY: all test testdeps bench
-
-testdata/redis:
-	mkdir -p $@
-	wget -qO- https://download.redis.io/releases/redis-7.0.0.tar.gz | tar xvz --strip-components=1 -C $@
-
-testdata/redis/src/redis-server: testdata/redis
-	cd $< && make all
-
-fmt:
-	gofmt -w -s ./
-	goimports -w  -local github.com/go-redis/redis ./
-
-go_mod_tidy:
-	set -e; for dir in $(PACKAGE_DIRS); do \
-	  echo "go mod tidy in $${dir}"; \
-	  (cd "$${dir}" && \
-	    go get -u ./... && \
-	    go mod tidy -compat=1.17); \
-	done

vendor/github.com/go-redis/redis/v9/README.md

@@ -1,195 +0,0 @@
-# Redis client for Go
-
-![build workflow](https://github.com/go-redis/redis/actions/workflows/build.yml/badge.svg)
-[![PkgGoDev](https://pkg.go.dev/badge/github.com/go-redis/redis/v8)](https://pkg.go.dev/github.com/go-redis/redis/v8?tab=doc)
-[![Documentation](https://img.shields.io/badge/redis-documentation-informational)](https://redis.uptrace.dev/)
-[![Chat](https://discordapp.com/api/guilds/752070105847955518/widget.png)](https://discord.gg/rWtp5Aj)
-
-> go-redis is brought to you by :star: [**uptrace/uptrace**](https://github.com/uptrace/uptrace).
-> Uptrace is an open source and blazingly fast
-> [distributed tracing tool](https://get.uptrace.dev/compare/distributed-tracing-tools.html) powered
-> by OpenTelemetry and ClickHouse. Give it a star as well!
-
-## Sponsors
-
-### Upstash: Serverless Database for Redis
-
-<a href="https://upstash.com/?utm_source=goredis"><img align="right" width="320" src="https://raw.githubusercontent.com/upstash/sponsorship/master/redis.png" alt="Upstash"></a>
-
-Upstash is a Serverless Database with Redis/REST API and durable storage. It is the perfect database
-for your applications thanks to its per request pricing and low latency data.
-
-[Start for free in 30 seconds!](https://upstash.com/?utm_source=goredis)
-
-<br clear="both"/>
-
-## Resources
-
-- [Documentation](https://redis.uptrace.dev)
-- [Discussions](https://github.com/go-redis/redis/discussions)
-- [Chat](https://discord.gg/rWtp5Aj)
-- [Reference](https://pkg.go.dev/github.com/go-redis/redis/v8?tab=doc)
-- [Examples](https://pkg.go.dev/github.com/go-redis/redis/v8?tab=doc#pkg-examples)
-
-## Ecosystem
-
-- [Redis Mock](https://github.com/go-redis/redismock)
-- [Distributed Locks](https://github.com/bsm/redislock)
-- [Redis Cache](https://github.com/go-redis/cache)
-- [Rate limiting](https://github.com/go-redis/redis_rate)
-
-This client also works with [kvrocks](https://github.com/KvrocksLabs/kvrocks), a distributed key
-value NoSQL database that uses RocksDB as storage engine and is compatible with Redis protocol.
-
-## Features
-
-- Redis 3 commands except QUIT, MONITOR, and SYNC.
-- Automatic connection pooling with
-- [Pub/Sub](https://redis.uptrace.dev/guide/go-redis-pubsub.html).
-- [Pipelines and transactions](https://redis.uptrace.dev/guide/go-redis-pipelines.html).
-- [Scripting](https://redis.uptrace.dev/guide/lua-scripting.html).
-- [Redis Sentinel](https://redis.uptrace.dev/guide/go-redis-sentinel.html).
-- [Redis Cluster](https://redis.uptrace.dev/guide/go-redis-cluster.html).
-- [Redis Ring](https://redis.uptrace.dev/guide/ring.html).
-- [Redis Performance Monitoring](https://redis.uptrace.dev/guide/redis-performance-monitoring.html).
-
-## Installation
-
-go-redis supports 2 last Go versions and requires a Go version with
-[modules](https://github.com/golang/go/wiki/Modules) support. So make sure to initialize a Go
-module:
-
-```shell
-go mod init github.com/my/repo
-```
-
-If you are using **Redis 6**, install go-redis/**v8**:
-
-```shell
-go get github.com/go-redis/redis/v8
-```
-
-If you are using **Redis 7**, install go-redis/**v9**:
-
-```shell
-go get github.com/go-redis/redis/v9
-```
-
-## Quickstart
-
-```go
-import (
-    "context"
-    "github.com/go-redis/redis/v8"
-    "fmt"
-)
-
-var ctx = context.Background()
-
-func ExampleClient() {
-    rdb := redis.NewClient(&redis.Options{
-        Addr:     "localhost:6379",
-        Password: "", // no password set
-        DB:       0,  // use default DB
-    })
-
-    err := rdb.Set(ctx, "key", "value", 0).Err()
-    if err != nil {
-        panic(err)
-    }
-
-    val, err := rdb.Get(ctx, "key").Result()
-    if err != nil {
-        panic(err)
-    }
-    fmt.Println("key", val)
-
-    val2, err := rdb.Get(ctx, "key2").Result()
-    if err == redis.Nil {
-        fmt.Println("key2 does not exist")
-    } else if err != nil {
-        panic(err)
-    } else {
-        fmt.Println("key2", val2)
-    }
-    // Output: key value
-    // key2 does not exist
-}
-```
-
-## Look and feel
-
-Some corner cases:
-
-```go
-// SET key value EX 10 NX
-set, err := rdb.SetNX(ctx, "key", "value", 10*time.Second).Result()
-
-// SET key value keepttl NX
-set, err := rdb.SetNX(ctx, "key", "value", redis.KeepTTL).Result()
-
-// SORT list LIMIT 0 2 ASC
-vals, err := rdb.Sort(ctx, "list", &redis.Sort{Offset: 0, Count: 2, Order: "ASC"}).Result()
-
-// ZRANGEBYSCORE zset -inf +inf WITHSCORES LIMIT 0 2
-vals, err := rdb.ZRangeByScoreWithScores(ctx, "zset", &redis.ZRangeBy{
-    Min: "-inf",
-    Max: "+inf",
-    Offset: 0,
-    Count: 2,
-}).Result()
-
-// ZINTERSTORE out 2 zset1 zset2 WEIGHTS 2 3 AGGREGATE SUM
-vals, err := rdb.ZInterStore(ctx, "out", &redis.ZStore{
-    Keys: []string{"zset1", "zset2"},
-    Weights: []int64{2, 3}
-}).Result()
-
-// EVAL "return {KEYS[1],ARGV[1]}" 1 "key" "hello"
-vals, err := rdb.Eval(ctx, "return {KEYS[1],ARGV[1]}", []string{"key"}, "hello").Result()
-
-// custom command
-res, err := rdb.Do(ctx, "set", "key", "value").Result()
-```
-
-## Run the test
-
-go-redis will start a redis-server and run the test cases.
-
-The paths of redis-server bin file and redis config file are defined in `main_test.go`:
-
-```go
-var (
-	redisServerBin, _  = filepath.Abs(filepath.Join("testdata", "redis", "src", "redis-server"))
-	redisServerConf, _ = filepath.Abs(filepath.Join("testdata", "redis", "redis.conf"))
-)
-```
-
-For local testing, you can change the variables to refer to your local files, or create a soft link
-to the corresponding folder for redis-server and copy the config file to `testdata/redis/`:
-
-```shell
-ln -s /usr/bin/redis-server ./go-redis/testdata/redis/src
-cp ./go-redis/testdata/redis.conf ./go-redis/testdata/redis/
-```
-
-Lastly, run:
-
-```shell
-go test
-```
-
-## See also
-
-- [Golang ORM](https://bun.uptrace.dev) for PostgreSQL, MySQL, MSSQL, and SQLite
-- [Golang PostgreSQL](https://bun.uptrace.dev/postgres/)
-- [Golang HTTP router](https://bunrouter.uptrace.dev/)
-- [Golang ClickHouse ORM](https://github.com/uptrace/go-clickhouse)
-
-## Contributors
-
-Thanks to all the people who already contributed!
-
-<a href="https://github.com/go-redis/redis/graphs/contributors">
-  <img src="https://contributors-img.web.app/image?repo=go-redis/redis" />
-</a>

vendor/github.com/go-redis/redis/v9/RELEASING.md

@@ -1,15 +0,0 @@
-# Releasing
-
-1. Run `release.sh` script which updates versions in go.mod files and pushes a new branch to GitHub:
-
-```shell
-TAG=v1.0.0 ./scripts/release.sh
-```
-
-2. Open a pull request and wait for the build to finish.
-
-3. Merge the pull request and run `tag.sh` to create tags for packages:
-
-```shell
-TAG=v1.0.0 ./scripts/tag.sh
-```

vendor/github.com/go-redis/redis/v9/cluster_commands.go

@@ -1,109 +0,0 @@
-package redis
-
-import (
-	"context"
-	"sync"
-	"sync/atomic"
-)
-
-func (c *ClusterClient) DBSize(ctx context.Context) *IntCmd {
-	cmd := NewIntCmd(ctx, "dbsize")
-	_ = c.hooks.process(ctx, cmd, func(ctx context.Context, _ Cmder) error {
-		var size int64
-		err := c.ForEachMaster(ctx, func(ctx context.Context, master *Client) error {
-			n, err := master.DBSize(ctx).Result()
-			if err != nil {
-				return err
-			}
-			atomic.AddInt64(&size, n)
-			return nil
-		})
-		if err != nil {
-			cmd.SetErr(err)
-		} else {
-			cmd.val = size
-		}
-		return nil
-	})
-	return cmd
-}
-
-func (c *ClusterClient) ScriptLoad(ctx context.Context, script string) *StringCmd {
-	cmd := NewStringCmd(ctx, "script", "load", script)
-	_ = c.hooks.process(ctx, cmd, func(ctx context.Context, _ Cmder) error {
-		mu := &sync.Mutex{}
-		err := c.ForEachShard(ctx, func(ctx context.Context, shard *Client) error {
-			val, err := shard.ScriptLoad(ctx, script).Result()
-			if err != nil {
-				return err
-			}
-
-			mu.Lock()
-			if cmd.Val() == "" {
-				cmd.val = val
-			}
-			mu.Unlock()
-
-			return nil
-		})
-		if err != nil {
-			cmd.SetErr(err)
-		}
-		return nil
-	})
-	return cmd
-}
-
-func (c *ClusterClient) ScriptFlush(ctx context.Context) *StatusCmd {
-	cmd := NewStatusCmd(ctx, "script", "flush")
-	_ = c.hooks.process(ctx, cmd, func(ctx context.Context, _ Cmder) error {
-		err := c.ForEachShard(ctx, func(ctx context.Context, shard *Client) error {
-			return shard.ScriptFlush(ctx).Err()
-		})
-		if err != nil {
-			cmd.SetErr(err)
-		}
-		return nil
-	})
-	return cmd
-}
-
-func (c *ClusterClient) ScriptExists(ctx context.Context, hashes ...string) *BoolSliceCmd {
-	args := make([]interface{}, 2+len(hashes))
-	args[0] = "script"
-	args[1] = "exists"
-	for i, hash := range hashes {
-		args[2+i] = hash
-	}
-	cmd := NewBoolSliceCmd(ctx, args...)
-
-	result := make([]bool, len(hashes))
-	for i := range result {
-		result[i] = true
-	}
-
-	_ = c.hooks.process(ctx, cmd, func(ctx context.Context, _ Cmder) error {
-		mu := &sync.Mutex{}
-		err := c.ForEachShard(ctx, func(ctx context.Context, shard *Client) error {
-			val, err := shard.ScriptExists(ctx, hashes...).Result()
-			if err != nil {
-				return err
-			}
-
-			mu.Lock()
-			for i, v := range val {
-				result[i] = result[i] && v
-			}
-			mu.Unlock()
-
-			return nil
-		})
-		if err != nil {
-			cmd.SetErr(err)
-		} else {
-			cmd.val = result
-		}
-		return nil
-	})
-	return cmd
-}

vendor/github.com/go-redis/redis/v9/doc.go

@@ -1,4 +0,0 @@
-/*
-Package redis implements a Redis client.
-*/
-package redis

vendor/github.com/go-redis/redis/v9/error.go

@@ -1,144 +0,0 @@
-package redis
-
-import (
-	"context"
-	"io"
-	"net"
-	"strings"
-
-	"github.com/go-redis/redis/v9/internal/pool"
-	"github.com/go-redis/redis/v9/internal/proto"
-)
-
-// ErrClosed performs any operation on the closed client will return this error.
-var ErrClosed = pool.ErrClosed
-
-type Error interface {
-	error
-
-	// RedisError is a no-op function but
-	// serves to distinguish types that are Redis
-	// errors from ordinary errors: a type is a
-	// Redis error if it has a RedisError method.
-	RedisError()
-}
-
-var _ Error = proto.RedisError("")
-
-func shouldRetry(err error, retryTimeout bool) bool {
-	switch err {
-	case io.EOF, io.ErrUnexpectedEOF:
-		return true
-	case nil, context.Canceled, context.DeadlineExceeded:
-		return false
-	}
-
-	if v, ok := err.(timeoutError); ok {
-		if v.Timeout() {
-			return retryTimeout
-		}
-		return true
-	}
-
-	s := err.Error()
-	if s == "ERR max number of clients reached" {
-		return true
-	}
-	if strings.HasPrefix(s, "LOADING ") {
-		return true
-	}
-	if strings.HasPrefix(s, "READONLY ") {
-		return true
-	}
-	if strings.HasPrefix(s, "CLUSTERDOWN ") {
-		return true
-	}
-	if strings.HasPrefix(s, "TRYAGAIN ") {
-		return true
-	}
-
-	return false
-}
-
-func isRedisError(err error) bool {
-	_, ok := err.(proto.RedisError)
-	return ok
-}
-
-func isBadConn(err error, allowTimeout bool, addr string) bool {
-	switch err {
-	case nil:
-		return false
-	case context.Canceled, context.DeadlineExceeded:
-		return true
-	}
-
-	if isRedisError(err) {
-		switch {
-		case isReadOnlyError(err):
-			// Close connections in read only state in case domain addr is used
-			// and domain resolves to a different Redis Server. See #790.
-			return true
-		case isMovedSameConnAddr(err, addr):
-			// Close connections when we are asked to move to the same addr
-			// of the connection. Force a DNS resolution when all connections
-			// of the pool are recycled
-			return true
-		default:
-			return false
-		}
-	}
-
-	if allowTimeout {
-		if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
-			return false
-		}
-	}
-
-	return true
-}
-
-func isMovedError(err error) (moved bool, ask bool, addr string) {
-	if !isRedisError(err) {
-		return
-	}
-
-	s := err.Error()
-	switch {
-	case strings.HasPrefix(s, "MOVED "):
-		moved = true
-	case strings.HasPrefix(s, "ASK "):
-		ask = true
-	default:
-		return
-	}
-
-	ind := strings.LastIndex(s, " ")
-	if ind == -1 {
-		return false, false, ""
-	}
-	addr = s[ind+1:]
-	return
-}
-
-func isLoadingError(err error) bool {
-	return strings.HasPrefix(err.Error(), "LOADING ")
-}
-
-func isReadOnlyError(err error) bool {
-	return strings.HasPrefix(err.Error(), "READONLY ")
-}
-
-func isMovedSameConnAddr(err error, addr string) bool {
-	redisError := err.Error()
-	if !strings.HasPrefix(redisError, "MOVED ") {
-		return false
-	}
-	return strings.HasSuffix(redisError, " "+addr)
-}
-
-//------------------------------------------------------------------------------
-
-type timeoutError interface {
-	Timeout() bool
-}

vendor/github.com/go-redis/redis/v9/internal/arg.go

@@ -1,56 +0,0 @@
-package internal
-
-import (
-	"fmt"
-	"strconv"
-	"time"
-)
-
-func AppendArg(b []byte, v interface{}) []byte {
-	switch v := v.(type) {
-	case nil:
-		return append(b, "<nil>"...)
-	case string:
-		return appendUTF8String(b, Bytes(v))
-	case []byte:
-		return appendUTF8String(b, v)
-	case int:
-		return strconv.AppendInt(b, int64(v), 10)
-	case int8:
-		return strconv.AppendInt(b, int64(v), 10)
-	case int16:
-		return strconv.AppendInt(b, int64(v), 10)
-	case int32:
-		return strconv.AppendInt(b, int64(v), 10)
-	case int64:
-		return strconv.AppendInt(b, v, 10)
-	case uint:
-		return strconv.AppendUint(b, uint64(v), 10)
-	case uint8:
-		return strconv.AppendUint(b, uint64(v), 10)
-	case uint16:
-		return strconv.AppendUint(b, uint64(v), 10)
-	case uint32:
-		return strconv.AppendUint(b, uint64(v), 10)
-	case uint64:
-		return strconv.AppendUint(b, v, 10)
-	case float32:
-		return strconv.AppendFloat(b, float64(v), 'f', -1, 64)
-	case float64:
-		return strconv.AppendFloat(b, v, 'f', -1, 64)
-	case bool:
-		if v {
-			return append(b, "true"...)
-		}
-		return append(b, "false"...)
-	case time.Time:
-		return v.AppendFormat(b, time.RFC3339Nano)
-	default:
-		return append(b, fmt.Sprint(v)...)
-	}
-}
-
-func appendUTF8String(dst []byte, src []byte) []byte {
-	dst = append(dst, src...)
-	return dst
-}

vendor/github.com/go-redis/redis/v9/internal/hashtag/hashtag.go

@@ -1,78 +0,0 @@
-package hashtag
-
-import (
-	"strings"
-
-	"github.com/go-redis/redis/v9/internal/rand"
-)
-
-const slotNumber = 16384
-
-// CRC16 implementation according to CCITT standards.
-// Copyright 2001-2010 Georges Menie (www.menie.org)
-// Copyright 2013 The Go Authors. All rights reserved.
-// http://redis.io/topics/cluster-spec#appendix-a-crc16-reference-implementation-in-ansi-c
-var crc16tab = [256]uint16{
-	0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
-	0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
-	0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
-	0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
-	0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
-	0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
-	0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
-	0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
-	0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
-	0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
-	0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
-	0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
-	0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
-	0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
-	0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
-	0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
-	0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
-	0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
-	0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
-	0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
-	0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
-	0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-	0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
-	0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
-	0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
-	0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
-	0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
-	0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
-	0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
-	0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
-	0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
-	0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0,
-}
-
-func Key(key string) string {
-	if s := strings.IndexByte(key, '{'); s > -1 {
-		if e := strings.IndexByte(key[s+1:], '}'); e > 0 {
-			return key[s+1 : s+e+1]
-		}
-	}
-	return key
-}
-
-func RandomSlot() int {
-	return rand.Intn(slotNumber)
-}
-
-// Slot returns a consistent slot number between 0 and 16383
-// for any given string key.
-func Slot(key string) int {
-	if key == "" {
-		return RandomSlot()
-	}
-	key = Key(key)
-	return int(crc16sum(key)) % slotNumber
-}
-
-func crc16sum(key string) (crc uint16) {
-	for i := 0; i < len(key); i++ {
-		crc = (crc << 8) ^ crc16tab[(byte(crc>>8)^key[i])&0x00ff]
-	}
-	return
-}

vendor/github.com/go-redis/redis/v9/internal/hscan/hscan.go

@@ -1,201 +0,0 @@
-package hscan
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-)
-
-// decoderFunc represents decoding functions for default built-in types.
-type decoderFunc func(reflect.Value, string) error
-
-var (
-	// List of built-in decoders indexed by their numeric constant values (eg: reflect.Bool = 1).
-	decoders = []decoderFunc{
-		reflect.Bool:          decodeBool,
-		reflect.Int:           decodeInt,
-		reflect.Int8:          decodeInt8,
-		reflect.Int16:         decodeInt16,
-		reflect.Int32:         decodeInt32,
-		reflect.Int64:         decodeInt64,
-		reflect.Uint:          decodeUint,
-		reflect.Uint8:         decodeUint8,
-		reflect.Uint16:        decodeUint16,
-		reflect.Uint32:        decodeUint32,
-		reflect.Uint64:        decodeUint64,
-		reflect.Float32:       decodeFloat32,
-		reflect.Float64:       decodeFloat64,
-		reflect.Complex64:     decodeUnsupported,
-		reflect.Complex128:    decodeUnsupported,
-		reflect.Array:         decodeUnsupported,
-		reflect.Chan:          decodeUnsupported,
-		reflect.Func:          decodeUnsupported,
-		reflect.Interface:     decodeUnsupported,
-		reflect.Map:           decodeUnsupported,
-		reflect.Ptr:           decodeUnsupported,
-		reflect.Slice:         decodeSlice,
-		reflect.String:        decodeString,
-		reflect.Struct:        decodeUnsupported,
-		reflect.UnsafePointer: decodeUnsupported,
-	}
-
-	// Global map of struct field specs that is populated once for every new
-	// struct type that is scanned. This caches the field types and the corresponding
-	// decoder functions to avoid iterating through struct fields on subsequent scans.
-	globalStructMap = newStructMap()
-)
-
-func Struct(dst interface{}) (StructValue, error) {
-	v := reflect.ValueOf(dst)
-
-	// The destination to scan into should be a struct pointer.
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return StructValue{}, fmt.Errorf("redis.Scan(non-pointer %T)", dst)
-	}
-
-	v = v.Elem()
-	if v.Kind() != reflect.Struct {
-		return StructValue{}, fmt.Errorf("redis.Scan(non-struct %T)", dst)
-	}
-
-	return StructValue{
-		spec:  globalStructMap.get(v.Type()),
-		value: v,
-	}, nil
-}
-
-// Scan scans the results from a key-value Redis map result set to a destination struct.
-// The Redis keys are matched to the struct's field with the `redis` tag.
-func Scan(dst interface{}, keys []interface{}, vals []interface{}) error {
-	if len(keys) != len(vals) {
-		return errors.New("args should have the same number of keys and vals")
-	}
-
-	strct, err := Struct(dst)
-	if err != nil {
-		return err
-	}
-
-	// Iterate through the (key, value) sequence.
-	for i := 0; i < len(vals); i++ {
-		key, ok := keys[i].(string)
-		if !ok {
-			continue
-		}
-
-		val, ok := vals[i].(string)
-		if !ok {
-			continue
-		}
-
-		if err := strct.Scan(key, val); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func decodeBool(f reflect.Value, s string) error {
-	b, err := strconv.ParseBool(s)
-	if err != nil {
-		return err
-	}
-	f.SetBool(b)
-	return nil
-}
-
-func decodeInt8(f reflect.Value, s string) error {
-	return decodeNumber(f, s, 8)
-}
-
-func decodeInt16(f reflect.Value, s string) error {
-	return decodeNumber(f, s, 16)
-}
-
-func decodeInt32(f reflect.Value, s string) error {
-	return decodeNumber(f, s, 32)
-}
-
-func decodeInt64(f reflect.Value, s string) error {
-	return decodeNumber(f, s, 64)
-}
-
-func decodeInt(f reflect.Value, s string) error {
-	return decodeNumber(f, s, 0)
-}
-
-func decodeNumber(f reflect.Value, s string, bitSize int) error {
-	v, err := strconv.ParseInt(s, 10, bitSize)
-	if err != nil {
-		return err
-	}
-	f.SetInt(v)
-	return nil
-}
-
-func decodeUint8(f reflect.Value, s string) error {
-	return decodeUnsignedNumber(f, s, 8)
-}
-
-func decodeUint16(f reflect.Value, s string) error {
-	return decodeUnsignedNumber(f, s, 16)
-}
-
-func decodeUint32(f reflect.Value, s string) error {
-	return decodeUnsignedNumber(f, s, 32)
-}
-
-func decodeUint64(f reflect.Value, s string) error {
-	return decodeUnsignedNumber(f, s, 64)
-}
-
-func decodeUint(f reflect.Value, s string) error {
-	return decodeUnsignedNumber(f, s, 0)
-}
-
-func decodeUnsignedNumber(f reflect.Value, s string, bitSize int) error {
-	v, err := strconv.ParseUint(s, 10, bitSize)
-	if err != nil {
-		return err
-	}
-	f.SetUint(v)
-	return nil
-}
-
-func decodeFloat32(f reflect.Value, s string) error {
-	v, err := strconv.ParseFloat(s, 32)
-	if err != nil {
-		return err
-	}
-	f.SetFloat(v)
-	return nil
-}
-
-// although the default is float64, but we better define it.
-func decodeFloat64(f reflect.Value, s string) error {
-	v, err := strconv.ParseFloat(s, 64)
-	if err != nil {
-		return err
-	}
-	f.SetFloat(v)
-	return nil
-}
-
-func decodeString(f reflect.Value, s string) error {
-	f.SetString(s)
-	return nil
-}
-
-func decodeSlice(f reflect.Value, s string) error {
-	// []byte slice ([]uint8).
-	if f.Type().Elem().Kind() == reflect.Uint8 {
-		f.SetBytes([]byte(s))
-	}
-	return nil
-}
-
-func decodeUnsupported(v reflect.Value, s string) error {
-	return fmt.Errorf("redis.Scan(unsupported %s)", v.Type())
-}

vendor/github.com/go-redis/redis/v9/internal/hscan/structmap.go

@@ -1,93 +0,0 @@
-package hscan
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-// structMap contains the map of struct fields for target structs
-// indexed by the struct type.
-type structMap struct {
-	m sync.Map
-}
-
-func newStructMap() *structMap {
-	return new(structMap)
-}
-
-func (s *structMap) get(t reflect.Type) *structSpec {
-	if v, ok := s.m.Load(t); ok {
-		return v.(*structSpec)
-	}
-
-	spec := newStructSpec(t, "redis")
-	s.m.Store(t, spec)
-	return spec
-}
-
-//------------------------------------------------------------------------------
-
-// structSpec contains the list of all fields in a target struct.
-type structSpec struct {
-	m map[string]*structField
-}
-
-func (s *structSpec) set(tag string, sf *structField) {
-	s.m[tag] = sf
-}
-
-func newStructSpec(t reflect.Type, fieldTag string) *structSpec {
-	numField := t.NumField()
-	out := &structSpec{
-		m: make(map[string]*structField, numField),
-	}
-
-	for i := 0; i < numField; i++ {
-		f := t.Field(i)
-
-		tag := f.Tag.Get(fieldTag)
-		if tag == "" || tag == "-" {
-			continue
-		}
-
-		tag = strings.Split(tag, ",")[0]
-		if tag == "" {
-			continue
-		}
-
-		// Use the built-in decoder.
-		out.set(tag, &structField{index: i, fn: decoders[f.Type.Kind()]})
-	}
-
-	return out
-}
-
-//------------------------------------------------------------------------------
-
-// structField represents a single field in a target struct.
-type structField struct {
-	index int
-	fn    decoderFunc
-}
-
-//------------------------------------------------------------------------------
-
-type StructValue struct {
-	spec  *structSpec
-	value reflect.Value
-}
-
-func (s StructValue) Scan(key string, value string) error {
-	field, ok := s.spec.m[key]
-	if !ok {
-		return nil
-	}
-	if err := field.fn(s.value.Field(field.index), value); err != nil {
-		t := s.value.Type()
-		return fmt.Errorf("cannot scan redis.result %s into struct field %s.%s of type %s, error-%s",
-			value, t.Name(), t.Field(field.index).Name, t.Field(field.index).Type, err.Error())
-	}
-	return nil
-}

vendor/github.com/go-redis/redis/v9/internal/internal.go

@@ -1,29 +0,0 @@
-package internal
-
-import (
-	"time"
-
-	"github.com/go-redis/redis/v9/internal/rand"
-)
-
-func RetryBackoff(retry int, minBackoff, maxBackoff time.Duration) time.Duration {
-	if retry < 0 {
-		panic("not reached")
-	}
-	if minBackoff == 0 {
-		return 0
-	}
-
-	d := minBackoff << uint(retry)
-	if d < minBackoff {
-		return maxBackoff
-	}
-
-	d = minBackoff + time.Duration(rand.Int63n(int64(d)))
-
-	if d > maxBackoff || d < minBackoff {
-		d = maxBackoff
-	}
-
-	return d
-}

vendor/github.com/go-redis/redis/v9/internal/log.go

@@ -1,26 +0,0 @@
-package internal
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-)
-
-type Logging interface {
-	Printf(ctx context.Context, format string, v ...interface{})
-}
-
-type logger struct {
-	log *log.Logger
-}
-
-func (l *logger) Printf(ctx context.Context, format string, v ...interface{}) {
-	_ = l.log.Output(2, fmt.Sprintf(format, v...))
-}
-
-// Logger calls Output to print to the stderr.
-// Arguments are handled in the manner of fmt.Print.
-var Logger Logging = &logger{
-	log: log.New(os.Stderr, "redis: ", log.LstdFlags|log.Lshortfile),
-}

vendor/github.com/go-redis/redis/v9/internal/once.go

@@ -1,60 +0,0 @@
-/*
-Copyright 2014 The Camlistore Authors
-
-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.
-*/
-
-package internal
-
-import (
-	"sync"
-	"sync/atomic"
-)
-
-// A Once will perform a successful action exactly once.
-//
-// Unlike a sync.Once, this Once's func returns an error
-// and is re-armed on failure.
-type Once struct {
-	m    sync.Mutex
-	done uint32
-}
-
-// Do calls the function f if and only if Do has not been invoked
-// without error for this instance of Once.  In other words, given
-// 	var once Once
-// if once.Do(f) is called multiple times, only the first call will
-// invoke f, even if f has a different value in each invocation unless
-// f returns an error.  A new instance of Once is required for each
-// function to execute.
-//
-// Do is intended for initialization that must be run exactly once.  Since f
-// is niladic, it may be necessary to use a function literal to capture the
-// arguments to a function to be invoked by Do:
-// 	err := config.once.Do(func() error { return config.init(filename) })
-func (o *Once) Do(f func() error) error {
-	if atomic.LoadUint32(&o.done) == 1 {
-		return nil
-	}
-	// Slow-path.
-	o.m.Lock()
-	defer o.m.Unlock()
-	var err error
-	if o.done == 0 {
-		err = f()
-		if err == nil {
-			atomic.StoreUint32(&o.done, 1)
-		}
-	}
-	return err
-}

vendor/github.com/go-redis/redis/v9/internal/pool/conn.go

@@ -1,125 +0,0 @@
-package pool
-
-import (
-	"bufio"
-	"context"
-	"net"
-	"sync/atomic"
-	"time"
-
-	"github.com/go-redis/redis/v9/internal/proto"
-)
-
-var noDeadline = time.Time{}
-
-type Conn struct {
-	usedAt  int64 // atomic
-	netConn net.Conn
-
-	rd *proto.Reader
-	bw *bufio.Writer
-	wr *proto.Writer
-
-	Inited    bool
-	pooled    bool
-	createdAt time.Time
-}
-
-func NewConn(netConn net.Conn) *Conn {
-	cn := &Conn{
-		netConn:   netConn,
-		createdAt: time.Now(),
-	}
-	cn.rd = proto.NewReader(netConn)
-	cn.bw = bufio.NewWriter(netConn)
-	cn.wr = proto.NewWriter(cn.bw)
-	cn.SetUsedAt(time.Now())
-	return cn
-}
-
-func (cn *Conn) UsedAt() time.Time {
-	unix := atomic.LoadInt64(&cn.usedAt)
-	return time.Unix(unix, 0)
-}
-
-func (cn *Conn) SetUsedAt(tm time.Time) {
-	atomic.StoreInt64(&cn.usedAt, tm.Unix())
-}
-
-func (cn *Conn) SetNetConn(netConn net.Conn) {
-	cn.netConn = netConn
-	cn.rd.Reset(netConn)
-	cn.bw.Reset(netConn)
-}
-
-func (cn *Conn) Write(b []byte) (int, error) {
-	return cn.netConn.Write(b)
-}
-
-func (cn *Conn) RemoteAddr() net.Addr {
-	if cn.netConn != nil {
-		return cn.netConn.RemoteAddr()
-	}
-	return nil
-}
-
-func (cn *Conn) WithReader(ctx context.Context, timeout time.Duration, fn func(rd *proto.Reader) error) error {
-	if timeout != 0 {
-		if err := cn.netConn.SetReadDeadline(cn.deadline(ctx, timeout)); err != nil {
-			return err
-		}
-	}
-	return fn(cn.rd)
-}
-
-func (cn *Conn) WithWriter(
-	ctx context.Context, timeout time.Duration, fn func(wr *proto.Writer) error,
-) error {
-	if timeout != 0 {
-		if err := cn.netConn.SetWriteDeadline(cn.deadline(ctx, timeout)); err != nil {
-			return err
-		}
-	}
-
-	if cn.bw.Buffered() > 0 {
-		cn.bw.Reset(cn.netConn)
-	}
-
-	if err := fn(cn.wr); err != nil {
-		return err
-	}
-
-	return cn.bw.Flush()
-}
-
-func (cn *Conn) Close() error {
-	return cn.netConn.Close()
-}
-
-func (cn *Conn) deadline(ctx context.Context, timeout time.Duration) time.Time {
-	tm := time.Now()
-	cn.SetUsedAt(tm)
-
-	if timeout > 0 {
-		tm = tm.Add(timeout)
-	}
-
-	if ctx != nil {
-		deadline, ok := ctx.Deadline()
-		if ok {
-			if timeout == 0 {
-				return deadline
-			}
-			if deadline.Before(tm) {
-				return deadline
-			}
-			return tm
-		}
-	}
-
-	if timeout > 0 {
-		return tm
-	}
-
-	return noDeadline
-}