From 354705ec5ba8a43dfd8ea7a07914bde7abcda5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Mon, 21 Oct 2024 01:07:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20cron=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8D=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/data/cron.go | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/internal/data/cron.go b/internal/data/cron.go
index 33d21041..a346a29f 100644
--- a/internal/data/cron.go
+++ b/internal/data/cron.go
@@ -92,6 +92,9 @@ panel-cli cutoff website -n %s -p %s
 panel-cli cutoff clear -t website -f %s -s %d -p %s
 `, req.Target, req.BackupPath, req.Target, req.Save, req.BackupPath)
 	}
+	if req.Type == "shell" {
+		script = req.Script
+	}
 
 	shellDir := fmt.Sprintf("%s/server/cron/", app.Root)
 	shellLogDir := fmt.Sprintf("%s/server/cron/logs/", app.Root)
@@ -200,24 +203,6 @@ func (r *cronRepo) Status(id uint, status bool) error {
 	return app.Orm.Save(cron).Error
 }
 
-func (r *cronRepo) Log(id uint) (string, error) {
-	cron, err := r.Get(id)
-	if err != nil {
-		return "", err
-	}
-
-	if !io.Exists(cron.Log) {
-		return "", errors.New("日志文件不存在")
-	}
-
-	log, err := shell.Execf("tail -n 1000 '%s'", cron.Log)
-	if err != nil {
-		return "", err
-	}
-
-	return log, nil
-}
-
 // addToSystem 添加到系统
 func (r *cronRepo) addToSystem(cron *biz.Cron) error {
 	if _, err := shell.Execf(`( crontab -l; echo "%s %s >> %s 2>&1" ) | sort - | uniq - | crontab -`, cron.Time, cron.Shell, cron.Log); err != nil {