From 41ef2e239d58bb0bfa9ba8195b59f20ff50397ba Mon Sep 17 00:00:00 2001 From: Akizon77 Date: Tue, 5 Aug 2025 06:44:24 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91=E4=BB=A5?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=A8=A1=E5=9E=8B=E4=B8=AD=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/admin/exec.go | 3 ++- api/client/task.go | 5 ++--- database/tasks/tasks.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/admin/exec.go b/api/admin/exec.go index 7544798..8b556fc 100644 --- a/api/admin/exec.go +++ b/api/admin/exec.go @@ -8,6 +8,7 @@ import ( "github.com/gorilla/websocket" "github.com/komari-monitor/komari/api" "github.com/komari-monitor/komari/database/auditlog" + "github.com/komari-monitor/komari/database/models" "github.com/komari-monitor/komari/database/tasks" "github.com/komari-monitor/komari/utils" "github.com/komari-monitor/komari/ws" @@ -79,7 +80,7 @@ func Exec(c *gin.Context) { }) if len(offlineClients) > 0 { for _, uuid := range offlineClients { - tasks.SaveTaskResult(taskId, uuid, "Client offline!", -1, time.Now()) + tasks.SaveTaskResult(taskId, uuid, "Client offline!", -1, models.FromTime(time.Now())) } } } diff --git a/api/client/task.go b/api/client/task.go index 9358916..c5d4812 100644 --- a/api/client/task.go +++ b/api/client/task.go @@ -1,10 +1,9 @@ package client import ( - "time" - "github.com/gin-gonic/gin" "github.com/komari-monitor/komari/database/clients" + "github.com/komari-monitor/komari/database/models" "github.com/komari-monitor/komari/database/tasks" ) @@ -19,7 +18,7 @@ func TaskResult(c *gin.Context) { TaskId string `json:"task_id" binding:"required"` Result string `json:"result" binding:"required"` ExitCode int `json:"exit_code"` - FinishedAt time.Time `json:"finished_at" binding:"required"` + FinishedAt models.LocalTime `json:"finished_at" binding:"required"` } if err := c.ShouldBindJSON(&req); err != nil { c.JSON(400, gin.H{"status": "error", "message": "Invalid request"}) diff --git a/database/tasks/tasks.go b/database/tasks/tasks.go index 38e054c..ca1285d 100644 --- a/database/tasks/tasks.go +++ b/database/tasks/tasks.go @@ -83,7 +83,7 @@ func DeleteTaskByTaskId(taskId string) error { return dbcore.GetDBInstance().Where("task_id = ?", taskId).Delete(&models.Task{}).Error } -func SaveTaskResult(taskId, clientId, result string, exitCode int, timestamp time.Time) error { +func SaveTaskResult(taskId, clientId, result string, exitCode int, timestamp models.LocalTime) error { return dbcore.GetDBInstance(). Model(&models.TaskResult{}). Where("task_id = ? AND client = ?", taskId, clientId).