From 35f728515ed4e52bdec2126e6fd1241bf66b367e Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Tue, 10 Nov 2020 21:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/build-demo.sh | 4 ++++ build/build.sh | 4 ++++ internal/web/actions/default/api/delete.go | 6 ++++++ .../web/actions/default/api/node/createPopup.go | 6 +++++- internal/web/actions/default/api/node/update.go | 4 ++++ .../default/clusters/cluster/createBatch.go | 4 ++++ .../default/clusters/cluster/createNode.go | 4 ++++ .../actions/default/clusters/cluster/delete.go | 6 ++++-- .../clusters/cluster/groups/createPopup.go | 4 ++++ .../default/clusters/cluster/groups/delete.go | 4 ++++ .../default/clusters/cluster/groups/sort.go | 4 ++++ .../clusters/cluster/groups/updatePopup.go | 4 ++++ .../default/clusters/cluster/installRemote.go | 4 ++++ .../default/clusters/cluster/node/install.go | 4 ++++ .../default/clusters/cluster/node/start.go | 5 +++++ .../actions/default/clusters/cluster/node/stop.go | 5 +++++ .../default/clusters/cluster/node/update.go | 4 ++++ .../clusters/cluster/node/updateInstallStatus.go | 6 +++++- .../default/clusters/cluster/settings/health.go | 4 ++++ .../clusters/cluster/settings/healthRunPopup.go | 4 ++++ .../default/clusters/cluster/settings/index.go | 4 ++++ .../default/clusters/cluster/updateNodeSSH.go | 4 ++++ .../default/clusters/cluster/upgradeRemote.go | 4 ++++ internal/web/actions/default/clusters/create.go | 8 ++++++-- .../web/actions/default/clusters/grants/create.go | 6 +++++- .../default/clusters/grants/createPopup.go | 4 ++++ .../web/actions/default/clusters/grants/delete.go | 4 ++++ .../web/actions/default/clusters/grants/update.go | 4 ++++ .../default/clusters/grants/updatePopup.go | 4 ++++ internal/web/actions/default/db/createPopup.go | 6 +++++- internal/web/actions/default/db/delete.go | 4 ++++ internal/web/actions/default/db/updatePopup.go | 4 ++++ internal/web/actions/default/dns/helper.go | 7 ------- internal/web/actions/default/dns/init.go | 6 ++++++ .../web/actions/default/dns/providers/index.go | 15 +++++++++++++++ internal/web/actions/default/messages/readAll.go | 4 ++++ internal/web/actions/default/messages/readPage.go | 4 ++++ internal/web/actions/default/nodes/delete.go | 6 +++++- .../web/actions/default/servers/addOriginPopup.go | 5 +++++ .../default/servers/components/cache/clean.go | 4 ++++ .../servers/components/cache/createPopup.go | 6 +++++- .../default/servers/components/cache/delete.go | 4 ++++ .../default/servers/components/cache/preheat.go | 4 ++++ .../default/servers/components/cache/purge.go | 4 ++++ .../default/servers/components/cache/stat.go | 4 ++++ .../default/servers/components/cache/testRead.go | 4 ++++ .../default/servers/components/cache/testWrite.go | 4 ++++ .../default/servers/components/cache/update.go | 4 ++++ .../servers/components/groups/createPopup.go | 8 ++++++-- .../default/servers/components/groups/delete.go | 4 ++++ .../default/servers/components/groups/sort.go | 4 ++++ .../servers/components/groups/updatePopup.go | 4 ++++ .../actions/default/servers/components/index.go | 4 ++++ .../servers/components/ip-library/delete.go | 4 ++++ .../servers/components/ip-library/uploadPopup.go | 6 +++++- .../default/servers/components/ssl/delete.go | 4 ++++ .../default/servers/components/ssl/updatePopup.go | 4 ++++ .../default/servers/components/ssl/uploadPopup.go | 4 ++++ internal/web/actions/default/servers/create.go | 6 +++++- internal/web/helpers/user_must_auth.go | 9 ++++++++- web/views/@default/dns/providers/index.html | 3 +++ 61 files changed, 273 insertions(+), 22 deletions(-) create mode 100644 internal/web/actions/default/dns/providers/index.go create mode 100644 web/views/@default/dns/providers/index.html diff --git a/build/build-demo.sh b/build/build-demo.sh index 22b2e95f..69238656 100755 --- a/build/build-demo.sh +++ b/build/build-demo.sh @@ -58,6 +58,10 @@ function build() { echo "building "${NAME}" ..." env GOOS=$OS GOARCH=$GOARCH go build -ldflags="-s -w" -tags demo -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go + # delete hidden files + find $DIST -name ".DS_Store" -delete + find $DIST -name ".gitignore" -delete + # zip echo "zip files ..." cd "${DIST}/../" || exit diff --git a/build/build.sh b/build/build.sh index 135ac5d5..3de20796 100755 --- a/build/build.sh +++ b/build/build.sh @@ -58,6 +58,10 @@ function build() { echo "building "${NAME}" ..." env GOOS=$OS GOARCH=$GOARCH go build -ldflags="-s -w" -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go + # delete hidden files + find $DIST -name ".DS_Store" -delete + find $DIST -name ".gitignore" -delete + # zip echo "zip files ..." cd "${DIST}/../" || exit diff --git a/internal/web/actions/default/api/delete.go b/internal/web/actions/default/api/delete.go index e1a8a54c..920b724c 100644 --- a/internal/web/actions/default/api/delete.go +++ b/internal/web/actions/default/api/delete.go @@ -1,6 +1,7 @@ package api import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,11 +13,16 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { NodeId int64 }) { + // TODO 检查权限 + _, err := this.RPC().APINodeRPC().DeleteAPINode(this.AdminContext(), &pb.DeleteAPINodeRequest{NodeId: params.NodeId}) if err != nil { this.ErrorPage(err) return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除API节点 %d", params.NodeId) + this.Success() } diff --git a/internal/web/actions/default/api/node/createPopup.go b/internal/web/actions/default/api/node/createPopup.go index 71c9463f..b16d0572 100644 --- a/internal/web/actions/default/api/node/createPopup.go +++ b/internal/web/actions/default/api/node/createPopup.go @@ -2,6 +2,7 @@ package node import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -122,7 +123,7 @@ func (this *CreatePopupAction) RunPost(params struct { return } - _, err = this.RPC().APINodeRPC().CreateAPINode(this.AdminContext(), &pb.CreateAPINodeRequest{ + createResp, err := this.RPC().APINodeRPC().CreateAPINode(this.AdminContext(), &pb.CreateAPINodeRequest{ Name: params.Name, Description: params.Description, HttpJSON: httpJSON, @@ -135,5 +136,8 @@ func (this *CreatePopupAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建API节点 %d", createResp.NodeId) + this.Success() } diff --git a/internal/web/actions/default/api/node/update.go b/internal/web/actions/default/api/node/update.go index 6682b500..5d237eaa 100644 --- a/internal/web/actions/default/api/node/update.go +++ b/internal/web/actions/default/api/node/update.go @@ -2,6 +2,7 @@ package node import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -232,5 +233,8 @@ func (this *UpdateAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改API节点 %d", params.NodeId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/createBatch.go b/internal/web/actions/default/clusters/cluster/createBatch.go index 4ba6ef0c..9760bbe1 100644 --- a/internal/web/actions/default/clusters/cluster/createBatch.go +++ b/internal/web/actions/default/clusters/cluster/createBatch.go @@ -1,6 +1,7 @@ package cluster import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -97,5 +98,8 @@ func (this *CreateBatchAction) RunPost(params struct { } } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "批量创建节点") + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/createNode.go b/internal/web/actions/default/clusters/cluster/createNode.go index 8b1e6b4e..fb4fb22b 100644 --- a/internal/web/actions/default/clusters/cluster/createNode.go +++ b/internal/web/actions/default/clusters/cluster/createNode.go @@ -2,6 +2,7 @@ package cluster import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -118,5 +119,8 @@ func (this *CreateNodeAction) RunPost(params struct { } } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建节点 %d", nodeId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/delete.go b/internal/web/actions/default/clusters/cluster/delete.go index 2e94b97c..c2a321a1 100644 --- a/internal/web/actions/default/clusters/cluster/delete.go +++ b/internal/web/actions/default/clusters/cluster/delete.go @@ -1,6 +1,7 @@ package cluster import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -18,8 +19,6 @@ func (this *DeleteAction) RunGet(params struct{}) { this.Show() } - - func (this *DeleteAction) RunPost(params struct { ClusterId int64 }) { @@ -40,5 +39,8 @@ func (this *DeleteAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除集群 %d", params.ClusterId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/groups/createPopup.go b/internal/web/actions/default/clusters/cluster/groups/createPopup.go index a8b60989..0eb800dd 100644 --- a/internal/web/actions/default/clusters/cluster/groups/createPopup.go +++ b/internal/web/actions/default/clusters/cluster/groups/createPopup.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -46,5 +47,8 @@ func (this *CreatePopupAction) RunPost(params struct { "name": params.Name, } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建集群分组", createResp.GroupId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/groups/delete.go b/internal/web/actions/default/clusters/cluster/groups/delete.go index 3fd04763..36fff33e 100644 --- a/internal/web/actions/default/clusters/cluster/groups/delete.go +++ b/internal/web/actions/default/clusters/cluster/groups/delete.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -29,5 +30,8 @@ func (this *DeleteAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除集群分组 %d", params.GroupId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/groups/sort.go b/internal/web/actions/default/clusters/cluster/groups/sort.go index b673f81d..bb5dcbc5 100644 --- a/internal/web/actions/default/clusters/cluster/groups/sort.go +++ b/internal/web/actions/default/clusters/cluster/groups/sort.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -18,5 +19,8 @@ func (this *SortAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改集群分组排序") + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/groups/updatePopup.go b/internal/web/actions/default/clusters/cluster/groups/updatePopup.go index 4a48c172..16732c54 100644 --- a/internal/web/actions/default/clusters/cluster/groups/updatePopup.go +++ b/internal/web/actions/default/clusters/cluster/groups/updatePopup.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -55,5 +56,8 @@ func (this *UpdatePopupAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改集群分组 %d", params.GroupId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/installRemote.go b/internal/web/actions/default/clusters/cluster/installRemote.go index bf659ef8..fe1b1e1d 100644 --- a/internal/web/actions/default/clusters/cluster/installRemote.go +++ b/internal/web/actions/default/clusters/cluster/installRemote.go @@ -2,6 +2,7 @@ package cluster import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -78,5 +79,8 @@ func (this *InstallRemoteAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "远程安装节点 %d", params.NodeId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/node/install.go b/internal/web/actions/default/clusters/cluster/node/install.go index a0494d51..6ebb353c 100644 --- a/internal/web/actions/default/clusters/cluster/node/install.go +++ b/internal/web/actions/default/clusters/cluster/node/install.go @@ -1,6 +1,7 @@ package node import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -110,5 +111,8 @@ func (this *InstallAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "安装节点 %d", params.NodeId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/node/start.go b/internal/web/actions/default/clusters/cluster/node/start.go index 2a933a12..b229551a 100644 --- a/internal/web/actions/default/clusters/cluster/node/start.go +++ b/internal/web/actions/default/clusters/cluster/node/start.go @@ -1,6 +1,7 @@ package node import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -17,6 +18,10 @@ func (this *StartAction) RunPost(params struct { this.ErrorPage(err) return } + + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "远程启动节点 %d", params.NodeId) + if resp.IsOk { this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/node/stop.go b/internal/web/actions/default/clusters/cluster/node/stop.go index 6129a37d..9b2d7ac9 100644 --- a/internal/web/actions/default/clusters/cluster/node/stop.go +++ b/internal/web/actions/default/clusters/cluster/node/stop.go @@ -1,6 +1,7 @@ package node import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -17,6 +18,10 @@ func (this *StopAction) RunPost(params struct { this.ErrorPage(err) return } + + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "远程停止节点 %d", params.NodeId) + if resp.IsOk { this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/node/update.go b/internal/web/actions/default/clusters/cluster/node/update.go index 3cce88c7..7126d28a 100644 --- a/internal/web/actions/default/clusters/cluster/node/update.go +++ b/internal/web/actions/default/clusters/cluster/node/update.go @@ -2,6 +2,7 @@ package node import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils" @@ -153,6 +154,9 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改节点 %d", params.NodeId) + if params.NodeId <= 0 { this.Fail("要操作的节点不存在") } diff --git a/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go b/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go index c98ec328..5202d7b2 100644 --- a/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go +++ b/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go @@ -1,8 +1,9 @@ package node import ( - "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) type UpdateInstallStatusAction struct { @@ -13,6 +14,9 @@ func (this *UpdateInstallStatusAction) RunPost(params struct { NodeId int64 IsInstalled bool }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改节点安装状态 %d", params.NodeId) + _, err := this.RPC().NodeRPC().UpdateNodeIsInstalled(this.AdminContext(), &pb.UpdateNodeIsInstalledRequest{ NodeId: params.NodeId, IsInstalled: params.IsInstalled, diff --git a/internal/web/actions/default/clusters/cluster/settings/health.go b/internal/web/actions/default/clusters/cluster/settings/health.go index e7ceaf1a..7f78b48e 100644 --- a/internal/web/actions/default/clusters/cluster/settings/health.go +++ b/internal/web/actions/default/clusters/cluster/settings/health.go @@ -2,6 +2,7 @@ package settings import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -44,6 +45,9 @@ func (this *HealthAction) RunPost(params struct { HealthCheckJSON []byte Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改集群健康检查设置 %d", params.ClusterId) + config := &serverconfigs.HealthCheckConfig{} err := json.Unmarshal(params.HealthCheckJSON, config) if err != nil { diff --git a/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go b/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go index 961f83bb..3835cd8a 100644 --- a/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go +++ b/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go @@ -1,6 +1,7 @@ package settings import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -24,6 +25,9 @@ func (this *HealthRunPopupAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "执行集群健康检查设置 %d", params.ClusterId) + resp, err := this.RPC().NodeClusterRPC().ExecuteNodeClusterHealthCheck(this.AdminContext(), &pb.ExecuteNodeClusterHealthCheckRequest{ClusterId: params.ClusterId}) if err != nil { this.Fail(err.Error()) diff --git a/internal/web/actions/default/clusters/cluster/settings/index.go b/internal/web/actions/default/clusters/cluster/settings/index.go index 951db3d3..415f280f 100644 --- a/internal/web/actions/default/clusters/cluster/settings/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/index.go @@ -1,6 +1,7 @@ package settings import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -70,6 +71,9 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改集群基础设置 %d", params.ClusterId) + params.Must. Field("name", params.Name). Require("请输入集群名称") diff --git a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go index e43c1e2e..54e767bb 100644 --- a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go +++ b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go @@ -2,6 +2,7 @@ package cluster import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -115,5 +116,8 @@ func (this *UpdateNodeSSHAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改节点 %d 配置", params.NodeId) + this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/upgradeRemote.go b/internal/web/actions/default/clusters/cluster/upgradeRemote.go index c7d58c04..aa27abec 100644 --- a/internal/web/actions/default/clusters/cluster/upgradeRemote.go +++ b/internal/web/actions/default/clusters/cluster/upgradeRemote.go @@ -2,6 +2,7 @@ package cluster import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -67,5 +68,8 @@ func (this *UpgradeRemoteAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "远程升级节点 %d", params.NodeId) + this.Success() } diff --git a/internal/web/actions/default/clusters/create.go b/internal/web/actions/default/clusters/create.go index 027c1164..1e53d9bf 100644 --- a/internal/web/actions/default/clusters/create.go +++ b/internal/web/actions/default/clusters/create.go @@ -1,8 +1,9 @@ package clusters import ( - "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -29,7 +30,7 @@ func (this *CreateAction) RunPost(params struct { Field("name", params.Name). Require("请输入集群名称") - _, err := this.RPC().NodeClusterRPC().CreateNodeCluster(this.AdminContext(), &pb.CreateNodeClusterRequest{ + createResp, err := this.RPC().NodeClusterRPC().CreateNodeCluster(this.AdminContext(), &pb.CreateNodeClusterRequest{ Name: params.Name, GrantId: params.GrantId, InstallDir: params.InstallDir, @@ -39,5 +40,8 @@ func (this *CreateAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建集群：%d", createResp.ClusterId) + this.Success() } diff --git a/internal/web/actions/default/clusters/grants/create.go b/internal/web/actions/default/clusters/grants/create.go index 8dd1d8a2..17233ef9 100644 --- a/internal/web/actions/default/clusters/grants/create.go +++ b/internal/web/actions/default/clusters/grants/create.go @@ -1,6 +1,7 @@ package grants import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -48,7 +49,7 @@ func (this *CreateAction) RunPost(params struct { this.Fail("请选择正确的认证方式") } - _, err := this.RPC().NodeGrantRPC().CreateNodeGrant(this.AdminContext(), &pb.CreateNodeGrantRequest{ + createResp, err := this.RPC().NodeGrantRPC().CreateNodeGrant(this.AdminContext(), &pb.CreateNodeGrantRequest{ Name: params.Name, Method: params.Method, Username: params.Username, @@ -62,5 +63,8 @@ func (this *CreateAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.GrantId) + this.Success() } diff --git a/internal/web/actions/default/clusters/grants/createPopup.go b/internal/web/actions/default/clusters/grants/createPopup.go index 06f622d4..6ce0fb36 100644 --- a/internal/web/actions/default/clusters/grants/createPopup.go +++ b/internal/web/actions/default/clusters/grants/createPopup.go @@ -1,6 +1,7 @@ package grants import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -70,5 +71,8 @@ func (this *CreatePopupAction) RunPost(params struct { "methodName": grantutils.FindGrantMethodName(params.Method), } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.GrantId) + this.Success() } diff --git a/internal/web/actions/default/clusters/grants/delete.go b/internal/web/actions/default/clusters/grants/delete.go index d9f008d3..98cdf0dd 100644 --- a/internal/web/actions/default/clusters/grants/delete.go +++ b/internal/web/actions/default/clusters/grants/delete.go @@ -1,6 +1,7 @@ package grants import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,6 +13,9 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { GrantId int64 }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除SSH认证 %d", params.GrantId) + // 检查是否有别的集群或节点正在使用 countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithGrantIdRequest{ GrantId: params.GrantId, diff --git a/internal/web/actions/default/clusters/grants/update.go b/internal/web/actions/default/clusters/grants/update.go index bd1c5f4f..4f91e27a 100644 --- a/internal/web/actions/default/clusters/grants/update.go +++ b/internal/web/actions/default/clusters/grants/update.go @@ -1,6 +1,7 @@ package grants import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -60,6 +61,9 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId) + params.Must. Field("name", params.Name). Require("请输入名称") diff --git a/internal/web/actions/default/clusters/grants/updatePopup.go b/internal/web/actions/default/clusters/grants/updatePopup.go index e2d7ca63..cb95386d 100644 --- a/internal/web/actions/default/clusters/grants/updatePopup.go +++ b/internal/web/actions/default/clusters/grants/updatePopup.go @@ -1,6 +1,7 @@ package grants import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -59,6 +60,9 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId) + params.Must. Field("name", params.Name). Require("请输入名称") diff --git a/internal/web/actions/default/db/createPopup.go b/internal/web/actions/default/db/createPopup.go index 7ddfb022..9eb613ec 100644 --- a/internal/web/actions/default/db/createPopup.go +++ b/internal/web/actions/default/db/createPopup.go @@ -1,6 +1,7 @@ package db import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -44,7 +45,7 @@ func (this *CreatePopupAction) RunPost(params struct { Field("username", params.Username). Require("请输入连接数据库的用户名") - _, err := this.RPC().DBNodeRPC().CreateDBNode(this.AdminContext(), &pb.CreateDBNodeRequest{ + createResp, err := this.RPC().DBNodeRPC().CreateDBNode(this.AdminContext(), &pb.CreateDBNodeRequest{ IsOn: params.IsOn, Name: params.Name, Description: params.Description, @@ -60,5 +61,8 @@ func (this *CreatePopupAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建数据库节点 %d", createResp.NodeId) + this.Success() } diff --git a/internal/web/actions/default/db/delete.go b/internal/web/actions/default/db/delete.go index a5e2784d..c89f5d09 100644 --- a/internal/web/actions/default/db/delete.go +++ b/internal/web/actions/default/db/delete.go @@ -1,6 +1,7 @@ package db import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,6 +13,9 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { NodeId int64 }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除数据库节点 %d", params.NodeId) + _, err := this.RPC().DBNodeRPC().DeleteDBNode(this.AdminContext(), &pb.DeleteDBNodeRequest{NodeId: params.NodeId}) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/db/updatePopup.go b/internal/web/actions/default/db/updatePopup.go index 26291f05..06508443 100644 --- a/internal/web/actions/default/db/updatePopup.go +++ b/internal/web/actions/default/db/updatePopup.go @@ -1,6 +1,7 @@ package db import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -60,6 +61,9 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改数据库节点 %d", params.NodeId) + params.Must. Field("name", params.Name). Require("请输入节点名称"). diff --git a/internal/web/actions/default/dns/helper.go b/internal/web/actions/default/dns/helper.go index b8e21dc1..9b7cdcf1 100644 --- a/internal/web/actions/default/dns/helper.go +++ b/internal/web/actions/default/dns/helper.go @@ -1,7 +1,6 @@ package dns import ( - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/iwind/TeaGo/actions" "net/http" ) @@ -15,10 +14,4 @@ func (this *Helper) BeforeAction(action *actions.ActionObject) { } action.Data["teaMenu"] = "dns" - - selectedTabbar, _ := action.Data["mainTab"] - - tabbar := actionutils.NewTabbar() - tabbar.Add("DNS", "", "/dns", "", selectedTabbar == "dns") - actionutils.SetTabbar(action, tabbar) } diff --git a/internal/web/actions/default/dns/init.go b/internal/web/actions/default/dns/init.go index 2814aadf..488b245e 100644 --- a/internal/web/actions/default/dns/init.go +++ b/internal/web/actions/default/dns/init.go @@ -1,6 +1,7 @@ package dns import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/providers" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -13,6 +14,11 @@ func init() { Prefix("/dns"). Get("", new(IndexAction)). + Prefix("/dns/providers"). + Data("teaSubMenu", "provider"). + Get("", new(providers.IndexAction)). + EndData(). + EndAll() }) } diff --git a/internal/web/actions/default/dns/providers/index.go b/internal/web/actions/default/dns/providers/index.go new file mode 100644 index 00000000..31778fd5 --- /dev/null +++ b/internal/web/actions/default/dns/providers/index.go @@ -0,0 +1,15 @@ +package providers + +import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + +type IndexAction struct { + actionutils.ParentAction +} + +func (this *IndexAction) Init() { + this.Nav("", "", "") +} + +func (this *IndexAction) RunGet(params struct{}) { + this.Show() +} diff --git a/internal/web/actions/default/messages/readAll.go b/internal/web/actions/default/messages/readAll.go index aaf7edb7..1ad15fa4 100644 --- a/internal/web/actions/default/messages/readAll.go +++ b/internal/web/actions/default/messages/readAll.go @@ -1,6 +1,7 @@ package messages import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -10,6 +11,9 @@ type ReadAllAction struct { } func (this *ReadAllAction) RunPost(params struct{}) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "将所有消息置为已读") + _, err := this.RPC().MessageRPC().UpdateAllMessagesRead(this.AdminContext(), &pb.UpdateAllMessagesReadRequest{}) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/messages/readPage.go b/internal/web/actions/default/messages/readPage.go index 39c9bad1..625a0d35 100644 --- a/internal/web/actions/default/messages/readPage.go +++ b/internal/web/actions/default/messages/readPage.go @@ -1,6 +1,7 @@ package messages import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,6 +13,9 @@ type ReadPageAction struct { func (this *ReadPageAction) RunPost(params struct { MessageIds []int64 }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "将一组消息置为已读") + _, err := this.RPC().MessageRPC().UpdateMessagesRead(this.AdminContext(), &pb.UpdateMessagesReadRequest{ MessageIds: params.MessageIds, IsRead: true, diff --git a/internal/web/actions/default/nodes/delete.go b/internal/web/actions/default/nodes/delete.go index 815f9d0f..41f93a16 100644 --- a/internal/web/actions/default/nodes/delete.go +++ b/internal/web/actions/default/nodes/delete.go @@ -1,8 +1,9 @@ package nodes import ( - "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) type DeleteAction struct { @@ -18,5 +19,8 @@ func (this *DeleteAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除节点", params.NodeId) + this.Success() } diff --git a/internal/web/actions/default/servers/addOriginPopup.go b/internal/web/actions/default/servers/addOriginPopup.go index 843730a4..179604ae 100644 --- a/internal/web/actions/default/servers/addOriginPopup.go +++ b/internal/web/actions/default/servers/addOriginPopup.go @@ -1,6 +1,7 @@ package servers import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -68,5 +69,9 @@ func (this *AddOriginPopupAction) RunPost(params struct { } this.Data["origin"] = origin + + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建源站 %d", resp.OriginId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/clean.go b/internal/web/actions/default/servers/components/cache/clean.go index d0077ac0..ef9c0b3f 100644 --- a/internal/web/actions/default/servers/components/cache/clean.go +++ b/internal/web/actions/default/servers/components/cache/clean.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" @@ -88,5 +89,8 @@ func (this *CleanAction) RunPost(params struct { this.Data["isAllOk"] = isAllOk this.Data["results"] = results + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "清除缓存，缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/createPopup.go b/internal/web/actions/default/servers/components/cache/createPopup.go index 3bb93b3d..d011829d 100644 --- a/internal/web/actions/default/servers/components/cache/createPopup.go +++ b/internal/web/actions/default/servers/components/cache/createPopup.go @@ -2,6 +2,7 @@ package cache import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -63,7 +64,7 @@ func (this *CreatePopupAction) RunPost(params struct { this.ErrorPage(err) return } - _, err = this.RPC().HTTPCachePolicyRPC().CreateHTTPCachePolicy(this.AdminContext(), &pb.CreateHTTPCachePolicyRequest{ + createResp, err := this.RPC().HTTPCachePolicyRPC().CreateHTTPCachePolicy(this.AdminContext(), &pb.CreateHTTPCachePolicyRequest{ IsOn: params.IsOn, Name: params.Name, Description: params.Description, @@ -78,5 +79,8 @@ func (this *CreatePopupAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建缓存策略：%d", createResp.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/delete.go b/internal/web/actions/default/servers/components/cache/delete.go index b0014b32..edba8436 100644 --- a/internal/web/actions/default/servers/components/cache/delete.go +++ b/internal/web/actions/default/servers/components/cache/delete.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -28,5 +29,8 @@ func (this *DeleteAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/preheat.go b/internal/web/actions/default/servers/components/cache/preheat.go index 214a0ded..6ff41451 100644 --- a/internal/web/actions/default/servers/components/cache/preheat.go +++ b/internal/web/actions/default/servers/components/cache/preheat.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" @@ -108,5 +109,8 @@ func (this *PreheatAction) RunPost(params struct { this.Data["isAllOk"] = isAllOk this.Data["results"] = results + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "预热缓存，缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/purge.go b/internal/web/actions/default/servers/components/cache/purge.go index b374f5ca..a56e6e13 100644 --- a/internal/web/actions/default/servers/components/cache/purge.go +++ b/internal/web/actions/default/servers/components/cache/purge.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" @@ -107,5 +108,8 @@ func (this *PurgeAction) RunPost(params struct { this.Data["isAllOk"] = isAllOk this.Data["results"] = results + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除缓存，缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/stat.go b/internal/web/actions/default/servers/components/cache/stat.go index 6efd5746..5430b6ab 100644 --- a/internal/web/actions/default/servers/components/cache/stat.go +++ b/internal/web/actions/default/servers/components/cache/stat.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" @@ -88,5 +89,8 @@ func (this *StatAction) RunPost(params struct { this.Data["isAllOk"] = isAllOk this.Data["results"] = results + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "统计缓存，缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/testRead.go b/internal/web/actions/default/servers/components/cache/testRead.go index faab5343..3c00dece 100644 --- a/internal/web/actions/default/servers/components/cache/testRead.go +++ b/internal/web/actions/default/servers/components/cache/testRead.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" @@ -56,5 +57,8 @@ func (this *TestReadAction) RunPost(params struct { this.Data["isAllOk"] = isAllOk this.Data["results"] = results + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "测试读取，缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/testWrite.go b/internal/web/actions/default/servers/components/cache/testWrite.go index 83852a57..5bea01d7 100644 --- a/internal/web/actions/default/servers/components/cache/testWrite.go +++ b/internal/web/actions/default/servers/components/cache/testWrite.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" @@ -59,5 +60,8 @@ func (this *TestWriteAction) RunPost(params struct { this.Data["isAllOk"] = isAllOk this.Data["results"] = results + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "测试写入，缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/update.go b/internal/web/actions/default/servers/components/cache/update.go index 7f49d6ed..ce219c82 100644 --- a/internal/web/actions/default/servers/components/cache/update.go +++ b/internal/web/actions/default/servers/components/cache/update.go @@ -2,6 +2,7 @@ package cache import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -104,5 +105,8 @@ func (this *UpdateAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改缓存策略：%d", params.CachePolicyId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/groups/createPopup.go b/internal/web/actions/default/servers/components/groups/createPopup.go index 8d1f40cd..b624c31e 100644 --- a/internal/web/actions/default/servers/components/groups/createPopup.go +++ b/internal/web/actions/default/servers/components/groups/createPopup.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -19,7 +20,7 @@ func (this *CreatePopupAction) RunGet(params struct{}) { this.Show() } -func (this *CreatePopupAction) RunPost(params struct{ +func (this *CreatePopupAction) RunPost(params struct { Name string Must *actions.Must @@ -28,7 +29,7 @@ func (this *CreatePopupAction) RunPost(params struct{ Field("name", params.Name). Require("请输入分组名称") createResp, err := this.RPC().ServerGroupRPC().CreateServerGroup(this.AdminContext(), &pb.CreateServerGroupRequest{ - Name: params.Name, + Name: params.Name, }) if err != nil { this.ErrorPage(err) @@ -40,5 +41,8 @@ func (this *CreatePopupAction) RunPost(params struct{ "name": params.Name, } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建代理服务分组 %d", createResp.GroupId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/groups/delete.go b/internal/web/actions/default/servers/components/groups/delete.go index 156c3e1d..c295cb8e 100644 --- a/internal/web/actions/default/servers/components/groups/delete.go +++ b/internal/web/actions/default/servers/components/groups/delete.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,6 +13,9 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { GroupId int64 }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除代理服务分组 %d", params.GroupId) + // 检查是否正在使用 countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithGroupIdRequest{GroupId: params.GroupId}) if err != nil { diff --git a/internal/web/actions/default/servers/components/groups/sort.go b/internal/web/actions/default/servers/components/groups/sort.go index 8b776273..6865dee2 100644 --- a/internal/web/actions/default/servers/components/groups/sort.go +++ b/internal/web/actions/default/servers/components/groups/sort.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,6 +13,9 @@ type SortAction struct { func (this *SortAction) RunPost(params struct { GroupIds []int64 }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改代理分组排序") + _, err := this.RPC().ServerGroupRPC().UpdateServerGroupOrders(this.AdminContext(), &pb.UpdateServerGroupOrdersRequest{GroupIds: params.GroupIds}) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/components/groups/updatePopup.go b/internal/web/actions/default/servers/components/groups/updatePopup.go index 92fa1dc5..18c9f919 100644 --- a/internal/web/actions/default/servers/components/groups/updatePopup.go +++ b/internal/web/actions/default/servers/components/groups/updatePopup.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -43,6 +44,9 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改代理服务分组 %d", params.GroupId) + params.Must. Field("name", params.Name). Require("请输入分组名称") diff --git a/internal/web/actions/default/servers/components/index.go b/internal/web/actions/default/servers/components/index.go index bb339e27..416d6264 100644 --- a/internal/web/actions/default/servers/components/index.go +++ b/internal/web/actions/default/servers/components/index.go @@ -2,6 +2,7 @@ package components import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -45,6 +46,9 @@ func (this *IndexAction) RunPost(params struct { GlobalConfigJSON []byte Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "保存代理服务全局配置") + if len(params.GlobalConfigJSON) == 0 { this.Fail("错误的配置信息，请刷新当前页面后重试") } diff --git a/internal/web/actions/default/servers/components/ip-library/delete.go b/internal/web/actions/default/servers/components/ip-library/delete.go index 4d010aef..3254e886 100644 --- a/internal/web/actions/default/servers/components/ip-library/delete.go +++ b/internal/web/actions/default/servers/components/ip-library/delete.go @@ -1,6 +1,7 @@ package iplibrary import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,6 +13,9 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { LibraryId int64 }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除IP库 %d", params.LibraryId) + _, err := this.RPC().IPLibraryRPC().DeleteIPLibrary(this.AdminContext(), &pb.DeleteIPLibraryRequest{IpLibraryId: params.LibraryId}) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/components/ip-library/uploadPopup.go b/internal/web/actions/default/servers/components/ip-library/uploadPopup.go index 0f2a613c..e73442e1 100644 --- a/internal/web/actions/default/servers/components/ip-library/uploadPopup.go +++ b/internal/web/actions/default/servers/components/ip-library/uploadPopup.go @@ -1,6 +1,7 @@ package iplibrary import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -93,7 +94,7 @@ func (this *UploadPopupAction) RunPost(params struct { } // 保存 - _, err = this.RPC().IPLibraryRPC().CreateIPLibrary(this.AdminContext(), &pb.CreateIPLibraryRequest{ + createResp, err := this.RPC().IPLibraryRPC().CreateIPLibrary(this.AdminContext(), &pb.CreateIPLibraryRequest{ Type: params.Type, FileId: fileId, }) @@ -102,5 +103,8 @@ func (this *UploadPopupAction) RunPost(params struct { return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "上传IP库 %d", createResp.IpLibraryId) + this.Success() } diff --git a/internal/web/actions/default/servers/components/ssl/delete.go b/internal/web/actions/default/servers/components/ssl/delete.go index f2c36508..f548dcf7 100644 --- a/internal/web/actions/default/servers/components/ssl/delete.go +++ b/internal/web/actions/default/servers/components/ssl/delete.go @@ -1,6 +1,7 @@ package ssl import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,6 +13,9 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { CertId int64 }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "删除SSL证书 %d", params.CertId) + // 是否正在被使用 countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledServersWithSSLCertIdRequest{CertId: params.CertId}) if err != nil { diff --git a/internal/web/actions/default/servers/components/ssl/updatePopup.go b/internal/web/actions/default/servers/components/ssl/updatePopup.go index 33288fd6..27afcb10 100644 --- a/internal/web/actions/default/servers/components/ssl/updatePopup.go +++ b/internal/web/actions/default/servers/components/ssl/updatePopup.go @@ -2,6 +2,7 @@ package ssl import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" @@ -54,6 +55,9 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "修改SSL证书 %d", params.CertId) + // 查询Cert certConfigResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{CertId: params.CertId}) if err != nil { diff --git a/internal/web/actions/default/servers/components/ssl/uploadPopup.go b/internal/web/actions/default/servers/components/ssl/uploadPopup.go index 8258dc7a..acac3e1e 100644 --- a/internal/web/actions/default/servers/components/ssl/uploadPopup.go +++ b/internal/web/actions/default/servers/components/ssl/uploadPopup.go @@ -2,6 +2,7 @@ package ssl import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" @@ -113,5 +114,8 @@ func (this *UploadPopupAction) RunPost(params struct { CertId: certId, } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "上传SSL证书 %d", certId) + this.Success() } diff --git a/internal/web/actions/default/servers/create.go b/internal/web/actions/default/servers/create.go index a652d55e..30de2793 100644 --- a/internal/web/actions/default/servers/create.go +++ b/internal/web/actions/default/servers/create.go @@ -3,6 +3,7 @@ package servers import ( "encoding/json" teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -310,11 +311,14 @@ func (this *CreateAction) RunPost(params struct { } req.UdpJSON = data } - _, err = this.RPC().ServerRPC().CreateServer(this.AdminContext(), req) + createResp, err := this.RPC().ServerRPC().CreateServer(this.AdminContext(), req) if err != nil { this.ErrorPage(err) return } + // 创建日志 + this.CreateLog(oplogs.LevelInfo, "创建代理服务 %d", createResp.ServerId) + this.Success() } diff --git a/internal/web/helpers/user_must_auth.go b/internal/web/helpers/user_must_auth.go index 17452b09..70bccd2f 100644 --- a/internal/web/helpers/user_must_auth.go +++ b/internal/web/helpers/user_must_auth.go @@ -106,8 +106,15 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam }, { "code": "dns", - "name": "DNS", + "name": "域名解析", "icon": "globe", + "subItems": []maps.Map{ + { + "name": "第三方DNS", + "url": "/dns/providers", + "code": "provider", + }, + }, }, { "code": "settings", diff --git a/web/views/@default/dns/providers/index.html b/web/views/@default/dns/providers/index.html new file mode 100644 index 00000000..a98dc909 --- /dev/null +++ b/web/views/@default/dns/providers/index.html @@ -0,0 +1,3 @@ +{$layout} + +

此功能暂未开放，敬请期待。

\ No newline at end of file