From b4207a5f4e711acf554098da6d2c1f6d6a329c20 Mon Sep 17 00:00:00 2001
From: ai567 <978713427@qq.com>
Date: Mon, 16 Dec 2024 11:23:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96SystemCrontabService?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/system/SystemCrontabService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/system/SystemCrontabService.php b/app/services/system/SystemCrontabService.php
index 6a86abf..37788ee 100644
--- a/app/services/system/SystemCrontabService.php
+++ b/app/services/system/SystemCrontabService.php
@@ -59,7 +59,7 @@ class SystemCrontabService extends BaseService
             foreach ($result as $item) {
                 $item->rule_name .= '';
                 $item->set('last_running_time', date('Y-m-d H:i:s', $item->getData('last_running_time')));
-                $item->logs = $systemCrontabLogService->dao->getModel()
+                $item->logs = $systemCrontabLogService->getModel()
                     ->where(['crontab_id' => $item->id])
                     ->order('create_time', 'desc')
                     ->find();
-- 
Gitee


From 86940bb0354ac53e5f7b5bec5ae1b1abbddeee23 Mon Sep 17 00:00:00 2001
From: ai567 <978713427@qq.com>
Date: Mon, 16 Dec 2024 16:23:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CrontabController?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95=E5=8F=8A=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/monitor/CrontabController.php    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/admin/controller/monitor/CrontabController.php b/app/admin/controller/monitor/CrontabController.php
index 4eef1f9..e8ef945 100644
--- a/app/admin/controller/monitor/CrontabController.php
+++ b/app/admin/controller/monitor/CrontabController.php
@@ -108,4 +108,21 @@ class CrontabController extends Crud
             return Json::fail($e->getMessage(), [], $e->getCode());
         }
     }
+
+    public function update(Request $request): Response
+    {
+        try {
+            $id   = $request->route->param('id');
+            $data = $this->inputFilter($request->all(),['month','week','day','hour','minute','second']);
+            if (isset($this->validate) && $this->validate) {
+                if (!$this->validate->scene('update')->check($data)) {
+                    throw new Exception($this->validate->getError());
+                }
+            }
+            $this->service->update($id, $data);
+            return $this->success('ok', []);
+        } catch (Throwable $e) {
+            return $this->fail($e->getMessage());
+        }
+    }
 }
-- 
Gitee