From d87c29e0265f03efe67dd4e0f75084dee2e59c03 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 25 Oct 2023 17:26:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E6=98=AF=E5=90=A6=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E8=A7=A6=E5=8F=91crom=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/framework/cron/log.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/framework/cron/log.go b/src/framework/cron/log.go
index 3e6b698c..b233fed1 100644
--- a/src/framework/cron/log.go
+++ b/src/framework/cron/log.go
@@ -37,7 +37,7 @@ func (s cronlog) Error(err error, msg string, keysAndValues ...any) {
 			jobLog := jobLogData{
 				JobID:     job.Opts.JobId,
 				Timestamp: job.Timestamp,
-				SysJob:    data.SysJob,
+				Data:      data,
 				Result:    err.Error(),
 			}
 			jobLog.SaveLog(common.STATUS_NO)
@@ -61,7 +61,7 @@ func (s cronlog) Completed(result any, msg string, keysAndValues ...any) {
 			jobLog := jobLogData{
 				JobID:     job.Opts.JobId,
 				Timestamp: job.Timestamp,
-				SysJob:    data.SysJob,
+				Data:      data,
 				Result:    result,
 			}
 			jobLog.SaveLog(common.STATUS_YES)
@@ -73,14 +73,14 @@ func (s cronlog) Completed(result any, msg string, keysAndValues ...any) {
 type jobLogData struct {
 	JobID     string
 	Timestamp int64
-	SysJob    model.SysJob
+	Data      JobData
 	Result    any
 }
 
 // SaveLog 日志记录保存
 func (jl *jobLogData) SaveLog(status string) {
 	// 读取任务信息
-	sysJob := jl.SysJob
+	sysJob := jl.Data.SysJob
 
 	// 任务ID与任务信息ID不相同
 	if jl.JobID == "" || jl.JobID != sysJob.JobID {
@@ -101,6 +101,7 @@ func (jl *jobLogData) SaveLog(status string) {
 	// 结果信息序列化字符串
 	jsonByte, _ := json.Marshal(map[string]any{
 		"name":    resultNmae,
+		"crom":    jl.Data.Repeat,
 		"message": jl.Result,
 	})
 	jobMsg := string(jsonByte)