diff --git a/internal/web/actions/default/clusters/logs/init.go b/internal/web/actions/default/clusters/logs/init.go
index 0a2d83b1..eb5a6c06 100644
--- a/internal/web/actions/default/clusters/logs/init.go
+++ b/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()
})
}
diff --git a/internal/web/actions/default/clusters/logs/readAllLogs.go b/internal/web/actions/default/clusters/logs/readAllLogs.go
new file mode 100644
index 00000000..7e8a9296
--- /dev/null
+++ b/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()
+}
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/lists.go b/internal/web/actions/default/servers/components/waf/ipadmin/lists.go
index d3e300bb..4d34cab3 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/lists.go
+++ b/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,
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/test.go b/internal/web/actions/default/servers/components/waf/ipadmin/test.go
index f2e8e570..8b4fef46 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/test.go
+++ b/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,
diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/allowList.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/allowList.go
index 0b831888..78f248c4 100644
--- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/allowList.go
+++ b/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,
diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/denyList.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/denyList.go
index 5813acfc..90dd0bc4 100644
--- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/denyList.go
+++ b/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,
diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go
index 29cac308..e816fb4a 100644
--- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go
+++ b/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),
diff --git a/internal/web/actions/default/servers/iplists/items.go b/internal/web/actions/default/servers/iplists/items.go
index 54132003..4b5ae9c4 100644
--- a/internal/web/actions/default/servers/iplists/items.go
+++ b/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,
diff --git a/internal/web/actions/default/servers/iplists/test.go b/internal/web/actions/default/servers/iplists/test.go
index cade249f..2c0b0136 100644
--- a/internal/web/actions/default/servers/iplists/test.go
+++ b/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),
diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/allowList.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/allowList.go
index 0b831888..78f248c4 100644
--- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/allowList.go
+++ b/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,
diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/denyList.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/denyList.go
index 5813acfc..90dd0bc4 100644
--- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/denyList.go
+++ b/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,
diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go
index 29cac308..e816fb4a 100644
--- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go
+++ b/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),
diff --git a/web/public/js/components/iplist/ip-list-table.js b/web/public/js/components/iplist/ip-list-table.js
index f5ff22e3..7f36fd1c 100644
--- a/web/public/js/components/iplist/ip-list-table.js
+++ b/web/public/js/components/iplist/ip-list-table.js
@@ -36,6 +36,9 @@ Vue.component("ip-list-table", {
|
{{item.ipFrom}} - {{item.ipTo}}
*
+
+ 添加于 {{item.createdTime}}
+
|
IPv4
diff --git a/web/views/@default/clusters/logs/index.html b/web/views/@default/clusters/logs/index.html
index a22d439e..7040e01e 100644
--- a/web/views/@default/clusters/logs/index.html
+++ b/web/views/@default/clusters/logs/index.html
@@ -38,6 +38,7 @@
[本页已读]
+ [全部已读]
diff --git a/web/views/@default/clusters/logs/index.js b/web/views/@default/clusters/logs/index.js
index 70a64586..eaba7256 100644
--- a/web/views/@default/clusters/logs/index.js
+++ b/web/views/@default/clusters/logs/index.js
@@ -18,12 +18,24 @@ Tea.context(function () {
let logIds = this.logs.map(function (v) {
return v.id
})
- this.$post(".readLogs")
- .params({
- logIds: logIds
- })
- .success(function () {
- teaweb.reload()
- })
+ teaweb.confirm("确定要设置本页日志为已读吗？", function () {
+ this.$post(".readLogs")
+ .params({
+ logIds: logIds
+ })
+ .success(function () {
+ teaweb.reload()
+ })
+ })
+ }
+
+ this.updateAllRead = function () {
+ teaweb.confirm("确定要设置所有日志为已读吗？", function () {
+ this.$post(".readAllLogs")
+ .params({})
+ .success(function () {
+ teaweb.reload()
+ })
+ })
}
})
\ No newline at end of file
diff --git a/web/views/@default/dashboard/boards/events.html b/web/views/@default/dashboard/boards/events.html
index 77e2f126..9b4cdf71 100644
--- a/web/views/@default/dashboard/boards/events.html
+++ b/web/views/@default/dashboard/boards/events.html
@@ -5,6 +5,7 @@
[本页已读]
+ [全部已读]
diff --git a/web/views/@default/dashboard/boards/events.js b/web/views/@default/dashboard/boards/events.js
index 436e01d7..5f74e63f 100644
--- a/web/views/@default/dashboard/boards/events.js
+++ b/web/views/@default/dashboard/boards/events.js
@@ -13,12 +13,24 @@ Tea.context(function () {
let logIds = this.logs.map(function (v) {
return v.id
})
- this.$post(".readEvents")
- .params({
- logIds: logIds
- })
- .success(function () {
- teaweb.reload()
- })
+ teaweb.confirm("确定要设置本页日志为已读吗？", function () {
+ this.$post(".readLogs")
+ .params({
+ logIds: logIds
+ })
+ .success(function () {
+ teaweb.reload()
+ })
+ })
+ }
+
+ this.updateAllRead = function () {
+ teaweb.confirm("确定要设置所有日志为已读吗？", function () {
+ this.$post(".readAllLogs")
+ .params({})
+ .success(function () {
+ teaweb.reload()
+ })
+ })
}
})
\ No newline at end of file
diff --git a/web/views/@default/servers/iplists/index.html b/web/views/@default/servers/iplists/index.html
index c9a9f301..c8d2b742 100644
--- a/web/views/@default/servers/iplists/index.html
+++ b/web/views/@default/servers/iplists/index.html
@@ -40,7 +40,7 @@
| {{list.description}} |
- {{list.countItems}}
+ {{list.countItems}}
0
|
| |