IP名单中的IP增加添加日期显示

internal/web/actions/default/clusters/logs/init.go

@@ -15,6 +15,7 @@ func init() {
 			Prefix("/clusters/logs").
 			Get("", new(IndexAction)).
 			Post("/readLogs", new(ReadLogsAction)).
+			Post("/readAllLogs", new(ReadAllLogsAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/clusters/logs/readAllLogs.go

@@ -0,0 +1,24 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type ReadAllLogsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *ReadAllLogsAction) RunPost(params struct {
+	LogIds []int64
+}) {
+	_, err := this.RPC().NodeLogRPC().UpdateAllNodeLogsRead(this.AdminContext(), &pb.UpdateAllNodeLogsReadRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/components/waf/ipadmin/lists.go

@@ -63,6 +63,7 @@ func (this *ListsAction) RunGet(params struct {
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,

internal/web/actions/default/servers/components/waf/ipadmin/test.go

@@ -60,6 +60,7 @@ func (this *TestAction) RunPost(params struct {
 			"ipFrom":         resp.IpItem.IpFrom,
 			"ipTo":           resp.IpItem.IpTo,
 			"reason":         resp.IpItem.Reason,
+			"createdTime":    timeutil.FormatTime("Y-m-d", resp.IpItem.CreatedAt),
 			"expiredAt":      resp.IpItem.ExpiredAt,
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,

internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/allowList.go

@@ -74,6 +74,7 @@ func (this *AllowListAction) RunGet(params struct {
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,

internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/denyList.go

@@ -74,6 +74,7 @@ func (this *DenyListAction) RunGet(params struct {
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,

internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go

@@ -74,6 +74,7 @@ func (this *TestAction) RunPost(params struct {
 			"ipTo":           resp.IpItem.IpTo,
 			"reason":         resp.IpItem.Reason,
 			"expiredAt":      resp.IpItem.ExpiredAt,
+			"createdTime":    timeutil.FormatTime("Y-m-d", resp.IpItem.CreatedAt),
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),

internal/web/actions/default/servers/iplists/items.go

@@ -66,6 +66,7 @@ func (this *ItemsAction) RunGet(params struct {
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,

internal/web/actions/default/servers/iplists/test.go

@@ -62,6 +62,7 @@ func (this *TestAction) RunPost(params struct {
 			"ipTo":           resp.IpItem.IpTo,
 			"reason":         resp.IpItem.Reason,
 			"expiredAt":      resp.IpItem.ExpiredAt,
+			"createdTime":    timeutil.FormatTime("Y-m-d", resp.IpItem.CreatedAt),
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),

internal/web/actions/default/servers/server/settings/waf/ipadmin/allowList.go

@@ -74,6 +74,7 @@ func (this *AllowListAction) RunGet(params struct {
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,

internal/web/actions/default/servers/server/settings/waf/ipadmin/denyList.go

@@ -74,6 +74,7 @@ func (this *DenyListAction) RunGet(params struct {
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,

internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go

@@ -74,6 +74,7 @@ func (this *TestAction) RunPost(params struct {
 			"ipTo":           resp.IpItem.IpTo,
 			"reason":         resp.IpItem.Reason,
 			"expiredAt":      resp.IpItem.ExpiredAt,
+			"createdTime":    timeutil.FormatTime("Y-m-d", resp.IpItem.CreatedAt),
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),