diff --git a/const.go b/const.go index d19d14c..d0c84a4 100644 --- a/const.go +++ b/const.go @@ -1,3 +1,3 @@ package gojobs -const Version = "1.0.46" +const Version = "1.0.47" diff --git a/go.mod b/go.mod index fb7d347..44a596c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/go-redis/redis/v9 v9.0.0-beta.2 github.com/jasonlvhit/gocron v0.0.1 github.com/robfig/cron/v3 v3.0.1 - go.dtapp.net/dorm v1.0.15 + go.dtapp.net/dorm v1.0.16 go.dtapp.net/goarray v1.0.1 go.dtapp.net/goip v1.0.24 go.dtapp.net/golock v1.0.2 diff --git a/go.sum b/go.sum index d62647c..bf36aad 100644 --- a/go.sum +++ b/go.sum @@ -488,8 +488,8 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.15 h1:YtukMl3TP4PPIew1Xy7QiGTQPGtYSQX8L+BSn+maA70= -go.dtapp.net/dorm v1.0.15/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM= +go.dtapp.net/dorm v1.0.16 h1:aLBW9mgXjN9enV7cAqNpErQPDZk1oM6JxX62vz6hTdQ= +go.dtapp.net/dorm v1.0.16/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.24 h1:62k3xt9I/YLUwA5tLp7YC8XPskkswc4RJrvxRRxjwIY= diff --git a/jobs_get.go b/jobs_get.go index f28929d..fb564c3 100644 --- a/jobs_get.go +++ b/jobs_get.go @@ -5,9 +5,9 @@ func (j *JobsGorm) getCornKeyIp() string { } func (j *JobsGorm) getCornKeyChannel() string { - return j.config.cornKeyIp + "_ch" + return j.config.cornKeyIp } func (j *JobsGorm) getCornKeyChannels() string { - return j.config.cornKeyIp + "_ch_*" + return j.config.cornKeyIp + "_*" } diff --git a/jobs_gorm.go b/jobs_gorm.go index 7a77b02..e056637 100644 --- a/jobs_gorm.go +++ b/jobs_gorm.go @@ -41,8 +41,8 @@ type JobsGorm struct { lockSeparator string // 锁分隔符 cornPrefix string // 任务key前缀 cornKeyIp string // 任务key - cornKeyChannel string // 任务频道key(任务key+_ch) - cornKeyChannels string // 任务频道key通配符匹配(任务key+_ch_*) + cornKeyChannel string // 任务频道key(任务key+ip) + cornKeyChannels string // 任务频道key通配符匹配(任务key+ip+_*) } } @@ -116,7 +116,7 @@ func NewJobsGorm(config *JobsGormConfig) (*JobsGorm, error) { } if c.config.debug == true { - log.Printf("配置:%+v\n", c.config) + log.Printf("JOBS配置:%+v\n", c.config) } return c, nil diff --git a/jobs_gorm_redis_get.go b/jobs_gorm_redis_get.go index cc09e94..b3ab14f 100644 --- a/jobs_gorm_redis_get.go +++ b/jobs_gorm_redis_get.go @@ -72,6 +72,9 @@ func (j *JobsGorm) GetSubscribeClientList(ctx context.Context) ([]string, error) // 扫描 values, err := j.redisClient.Keys(ctx, j.config.cornPrefix+"_*").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())) }