From 5405bdf377ca3a1ace345efc44f2bc775ec8c9bc Mon Sep 17 00:00:00 2001 From: Akizon77 Date: Wed, 2 Sep 2026 16:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BA=BA=E7=B1=BB=E5=8F=8B?= =?UTF-8?q?=E5=A5=BD=E7=9A=84=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/messageSender/javascript/javascript.go | 5 ++--- utils/messageSender/loader_test.go | 2 +- utils/messageSender/sender.go | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/messageSender/javascript/javascript.go b/utils/messageSender/javascript/javascript.go index cb96d71..b24b3ac 100644 --- a/utils/messageSender/javascript/javascript.go +++ b/utils/messageSender/javascript/javascript.go @@ -4,7 +4,6 @@ import ( "encoding/json" "errors" "fmt" - "time" "github.com/komari-monitor/komari/database/models" "github.com/komari-monitor/komari/pkg/jsruntime" @@ -88,7 +87,7 @@ func (j *JavaScriptSender) fallbackToTextMessage(event models.EventMessage) erro event.Emoji, event.Emoji, event.Emoji, event.Event, event.Message, - event.Time.UTC().Format(time.RFC3339Nano)) + event.Time.UTC().Format("2006-01-02 15:04:05")) if len(event.Clients) > 0 { clientNames := make([]string, 0, len(event.Clients)) for _, client := range event.Clients { @@ -103,7 +102,7 @@ func (j *JavaScriptSender) fallbackToTextMessage(event models.EventMessage) erro event.Event, clientNames, event.Message, - event.Time.UTC().Format(time.RFC3339Nano)) + event.Time.UTC().Format("2006-01-02 15:04:05")) } return j.SendTextMessage(message, fmt.Sprint(event.Event)) } diff --git a/utils/messageSender/loader_test.go b/utils/messageSender/loader_test.go index 14d72ba..1bdf433 100644 --- a/utils/messageSender/loader_test.go +++ b/utils/messageSender/loader_test.go @@ -15,7 +15,7 @@ func TestParseTemplateFormatsEventTimeInLocalTimezone(t *testing.T) { eventTime := time.Date(2026, 7, 17, 1, 30, 0, 123456789, time.UTC) got := parseTemplate("{{time}}", models.EventMessage{Time: eventTime}) - want := "2026-07-17T09:30:00.123456789+08:00" + want := "2026-07-17 09:30:00" if got != want { t.Fatalf("formatted event time = %q, want %q", got, want) } diff --git a/utils/messageSender/sender.go b/utils/messageSender/sender.go index b053117..df9ce91 100644 --- a/utils/messageSender/sender.go +++ b/utils/messageSender/sender.go @@ -232,7 +232,7 @@ func formatTemplateField(fieldName string, v reflect.Value) string { } case reflect.Struct: if t, ok := v.Interface().(time.Time); ok { - return t.In(time.Local).Format(time.RFC3339Nano) + return t.In(time.Local).Format("2006-01-02 15:04:05") } } return ""