- 修复时间问题
continuous-integration/drone/push Build was killed Details
continuous-integration/drone/tag Build is failing Details

master v1.0.33
李光春 2 years ago
parent 0dde924fe4
commit a3f7861e39

@ -90,9 +90,12 @@ func (j *JobsGorm) Run(info jobs_gorm_model.Task, status int, desc string) {
log.Println("statusCreate", statusCreate.Error) log.Println("statusCreate", statusCreate.Error)
} }
if status == 0 { if status == 0 {
statusEdit := j.EditTask(j.db, info.Id).Select("run_id").Updates(jobs_gorm_model.Task{ statusEdit := j.EditTask(j.db, info.Id).
RunId: gouuid.GetUuId(), Select("run_id", "updated_at").
}) Updates(jobs_gorm_model.Task{
RunId: gouuid.GetUuId(),
UpdatedAt: gotime.Current().Format(),
})
if statusEdit.RowsAffected == 0 { if statusEdit.RowsAffected == 0 {
log.Println("statusEdit", statusEdit.Error) log.Println("statusEdit", statusEdit.Error)
} }
@ -151,9 +154,10 @@ func (j *JobsGorm) Run(info jobs_gorm_model.Task, status int, desc string) {
if info.Number+1 >= info.MaxNumber { if info.Number+1 >= info.MaxNumber {
// 关闭执行 // 关闭执行
statusEdit := j.EditTask(j.db, info.Id). statusEdit := j.EditTask(j.db, info.Id).
Select("status"). Select("status", "updated_at").
Updates(jobs_gorm_model.Task{ Updates(jobs_gorm_model.Task{
Status: TASK_TIMEOUT, Status: TASK_TIMEOUT,
UpdatedAt: gotime.Current().Format(),
}) })
if statusEdit.RowsAffected == 0 { if statusEdit.RowsAffected == 0 {
log.Println("statusEdit", statusEdit.Error) log.Println("statusEdit", statusEdit.Error)
@ -203,6 +207,8 @@ func (j *JobsGorm) CreateInCustomId(config *ConfigCreateInCustomId) error {
CreatedIp: j.outsideIp, CreatedIp: j.outsideIp,
SpecifyIp: config.SpecifyIp, SpecifyIp: config.SpecifyIp,
UpdatedIp: j.outsideIp, UpdatedIp: j.outsideIp,
CreatedAt: gotime.Current().Format(),
UpdatedAt: gotime.Current().Format(),
}) })
if createStatus.RowsAffected == 0 { if createStatus.RowsAffected == 0 {
return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error)) return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error))
@ -239,6 +245,8 @@ func (j *JobsGorm) CreateInCustomIdOnly(config *ConfigCreateInCustomIdOnly) erro
CreatedIp: j.outsideIp, CreatedIp: j.outsideIp,
SpecifyIp: config.SpecifyIp, SpecifyIp: config.SpecifyIp,
UpdatedIp: j.outsideIp, UpdatedIp: j.outsideIp,
CreatedAt: gotime.Current().Format(),
UpdatedAt: gotime.Current().Format(),
}) })
if createStatus.RowsAffected == 0 { if createStatus.RowsAffected == 0 {
return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error)) return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error))
@ -273,6 +281,8 @@ func (j *JobsGorm) CreateInCustomIdMaxNumber(config *ConfigCreateInCustomIdMaxNu
CreatedIp: j.outsideIp, CreatedIp: j.outsideIp,
SpecifyIp: config.SpecifyIp, SpecifyIp: config.SpecifyIp,
UpdatedIp: j.outsideIp, UpdatedIp: j.outsideIp,
CreatedAt: gotime.Current().Format(),
UpdatedAt: gotime.Current().Format(),
}) })
if createStatus.RowsAffected == 0 { if createStatus.RowsAffected == 0 {
return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error)) return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error))
@ -311,6 +321,8 @@ func (j *JobsGorm) CreateInCustomIdMaxNumberOnly(config *ConfigCreateInCustomIdM
CreatedIp: j.outsideIp, CreatedIp: j.outsideIp,
SpecifyIp: config.SpecifyIp, SpecifyIp: config.SpecifyIp,
UpdatedIp: j.outsideIp, UpdatedIp: j.outsideIp,
CreatedAt: gotime.Current().Format(),
UpdatedAt: gotime.Current().Format(),
}) })
if createStatus.RowsAffected == 0 { if createStatus.RowsAffected == 0 {
return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error)) return errors.New(fmt.Sprintf("创建[%s@%s]任务失败:%s", config.CustomId, config.Type, createStatus.Error))

@ -2,6 +2,7 @@ package gojobs
import ( import (
"go.dtapp.net/gojobs/jobs_gorm_model" "go.dtapp.net/gojobs/jobs_gorm_model"
"go.dtapp.net/gotime"
"gorm.io/gorm" "gorm.io/gorm"
"log" "log"
"strings" "strings"
@ -126,9 +127,10 @@ func (j *JobsGorm) EditTask(tx *gorm.DB, id uint) *gorm.DB {
// UpdateFrequency 更新任务频率 // UpdateFrequency 更新任务频率
func (j *JobsGorm) UpdateFrequency(tx *gorm.DB, id uint, frequency int64) *gorm.DB { func (j *JobsGorm) UpdateFrequency(tx *gorm.DB, id uint, frequency int64) *gorm.DB {
return j.EditTask(tx, id). return j.EditTask(tx, id).
Select("frequency"). Select("frequency", "updated_at").
Updates(jobs_gorm_model.Task{ Updates(jobs_gorm_model.Task{
Frequency: frequency, Frequency: frequency,
UpdatedAt: gotime.Current().Format(),
}) })
} }

@ -1,3 +1,3 @@
package gojobs package gojobs
const Version = "1.0.32" const Version = "1.0.33"

Loading…
Cancel
Save