diff --git a/go.mod b/go.mod
index 6f8a100a..2e450d09 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000
github.com/go-sql-driver/mysql v1.5.0
github.com/go-yaml/yaml v2.1.0+incompatible
- github.com/iwind/TeaGo v0.0.0-20201110043415-859f4b3b98f3
+ github.com/iwind/TeaGo v0.0.0-20201120063500-ee2d7090f4bc
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect
google.golang.org/grpc v1.32.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
diff --git a/go.sum b/go.sum
index 3ab10a69..7ad4258d 100644
--- a/go.sum
+++ b/go.sum
@@ -52,6 +52,8 @@ github.com/iwind/TeaGo v0.0.0-20201110022333-4505cfeba483 h1:iQlMhGYBNrvbyp90f4W
github.com/iwind/TeaGo v0.0.0-20201110022333-4505cfeba483/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
github.com/iwind/TeaGo v0.0.0-20201110043415-859f4b3b98f3 h1:fJ32s0nZmhH780KYG9oWi11chljyaZ4JLRTvKV8nzb0=
github.com/iwind/TeaGo v0.0.0-20201110043415-859f4b3b98f3/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20201120063500-ee2d7090f4bc h1:AOKJWsgCX5e7xnW2f7evcrgj6vzvvHIoDmA+xxL3BMI=
+github.com/iwind/TeaGo v0.0.0-20201120063500-ee2d7090f4bc/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
diff --git a/internal/web/actions/actionutils/parent_action.go b/internal/web/actions/actionutils/parent_action.go
index 88a45979..470196e0 100644
--- a/internal/web/actions/actionutils/parent_action.go
+++ b/internal/web/actions/actionutils/parent_action.go
@@ -78,12 +78,25 @@ func (this *ParentAction) AdminId() int64 {
}
func (this *ParentAction) CreateLog(level string, description string, args ...interface{}) {
- err := models.SharedLogDAO.CreateAdminLog(this.AdminContext(), level, this.Request.URL.Path, fmt.Sprintf(description, args...), this.RequestRemoteIP())
+ desc := fmt.Sprintf(description, args...)
+ if level == oplogs.LevelInfo {
+ if this.Code != 200 {
+ level = oplogs.LevelWarn
+ if len(this.Message) > 0 {
+ desc += " 失败：" + this.Message
+ }
+ }
+ }
+ err := models.SharedLogDAO.CreateAdminLog(this.AdminContext(), level, this.Request.URL.Path, desc, this.RequestRemoteIP())
if err != nil {
utils.PrintError(err)
}
}
+func (this *ParentAction) CreateLogInfo(description string, args ...interface{}) {
+ this.CreateLog(oplogs.LevelInfo, description, args...)
+}
+
// 获取RPC
func (this *ParentAction) RPC() *rpc.RPCClient {
if this.rpcClient != nil {
diff --git a/internal/web/actions/default/api/delete.go b/internal/web/actions/default/api/delete.go
index 920b724c..2772e046 100644
--- a/internal/web/actions/default/api/delete.go
+++ b/internal/web/actions/default/api/delete.go
@@ -22,7 +22,7 @@ func (this *DeleteAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除API节点 %d", params.NodeId)
+ defer 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 b16d0572..14307951 100644
--- a/internal/web/actions/default/api/node/createPopup.go
+++ b/internal/web/actions/default/api/node/createPopup.go
@@ -137,7 +137,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建API节点 %d", createResp.NodeId)
+ defer 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 5d237eaa..6fcf24a7 100644
--- a/internal/web/actions/default/api/node/update.go
+++ b/internal/web/actions/default/api/node/update.go
@@ -234,7 +234,7 @@ func (this *UpdateAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改API节点 %d", params.NodeId)
+ defer 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 9760bbe1..9839bd56 100644
--- a/internal/web/actions/default/clusters/cluster/createBatch.go
+++ b/internal/web/actions/default/clusters/cluster/createBatch.go
@@ -99,7 +99,7 @@ func (this *CreateBatchAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "批量创建节点")
+ defer 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 772c2c88..8215990c 100644
--- a/internal/web/actions/default/clusters/cluster/createNode.go
+++ b/internal/web/actions/default/clusters/cluster/createNode.go
@@ -159,7 +159,7 @@ func (this *CreateNodeAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建节点 %d", nodeId)
+ defer 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 c2a321a1..51428a52 100644
--- a/internal/web/actions/default/clusters/cluster/delete.go
+++ b/internal/web/actions/default/clusters/cluster/delete.go
@@ -40,7 +40,7 @@ func (this *DeleteAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除集群 %d", params.ClusterId)
+ defer 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 0eb800dd..237b5b18 100644
--- a/internal/web/actions/default/clusters/cluster/groups/createPopup.go
+++ b/internal/web/actions/default/clusters/cluster/groups/createPopup.go
@@ -48,7 +48,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建集群分组", createResp.GroupId)
+ defer 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 36fff33e..6c923816 100644
--- a/internal/web/actions/default/clusters/cluster/groups/delete.go
+++ b/internal/web/actions/default/clusters/cluster/groups/delete.go
@@ -31,7 +31,7 @@ func (this *DeleteAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除集群分组 %d", params.GroupId)
+ defer 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 bb5dcbc5..ed2e68a5 100644
--- a/internal/web/actions/default/clusters/cluster/groups/sort.go
+++ b/internal/web/actions/default/clusters/cluster/groups/sort.go
@@ -20,7 +20,7 @@ func (this *SortAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改集群分组排序")
+ defer 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 16732c54..30407c50 100644
--- a/internal/web/actions/default/clusters/cluster/groups/updatePopup.go
+++ b/internal/web/actions/default/clusters/cluster/groups/updatePopup.go
@@ -57,7 +57,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改集群分组 %d", params.GroupId)
+ defer 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 fe1b1e1d..a5ba4dee 100644
--- a/internal/web/actions/default/clusters/cluster/installRemote.go
+++ b/internal/web/actions/default/clusters/cluster/installRemote.go
@@ -80,7 +80,7 @@ func (this *InstallRemoteAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "远程安装节点 %d", params.NodeId)
+ defer 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 6ebb353c..9f817eb5 100644
--- a/internal/web/actions/default/clusters/cluster/node/install.go
+++ b/internal/web/actions/default/clusters/cluster/node/install.go
@@ -112,7 +112,7 @@ func (this *InstallAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "安装节点 %d", params.NodeId)
+ defer 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 b229551a..a82a14bc 100644
--- a/internal/web/actions/default/clusters/cluster/node/start.go
+++ b/internal/web/actions/default/clusters/cluster/node/start.go
@@ -20,7 +20,7 @@ func (this *StartAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "远程启动节点 %d", params.NodeId)
+ defer 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 9b2d7ac9..e50ed8a1 100644
--- a/internal/web/actions/default/clusters/cluster/node/stop.go
+++ b/internal/web/actions/default/clusters/cluster/node/stop.go
@@ -20,7 +20,7 @@ func (this *StopAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "远程停止节点 %d", params.NodeId)
+ defer 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 f2e6f20b..40add657 100644
--- a/internal/web/actions/default/clusters/cluster/node/update.go
+++ b/internal/web/actions/default/clusters/cluster/node/update.go
@@ -190,7 +190,7 @@ func (this *UpdateAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改节点 %d", params.NodeId)
+ defer 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 5202d7b2..72f12f0c 100644
--- a/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go
+++ b/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go
@@ -15,7 +15,7 @@ func (this *UpdateInstallStatusAction) RunPost(params struct {
IsInstalled bool
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改节点安装状态 %d", params.NodeId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改节点安装状态 %d", params.NodeId)
_, err := this.RPC().NodeRPC().UpdateNodeIsInstalled(this.AdminContext(), &pb.UpdateNodeIsInstalledRequest{
NodeId: params.NodeId,
diff --git a/internal/web/actions/default/clusters/cluster/settings/dns/index.go b/internal/web/actions/default/clusters/cluster/settings/dns/index.go
index 3102ac95..89625f1d 100644
--- a/internal/web/actions/default/clusters/cluster/settings/dns/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/dns/index.go
@@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct {
CSRF *actionutils.CSRF
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId)
// 检查DNS名称
if len(params.DnsName) > 0 {
diff --git a/internal/web/actions/default/clusters/cluster/settings/health.go b/internal/web/actions/default/clusters/cluster/settings/health.go
index 7f78b48e..d268c276 100644
--- a/internal/web/actions/default/clusters/cluster/settings/health.go
+++ b/internal/web/actions/default/clusters/cluster/settings/health.go
@@ -46,7 +46,7 @@ func (this *HealthAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改集群健康检查设置 %d", params.ClusterId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改集群健康检查设置 %d", params.ClusterId)
config := &serverconfigs.HealthCheckConfig{}
err := json.Unmarshal(params.HealthCheckJSON, config)
diff --git a/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go b/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
index 3835cd8a..406b50b9 100644
--- a/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
+++ b/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
@@ -26,7 +26,7 @@ func (this *HealthRunPopupAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "执行集群健康检查设置 %d", params.ClusterId)
+ defer this.CreateLog(oplogs.LevelInfo, "执行集群健康检查设置 %d", params.ClusterId)
resp, err := this.RPC().NodeClusterRPC().ExecuteNodeClusterHealthCheck(this.AdminContext(), &pb.ExecuteNodeClusterHealthCheckRequest{ClusterId: params.ClusterId})
if err != nil {
diff --git a/internal/web/actions/default/clusters/cluster/settings/index.go b/internal/web/actions/default/clusters/cluster/settings/index.go
index 415f280f..a8e37823 100644
--- a/internal/web/actions/default/clusters/cluster/settings/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/index.go
@@ -72,7 +72,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改集群基础设置 %d", params.ClusterId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改集群基础设置 %d", params.ClusterId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go
index 54e767bb..49b2b365 100644
--- a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go
+++ b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go
@@ -117,7 +117,7 @@ func (this *UpdateNodeSSHAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改节点 %d 配置", params.NodeId)
+ defer 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 aa27abec..85c43a9e 100644
--- a/internal/web/actions/default/clusters/cluster/upgradeRemote.go
+++ b/internal/web/actions/default/clusters/cluster/upgradeRemote.go
@@ -69,7 +69,7 @@ func (this *UpgradeRemoteAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "远程升级节点 %d", params.NodeId)
+ defer 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 a20782bd..ccd82f8b 100644
--- a/internal/web/actions/default/clusters/create.go
+++ b/internal/web/actions/default/clusters/create.go
@@ -79,7 +79,7 @@ func (this *CreateAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建节点集群：%d", createResp.ClusterId)
+ defer 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 17233ef9..4c2687d8 100644
--- a/internal/web/actions/default/clusters/grants/create.go
+++ b/internal/web/actions/default/clusters/grants/create.go
@@ -64,7 +64,7 @@ func (this *CreateAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.GrantId)
+ defer 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 6ce0fb36..e886a653 100644
--- a/internal/web/actions/default/clusters/grants/createPopup.go
+++ b/internal/web/actions/default/clusters/grants/createPopup.go
@@ -72,7 +72,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.GrantId)
+ defer 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 98cdf0dd..19b8a3ef 100644
--- a/internal/web/actions/default/clusters/grants/delete.go
+++ b/internal/web/actions/default/clusters/grants/delete.go
@@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct {
GrantId int64
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除SSH认证 %d", params.GrantId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除SSH认证 %d", params.GrantId)
// 检查是否有别的集群或节点正在使用
countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithGrantIdRequest{
diff --git a/internal/web/actions/default/clusters/grants/update.go b/internal/web/actions/default/clusters/grants/update.go
index 4f91e27a..f35619bc 100644
--- a/internal/web/actions/default/clusters/grants/update.go
+++ b/internal/web/actions/default/clusters/grants/update.go
@@ -62,7 +62,7 @@ func (this *UpdateAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/clusters/grants/updatePopup.go b/internal/web/actions/default/clusters/grants/updatePopup.go
index cb95386d..fcf5a10b 100644
--- a/internal/web/actions/default/clusters/grants/updatePopup.go
+++ b/internal/web/actions/default/clusters/grants/updatePopup.go
@@ -61,7 +61,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/db/createPopup.go b/internal/web/actions/default/db/createPopup.go
index 9eb613ec..74967920 100644
--- a/internal/web/actions/default/db/createPopup.go
+++ b/internal/web/actions/default/db/createPopup.go
@@ -62,7 +62,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建数据库节点 %d", createResp.NodeId)
+ defer 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 c89f5d09..5b6ee429 100644
--- a/internal/web/actions/default/db/delete.go
+++ b/internal/web/actions/default/db/delete.go
@@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct {
NodeId int64
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除数据库节点 %d", params.NodeId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除数据库节点 %d", params.NodeId)
_, err := this.RPC().DBNodeRPC().DeleteDBNode(this.AdminContext(), &pb.DeleteDBNodeRequest{NodeId: params.NodeId})
if err != nil {
diff --git a/internal/web/actions/default/db/updatePopup.go b/internal/web/actions/default/db/updatePopup.go
index 06508443..9602c975 100644
--- a/internal/web/actions/default/db/updatePopup.go
+++ b/internal/web/actions/default/db/updatePopup.go
@@ -62,7 +62,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改数据库节点 %d", params.NodeId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改数据库节点 %d", params.NodeId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/dns/clusters/sync.go b/internal/web/actions/default/dns/clusters/sync.go
index be890f20..21ee3d92 100644
--- a/internal/web/actions/default/dns/clusters/sync.go
+++ b/internal/web/actions/default/dns/clusters/sync.go
@@ -14,7 +14,7 @@ func (this *SyncAction) RunPost(params struct {
ClusterId int64
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "同步集群 %d 的DNS设置", params.ClusterId)
+ defer this.CreateLog(oplogs.LevelInfo, "同步集群 %d 的DNS设置", params.ClusterId)
dnsInfoResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
if err != nil {
diff --git a/internal/web/actions/default/dns/domains/createPopup.go b/internal/web/actions/default/dns/domains/createPopup.go
index baf80ea6..a42ad05f 100644
--- a/internal/web/actions/default/dns/domains/createPopup.go
+++ b/internal/web/actions/default/dns/domains/createPopup.go
@@ -54,7 +54,7 @@ func (this *CreatePopupAction) RunPost(params struct {
return
}
- this.CreateLog(oplogs.LevelInfo, "添加管理域名到DNS服务商 %d", createResp.DnsDomainId)
+ defer this.CreateLog(oplogs.LevelInfo, "添加管理域名到DNS服务商 %d", createResp.DnsDomainId)
this.Success()
}
diff --git a/internal/web/actions/default/dns/domains/delete.go b/internal/web/actions/default/dns/domains/delete.go
index 95dda065..4ddb5b5d 100644
--- a/internal/web/actions/default/dns/domains/delete.go
+++ b/internal/web/actions/default/dns/domains/delete.go
@@ -15,7 +15,7 @@ func (this *DeleteAction) RunPost(params struct {
DomainId int64
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "从DNS服务商中删除域名 %d", params.DomainId)
+ defer this.CreateLog(oplogs.LevelInfo, "从DNS服务商中删除域名 %d", params.DomainId)
// 检查是否正在使用
countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithDNSDomainId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithDNSDomainIdRequest{DnsDomainId: params.DomainId})
diff --git a/internal/web/actions/default/dns/domains/sync.go b/internal/web/actions/default/dns/domains/sync.go
index 6a693c56..cd9fbf4c 100644
--- a/internal/web/actions/default/dns/domains/sync.go
+++ b/internal/web/actions/default/dns/domains/sync.go
@@ -14,7 +14,7 @@ func (this *SyncAction) RunPost(params struct {
DomainId int64
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "同步DNS域名数据 %d", params.DomainId)
+ defer this.CreateLog(oplogs.LevelInfo, "同步DNS域名数据 %d", params.DomainId)
// 执行同步
resp, err := this.RPC().DNSDomainRPC().SyncDNSDomainData(this.AdminContext(), &pb.SyncDNSDomainDataRequest{DnsDomainId: params.DomainId})
diff --git a/internal/web/actions/default/dns/domains/updatePopup.go b/internal/web/actions/default/dns/domains/updatePopup.go
index f7a34112..48ec9a29 100644
--- a/internal/web/actions/default/dns/domains/updatePopup.go
+++ b/internal/web/actions/default/dns/domains/updatePopup.go
@@ -52,7 +52,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
// TODO 检查DomainId
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "修改管理域名到DNS服务商 %d", params.DomainId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改管理域名到DNS服务商 %d", params.DomainId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/dns/issues/updateNodePopup.go b/internal/web/actions/default/dns/issues/updateNodePopup.go
index a62b37d8..d3944f3f 100644
--- a/internal/web/actions/default/dns/issues/updateNodePopup.go
+++ b/internal/web/actions/default/dns/issues/updateNodePopup.go
@@ -74,7 +74,7 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
CSRF *actionutils.CSRF
}) {
// 操作日志
- this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
routes := []string{}
err := json.Unmarshal(params.DnsRoutesJSON, &routes)
diff --git a/internal/web/actions/default/dns/providers/createPopup.go b/internal/web/actions/default/dns/providers/createPopup.go
index aad78641..823f0712 100644
--- a/internal/web/actions/default/dns/providers/createPopup.go
+++ b/internal/web/actions/default/dns/providers/createPopup.go
@@ -103,7 +103,7 @@ func (this *CreatePopupAction) RunPost(params struct {
return
}
- this.CreateLog(oplogs.LevelInfo, "创建DNS服务商 %d", createResp.DnsProviderId)
+ defer this.CreateLog(oplogs.LevelInfo, "创建DNS服务商 %d", createResp.DnsProviderId)
this.Success()
}
diff --git a/internal/web/actions/default/dns/providers/delete.go b/internal/web/actions/default/dns/providers/delete.go
index ca83d5bb..36c9202a 100644
--- a/internal/web/actions/default/dns/providers/delete.go
+++ b/internal/web/actions/default/dns/providers/delete.go
@@ -17,7 +17,7 @@ func (this *DeleteAction) RunPost(params struct {
// TODO 检查权限
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "删除DNS服务商 %d", params.ProviderId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除DNS服务商 %d", params.ProviderId)
// 检查是否被使用
countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithDNSProviderId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithDNSProviderIdRequest{DnsProviderId: params.ProviderId})
diff --git a/internal/web/actions/default/dns/providers/updatePopup.go b/internal/web/actions/default/dns/providers/updatePopup.go
index a2e743b7..b54a3afa 100644
--- a/internal/web/actions/default/dns/providers/updatePopup.go
+++ b/internal/web/actions/default/dns/providers/updatePopup.go
@@ -87,7 +87,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
Must *actions.Must
CSRF *actionutils.CSRF
}) {
- this.CreateLog(oplogs.LevelInfo, "修改DNS服务商 %d", params.ProviderId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改DNS服务商 %d", params.ProviderId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/dns/updateClusterPopup.go b/internal/web/actions/default/dns/updateClusterPopup.go
index 26dd602e..6e1116de 100644
--- a/internal/web/actions/default/dns/updateClusterPopup.go
+++ b/internal/web/actions/default/dns/updateClusterPopup.go
@@ -75,7 +75,7 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
CSRF *actionutils.CSRF
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId)
params.Must.
Field("dnsName", params.DnsName).
diff --git a/internal/web/actions/default/messages/readAll.go b/internal/web/actions/default/messages/readAll.go
index 1ad15fa4..f50dd9fb 100644
--- a/internal/web/actions/default/messages/readAll.go
+++ b/internal/web/actions/default/messages/readAll.go
@@ -12,7 +12,7 @@ type ReadAllAction struct {
func (this *ReadAllAction) RunPost(params struct{}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "将所有消息置为已读")
+ defer this.CreateLog(oplogs.LevelInfo, "将所有消息置为已读")
_, err := this.RPC().MessageRPC().UpdateAllMessagesRead(this.AdminContext(), &pb.UpdateAllMessagesReadRequest{})
if err != nil {
diff --git a/internal/web/actions/default/messages/readPage.go b/internal/web/actions/default/messages/readPage.go
index 625a0d35..9bda1c88 100644
--- a/internal/web/actions/default/messages/readPage.go
+++ b/internal/web/actions/default/messages/readPage.go
@@ -14,7 +14,7 @@ func (this *ReadPageAction) RunPost(params struct {
MessageIds []int64
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "将一组消息置为已读")
+ defer this.CreateLog(oplogs.LevelInfo, "将一组消息置为已读")
_, err := this.RPC().MessageRPC().UpdateMessagesRead(this.AdminContext(), &pb.UpdateMessagesReadRequest{
MessageIds: params.MessageIds,
diff --git a/internal/web/actions/default/nodes/delete.go b/internal/web/actions/default/nodes/delete.go
index de3381ee..935d6571 100644
--- a/internal/web/actions/default/nodes/delete.go
+++ b/internal/web/actions/default/nodes/delete.go
@@ -20,7 +20,7 @@ func (this *DeleteAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除节点", params.NodeId)
+ defer 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 179604ae..98535c17 100644
--- a/internal/web/actions/default/servers/addOriginPopup.go
+++ b/internal/web/actions/default/servers/addOriginPopup.go
@@ -71,7 +71,7 @@ func (this *AddOriginPopupAction) RunPost(params struct {
this.Data["origin"] = origin
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建源站 %d", resp.OriginId)
+ defer 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 ef9c0b3f..d7f83f0a 100644
--- a/internal/web/actions/default/servers/components/cache/clean.go
+++ b/internal/web/actions/default/servers/components/cache/clean.go
@@ -90,7 +90,7 @@ func (this *CleanAction) RunPost(params struct {
this.Data["results"] = results
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "清除缓存，缓存策略：%d", params.CachePolicyId)
+ defer 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 d011829d..fbe7e826 100644
--- a/internal/web/actions/default/servers/components/cache/createPopup.go
+++ b/internal/web/actions/default/servers/components/cache/createPopup.go
@@ -80,7 +80,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建缓存策略：%d", createResp.CachePolicyId)
+ defer 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 edba8436..af0c02df 100644
--- a/internal/web/actions/default/servers/components/cache/delete.go
+++ b/internal/web/actions/default/servers/components/cache/delete.go
@@ -30,7 +30,7 @@ func (this *DeleteAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除缓存策略：%d", params.CachePolicyId)
+ defer 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 6ff41451..636e2a1f 100644
--- a/internal/web/actions/default/servers/components/cache/preheat.go
+++ b/internal/web/actions/default/servers/components/cache/preheat.go
@@ -110,7 +110,7 @@ func (this *PreheatAction) RunPost(params struct {
this.Data["results"] = results
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "预热缓存，缓存策略：%d", params.CachePolicyId)
+ defer 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 a56e6e13..672a43f4 100644
--- a/internal/web/actions/default/servers/components/cache/purge.go
+++ b/internal/web/actions/default/servers/components/cache/purge.go
@@ -109,7 +109,7 @@ func (this *PurgeAction) RunPost(params struct {
this.Data["results"] = results
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除缓存，缓存策略：%d", params.CachePolicyId)
+ defer 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 5430b6ab..11633d13 100644
--- a/internal/web/actions/default/servers/components/cache/stat.go
+++ b/internal/web/actions/default/servers/components/cache/stat.go
@@ -90,7 +90,7 @@ func (this *StatAction) RunPost(params struct {
this.Data["results"] = results
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "统计缓存，缓存策略：%d", params.CachePolicyId)
+ defer 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 3c00dece..fe5293f5 100644
--- a/internal/web/actions/default/servers/components/cache/testRead.go
+++ b/internal/web/actions/default/servers/components/cache/testRead.go
@@ -58,7 +58,7 @@ func (this *TestReadAction) RunPost(params struct {
this.Data["results"] = results
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "测试读取，缓存策略：%d", params.CachePolicyId)
+ defer 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 5bea01d7..be1e3f40 100644
--- a/internal/web/actions/default/servers/components/cache/testWrite.go
+++ b/internal/web/actions/default/servers/components/cache/testWrite.go
@@ -61,7 +61,7 @@ func (this *TestWriteAction) RunPost(params struct {
this.Data["results"] = results
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "测试写入，缓存策略：%d", params.CachePolicyId)
+ defer 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 ce219c82..14297e3e 100644
--- a/internal/web/actions/default/servers/components/cache/update.go
+++ b/internal/web/actions/default/servers/components/cache/update.go
@@ -106,7 +106,7 @@ func (this *UpdateAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改缓存策略：%d", params.CachePolicyId)
+ defer 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 b624c31e..778bc391 100644
--- a/internal/web/actions/default/servers/components/groups/createPopup.go
+++ b/internal/web/actions/default/servers/components/groups/createPopup.go
@@ -42,7 +42,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建代理服务分组 %d", createResp.GroupId)
+ defer 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 c295cb8e..a23f25e3 100644
--- a/internal/web/actions/default/servers/components/groups/delete.go
+++ b/internal/web/actions/default/servers/components/groups/delete.go
@@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct {
GroupId int64
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除代理服务分组 %d", params.GroupId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除代理服务分组 %d", params.GroupId)
// 检查是否正在使用
countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithGroupIdRequest{GroupId: params.GroupId})
diff --git a/internal/web/actions/default/servers/components/groups/sort.go b/internal/web/actions/default/servers/components/groups/sort.go
index 6865dee2..ffe46395 100644
--- a/internal/web/actions/default/servers/components/groups/sort.go
+++ b/internal/web/actions/default/servers/components/groups/sort.go
@@ -14,7 +14,7 @@ func (this *SortAction) RunPost(params struct {
GroupIds []int64
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改代理分组排序")
+ defer this.CreateLog(oplogs.LevelInfo, "修改代理分组排序")
_, err := this.RPC().ServerGroupRPC().UpdateServerGroupOrders(this.AdminContext(), &pb.UpdateServerGroupOrdersRequest{GroupIds: params.GroupIds})
if err != nil {
diff --git a/internal/web/actions/default/servers/components/groups/updatePopup.go b/internal/web/actions/default/servers/components/groups/updatePopup.go
index 18c9f919..a131680d 100644
--- a/internal/web/actions/default/servers/components/groups/updatePopup.go
+++ b/internal/web/actions/default/servers/components/groups/updatePopup.go
@@ -45,7 +45,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改代理服务分组 %d", params.GroupId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改代理服务分组 %d", params.GroupId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/servers/components/index.go b/internal/web/actions/default/servers/components/index.go
index 95978a0d..2d13efc1 100644
--- a/internal/web/actions/default/servers/components/index.go
+++ b/internal/web/actions/default/servers/components/index.go
@@ -56,7 +56,7 @@ func (this *IndexAction) RunPost(params struct {
DefaultDomain string
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "保存代理服务全局配置")
+ defer 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 3254e886..56e3871f 100644
--- a/internal/web/actions/default/servers/components/ip-library/delete.go
+++ b/internal/web/actions/default/servers/components/ip-library/delete.go
@@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct {
LibraryId int64
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除IP库 %d", params.LibraryId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除IP库 %d", params.LibraryId)
_, err := this.RPC().IPLibraryRPC().DeleteIPLibrary(this.AdminContext(), &pb.DeleteIPLibraryRequest{IpLibraryId: params.LibraryId})
if err != nil {
diff --git a/internal/web/actions/default/servers/components/ip-library/download.go b/internal/web/actions/default/servers/components/ip-library/download.go
index c7a73f40..fd11a3a8 100644
--- a/internal/web/actions/default/servers/components/ip-library/download.go
+++ b/internal/web/actions/default/servers/components/ip-library/download.go
@@ -18,7 +18,7 @@ func (this *DownloadAction) RunGet(params struct {
LibraryId int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "下载IP库 %d", params.LibraryId)
+ defer this.CreateLog(oplogs.LevelInfo, "下载IP库 %d", params.LibraryId)
libraryResp, err := this.RPC().IPLibraryRPC().FindEnabledIPLibrary(this.AdminContext(), &pb.FindEnabledIPLibraryRequest{IpLibraryId: params.LibraryId})
if err != nil {
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 e73442e1..df82350b 100644
--- a/internal/web/actions/default/servers/components/ip-library/uploadPopup.go
+++ b/internal/web/actions/default/servers/components/ip-library/uploadPopup.go
@@ -104,7 +104,7 @@ func (this *UploadPopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "上传IP库 %d", createResp.IpLibraryId)
+ defer 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 f548dcf7..8a8b7d46 100644
--- a/internal/web/actions/default/servers/components/ssl/delete.go
+++ b/internal/web/actions/default/servers/components/ssl/delete.go
@@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct {
CertId int64
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "删除SSL证书 %d", params.CertId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除SSL证书 %d", params.CertId)
// 是否正在被使用
countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledServersWithSSLCertIdRequest{CertId: params.CertId})
diff --git a/internal/web/actions/default/servers/components/ssl/downloadCert.go b/internal/web/actions/default/servers/components/ssl/downloadCert.go
index 8f9fd922..ef4a5bf7 100644
--- a/internal/web/actions/default/servers/components/ssl/downloadCert.go
+++ b/internal/web/actions/default/servers/components/ssl/downloadCert.go
@@ -19,6 +19,8 @@ func (this *DownloadCertAction) Init() {
func (this *DownloadCertAction) RunGet(params struct {
CertId int64
}) {
+ defer this.CreateLogInfo("下载SSL证书 %d", params.CertId)
+
certResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{CertId: params.CertId})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/components/ssl/downloadKey.go b/internal/web/actions/default/servers/components/ssl/downloadKey.go
index 8d2a805c..e1cd9af8 100644
--- a/internal/web/actions/default/servers/components/ssl/downloadKey.go
+++ b/internal/web/actions/default/servers/components/ssl/downloadKey.go
@@ -19,6 +19,8 @@ func (this *DownloadKeyAction) Init() {
func (this *DownloadKeyAction) RunGet(params struct {
CertId int64
}) {
+ defer this.CreateLogInfo("下载SSL密钥 %d", params.CertId)
+
certResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{CertId: params.CertId})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/components/ssl/downloadZip.go b/internal/web/actions/default/servers/components/ssl/downloadZip.go
index 4e29d2cb..40185acb 100644
--- a/internal/web/actions/default/servers/components/ssl/downloadZip.go
+++ b/internal/web/actions/default/servers/components/ssl/downloadZip.go
@@ -20,6 +20,8 @@ func (this *DownloadZipAction) Init() {
func (this *DownloadZipAction) RunGet(params struct {
CertId int64
}) {
+ defer this.CreateLogInfo("下载SSL证书压缩包 %d", params.CertId)
+
certResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{CertId: params.CertId})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/components/ssl/updatePopup.go b/internal/web/actions/default/servers/components/ssl/updatePopup.go
index 27afcb10..34bdd82d 100644
--- a/internal/web/actions/default/servers/components/ssl/updatePopup.go
+++ b/internal/web/actions/default/servers/components/ssl/updatePopup.go
@@ -56,7 +56,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
Must *actions.Must
}) {
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "修改SSL证书 %d", params.CertId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改SSL证书 %d", params.CertId)
// 查询Cert
certConfigResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{CertId: params.CertId})
diff --git a/internal/web/actions/default/servers/components/ssl/uploadPopup.go b/internal/web/actions/default/servers/components/ssl/uploadPopup.go
index acac3e1e..cddd3d4b 100644
--- a/internal/web/actions/default/servers/components/ssl/uploadPopup.go
+++ b/internal/web/actions/default/servers/components/ssl/uploadPopup.go
@@ -115,7 +115,7 @@ func (this *UploadPopupAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "上传SSL证书 %d", certId)
+ defer this.CreateLog(oplogs.LevelInfo, "上传SSL证书 %d", certId)
this.Success()
}
diff --git a/internal/web/actions/default/servers/components/waf/createGroupPopup.go b/internal/web/actions/default/servers/components/waf/createGroupPopup.go
index 9ead21ba..ffa299dd 100644
--- a/internal/web/actions/default/servers/components/waf/createGroupPopup.go
+++ b/internal/web/actions/default/servers/components/waf/createGroupPopup.go
@@ -96,7 +96,7 @@ func (this *CreateGroupPopupAction) RunPost(params struct {
}
// 日志
- this.CreateLog(oplogs.LevelInfo, "创建规则分组 %d，名称：%s", groupId, params.Name)
+ defer this.CreateLog(oplogs.LevelInfo, "创建规则分组 %d，名称：%s", groupId, params.Name)
this.Success()
}
diff --git a/internal/web/actions/default/servers/components/waf/createPopup.go b/internal/web/actions/default/servers/components/waf/createPopup.go
index d672e722..f5231db7 100644
--- a/internal/web/actions/default/servers/components/waf/createPopup.go
+++ b/internal/web/actions/default/servers/components/waf/createPopup.go
@@ -57,7 +57,7 @@ func (this *CreatePopupAction) RunPost(params struct {
}
// 日志
- this.CreateLog(oplogs.LevelInfo, "创建WAF策略 %d", createResp.FirewallPolicyId)
+ defer this.CreateLog(oplogs.LevelInfo, "创建WAF策略 %d", createResp.FirewallPolicyId)
this.Success()
}
diff --git a/internal/web/actions/default/servers/components/waf/delete.go b/internal/web/actions/default/servers/components/waf/delete.go
index 9809af02..6d25e2d6 100644
--- a/internal/web/actions/default/servers/components/waf/delete.go
+++ b/internal/web/actions/default/servers/components/waf/delete.go
@@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct {
FirewallPolicyId int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d", params.FirewallPolicyId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d", params.FirewallPolicyId)
countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.CountAllEnabledServersWithHTTPFirewallPolicyIdRequest{FirewallPolicyId: params.FirewallPolicyId})
if err != nil {
diff --git a/internal/web/actions/default/servers/components/waf/deleteGroup.go b/internal/web/actions/default/servers/components/waf/deleteGroup.go
index 7842afec..88fdb9f8 100644
--- a/internal/web/actions/default/servers/components/waf/deleteGroup.go
+++ b/internal/web/actions/default/servers/components/waf/deleteGroup.go
@@ -16,7 +16,7 @@ func (this *DeleteGroupAction) RunPost(params struct {
GroupId int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d 的规则分组 %d", params.FirewallPolicyId, params.GroupId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d 的规则分组 %d", params.FirewallPolicyId, params.GroupId)
firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
if err != nil {
diff --git a/internal/web/actions/default/servers/components/waf/deleteSet.go b/internal/web/actions/default/servers/components/waf/deleteSet.go
index 1c89869e..c96b0268 100644
--- a/internal/web/actions/default/servers/components/waf/deleteSet.go
+++ b/internal/web/actions/default/servers/components/waf/deleteSet.go
@@ -18,7 +18,7 @@ func (this *DeleteSetAction) RunPost(params struct {
SetId int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "删除WAF规则分组 %d 中的规则集 %d", params.GroupId, params.SetId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除WAF规则分组 %d 中的规则集 %d", params.GroupId, params.SetId)
groupConfig, err := models.SharedHTTPFirewallRuleGroupDAO.FindRuleGroupConfig(this.AdminContext(), params.GroupId)
if err != nil {
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/createIPPopup.go b/internal/web/actions/default/servers/components/waf/ipadmin/createIPPopup.go
index c2f11b9c..793e2df3 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/createIPPopup.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/createIPPopup.go
@@ -72,7 +72,7 @@ func (this *CreateIPPopupAction) RunPost(params struct {
}
// 日志
- this.CreateLog(oplogs.LevelInfo, "在WAF策略 %d 名单中添加IP %d", params.FirewallPolicyId, itemId)
+ defer this.CreateLog(oplogs.LevelInfo, "在WAF策略 %d 名单中添加IP %d", params.FirewallPolicyId, itemId)
this.Success()
}
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/deleteIP.go b/internal/web/actions/default/servers/components/waf/ipadmin/deleteIP.go
index e752b317..e2749313 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/deleteIP.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/deleteIP.go
@@ -16,7 +16,7 @@ func (this *DeleteIPAction) RunPost(params struct {
ItemId int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "从WAF策略 %d 名单中删除IP %d", params.FirewallPolicyId, params.ItemId)
+ defer this.CreateLog(oplogs.LevelInfo, "从WAF策略 %d 名单中删除IP %d", params.FirewallPolicyId, params.ItemId)
// TODO 判断权限
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/index.go b/internal/web/actions/default/servers/components/waf/ipadmin/index.go
index 300d1f4a..5a7cee29 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/index.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/index.go
@@ -67,7 +67,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的国家和地区", params.FirewallPolicyId)
+ defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的国家和地区", params.FirewallPolicyId)
policyConfig, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
if err != nil {
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
index 973be47e..f957aeb8 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
@@ -69,7 +69,7 @@ func (this *ProvincesAction) RunPost(params struct {
Must *actions.Must
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的省份", params.FirewallPolicyId)
+ defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的省份", params.FirewallPolicyId)
policyConfig, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
if err != nil {
diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go b/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go
index 639ecc7d..2da71090 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go
@@ -55,7 +55,7 @@ func (this *UpdateIPPopupAction) RunPost(params struct {
CSRF *actionutils.CSRF
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 名单中的IP %d", params.FirewallPolicyId, params.ItemId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 名单中的IP %d", params.FirewallPolicyId, params.ItemId)
// TODO 校验ItemId所属用户
// TODO 校验IP格式（ipFrom/ipTo）
diff --git a/internal/web/actions/default/servers/components/waf/sortGroups.go b/internal/web/actions/default/servers/components/waf/sortGroups.go
index a69f1e0c..86c5f654 100644
--- a/internal/web/actions/default/servers/components/waf/sortGroups.go
+++ b/internal/web/actions/default/servers/components/waf/sortGroups.go
@@ -18,7 +18,7 @@ func (this *SortGroupsAction) RunPost(params struct {
GroupIds []int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 中的规则分组中的排序", params.FirewallPolicyId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 中的规则分组中的排序", params.FirewallPolicyId)
firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicyConfig(this.AdminContext(), params.FirewallPolicyId)
if err != nil {
diff --git a/internal/web/actions/default/servers/components/waf/sortSets.go b/internal/web/actions/default/servers/components/waf/sortSets.go
index d6b60f78..37906a13 100644
--- a/internal/web/actions/default/servers/components/waf/sortSets.go
+++ b/internal/web/actions/default/servers/components/waf/sortSets.go
@@ -18,7 +18,7 @@ func (this *SortSetsAction) RunPost(params struct {
SetIds []int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 中的规则集排序", params.GroupId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 中的规则集排序", params.GroupId)
groupConfig, err := models.SharedHTTPFirewallRuleGroupDAO.FindRuleGroupConfig(this.AdminContext(), params.GroupId)
if err != nil {
diff --git a/internal/web/actions/default/servers/components/waf/update.go b/internal/web/actions/default/servers/components/waf/update.go
index 5139eb12..276ab0de 100644
--- a/internal/web/actions/default/servers/components/waf/update.go
+++ b/internal/web/actions/default/servers/components/waf/update.go
@@ -69,7 +69,7 @@ func (this *UpdateAction) RunPost(params struct {
Must *actions.Must
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 基本信息", params.FirewallPolicyId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 基本信息", params.FirewallPolicyId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/servers/components/waf/updateGroupOn.go b/internal/web/actions/default/servers/components/waf/updateGroupOn.go
index 0552ba0f..f039e773 100644
--- a/internal/web/actions/default/servers/components/waf/updateGroupOn.go
+++ b/internal/web/actions/default/servers/components/waf/updateGroupOn.go
@@ -15,7 +15,7 @@ func (this *UpdateGroupOnAction) RunPost(params struct {
IsOn bool
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "设置WAF规则分组 %d 开启状态", params.GroupId)
+ defer this.CreateLog(oplogs.LevelInfo, "设置WAF规则分组 %d 开启状态", params.GroupId)
_, err := this.RPC().HTTPFirewallRuleGroupRPC().UpdateHTTPFirewallRuleGroupIsOn(this.AdminContext(), &pb.UpdateHTTPFirewallRuleGroupIsOnRequest{
FirewallRuleGroupId: params.GroupId,
diff --git a/internal/web/actions/default/servers/components/waf/updateGroupPopup.go b/internal/web/actions/default/servers/components/waf/updateGroupPopup.go
index 41d47b5b..e8e5901a 100644
--- a/internal/web/actions/default/servers/components/waf/updateGroupPopup.go
+++ b/internal/web/actions/default/servers/components/waf/updateGroupPopup.go
@@ -49,7 +49,7 @@ func (this *UpdateGroupPopupAction) RunPost(params struct {
Must *actions.Must
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 基本信息", params.GroupId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 基本信息", params.GroupId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/servers/components/waf/updateSetOn.go b/internal/web/actions/default/servers/components/waf/updateSetOn.go
index 832baf87..87270c51 100644
--- a/internal/web/actions/default/servers/components/waf/updateSetOn.go
+++ b/internal/web/actions/default/servers/components/waf/updateSetOn.go
@@ -15,7 +15,7 @@ func (this *UpdateSetOnAction) RunPost(params struct {
IsOn bool
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 开启状态", params.SetId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 开启状态", params.SetId)
_, err := this.RPC().HTTPFirewallRuleSetRPC().UpdateHTTPFirewallRuleSetIsOn(this.AdminContext(), &pb.UpdateHTTPFirewallRuleSetIsOnRequest{
FirewallRuleSetId: params.SetId,
diff --git a/internal/web/actions/default/servers/components/waf/updateSetPopup.go b/internal/web/actions/default/servers/components/waf/updateSetPopup.go
index 29037ffb..d3f4e3bc 100644
--- a/internal/web/actions/default/servers/components/waf/updateSetPopup.go
+++ b/internal/web/actions/default/servers/components/waf/updateSetPopup.go
@@ -27,7 +27,7 @@ func (this *UpdateSetPopupAction) RunGet(params struct {
SetId int64
}) {
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 基本信息", params.SetId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 基本信息", params.SetId)
this.Data["groupId"] = params.GroupId
this.Data["type"] = params.Type
diff --git a/internal/web/actions/default/servers/create.go b/internal/web/actions/default/servers/create.go
index 30de2793..f8e4c8f3 100644
--- a/internal/web/actions/default/servers/create.go
+++ b/internal/web/actions/default/servers/create.go
@@ -318,7 +318,7 @@ func (this *CreateAction) RunPost(params struct {
}
// 创建日志
- this.CreateLog(oplogs.LevelInfo, "创建代理服务 %d", createResp.ServerId)
+ defer this.CreateLog(oplogs.LevelInfo, "创建代理服务 %d", createResp.ServerId)
this.Success()
}
diff --git a/internal/web/actions/default/servers/server/delete/index.go b/internal/web/actions/default/servers/server/delete/index.go
index 04d73649..0235ce2e 100644
--- a/internal/web/actions/default/servers/server/delete/index.go
+++ b/internal/web/actions/default/servers/server/delete/index.go
@@ -25,7 +25,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "删除代理服务 %d", params.ServerId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除代理服务 %d", params.ServerId)
// 执行删除
_, err := this.RPC().ServerRPC().DisableServer(this.AdminContext(), &pb.DisableServerRequest{ServerId: params.ServerId})
diff --git a/internal/web/actions/default/servers/server/settings/accessLog/index.go b/internal/web/actions/default/servers/server/settings/accessLog/index.go
index d438cd6a..0b2de205 100644
--- a/internal/web/actions/default/servers/server/settings/accessLog/index.go
+++ b/internal/web/actions/default/servers/server/settings/accessLog/index.go
@@ -1,6 +1,7 @@
package accessLog
import (
+ "github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -59,6 +60,9 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的访问日志设置", params.WebId)
+
// TODO 检查参数
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{
diff --git a/internal/web/actions/default/servers/server/settings/cache/index.go b/internal/web/actions/default/servers/server/settings/cache/index.go
index 4b5bd980..d7df9d9a 100644
--- a/internal/web/actions/default/servers/server/settings/cache/index.go
+++ b/internal/web/actions/default/servers/server/settings/cache/index.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/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -39,6 +40,9 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的缓存设置", params.WebId)
+
// TODO 校验配置
cacheConfig := &serverconfigs.HTTPCacheConfig{}
err := json.Unmarshal(params.CacheJSON, cacheConfig)
diff --git a/internal/web/actions/default/servers/server/settings/charset/index.go b/internal/web/actions/default/servers/server/settings/charset/index.go
index 0adbb1fb..8477bfc9 100644
--- a/internal/web/actions/default/servers/server/settings/charset/index.go
+++ b/internal/web/actions/default/servers/server/settings/charset/index.go
@@ -1,6 +1,7 @@
package charset
import (
+ "github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
@@ -41,6 +42,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的字符集设置", params.WebId)
+
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{
WebId: params.WebId,
CharsetJSON: params.CharsetJSON,
diff --git a/internal/web/actions/default/servers/server/settings/gzip/index.go b/internal/web/actions/default/servers/server/settings/gzip/index.go
index 66b952d1..d977b696 100644
--- a/internal/web/actions/default/servers/server/settings/gzip/index.go
+++ b/internal/web/actions/default/servers/server/settings/gzip/index.go
@@ -2,6 +2,7 @@ package gzip
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/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -76,6 +77,9 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的GZip配置", params.WebId)
+
if params.Level < 0 || params.Level > 9 {
this.Fail("请选择正确的压缩级别")
}
diff --git a/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go b/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
index 975e0196..fdd67dfa 100644
--- a/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
@@ -2,6 +2,7 @@ package headers
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/shared"
@@ -30,6 +31,13 @@ func (this *CreateDeletePopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "添加删除的Header HeaderPolicyId: %d, Name: %s", params.HeaderPolicyId, params.Name)
+
+ params.Must.
+ Field("name", params.Name).
+ Require("名称不能为空")
+
policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go b/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
index 0a15fe9c..ad1fae37 100644
--- a/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
@@ -2,6 +2,7 @@ package headers
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/shared"
@@ -32,6 +33,9 @@ func (this *CreateSetPopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "设置请求Header，HeaderPolicyId:%d, Name:%s, Value:%s", params.HeaderPolicyId, params.Name, params.Value)
+
params.Must.
Field("name", params.Name).
Require("请输入Header名称")
diff --git a/internal/web/actions/default/servers/server/settings/headers/delete.go b/internal/web/actions/default/servers/server/settings/headers/delete.go
index ddc0c179..cf530ea4 100644
--- a/internal/web/actions/default/servers/server/settings/headers/delete.go
+++ b/internal/web/actions/default/servers/server/settings/headers/delete.go
@@ -2,6 +2,7 @@ package headers
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/shared"
@@ -17,6 +18,8 @@ func (this *DeleteAction) RunPost(params struct {
Type string
HeaderId int64
}) {
+ defer this.CreateLog(oplogs.LevelInfo, "删除请求Header，HeaderPolicyId:%d, HeaderId:%d", params.HeaderPolicyId, params.HeaderId)
+
policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{
HeaderPolicyId: params.HeaderPolicyId,
})
diff --git a/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go b/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
index 442d5805..36558577 100644
--- a/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
+++ b/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
@@ -2,6 +2,7 @@ package headers
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/shared"
@@ -15,6 +16,9 @@ func (this *DeleteDeletingHeaderAction) RunPost(params struct {
HeaderPolicyId int64
HeaderName string
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "删除需要删除的请求Header，HeaderPolicyId:%d, HeaderName:%s", params.HeaderPolicyId, params.HeaderName)
+
policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go b/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go
index 6503cdef..4d358b13 100644
--- a/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go
@@ -2,6 +2,7 @@ package headers
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/shared"
@@ -46,6 +47,9 @@ func (this *UpdateSetPopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "修改设置请求Header，HeaderPolicyId:%d, Name:%s, Value:%s", params.HeaderId, params.Name, params.Value)
+
params.Must.
Field("name", params.Name).
Require("请输入Header名称")
diff --git a/internal/web/actions/default/servers/server/settings/http/index.go b/internal/web/actions/default/servers/server/settings/http/index.go
index e769cb46..760327ee 100644
--- a/internal/web/actions/default/servers/server/settings/http/index.go
+++ b/internal/web/actions/default/servers/server/settings/http/index.go
@@ -68,7 +68,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTP设置", params.ServerId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTP设置", params.ServerId)
addresses := []*serverconfigs.NetworkAddressConfig{}
err := json.Unmarshal([]byte(params.Addresses), &addresses)
diff --git a/internal/web/actions/default/servers/server/settings/https/index.go b/internal/web/actions/default/servers/server/settings/https/index.go
index 8f86e285..1d5f7955 100644
--- a/internal/web/actions/default/servers/server/settings/https/index.go
+++ b/internal/web/actions/default/servers/server/settings/https/index.go
@@ -79,7 +79,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTPS设置", params.ServerId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTPS设置", params.ServerId)
addresses := []*serverconfigs.NetworkAddressConfig{}
err := json.Unmarshal([]byte(params.Addresses), &addresses)
diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go
index 3572d837..9ea603cd 100644
--- a/internal/web/actions/default/servers/server/settings/index.go
+++ b/internal/web/actions/default/servers/server/settings/index.go
@@ -103,7 +103,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 基本信息", params.ServerId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 基本信息", params.ServerId)
params.Must.
Field("name", params.Name).
diff --git a/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go b/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go
index b74bb201..04d26646 100644
--- a/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go
@@ -57,6 +57,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的访问日志设置", params.WebId)
+
// TODO 检查参数
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{
diff --git a/internal/web/actions/default/servers/server/settings/locations/cache/index.go b/internal/web/actions/default/servers/server/settings/locations/cache/index.go
index 0acf09c9..f3cb7a16 100644
--- a/internal/web/actions/default/servers/server/settings/locations/cache/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/cache/index.go
@@ -37,6 +37,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的缓存设置", params.WebId)
+
// TODO 校验配置
cacheConfig := &serverconfigs.HTTPCacheConfig{}
err := json.Unmarshal(params.CacheJSON, cacheConfig)
diff --git a/internal/web/actions/default/servers/server/settings/locations/charset/index.go b/internal/web/actions/default/servers/server/settings/locations/charset/index.go
index e2c4442c..25791a5e 100644
--- a/internal/web/actions/default/servers/server/settings/locations/charset/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/charset/index.go
@@ -39,6 +39,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的字符集设置", params.WebId)
+
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{
WebId: params.WebId,
CharsetJSON: params.CharsetJSON,
diff --git a/internal/web/actions/default/servers/server/settings/locations/gzip/index.go b/internal/web/actions/default/servers/server/settings/locations/gzip/index.go
index 49b3407c..e3cf733d 100644
--- a/internal/web/actions/default/servers/server/settings/locations/gzip/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/gzip/index.go
@@ -75,6 +75,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的Gzip设置", params.WebId)
+
if params.Level < 0 || params.Level > 9 {
this.Fail("请选择正确的压缩级别")
}
diff --git a/internal/web/actions/default/servers/server/settings/locations/headers/index.go b/internal/web/actions/default/servers/server/settings/locations/headers/index.go
index 70e057c7..c9949acc 100644
--- a/internal/web/actions/default/servers/server/settings/locations/headers/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/headers/index.go
@@ -102,6 +102,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的Header设置", params.WebId)
+
// TODO 检查配置
switch params.Type {
diff --git a/internal/web/actions/default/servers/server/settings/locations/http/index.go b/internal/web/actions/default/servers/server/settings/locations/http/index.go
index 3da71d20..f820a136 100644
--- a/internal/web/actions/default/servers/server/settings/locations/http/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/http/index.go
@@ -35,6 +35,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的通用设置", params.WebId)
+
// 设置跳转到HTTPS
// TODO 校验设置
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRedirectToHTTPS(this.AdminContext(), &pb.UpdateHTTPWebRedirectToHTTPSRequest{
diff --git a/internal/web/actions/default/servers/server/settings/locations/location/index.go b/internal/web/actions/default/servers/server/settings/locations/location/index.go
index de7f84db..d702f2a8 100644
--- a/internal/web/actions/default/servers/server/settings/locations/location/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/location/index.go
@@ -47,6 +47,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改路径规则 %d 设置", params.LocationId)
+
params.Must.
Field("pattern", params.Pattern).
Require("请输入路径匹配规则")
diff --git a/internal/web/actions/default/servers/server/settings/locations/pages/index.go b/internal/web/actions/default/servers/server/settings/locations/pages/index.go
index fdaeefc2..26bb5222 100644
--- a/internal/web/actions/default/servers/server/settings/locations/pages/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/pages/index.go
@@ -36,6 +36,8 @@ func (this *IndexAction) RunPost(params struct {
ShutdownJSON string
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的特殊页面设置", params.WebId)
+
// TODO 检查配置
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{
diff --git a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go
index 0c561a71..70ea39b9 100644
--- a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go
+++ b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go
@@ -51,6 +51,8 @@ func (this *SettingAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改路径规则 %d 的反向代理设置", params.LocationId)
+
// TODO 校验配置
reverseProxyConfig := &serverconfigs.ReverseProxyConfig{}
diff --git a/internal/web/actions/default/servers/server/settings/locations/stat/index.go b/internal/web/actions/default/servers/server/settings/locations/stat/index.go
index 658db374..1d05b7e7 100644
--- a/internal/web/actions/default/servers/server/settings/locations/stat/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/stat/index.go
@@ -35,6 +35,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的统计设置", params.WebId)
+
// TODO 校验配置
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{
diff --git a/internal/web/actions/default/servers/server/settings/locations/waf/index.go b/internal/web/actions/default/servers/server/settings/locations/waf/index.go
index 896013d3..cf6bcef7 100644
--- a/internal/web/actions/default/servers/server/settings/locations/waf/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/waf/index.go
@@ -53,6 +53,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的WAF设置", params.WebId)
+
// TODO 检查配置
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{
diff --git a/internal/web/actions/default/servers/server/settings/locations/web/index.go b/internal/web/actions/default/servers/server/settings/locations/web/index.go
index 70ccd4b6..0ba350b6 100644
--- a/internal/web/actions/default/servers/server/settings/locations/web/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/web/index.go
@@ -35,6 +35,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的根目录等设置", params.WebId)
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{
WebId: params.WebId,
diff --git a/internal/web/actions/default/servers/server/settings/locations/websocket/index.go b/internal/web/actions/default/servers/server/settings/locations/websocket/index.go
index 58de11b9..87f1b513 100644
--- a/internal/web/actions/default/servers/server/settings/locations/websocket/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/websocket/index.go
@@ -40,6 +40,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的Websocket设置", params.WebId)
+
// TODO 检查配置
websocketRef := &serverconfigs.HTTPWebsocketRef{}
diff --git a/internal/web/actions/default/servers/server/settings/origins/addPopup.go b/internal/web/actions/default/servers/server/settings/origins/addPopup.go
index 00e857d8..dfa7b985 100644
--- a/internal/web/actions/default/servers/server/settings/origins/addPopup.go
+++ b/internal/web/actions/default/servers/server/settings/origins/addPopup.go
@@ -132,7 +132,7 @@ func (this *AddPopupAction) RunPost(params struct {
}
// 日志
- this.CreateLog(oplogs.LevelInfo, "为反向代理服务 %d 添加源站 %d", params.ReverseProxyId, originId)
+ defer this.CreateLog(oplogs.LevelInfo, "为反向代理服务 %d 添加源站 %d", params.ReverseProxyId, originId)
this.Success()
}
diff --git a/internal/web/actions/default/servers/server/settings/origins/delete.go b/internal/web/actions/default/servers/server/settings/origins/delete.go
index c234f8d3..904f3832 100644
--- a/internal/web/actions/default/servers/server/settings/origins/delete.go
+++ b/internal/web/actions/default/servers/server/settings/origins/delete.go
@@ -83,7 +83,7 @@ func (this *DeleteAction) RunPost(params struct {
}
// 日志
- this.CreateLog(oplogs.LevelInfo, "删除反向代理服务 %d 的源站 %d", params.ReverseProxyId, params.OriginId)
+ defer this.CreateLog(oplogs.LevelInfo, "删除反向代理服务 %d 的源站 %d", params.ReverseProxyId, params.OriginId)
this.Success()
}
diff --git a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
index 1b20bbd6..10d08dab 100644
--- a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
+++ b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
@@ -104,7 +104,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
}
// 日志
- this.CreateLog(oplogs.LevelInfo, "修改反向代理服务 %d 的源站 %d", params.ReverseProxyId, params.OriginId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改反向代理服务 %d 的源站 %d", params.ReverseProxyId, params.OriginId)
this.Success()
}
diff --git a/internal/web/actions/default/servers/server/settings/pages/createPopup.go b/internal/web/actions/default/servers/server/settings/pages/createPopup.go
index 3846f24e..b480484c 100644
--- a/internal/web/actions/default/servers/server/settings/pages/createPopup.go
+++ b/internal/web/actions/default/servers/server/settings/pages/createPopup.go
@@ -2,6 +2,7 @@ package pages
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"
@@ -60,5 +61,8 @@ func (this *CreatePopupAction) RunPost(params struct {
}
this.Data["page"] = pageConfig
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "创建特殊页面 %d", pageId)
+
this.Success()
}
diff --git a/internal/web/actions/default/servers/server/settings/pages/index.go b/internal/web/actions/default/servers/server/settings/pages/index.go
index f19f954c..0c56a126 100644
--- a/internal/web/actions/default/servers/server/settings/pages/index.go
+++ b/internal/web/actions/default/servers/server/settings/pages/index.go
@@ -1,6 +1,7 @@
package pages
import (
+ "github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -38,6 +39,9 @@ func (this *IndexAction) RunPost(params struct {
ShutdownJSON string
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的设置", params.WebId)
+
// TODO 检查配置
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{
diff --git a/internal/web/actions/default/servers/server/settings/pages/updatePopup.go b/internal/web/actions/default/servers/server/settings/pages/updatePopup.go
index 911ac5e0..15764f33 100644
--- a/internal/web/actions/default/servers/server/settings/pages/updatePopup.go
+++ b/internal/web/actions/default/servers/server/settings/pages/updatePopup.go
@@ -2,6 +2,7 @@ package pages
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"
@@ -46,6 +47,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ // 日志
+ defer this.CreateLog(oplogs.LevelInfo, "修改特殊页面 %d", params.PageId)
+
params.Must.
Field("status", params.Status).
Require("请输入响应状态码").
diff --git a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go
index 37df74d7..66f0db08 100644
--- a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go
+++ b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go
@@ -51,6 +51,8 @@ func (this *SettingAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改代理服务 %d 的反向代理设置", params.ServerId)
+
// TODO 校验配置
reverseProxyConfig := &serverconfigs.ReverseProxyConfig{}
diff --git a/internal/web/actions/default/servers/server/settings/reverseProxy/updateSchedulingPopup.go b/internal/web/actions/default/servers/server/settings/reverseProxy/updateSchedulingPopup.go
index 38f77f8c..9d756239 100644
--- a/internal/web/actions/default/servers/server/settings/reverseProxy/updateSchedulingPopup.go
+++ b/internal/web/actions/default/servers/server/settings/reverseProxy/updateSchedulingPopup.go
@@ -93,6 +93,8 @@ func (this *UpdateSchedulingPopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改反向代理 %d 负载均衡算法", params.ReverseProxyId)
+
reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxyConfig(this.AdminContext(), &pb.FindEnabledReverseProxyConfigRequest{ReverseProxyId: params.ReverseProxyId})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go b/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go
index c1462965..39acb23d 100644
--- a/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go
+++ b/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go
@@ -98,5 +98,8 @@ func (this *CreatePopupAction) RunPost(params struct {
return
}
+ // 日志
+ defer this.CreateLogInfo("在Web %d 中创建重写规则 %d", params.WebId, createResp.RewriteRuleId)
+
this.Success()
}
diff --git a/internal/web/actions/default/servers/server/settings/rewrite/delete.go b/internal/web/actions/default/servers/server/settings/rewrite/delete.go
index 0daabc7c..f9c9bd1e 100644
--- a/internal/web/actions/default/servers/server/settings/rewrite/delete.go
+++ b/internal/web/actions/default/servers/server/settings/rewrite/delete.go
@@ -16,6 +16,8 @@ func (this *DeleteAction) RunPost(params struct {
WebId int64
RewriteRuleId int64
}) {
+ defer this.CreateLogInfo("从Web %d 中删除重写规则 %d", params.WebId, params.RewriteRuleId)
+
webConfig, err := webutils.FindWebConfigWithId(this.Parent(), params.WebId)
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/settings/rewrite/sort.go b/internal/web/actions/default/servers/server/settings/rewrite/sort.go
index 38224a6b..2f4fc4b7 100644
--- a/internal/web/actions/default/servers/server/settings/rewrite/sort.go
+++ b/internal/web/actions/default/servers/server/settings/rewrite/sort.go
@@ -16,6 +16,8 @@ func (this *SortAction) RunPost(params struct {
WebId int64
RewriteRuleIds []int64
}) {
+ defer this.CreateLogInfo("对Web %d 中的重写规则进行排序", params.WebId)
+
webConfig, err := webutils.FindWebConfigWithId(this.Parent(), params.WebId)
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go b/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go
index 4b2c2143..b1535825 100644
--- a/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go
+++ b/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go
@@ -59,6 +59,8 @@ func (this *UpdatePopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 中的重写规则 %d", params.WebId, params.RewriteRuleId)
+
params.Must.
Field("pattern", params.Pattern).
Require("请输入匹配规则").
diff --git a/internal/web/actions/default/servers/server/settings/serverNames/index.go b/internal/web/actions/default/servers/server/settings/serverNames/index.go
index 2f3850fa..f741ef26 100644
--- a/internal/web/actions/default/servers/server/settings/serverNames/index.go
+++ b/internal/web/actions/default/servers/server/settings/serverNames/index.go
@@ -49,7 +49,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
// 记录日志
- this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 域名", params.ServerId)
+ defer this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 域名", params.ServerId)
serverNames := []*serverconfigs.ServerNameConfig{}
err := json.Unmarshal([]byte(params.ServerNames), &serverNames)
diff --git a/internal/web/actions/default/servers/server/settings/stat/index.go b/internal/web/actions/default/servers/server/settings/stat/index.go
index fd526821..5f6c6dac 100644
--- a/internal/web/actions/default/servers/server/settings/stat/index.go
+++ b/internal/web/actions/default/servers/server/settings/stat/index.go
@@ -37,6 +37,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的统计设置", params.WebId)
+
// TODO 校验配置
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{
diff --git a/internal/web/actions/default/servers/server/settings/tcp/index.go b/internal/web/actions/default/servers/server/settings/tcp/index.go
index b63fc885..2b471494 100644
--- a/internal/web/actions/default/servers/server/settings/tcp/index.go
+++ b/internal/web/actions/default/servers/server/settings/tcp/index.go
@@ -49,6 +49,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改代理服务 %d TCP设置", params.ServerId)
+
server, _, isOk := serverutils.FindServer(this.Parent(), params.ServerId)
if !isOk {
return
diff --git a/internal/web/actions/default/servers/server/settings/tls/index.go b/internal/web/actions/default/servers/server/settings/tls/index.go
index 8804f4ec..e3f3727d 100644
--- a/internal/web/actions/default/servers/server/settings/tls/index.go
+++ b/internal/web/actions/default/servers/server/settings/tls/index.go
@@ -78,6 +78,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改代理服务 %d TLS设置", params.ServerId)
+
server, _, isOk := serverutils.FindServer(this.Parent(), params.ServerId)
if !isOk {
return
diff --git a/internal/web/actions/default/servers/server/settings/waf/index.go b/internal/web/actions/default/servers/server/settings/waf/index.go
index 34457036..4802cb1c 100644
--- a/internal/web/actions/default/servers/server/settings/waf/index.go
+++ b/internal/web/actions/default/servers/server/settings/waf/index.go
@@ -55,6 +55,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的WAF设置", params.WebId)
+
// TODO 检查配置
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{
diff --git a/internal/web/actions/default/servers/server/settings/web/index.go b/internal/web/actions/default/servers/server/settings/web/index.go
index ec6a864b..cb384b4d 100644
--- a/internal/web/actions/default/servers/server/settings/web/index.go
+++ b/internal/web/actions/default/servers/server/settings/web/index.go
@@ -38,6 +38,7 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的首页文件名", params.WebId)
_, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{
WebId: params.WebId,
diff --git a/internal/web/actions/default/servers/server/settings/websocket/index.go b/internal/web/actions/default/servers/server/settings/websocket/index.go
index cba47a1d..3b804966 100644
--- a/internal/web/actions/default/servers/server/settings/websocket/index.go
+++ b/internal/web/actions/default/servers/server/settings/websocket/index.go
@@ -41,6 +41,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改Web %d 的Websocket设置", params.WebId)
+
// TODO 检查配置
websocketRef := &serverconfigs.HTTPWebsocketRef{}
diff --git a/internal/web/actions/default/settings/database/update.go b/internal/web/actions/default/settings/database/update.go
index 79de6051..d1b19711 100644
--- a/internal/web/actions/default/settings/database/update.go
+++ b/internal/web/actions/default/settings/database/update.go
@@ -55,7 +55,7 @@ func (this *UpdateAction) RunGet(params struct{}) {
dbConfig = db
break
}
-
+
dsn := dbConfig.Dsn
dsn = regexp.MustCompile(`tcp\((.+)\)`).ReplaceAllString(dsn, "$1")
dsnURL, err := url.Parse("mysql://" + dsn)
@@ -93,6 +93,8 @@ func (this *UpdateAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改API节点数据库设置")
+
params.Must.
Field("host", params.Host).
Require("请输入主机地址").
diff --git a/internal/web/actions/default/settings/login/index.go b/internal/web/actions/default/settings/login/index.go
index 71a1d749..dc062a87 100644
--- a/internal/web/actions/default/settings/login/index.go
+++ b/internal/web/actions/default/settings/login/index.go
@@ -41,6 +41,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改登录设置")
+
params.Must.
Field("username", params.Username).
Require("请输入登录用户名").
diff --git a/internal/web/actions/default/settings/profile/index.go b/internal/web/actions/default/settings/profile/index.go
index 43756099..954f520a 100644
--- a/internal/web/actions/default/settings/profile/index.go
+++ b/internal/web/actions/default/settings/profile/index.go
@@ -39,6 +39,8 @@ func (this *IndexAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改个人资料")
+
params.Must.
Field("fullname", params.Fullname).
Require("请输入你的姓名")
diff --git a/internal/web/actions/default/settings/ui/updateHTTPPopup.go b/internal/web/actions/default/settings/ui/updateHTTPPopup.go
index db1abbe5..797ec742 100644
--- a/internal/web/actions/default/settings/ui/updateHTTPPopup.go
+++ b/internal/web/actions/default/settings/ui/updateHTTPPopup.go
@@ -32,6 +32,8 @@ func (this *UpdateHTTPPopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改管理界面的HTTP设置")
+
if len(params.Listens) == 0 {
this.Fail("请输入绑定地址")
}
diff --git a/internal/web/actions/default/settings/ui/updateHTTPSPopup.go b/internal/web/actions/default/settings/ui/updateHTTPSPopup.go
index 675d2b8f..3cf39c01 100644
--- a/internal/web/actions/default/settings/ui/updateHTTPSPopup.go
+++ b/internal/web/actions/default/settings/ui/updateHTTPSPopup.go
@@ -64,6 +64,8 @@ func (this *UpdateHTTPSPopupAction) RunPost(params struct {
Must *actions.Must
}) {
+ defer this.CreateLogInfo("修改管理界面的HTTPS设置")
+
if len(params.Listens) == 0 {
this.Fail("请输入绑定地址")
}
diff --git a/web/views/@default/log/index.html b/web/views/@default/log/index.html
index 62262aa4..c8e5309a 100644
--- a/web/views/@default/log/index.html
+++ b/web/views/@default/log/index.html
@@ -3,10 +3,10 @@
-
+
| {{log.createdTime}} | {{log.userName}} | {{log.ip}} | {{log.region}} |
-
+
| {{log.description}} |
diff --git a/web/views/@default/servers/components/waf/group.html b/web/views/@default/servers/components/waf/group.html
index e5cfd42d..88b0d04e 100644
--- a/web/views/@default/servers/components/waf/group.html
+++ b/web/views/@default/servers/components/waf/group.html
@@ -33,7 +33,7 @@
|
规则集名称 |
规则 |
- 关系 |
+ 关系 |
动作 |
操作 |
@@ -52,7 +52,7 @@
暂时还没有规则
- {{set.connector.toUpperCase()}} |
+ {{set.connector.toUpperCase()}} |
{{set.actionName}}[{{set.action.toUpperCase()}}]
-> [{{link.name}}]
diff --git a/web/views/@default/servers/components/waf/groups.html b/web/views/@default/servers/components/waf/groups.html
index 87287d31..aba9836f 100644
--- a/web/views/@default/servers/components/waf/groups.html
+++ b/web/views/@default/servers/components/waf/groups.html
@@ -15,7 +15,7 @@
|
规则分组 |
- 规则集 |
+ 规则集 |
操作 |
@@ -31,7 +31,7 @@
自定义
|
-
+ |
{{group.countSets}}
|
|