diff --git a/const.go b/const.go index 4031162..474dc54 100644 --- a/const.go +++ b/const.go @@ -1,5 +1,6 @@ package gojobs -const Version = "1.0.71" - -const SpecifyIpNull = "0.0.0.0" +const ( + Version = "1.0.72" + SpecifyIpNull = "0.0.0.0" +) diff --git a/go.mod b/go.mod index c6b6c50..e8880a8 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( go.dtapp.net/dorm v1.0.30 go.dtapp.net/goarray v1.0.1 go.dtapp.net/goip v1.0.28 - go.dtapp.net/golog v1.0.44 + go.dtapp.net/golog v1.0.51 go.dtapp.net/gostring v1.0.10 go.dtapp.net/gotime v1.0.5 go.dtapp.net/gotrace_id v1.0.6 @@ -77,7 +77,7 @@ require ( github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect go.dtapp.net/gorandom v1.0.1 // indirect - go.dtapp.net/gorequest v1.0.27 // indirect + go.dtapp.net/gorequest v1.0.28 // indirect go.dtapp.net/gourl v1.0.0 // indirect go.dtapp.net/goxml v1.0.1 // indirect go.mongodb.org/mongo-driver v1.10.1 // indirect diff --git a/go.sum b/go.sum index 2bad1fe..4dc523c 100644 --- a/go.sum +++ b/go.sum @@ -530,12 +530,12 @@ 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.28 h1:wZt+wbzNhOLRUJnepG4c8HhUr4V9jNXOF6wJ1h7jUvU= go.dtapp.net/goip v1.0.28/go.mod h1:ZqPPUvpOSzdtB/dEZFiaD0CBRZmvIzjDmm3XkpMC9Bo= -go.dtapp.net/golog v1.0.44 h1:wGTEcUgIJj/GSqYNiRPYou4FMssyMioAyDmDWcisc74= -go.dtapp.net/golog v1.0.44/go.mod h1:gBfmjjRJOfauahiqhKBoLC6vrk4WpLLrPfJu/+OOgL0= +go.dtapp.net/golog v1.0.51 h1:FIXZdwN+Vn4mj7QafY4w/BKQiliER8DrWt5BjJ14kOU= +go.dtapp.net/golog v1.0.51/go.mod h1:aXer1I0jFUFfcNKeftAf0S6yKT86dhQ8manUWXIJ2ZE= 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.27 h1:Hip1mfSZJDNcmE2iZgB3PYa0C/7BAMEJLsCaMd6t9iE= -go.dtapp.net/gorequest v1.0.27/go.mod h1:922s7pjYulKIytUMGAYS4aHU6cnzTbOQURGBPCKSxAk= +go.dtapp.net/gorequest v1.0.28 h1:EehFtF5WcvyZ9rB6MAQoI2kJkhR8Wv8tVgpoxXcb3sI= +go.dtapp.net/gorequest v1.0.28/go.mod h1:Nr0BIOXhapY3Es86hL7pN2c2PgjZwImcrWdMpLzHlJE= 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= diff --git a/jobs_gorm_lock.go b/jobs_gorm_lock.go index cfca9fc..071caf2 100644 --- a/jobs_gorm_lock.go +++ b/jobs_gorm_lock.go @@ -4,12 +4,13 @@ import ( "context" "fmt" "go.dtapp.net/gojobs/jobs_gorm_model" + "go.dtapp.net/gotime" "time" ) // Lock 上锁 func (j *JobsGorm) Lock(ctx context.Context, info jobs_gorm_model.Task, id any) (string, error) { - return j.lockClient.Lock(ctx, 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) + return j.lockClient.Lock(ctx, fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, id), fmt.Sprintf("已在%s@%s机器上锁成功,%v", j.config.insideIp, j.config.outsideIp, gotime.Current().Format()), time.Duration(info.Frequency)*3*time.Second) } // Unlock Lock 解锁 @@ -19,5 +20,5 @@ func (j *JobsGorm) Unlock(ctx context.Context, info jobs_gorm_model.Task, id any // LockForever 永远上锁 func (j *JobsGorm) LockForever(ctx context.Context, info jobs_gorm_model.Task, id any) (string, error) { - return j.lockClient.LockForever(ctx, 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)) + return j.lockClient.LockForever(ctx, fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, id), fmt.Sprintf("已在%s@%s机器永远上锁成功,%v", j.config.insideIp, j.config.outsideIp, gotime.Current().Format())) } diff --git a/jobs_gorm_lock_id.go b/jobs_gorm_lock_id.go index 380dd74..862e50f 100644 --- a/jobs_gorm_lock_id.go +++ b/jobs_gorm_lock_id.go @@ -4,12 +4,13 @@ import ( "context" "fmt" "go.dtapp.net/gojobs/jobs_gorm_model" + "go.dtapp.net/gotime" "time" ) // LockId 上锁 func (j *JobsGorm) LockId(ctx context.Context, info jobs_gorm_model.Task) (string, error) { - return j.lockClient.Lock(ctx, fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, info.Id), fmt.Sprintf("已在%s@%s机器上锁成功", j.config.insideIp, j.config.outsideIp), time.Duration(info.Frequency)*3*time.Second) + return j.lockClient.Lock(ctx, fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, info.Id), fmt.Sprintf("已在%s@%s机器上锁成功,%v", j.config.insideIp, j.config.outsideIp, gotime.Current().Format()), time.Duration(info.Frequency)*3*time.Second) } // UnlockId Lock 解锁 @@ -19,5 +20,5 @@ func (j *JobsGorm) UnlockId(ctx context.Context, info jobs_gorm_model.Task) erro // LockForeverId 永远上锁 func (j *JobsGorm) LockForeverId(ctx context.Context, info jobs_gorm_model.Task) (string, error) { - return j.lockClient.LockForever(ctx, fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, info.Id), fmt.Sprintf("已在%s@%s机器永远上锁成功", j.config.insideIp, j.config.outsideIp)) + return j.lockClient.LockForever(ctx, fmt.Sprintf("%s%s%v%s%v", j.config.lockKeyPrefix, j.config.lockKeySeparator, info.Type, j.config.lockKeySeparator, info.Id), fmt.Sprintf("已在%s@%s机器永远上锁成功,%v", j.config.insideIp, j.config.outsideIp, gotime.Current().Format())) }