From 01209b66acfc669de257ea6c41e96272247c2517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Thu, 18 Aug 2022 09:28:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=92=8CIP=E5=90=8D=E5=8D=95=E8=BF=9B=E8=A1=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=B6=EF=BC=8C=E5=8F=8A=E6=97=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95Badge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/actions/default/clusters/logs/fix.go | 4 ++++ .../web/actions/default/clusters/logs/fixAll.go | 4 ++++ .../actions/default/clusters/logs/readAllLogs.go | 4 ++++ .../actions/default/clusters/logs/readLogs.go | 4 ++++ .../actions/default/servers/iplists/delete.go | 4 ++++ .../actions/default/servers/iplists/deleteIP.go | 4 ++++ .../default/servers/iplists/deleteItems.go | 4 ++++ .../actions/default/servers/iplists/readAll.go | 4 ++++ internal/web/helpers/user_must_auth.go | 16 ++++++++++++++++ 9 files changed, 48 insertions(+) diff --git a/internal/web/actions/default/clusters/logs/fix.go b/internal/web/actions/default/clusters/logs/fix.go index 22dca5f4..48608a2a 100644 --- a/internal/web/actions/default/clusters/logs/fix.go +++ b/internal/web/actions/default/clusters/logs/fix.go @@ -4,6 +4,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/types" "strings" @@ -29,5 +30,8 @@ func (this *FixAction) RunPost(params struct { return } + // 通知左侧数字Badge更新 + helpers.NotifyNodeLogsCountChange() + this.Success() } diff --git a/internal/web/actions/default/clusters/logs/fixAll.go b/internal/web/actions/default/clusters/logs/fixAll.go index 8ffb541c..f393f52e 100644 --- a/internal/web/actions/default/clusters/logs/fixAll.go +++ b/internal/web/actions/default/clusters/logs/fixAll.go @@ -4,6 +4,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -21,5 +22,8 @@ func (this *FixAllAction) RunPost(params struct { return } + // 通知左侧数字Badge更新 + helpers.NotifyNodeLogsCountChange() + this.Success() } diff --git a/internal/web/actions/default/clusters/logs/readAllLogs.go b/internal/web/actions/default/clusters/logs/readAllLogs.go index 7e8a9296..7abeaf65 100644 --- a/internal/web/actions/default/clusters/logs/readAllLogs.go +++ b/internal/web/actions/default/clusters/logs/readAllLogs.go @@ -4,6 +4,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -20,5 +21,8 @@ func (this *ReadAllLogsAction) RunPost(params struct { return } + // 通知左侧数字Badge更新 + helpers.NotifyNodeLogsCountChange() + this.Success() } diff --git a/internal/web/actions/default/clusters/logs/readLogs.go b/internal/web/actions/default/clusters/logs/readLogs.go index 080ce9d9..c1fcf023 100644 --- a/internal/web/actions/default/clusters/logs/readLogs.go +++ b/internal/web/actions/default/clusters/logs/readLogs.go @@ -4,6 +4,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -22,5 +23,8 @@ func (this *ReadLogsAction) RunPost(params struct { return } + // 通知左侧数字Badge更新 + helpers.NotifyNodeLogsCountChange() + this.Success() } diff --git a/internal/web/actions/default/servers/iplists/delete.go b/internal/web/actions/default/servers/iplists/delete.go index 0f6ed18f..c385b3a8 100644 --- a/internal/web/actions/default/servers/iplists/delete.go +++ b/internal/web/actions/default/servers/iplists/delete.go @@ -4,6 +4,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -23,5 +24,8 @@ func (this *DeleteAction) RunPost(params struct { return } + // 通知左侧菜单Badge更新 + helpers.NotifyIPItemsCountChanges() + this.Success() } diff --git a/internal/web/actions/default/servers/iplists/deleteIP.go b/internal/web/actions/default/servers/iplists/deleteIP.go index 7730e2eb..c99555dc 100644 --- a/internal/web/actions/default/servers/iplists/deleteIP.go +++ b/internal/web/actions/default/servers/iplists/deleteIP.go @@ -3,6 +3,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -22,5 +23,8 @@ func (this *DeleteIPAction) RunPost(params struct { return } + // 通知左侧菜单Badge更新 + helpers.NotifyIPItemsCountChanges() + this.Success() } diff --git a/internal/web/actions/default/servers/iplists/deleteItems.go b/internal/web/actions/default/servers/iplists/deleteItems.go index 7aad71cf..2cfe2d86 100644 --- a/internal/web/actions/default/servers/iplists/deleteItems.go +++ b/internal/web/actions/default/servers/iplists/deleteItems.go @@ -4,6 +4,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/types" "strings" @@ -33,5 +34,8 @@ func (this *DeleteItemsAction) RunPost(params struct { return } + // 通知左侧菜单Badge更新 + helpers.NotifyIPItemsCountChanges() + this.Success() } diff --git a/internal/web/actions/default/servers/iplists/readAll.go b/internal/web/actions/default/servers/iplists/readAll.go index 2d448e00..ddd78f75 100644 --- a/internal/web/actions/default/servers/iplists/readAll.go +++ b/internal/web/actions/default/servers/iplists/readAll.go @@ -4,6 +4,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -20,5 +21,8 @@ func (this *ReadAllAction) RunPost(params struct{}) { return } + // 通知左侧菜单Badge更新 + helpers.NotifyIPItemsCountChanges() + this.Success() } diff --git a/internal/web/helpers/user_must_auth.go b/internal/web/helpers/user_must_auth.go index 376a58e2..50a5c67f 100644 --- a/internal/web/helpers/user_must_auth.go +++ b/internal/web/helpers/user_must_auth.go @@ -22,6 +22,22 @@ import ( var nodeLogsCountChanges = make(chan bool, 1) var ipItemsCountChanges = make(chan bool, 1) +func NotifyNodeLogsCountChange() { + select { + case nodeLogsCountChanges <- true: + default: + + } +} + +func NotifyIPItemsCountChanges() { + select { + case ipItemsCountChanges <- true: + default: + + } +} + // 运行日志 var countUnreadNodeLogs int64 = 0 var nodeLogsType = ""