diff --git a/const.go b/const.go index faab895..57c036d 100644 --- a/const.go +++ b/const.go @@ -1,3 +1,3 @@ package gojobs -const Version = "1.0.49" +const Version = "1.0.50" diff --git a/go.mod b/go.mod index 44a596c..71cd6d1 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( 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 + go.dtapp.net/golock v1.0.3 go.dtapp.net/gostring v1.0.6 go.dtapp.net/gotime v1.0.5 google.golang.org/grpc v1.48.0 diff --git a/go.sum b/go.sum index bf36aad..145a07f 100644 --- a/go.sum +++ b/go.sum @@ -494,8 +494,8 @@ 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= go.dtapp.net/goip v1.0.24/go.mod h1:tps0yoq5kSykLGDb01vuai47hzAQ6nYUPFWLdlQA2Oo= -go.dtapp.net/golock v1.0.2 h1:37AWwIBT5XBcHAmPxnBWvkgJjDefivAlkbl/iYz5Ruk= -go.dtapp.net/golock v1.0.2/go.mod h1:NkAzaTHsDB4kPWjUPssXYIqx9C/7Szx8CdhB7USxMiE= +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/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.24 h1:N2RJOpCXPWbsjfQ8iYJI1EYC2se3I4QhK1l94DSJsuE= diff --git a/jobs_gorm_lock.go b/jobs_gorm_lock.go index 89b69db..d39c45e 100644 --- a/jobs_gorm_lock.go +++ b/jobs_gorm_lock.go @@ -3,11 +3,12 @@ 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.lockPrefix, j.config.lockSeparator, info.Type, j.config.lockSeparator, id), fmt.Sprintf("已在%s@%s机器上锁成功", j.config.insideIp, j.config.outsideIp), info.Frequency*3) + return j.lockClient.Lock(fmt.Sprintf("%s%s%v%s%v", j.config.lockPrefix, j.config.lockSeparator, info.Type, j.config.lockSeparator, id), fmt.Sprintf("已在%s@%s机器上锁成功", j.config.insideIp, j.config.outsideIp), time.Duration(info.Frequency)*3*time.Second) } // Unlock Lock 解锁 diff --git a/jobs_gorm_redis_ping.go b/jobs_gorm_redis_ping.go index 9d858a3..285a1b5 100644 --- a/jobs_gorm_redis_ping.go +++ b/jobs_gorm_redis_ping.go @@ -4,13 +4,14 @@ 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.cornKeyIp, j.config.outsideIp, 3).Result() + result, err := j.redisClient.Set(ctx, j.config.cornKeyIp, j.config.outsideIp, 3*time.Second).Result() if j.config.debug == true { log.Println("JOBS心跳", j.config.cornKeyIp, j.config.outsideIp, result, err) }