From a3f7861e39ac62967817dc2a6188b79cdee9abef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Mon, 13 Jun 2022 14:28:46 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jobs_gorm.go       | 22 +++++++++++++++++-----
 jobs_gorm_model.go |  4 +++-
 version.go         |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/jobs_gorm.go b/jobs_gorm.go
index f9f6531..bbf4662 100644
--- a/jobs_gorm.go
+++ b/jobs_gorm.go
@@ -90,9 +90,12 @@ func (j *JobsGorm) Run(info jobs_gorm_model.Task, status int, desc string) {
 		log.Println("statusCreate", statusCreate.Error)
 	}
 	if status == 0 {
-		statusEdit := j.EditTask(j.db, info.Id).Select("run_id").Updates(jobs_gorm_model.Task{
-			RunId: gouuid.GetUuId(),
-		})
+		statusEdit := j.EditTask(j.db, info.Id).
+			Select("run_id", "updated_at").
+			Updates(jobs_gorm_model.Task{
+				RunId:     gouuid.GetUuId(),
+				UpdatedAt: gotime.Current().Format(),
+			})
 		if statusEdit.RowsAffected == 0 {
 			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 {
 			// 关闭执行
 			statusEdit := j.EditTask(j.db, info.Id).
-				Select("status").
+				Select("status", "updated_at").
 				Updates(jobs_gorm_model.Task{
-					Status: TASK_TIMEOUT,
+					Status:    TASK_TIMEOUT,
+					UpdatedAt: gotime.Current().Format(),
 				})
 			if statusEdit.RowsAffected == 0 {
 				log.Println("statusEdit", statusEdit.Error)
@@ -203,6 +207,8 @@ func (j *JobsGorm) CreateInCustomId(config *ConfigCreateInCustomId) error {
 		CreatedIp:      j.outsideIp,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      j.outsideIp,
+		CreatedAt:      gotime.Current().Format(),
+		UpdatedAt:      gotime.Current().Format(),
 	})
 	if createStatus.RowsAffected == 0 {
 		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,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      j.outsideIp,
+		CreatedAt:      gotime.Current().Format(),
+		UpdatedAt:      gotime.Current().Format(),
 	})
 	if createStatus.RowsAffected == 0 {
 		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,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      j.outsideIp,
+		CreatedAt:      gotime.Current().Format(),
+		UpdatedAt:      gotime.Current().Format(),
 	})
 	if createStatus.RowsAffected == 0 {
 		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,
 		SpecifyIp:      config.SpecifyIp,
 		UpdatedIp:      j.outsideIp,
+		CreatedAt:      gotime.Current().Format(),
+		UpdatedAt:      gotime.Current().Format(),
 	})
 	if createStatus.RowsAffected == 0 {
 		return errors.New(fmt.Sprintf("创建[%s@%s]任务失败：%s", config.CustomId, config.Type, createStatus.Error))
diff --git a/jobs_gorm_model.go b/jobs_gorm_model.go
index 3853d44..eb22787 100644
--- a/jobs_gorm_model.go
+++ b/jobs_gorm_model.go
@@ -2,6 +2,7 @@ package gojobs
 
 import (
 	"go.dtapp.net/gojobs/jobs_gorm_model"
+	"go.dtapp.net/gotime"
 	"gorm.io/gorm"
 	"log"
 	"strings"
@@ -126,9 +127,10 @@ func (j *JobsGorm) EditTask(tx *gorm.DB, id uint) *gorm.DB {
 // UpdateFrequency 更新任务频率
 func (j *JobsGorm) UpdateFrequency(tx *gorm.DB, id uint, frequency int64) *gorm.DB {
 	return j.EditTask(tx, id).
-		Select("frequency").
+		Select("frequency", "updated_at").
 		Updates(jobs_gorm_model.Task{
 			Frequency: frequency,
+			UpdatedAt: gotime.Current().Format(),
 		})
 }
 
diff --git a/version.go b/version.go
index 1d44d4f..dcbe37b 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package gojobs
 
-const Version = "1.0.32"
+const Version = "1.0.33"