From 5b45314c6996e81323dc9132c91bc521cf1e8fb3 Mon Sep 17 00:00:00 2001 From: shaoying Date: Sat, 25 Jul 2020 14:01:47 +0800 Subject: [PATCH] opt some --- base/cli/system.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/cli/system.go b/base/cli/system.go index 91f5cf7a..68bfbf19 100644 --- a/base/cli/system.go +++ b/base/cli/system.go @@ -1,8 +1,6 @@ package cli import ( - "strings" - ice "github.com/shylinux/icebergs" kit "github.com/shylinux/toolkits" @@ -10,6 +8,8 @@ import ( "fmt" "os" "os/exec" + "strings" + "time" ) const ( @@ -90,11 +90,11 @@ func init() { m.Push("name", value["name"]) m.Push("term", value["term"]) ls := strings.Split(value["begin"], " (") - t, _ := time.Parse("Jan 2 15:04", ls[0]) - m.Push("begin", t.Format("2006-01-02 15:04:05")) + ls[0] = strings.Join(kit.Split(ls[0], " \t"), " ") - m.Push("ip", value["ip"]) - m.Push("duration", value["duration"]) + t, _ := time.ParseInLocation("2006 Jan 2 15:04", "2020 "+ls[0], time.Local) + m.Push("begin", t.Format("2006-01-02 15:04:05")) + m.Push("duration", time.Since(t).String()) }) }}, },