diff --git a/internal/configloaders/admin_module.go b/internal/configloaders/admin_module.go index 40bb34de..90e508de 100644 --- a/internal/configloaders/admin_module.go +++ b/internal/configloaders/admin_module.go @@ -7,6 +7,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" + "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" ) @@ -173,51 +174,68 @@ func FindAdminLang(adminId int64) string { return "" } +func FindAdminLangForAction(actionPtr actions.ActionWrapper) (langCode langs.LangCode) { + locker.Lock() + defer locker.Unlock() + + var adminId = actionPtr.Object().Session().GetInt64(teaconst.SessionAdminId) + list, ok := sharedAdminModuleMapping[adminId] + var result = "" + if ok { + result = list.Lang + } + + if len(result) == 0 { + result = langs.ParseLangFromAction(actionPtr) + } + + return result +} // AllModuleMaps 所有权限列表 func AllModuleMaps(langCode string) []maps.Map { var m = []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuDashboard), + "name": langs.Message(langCode, codes.AdminMenu_Dashboard), "code": AdminModuleCodeDashboard, "url": "/dashboard", }, { - "name": langs.Message(langCode, codes.AdminMenuServers), + "name": langs.Message(langCode, codes.AdminMenu_Servers), "code": AdminModuleCodeServer, "url": "/servers", }, { - "name": langs.Message(langCode, codes.AdminMenuNodes), + "name": langs.Message(langCode, codes.AdminMenu_Nodes), "code": AdminModuleCodeNode, "url": "/clusters", }, { - "name": langs.Message(langCode, codes.AdminMenuDNS), + "name": langs.Message(langCode, codes.AdminMenu_DNS), "code": AdminModuleCodeDNS, "url": "/dns", }, } if teaconst.IsPlus { m = append(m, maps.Map{ - "name": langs.Message(langCode, codes.AdminMenuNS), + "name": langs.Message(langCode, codes.AdminMenu_NS), "code": AdminModuleCodeNS, "url": "/ns", }) } m = append(m, []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuUsers), + "name": langs.Message(langCode, codes.AdminMenu_Users), "code": AdminModuleCodeUser, "url": "/users", }, { - "name": langs.Message(langCode, codes.AdminMenuAdmins), + "name": langs.Message(langCode, codes.AdminMenu_Admins), "code": AdminModuleCodeAdmin, "url": "/admins", }, { - "name": langs.Message(langCode, codes.AdminMenuFinance), + "name": langs.Message(langCode, codes.AdminMenu_Finance), "code": AdminModuleCodeFinance, "url": "/finance", }, @@ -226,12 +244,12 @@ func AllModuleMaps(langCode string) []maps.Map { if teaconst.IsPlus { m = append(m, []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuPlans), + "name": langs.Message(langCode, codes.AdminMenu_Plans), "code": AdminModuleCodePlan, "url": "/plans", }, { - "name": langs.Message(langCode, codes.AdminMenuTickets), + "name": langs.Message(langCode, codes.AdminMenu_Tickets), "code": AdminModuleCodeTicket, "url": "/tickets", }, @@ -240,12 +258,12 @@ func AllModuleMaps(langCode string) []maps.Map { m = append(m, []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuLogs), + "name": langs.Message(langCode, codes.AdminMenu_Logs), "code": AdminModuleCodeLog, "url": "/log", }, { - "name": langs.Message(langCode, codes.AdminMenuSettings), + "name": langs.Message(langCode, codes.AdminMenu_Settings), "code": AdminModuleCodeSetting, "url": "/settings", }, diff --git a/internal/configloaders/admin_ui_config.go b/internal/configloaders/admin_ui_config.go index 59712604..5be04dab 100644 --- a/internal/configloaders/admin_ui_config.go +++ b/internal/configloaders/admin_ui_config.go @@ -3,6 +3,8 @@ package configloaders import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/rpc" + "github.com/TeaOSLab/EdgeCommon/pkg/langs" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" @@ -107,8 +109,8 @@ func loadAdminUIConfig() (*systemconfigs.AdminUIConfig, error) { func defaultAdminUIConfig() *systemconfigs.AdminUIConfig { return &systemconfigs.AdminUIConfig{ - ProductName: "GoEdge", - AdminSystemName: "GoEdge管理员系统", + ProductName: langs.DefaultMessage(codes.AdminUI_DefaultProductName), + AdminSystemName: langs.DefaultMessage(codes.AdminUI_DefaultSystemName), ShowOpenSourceInfo: true, ShowVersion: true, ShowFinance: true, diff --git a/internal/const/const.go b/internal/const/const.go index b911b6e5..26cc4214 100644 --- a/internal/const/const.go +++ b/internal/const/const.go @@ -14,8 +14,8 @@ const ( EncryptKey = "8f983f4d69b83aaa0d74b21a212f6967" EncryptMethod = "aes-256-cfb" - ErrServer = "服务器出了点小问题，请联系技术人员处理。" - CookieSID = "edgesid" + CookieSID = "edgesid" + SessionAdminId = "adminId" SystemdServiceName = "edge-admin" UpdatesURL = "https://goedge.cn/api/boot/versions?os=${os}&arch=${arch}&version=${version}" diff --git a/internal/utils/nodelogutils/utils.go b/internal/utils/nodelogutils/utils.go index e0f2d033..fd40f0ba 100644 --- a/internal/utils/nodelogutils/utils.go +++ b/internal/utils/nodelogutils/utils.go @@ -13,15 +13,15 @@ import ( func FindNodeCommonTags(langCode langs.LangCode) []maps.Map { return []maps.Map{ { - "name": langs.Message(langCode, codes.AdminLogTagListener), + "name": langs.Message(langCode, codes.Log_TagListener), "code": "LISTENER", }, { - "name": langs.Message(langCode, codes.AdminLogTagWAF), + "name": langs.Message(langCode, codes.Log_TagWAF), "code": "WAF", }, { - "name": langs.Message(langCode, codes.AdminLogTagAccessLog), + "name": langs.Message(langCode, codes.Log_TagAccessLog), "code": "ACCESS_LOG", }, } diff --git a/internal/web/actions/actionutils/parent_action.go b/internal/web/actions/actionutils/parent_action.go index f1942414..e3f2cdbf 100644 --- a/internal/web/actions/actionutils/parent_action.go +++ b/internal/web/actions/actionutils/parent_action.go @@ -5,10 +5,12 @@ import ( "errors" "fmt" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/rpc" "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeCommon/pkg/langs" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/logs" @@ -36,7 +38,7 @@ func (this *ParentAction) ErrorPage(err error) { } // 日志 - this.CreateLog(oplogs.LevelError, "系统发生错误：%s", err.Error()) + this.CreateLog(oplogs.LevelError, codes.AdminCommon_LogSystemError, err.Error()) if this.Request.Method == http.MethodGet { FailPage(this, err) @@ -90,11 +92,12 @@ func (this *ParentAction) TinyMenu(menuItem string) { } func (this *ParentAction) AdminId() int64 { - return this.Context.GetInt64("adminId") + return this.Context.GetInt64(teaconst.SessionAdminId) } -func (this *ParentAction) CreateLog(level string, description string, args ...interface{}) { - desc := fmt.Sprintf(description, args...) +func (this *ParentAction) CreateLog(level string, messageCode langs.MessageCode, args ...any) { + var description = messageCode.For(this.LangCode()) + var desc = fmt.Sprintf(description, args...) if level == oplogs.LevelInfo { if this.Code != 200 { level = oplogs.LevelWarn @@ -103,14 +106,14 @@ func (this *ParentAction) CreateLog(level string, description string, args ...in } } } - err := dao.SharedLogDAO.CreateAdminLog(this.AdminContext(), level, this.Request.URL.Path, desc, this.RequestRemoteIP()) + err := dao.SharedLogDAO.CreateAdminLog(this.AdminContext(), level, this.Request.URL.Path, desc, this.RequestRemoteIP(), messageCode, args) if err != nil { utils.PrintError(err) } } -func (this *ParentAction) CreateLogInfo(description string, args ...interface{}) { - this.CreateLog(oplogs.LevelInfo, description, args...) +func (this *ParentAction) CreateLogInfo(messageCode langs.MessageCode, args ...any) { + this.CreateLog(oplogs.LevelInfo, messageCode, args...) } // RPC 获取RPC @@ -151,12 +154,7 @@ func (this *ParentAction) ViewData() maps.Map { } func (this *ParentAction) LangCode() string { - var lang = configloaders.FindAdminLang(this.AdminId()) - if len(lang) > 0 { - // TODO check language still exists - return lang - } - return langs.ParseLangFromAction(this) + return configloaders.FindAdminLangForAction(this) } func (this *ParentAction) Lang(messageCode langs.MessageCode, args ...any) string { diff --git a/internal/web/actions/actionutils/utils.go b/internal/web/actions/actionutils/utils.go index 93f17df5..569abb0b 100644 --- a/internal/web/actions/actionutils/utils.go +++ b/internal/web/actions/actionutils/utils.go @@ -4,8 +4,9 @@ import ( "encoding/json" "errors" "fmt" + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/configs" - teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" rpcerrors "github.com/TeaOSLab/EdgeCommon/pkg/rpc/errors" "github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/actions" @@ -23,35 +24,42 @@ import ( ) // Fail 提示服务器错误信息 -func Fail(action actions.ActionWrapper, err error) { +func Fail(actionPtr actions.ActionWrapper, err error) { if err == nil { err = errors.New("unknown error") } - logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error())) + var langCode = configloaders.FindAdminLangForAction(actionPtr) + var serverErrString = codes.AdminCommon_ServerError.For(langCode) - _, _, isLocalAPI, issuesHTML := parseAPIErr(action, err) + logs.Println("[" + reflect.TypeOf(actionPtr).String() + "]" + findStack(err.Error())) + + _, _, isLocalAPI, issuesHTML := parseAPIErr(actionPtr, err) if isLocalAPI && len(issuesHTML) > 0 { - action.Object().Fail(teaconst.ErrServer + "（" + err.Error() + "；最近一次错误提示：" + issuesHTML + "）") + actionPtr.Object().Fail(serverErrString + "（" + err.Error() + "；最近一次错误提示：" + issuesHTML + "）") } else { - action.Object().Fail(teaconst.ErrServer + "（" + err.Error() + "）") + actionPtr.Object().Fail(serverErrString + "（" + err.Error() + "）") } } // FailPage 提示页面错误信息 -func FailPage(action actions.ActionWrapper, err error) { +func FailPage(actionPtr actions.ActionWrapper, err error) { if err == nil { err = errors.New("unknown error") } - logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error())) + var langCode = configloaders.FindAdminLangForAction(actionPtr) + var serverErrString = codes.AdminCommon_ServerError.For(langCode) - action.Object().ResponseWriter.WriteHeader(http.StatusInternalServerError) - if len(action.Object().Request.Header.Get("X-Requested-With")) > 0 { - action.Object().WriteString(teaconst.ErrServer) + logs.Println("[" + reflect.TypeOf(actionPtr).String() + "]" + findStack(err.Error())) + + actionPtr.Object().ResponseWriter.WriteHeader(http.StatusInternalServerError) + + if len(actionPtr.Object().Request.Header.Get("X-Requested-With")) > 0 { + actionPtr.Object().WriteString(serverErrString) } else { - apiNodeIsStarting, apiNodeProgress, _, issuesHTML := parseAPIErr(action, err) + apiNodeIsStarting, apiNodeProgress, _, issuesHTML := parseAPIErr(actionPtr, err) var html = ` @@ -74,7 +82,7 @@ func FailPage(action actions.ActionWrapper, err error) { html += "" } else { - html += teaconst.ErrServer + ` + html += serverErrString + `
可以通过查看 $安装目录/logs/run.log 日志文件查看具体的错误提示。
Error: ` + err.Error() + `
` @@ -85,7 +93,7 @@ func FailPage(action actions.ActionWrapper, err error) { } } - action.Object().WriteString(html + ` + actionPtr.Object().WriteString(html + ` `) diff --git a/internal/web/actions/default/admins/accesskeys/createPopup.go b/internal/web/actions/default/admins/accesskeys/createPopup.go index 168b7a0b..23926701 100644 --- a/internal/web/actions/default/admins/accesskeys/createPopup.go +++ b/internal/web/actions/default/admins/accesskeys/createPopup.go @@ -4,6 +4,7 @@ package accesskeys import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -43,7 +44,7 @@ func (this *CreatePopupAction) RunPost(params struct { return } - defer this.CreateLogInfo("创建AccessKey %d", accessKeyIdResp.UserAccessKeyId) + defer this.CreateLogInfo(codes.UserAccessKey_LogCreateUserAccessKey, accessKeyIdResp.UserAccessKeyId) this.Success() } diff --git a/internal/web/actions/default/admins/accesskeys/delete.go b/internal/web/actions/default/admins/accesskeys/delete.go index fd84da1c..dc837b6f 100644 --- a/internal/web/actions/default/admins/accesskeys/delete.go +++ b/internal/web/actions/default/admins/accesskeys/delete.go @@ -2,6 +2,7 @@ package accesskeys import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { AccessKeyId int64 }) { - defer this.CreateLogInfo("删除AccessKey %d", params.AccessKeyId) + defer this.CreateLogInfo(codes.UserAccessKey_LogDeleteUserAccessKey, params.AccessKeyId) _, err := this.RPC().UserAccessKeyRPC().DeleteUserAccessKey(this.AdminContext(), &pb.DeleteUserAccessKeyRequest{UserAccessKeyId: params.AccessKeyId}) if err != nil { diff --git a/internal/web/actions/default/admins/accesskeys/updateIsOn.go b/internal/web/actions/default/admins/accesskeys/updateIsOn.go index 7720cecf..e4f4b0c8 100644 --- a/internal/web/actions/default/admins/accesskeys/updateIsOn.go +++ b/internal/web/actions/default/admins/accesskeys/updateIsOn.go @@ -2,6 +2,7 @@ package accesskeys import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -13,7 +14,7 @@ func (this *UpdateIsOnAction) RunPost(params struct { AccessKeyId int64 IsOn bool }) { - defer this.CreateLogInfo("设置AccessKey %d 启用状态", params.AccessKeyId) + defer this.CreateLogInfo(codes.UserAccessKey_LogUpdateUserAccessKeyIsOn, params.AccessKeyId) _, err := this.RPC().UserAccessKeyRPC().UpdateUserAccessKeyIsOn(this.AdminContext(), &pb.UpdateUserAccessKeyIsOnRequest{ UserAccessKeyId: params.AccessKeyId, diff --git a/internal/web/actions/default/admins/createPopup.go b/internal/web/actions/default/admins/createPopup.go index d214cdc7..f1a30207 100644 --- a/internal/web/actions/default/admins/createPopup.go +++ b/internal/web/actions/default/admins/createPopup.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" "github.com/iwind/TeaGo/actions" @@ -114,7 +115,7 @@ func (this *CreatePopupAction) RunPost(params struct { } } - defer this.CreateLogInfo("创建系统用户 %d", createResp.AdminId) + defer this.CreateLogInfo(codes.Admin_LogCreateAdmin, createResp.AdminId) // 通知更改 err = configloaders.NotifyAdminModuleMappingChange() diff --git a/internal/web/actions/default/admins/delete.go b/internal/web/actions/default/admins/delete.go index 7c33078d..b24db563 100644 --- a/internal/web/actions/default/admins/delete.go +++ b/internal/web/actions/default/admins/delete.go @@ -3,6 +3,7 @@ package admins import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -13,7 +14,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { AdminId int64 }) { - defer this.CreateLogInfo("删除系统用户 %d", params.AdminId) + defer this.CreateLogInfo(codes.Admin_LogDeleteAdmin, params.AdminId) _, err := this.RPC().AdminRPC().DeleteAdmin(this.AdminContext(), &pb.DeleteAdminRequest{AdminId: params.AdminId}) if err != nil { diff --git a/internal/web/actions/default/admins/recipients/createPopup.go b/internal/web/actions/default/admins/recipients/createPopup.go index f98712b0..f9156fa3 100644 --- a/internal/web/actions/default/admins/recipients/createPopup.go +++ b/internal/web/actions/default/admins/recipients/createPopup.go @@ -3,6 +3,7 @@ package recipients import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "regexp" @@ -75,7 +76,7 @@ func (this *CreatePopupAction) RunPost(params struct { return } - defer this.CreateLogInfo("创建媒介接收人 %d", resp.MessageRecipientId) + defer this.CreateLogInfo(codes.MessageRecipient_LogCreateMessageRecipient, resp.MessageRecipientId) this.Success() } diff --git a/internal/web/actions/default/admins/recipients/delete.go b/internal/web/actions/default/admins/recipients/delete.go index bf633556..d4e80e85 100644 --- a/internal/web/actions/default/admins/recipients/delete.go +++ b/internal/web/actions/default/admins/recipients/delete.go @@ -2,6 +2,7 @@ package recipients import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { RecipientId int64 }) { - defer this.CreateLogInfo("删除媒介接收人 %d", params.RecipientId) + defer this.CreateLogInfo(codes.MessageRecipient_LogDeleteMessageRecipient, params.RecipientId) _, err := this.RPC().MessageRecipientRPC().DeleteMessageRecipient(this.AdminContext(), &pb.DeleteMessageRecipientRequest{MessageRecipientId: params.RecipientId}) if err != nil { diff --git a/internal/web/actions/default/admins/recipients/instances/createPopup.go b/internal/web/actions/default/admins/recipients/instances/createPopup.go index b8889d1a..f7b7caa6 100644 --- a/internal/web/actions/default/admins/recipients/instances/createPopup.go +++ b/internal/web/actions/default/admins/recipients/instances/createPopup.go @@ -3,6 +3,7 @@ package instances import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -260,7 +261,7 @@ func (this *CreatePopupAction) RunPost(params struct { return } - defer this.CreateLogInfo("创建消息媒介 %d", resp.MessageMediaInstanceId) + defer this.CreateLogInfo(codes.MessageMediaInstance_LogCreateMessageMediaInstance, resp.MessageMediaInstanceId) this.Success() } diff --git a/internal/web/actions/default/admins/recipients/instances/delete.go b/internal/web/actions/default/admins/recipients/instances/delete.go index 458ccebd..4a50b73d 100644 --- a/internal/web/actions/default/admins/recipients/instances/delete.go +++ b/internal/web/actions/default/admins/recipients/instances/delete.go @@ -2,6 +2,7 @@ package instances import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { InstanceId int64 }) { - defer this.CreateLogInfo("删除消息媒介 %d", params.InstanceId) + defer this.CreateLogInfo(codes.MessageMediaInstance_LogDeleteMessageMediaInstance, params.InstanceId) _, err := this.RPC().MessageMediaInstanceRPC().DeleteMessageMediaInstance(this.AdminContext(), &pb.DeleteMessageMediaInstanceRequest{MessageMediaInstanceId: params.InstanceId}) if err != nil { diff --git a/internal/web/actions/default/admins/recipients/instances/test.go b/internal/web/actions/default/admins/recipients/instances/test.go index 699f7499..892362bb 100644 --- a/internal/web/actions/default/admins/recipients/instances/test.go +++ b/internal/web/actions/default/admins/recipients/instances/test.go @@ -3,6 +3,7 @@ package instances import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -81,7 +82,7 @@ func (this *TestAction) RunPost(params struct { } this.Data["taskId"] = resp.MessageTaskId - defer this.CreateLogInfo("创建媒介测试任务 %d", resp.MessageTaskId) + defer this.CreateLogInfo(codes.MessageTask_LogCreateTestingMessageTask, resp.MessageTaskId) this.Success() } diff --git a/internal/web/actions/default/admins/recipients/instances/update.go b/internal/web/actions/default/admins/recipients/instances/update.go index b1a05514..8e0429b7 100644 --- a/internal/web/actions/default/admins/recipients/instances/update.go +++ b/internal/web/actions/default/admins/recipients/instances/update.go @@ -3,6 +3,7 @@ package instances import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -124,7 +125,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改消息媒介 %d", params.InstanceId) + defer this.CreateLogInfo(codes.MessageMediaInstance_LogUpdateMessageMediaInstance, params.InstanceId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/admins/recipients/tasks/delete.go b/internal/web/actions/default/admins/recipients/tasks/delete.go index ca3d6752..bfc85513 100644 --- a/internal/web/actions/default/admins/recipients/tasks/delete.go +++ b/internal/web/actions/default/admins/recipients/tasks/delete.go @@ -4,6 +4,7 @@ package tasks import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { TaskId int64 }) { - defer this.CreateLogInfo("删除消息发送任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.MessageTask_LogDeleteMessageTask, params.TaskId) _, err := this.RPC().MessageTaskRPC().DeleteMessageTask(this.AdminContext(), &pb.DeleteMessageTaskRequest{MessageTaskId: params.TaskId}) if err != nil { diff --git a/internal/web/actions/default/admins/recipients/test.go b/internal/web/actions/default/admins/recipients/test.go index ca3eab29..6623219f 100644 --- a/internal/web/actions/default/admins/recipients/test.go +++ b/internal/web/actions/default/admins/recipients/test.go @@ -3,6 +3,7 @@ package recipients import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -107,7 +108,7 @@ func (this *TestAction) RunPost(params struct { } this.Data["taskId"] = resp.MessageTaskId - defer this.CreateLogInfo("创建媒介测试任务 %d", resp.MessageTaskId) + defer this.CreateLogInfo(codes.MessageTask_LogCreateTestingMessageTask, resp.MessageTaskId) this.Success() } diff --git a/internal/web/actions/default/admins/recipients/update.go b/internal/web/actions/default/admins/recipients/update.go index 96f8f196..010b5bcf 100644 --- a/internal/web/actions/default/admins/recipients/update.go +++ b/internal/web/actions/default/admins/recipients/update.go @@ -3,6 +3,7 @@ package recipients import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -101,7 +102,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改媒介接收人 %d", params.RecipientId) + defer this.CreateLogInfo(codes.MessageRecipient_LogUpdateMessageRecipient, params.RecipientId) params.Must. Field("adminId", params.AdminId). diff --git a/internal/web/actions/default/admins/update.go b/internal/web/actions/default/admins/update.go index cac8160b..6b09c62b 100644 --- a/internal/web/actions/default/admins/update.go +++ b/internal/web/actions/default/admins/update.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" "github.com/iwind/TeaGo/actions" @@ -94,7 +95,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改系统用户 %d", params.AdminId) + defer this.CreateLogInfo(codes.Admin_LogUpdateAdmin, params.AdminId) params.Must. Field("fullname", params.Fullname). diff --git a/internal/web/actions/default/clusters/cluster/createBatch.go b/internal/web/actions/default/clusters/cluster/createBatch.go index 4e94ae7b..7b004692 100644 --- a/internal/web/actions/default/clusters/cluster/createBatch.go +++ b/internal/web/actions/default/clusters/cluster/createBatch.go @@ -1,7 +1,6 @@ package cluster import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" @@ -28,12 +27,12 @@ func (this *CreateBatchAction) RunGet(params struct { }) { leftMenuItems := []maps.Map{ { - "name": this.Lang(codes.AdminNodeMenuCreateSingleNode), + "name": this.Lang(codes.NodeMenu_CreateSingleNode), "url": "/clusters/cluster/createNode?clusterId=" + strconv.FormatInt(params.ClusterId, 10), "isActive": false, }, { - "name": this.Lang(codes.AdminNodeMenuCreateMultipleNodes), + "name": this.Lang(codes.NodeMenu_CreateMultipleNodes), "url": "/clusters/cluster/createBatch?clusterId=" + strconv.FormatInt(params.ClusterId, 10), "isActive": true, }, @@ -116,7 +115,7 @@ func (this *CreateBatchAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "批量创建节点") + defer this.CreateLogInfo(codes.Node_LogCreateNodeBatch) this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/createNode.go b/internal/web/actions/default/clusters/cluster/createNode.go index c65d2b96..765fbd66 100644 --- a/internal/web/actions/default/clusters/cluster/createNode.go +++ b/internal/web/actions/default/clusters/cluster/createNode.go @@ -2,7 +2,6 @@ package cluster import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" @@ -38,12 +37,12 @@ func (this *CreateNodeAction) RunGet(params struct { var leftMenuItems = []maps.Map{ { - "name": this.Lang(codes.AdminNodeMenuCreateSingleNode), + "name": this.Lang(codes.NodeMenu_CreateSingleNode), "url": "/clusters/cluster/createNode?clusterId=" + strconv.FormatInt(params.ClusterId, 10), "isActive": true, }, { - "name": this.Lang(codes.AdminNodeMenuCreateMultipleNodes), + "name": this.Lang(codes.NodeMenu_CreateMultipleNodes), "url": "/clusters/cluster/createBatch?clusterId=" + strconv.FormatInt(params.ClusterId, 10), "isActive": false, }, @@ -294,7 +293,7 @@ func (this *CreateNodeAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建节点 %d", nodeId) + defer this.CreateLogInfo(codes.Node_LogCreateNode, nodeId) // 响应数据 this.Data["nodeId"] = nodeId diff --git a/internal/web/actions/default/clusters/cluster/createNodeInstall.go b/internal/web/actions/default/clusters/cluster/createNodeInstall.go index 16cf73c5..6c46b5e3 100644 --- a/internal/web/actions/default/clusters/cluster/createNodeInstall.go +++ b/internal/web/actions/default/clusters/cluster/createNodeInstall.go @@ -4,6 +4,7 @@ package cluster import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -21,7 +22,7 @@ func (this *CreateNodeInstallAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("安装节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.NodeSSH_LogUpdateNodeSSH, params.NodeId) params.Must. Field("sshHost2", params.SshHost). diff --git a/internal/web/actions/default/clusters/cluster/delete.go b/internal/web/actions/default/clusters/cluster/delete.go index 0be65319..43a2c2c2 100644 --- a/internal/web/actions/default/clusters/cluster/delete.go +++ b/internal/web/actions/default/clusters/cluster/delete.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -40,7 +40,7 @@ func (this *DeleteAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除集群 %d", params.ClusterId) + defer this.CreateLogInfo(codes.NodeCluster_LogDeleteCluster, 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 3666986b..99904016 100644 --- a/internal/web/actions/default/clusters/cluster/groups/createPopup.go +++ b/internal/web/actions/default/clusters/cluster/groups/createPopup.go @@ -1,8 +1,8 @@ package groups import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -48,7 +48,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建节点分组 %d", createResp.NodeGroupId) + defer this.CreateLogInfo(codes.NodeGroup_LogCreateNodeGroup, createResp.NodeGroupId) 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 58a960c0..3efa4ca0 100644 --- a/internal/web/actions/default/clusters/cluster/groups/delete.go +++ b/internal/web/actions/default/clusters/cluster/groups/delete.go @@ -1,8 +1,8 @@ package groups import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -31,7 +31,7 @@ func (this *DeleteAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除集群分组 %d", params.GroupId) + defer this.CreateLogInfo(codes.NodeGroup_LogDeleteNodeGroup, 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 a30d4c3a..c49ddd99 100644 --- a/internal/web/actions/default/clusters/cluster/groups/sort.go +++ b/internal/web/actions/default/clusters/cluster/groups/sort.go @@ -1,8 +1,8 @@ package groups import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -20,7 +20,7 @@ func (this *SortAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改集群分组排序") + defer this.CreateLogInfo(codes.NodeGroup_LogSortNodeGroups) 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 8d9b5eb7..754472ab 100644 --- a/internal/web/actions/default/clusters/cluster/groups/updatePopup.go +++ b/internal/web/actions/default/clusters/cluster/groups/updatePopup.go @@ -1,8 +1,8 @@ package groups import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -57,7 +57,7 @@ func (this *UpdatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改集群分组 %d", params.GroupId) + defer this.CreateLogInfo(codes.NodeGroup_LogUpdateNodeGroup, 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 59ee4420..448b6b79 100644 --- a/internal/web/actions/default/clusters/cluster/installRemote.go +++ b/internal/web/actions/default/clusters/cluster/installRemote.go @@ -2,8 +2,8 @@ package cluster import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -80,7 +80,7 @@ func (this *InstallRemoteAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "远程安装节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogInstallNodeRemotely, 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 1372dde9..25202346 100644 --- a/internal/web/actions/default/clusters/cluster/node/install.go +++ b/internal/web/actions/default/clusters/cluster/node/install.go @@ -2,10 +2,10 @@ 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/cluster/node/nodeutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -127,7 +127,7 @@ func (this *InstallAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "安装节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogInstallNode, params.NodeId) this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/node/nodeutils/utils.go b/internal/web/actions/default/clusters/cluster/node/nodeutils/utils.go index 25de4956..f147c768 100644 --- a/internal/web/actions/default/clusters/cluster/node/nodeutils/utils.go +++ b/internal/web/actions/default/clusters/cluster/node/nodeutils/utils.go @@ -58,24 +58,24 @@ func InitNodeInfo(parentAction *actionutils.ParentAction, nodeId int64) (*pb.Nod var menuItems = []maps.Map{ { - "name": parentAction.Lang(codes.AdminNodeMenuSettingBasic), + "name": parentAction.Lang(codes.NodeMenu_SettingBasic), "url": prefix + "/update?" + query, "isActive": menuItem == "basic", }, { - "name": parentAction.Lang(codes.AdminNodeMenuSettingDNS), + "name": parentAction.Lang(codes.NodeMenu_SettingDNS), "url": prefix + "/settings/dns?" + query, "isActive": menuItem == "dns", "isOn": info.HasDNSInfo, }, { - "name": parentAction.Lang(codes.AdminNodeMenuSettingCache), + "name": parentAction.Lang(codes.NodeMenu_SettingCache), "url": prefix + "/settings/cache?" + query, "isActive": menuItem == "cache", "isOn": info.HasCacheInfo, }, { - "name": parentAction.Lang(codes.AdminNodeMenuSettingDDoSProtection), + "name": parentAction.Lang(codes.NodeMenu_SettingDDoSProtection), "url": prefix + "/settings/ddos-protection?" + query, "isActive": menuItem == "ddosProtection", "isOn": info.HasDDoSProtection, @@ -88,13 +88,13 @@ func InitNodeInfo(parentAction *actionutils.ParentAction, nodeId int64) (*pb.Nod menuItems = filterMenuItems(menuItems, menuItem, prefix, query, info, parentAction.LangCode()) menuItems = append(menuItems, []maps.Map{ { - "name": parentAction.Lang(codes.AdminNodeMenuSettingSSH), + "name": parentAction.Lang(codes.NodeMenu_SettingSSH), "url": prefix + "/settings/ssh?" + query, "isActive": menuItem == "ssh", "isOn": info.HasSSH, }, { - "name": parentAction.Lang(codes.AdminNodeMenuSettingSystem), + "name": parentAction.Lang(codes.NodeMenu_SettingSystem), "url": prefix + "/settings/system?" + query, "isActive": menuItem == "system", "isOn": info.HasSystemSettings, diff --git a/internal/web/actions/default/clusters/cluster/node/settings/cache/index.go b/internal/web/actions/default/clusters/cluster/node/settings/cache/index.go index 0c98ef5a..64a9c091 100644 --- a/internal/web/actions/default/clusters/cluster/node/settings/cache/index.go +++ b/internal/web/actions/default/clusters/cluster/node/settings/cache/index.go @@ -6,6 +6,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -86,7 +87,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改节点 %d 缓存设置", params.NodeId) + defer this.CreateLogInfo(codes.NodeCache_LogUpdateNodeCacheSettings, params.NodeId) // 缓存硬盘 & 内存容量 var pbMaxCacheDiskCapacity *pb.SizeCapacity diff --git a/internal/web/actions/default/clusters/cluster/node/settings/ddos-protection/index.go b/internal/web/actions/default/clusters/cluster/node/settings/ddos-protection/index.go index a61f7eef..d9b77631 100644 --- a/internal/web/actions/default/clusters/cluster/node/settings/ddos-protection/index.go +++ b/internal/web/actions/default/clusters/cluster/node/settings/ddos-protection/index.go @@ -6,6 +6,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs" @@ -81,7 +82,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改节点 %d 的DDOS防护设置", params.NodeId) + defer this.CreateLogInfo(codes.DDoSProtection_LogUpdateNodeDDoSProtection, params.NodeId) var ddosProtectionConfig = &ddosconfigs.ProtectionConfig{} err := json.Unmarshal(params.DdosProtectionJSON, ddosProtectionConfig) diff --git a/internal/web/actions/default/clusters/cluster/node/settings/dns/index.go b/internal/web/actions/default/clusters/cluster/node/settings/dns/index.go index b094bd1a..824a5159 100644 --- a/internal/web/actions/default/clusters/cluster/node/settings/dns/index.go +++ b/internal/web/actions/default/clusters/cluster/node/settings/dns/index.go @@ -6,6 +6,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -99,7 +100,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改节点 %d DNS设置", params.NodeId) + defer this.CreateLogInfo(codes.NodeDNS_LogUpdateNodeDNS, params.NodeId) dnsRouteCodes := []string{} if len(params.DnsRoutesJSON) > 0 { diff --git a/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go b/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go index 160e3e54..df472d64 100644 --- a/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go +++ b/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go @@ -7,6 +7,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -132,7 +133,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改节点 %d SSH登录信息", params.NodeId) + defer this.CreateLogInfo(codes.NodeSSH_LogUpdateNodeSSH, params.NodeId) // 检查IP地址 if regexp.MustCompile(`^\d+\.\d+\.\d+\.\d+$`).MatchString(params.SshHost) && net.ParseIP(params.SshHost) == nil { diff --git a/internal/web/actions/default/clusters/cluster/node/settings/system/index.go b/internal/web/actions/default/clusters/cluster/node/settings/system/index.go index f1629753..e298fff1 100644 --- a/internal/web/actions/default/clusters/cluster/node/settings/system/index.go +++ b/internal/web/actions/default/clusters/cluster/node/settings/system/index.go @@ -6,6 +6,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -81,7 +82,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改节点 %d 系统信息", params.NodeId) + defer this.CreateLogInfo(codes.NodeSystem_LogUpdateNodeSystemSettings, params.NodeId) if params.MaxCPU < 0 { this.Fail("CPU线程数不能小于0") diff --git a/internal/web/actions/default/clusters/cluster/node/start.go b/internal/web/actions/default/clusters/cluster/node/start.go index a82a14bc..65536a53 100644 --- a/internal/web/actions/default/clusters/cluster/node/start.go +++ b/internal/web/actions/default/clusters/cluster/node/start.go @@ -1,8 +1,8 @@ package node import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -20,7 +20,7 @@ func (this *StartAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "远程启动节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogStartNodeRemotely, 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 e50ed8a1..3393bee1 100644 --- a/internal/web/actions/default/clusters/cluster/node/stop.go +++ b/internal/web/actions/default/clusters/cluster/node/stop.go @@ -1,8 +1,8 @@ package node import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -20,7 +20,7 @@ func (this *StopAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "远程停止节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogStopNodeRemotely, params.NodeId) if resp.IsOk { this.Success() diff --git a/internal/web/actions/default/clusters/cluster/node/syncDomain.go b/internal/web/actions/default/clusters/cluster/node/syncDomain.go index 769d1962..b4ed5617 100644 --- a/internal/web/actions/default/clusters/cluster/node/syncDomain.go +++ b/internal/web/actions/default/clusters/cluster/node/syncDomain.go @@ -1,8 +1,8 @@ package node import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +14,7 @@ func (this *SyncDomainAction) RunPost(params struct { DomainId int64 }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "同步DNS域名数据 %d", params.DomainId) + defer this.CreateLogInfo(codes.DNS_LogSyncDomain, params.DomainId) // 执行同步 resp, err := this.RPC().DNSDomainRPC().SyncDNSDomainData(this.AdminContext(), &pb.SyncDNSDomainDataRequest{DnsDomainId: params.DomainId}) diff --git a/internal/web/actions/default/clusters/cluster/node/up.go b/internal/web/actions/default/clusters/cluster/node/up.go index fe582701..eb44f7ba 100644 --- a/internal/web/actions/default/clusters/cluster/node/up.go +++ b/internal/web/actions/default/clusters/cluster/node/up.go @@ -2,6 +2,7 @@ package node import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -13,7 +14,7 @@ type UpAction struct { func (this *UpAction) RunPost(params struct { NodeId int64 }) { - defer this.CreateLogInfo("手动上线节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogUpNode, params.NodeId) _, err := this.RPC().NodeRPC().UpdateNodeUp(this.AdminContext(), &pb.UpdateNodeUpRequest{ NodeId: params.NodeId, diff --git a/internal/web/actions/default/clusters/cluster/node/update.go b/internal/web/actions/default/clusters/cluster/node/update.go index 3123d80b..726ba931 100644 --- a/internal/web/actions/default/clusters/cluster/node/update.go +++ b/internal/web/actions/default/clusters/cluster/node/update.go @@ -2,10 +2,10 @@ 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/cluster/node/nodeutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -174,7 +174,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 基本信息", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogUpdateNode, params.NodeId) if params.NodeId <= 0 { this.Fail("要操作的节点不存在") diff --git a/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go b/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go index 9e0accb3..97cb0cd4 100644 --- a/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go +++ b/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go @@ -2,9 +2,9 @@ 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/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -82,7 +82,7 @@ func (this *UpdateDNSPopupAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 操作日志 - defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId) + defer this.CreateLogInfo(codes.NodeDNS_LogUpdateNodeDNS, params.NodeId) routes := []string{} if len(params.DnsRoutesJSON) > 0 { diff --git a/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go b/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go index 72f12f0c..c54e8730 100644 --- a/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go +++ b/internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go @@ -1,8 +1,8 @@ package node import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +15,7 @@ func (this *UpdateInstallStatusAction) RunPost(params struct { IsInstalled bool }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改节点安装状态 %d", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogUpdateNodeInstallationStatus, params.NodeId) _, err := this.RPC().NodeRPC().UpdateNodeIsInstalled(this.AdminContext(), &pb.UpdateNodeIsInstalledRequest{ NodeId: params.NodeId, diff --git a/internal/web/actions/default/clusters/cluster/nodes.go b/internal/web/actions/default/clusters/cluster/nodes.go index e77f2f82..d0eca893 100644 --- a/internal/web/actions/default/clusters/cluster/nodes.go +++ b/internal/web/actions/default/clusters/cluster/nodes.go @@ -291,7 +291,7 @@ func (this *NodesAction) RunGet(params struct { groupMaps = append([]maps.Map{ { "id": -1, - "name": "[" + this.Lang(codes.AdminNodeUngroupedLabel)+ "](" + types.String(countUngroupNodes) + ")", + "name": "[" + this.Lang(codes.Node_UngroupedLabel)+ "](" + types.String(countUngroupNodes) + ")", "countNodes": countUngroupNodes, }, }, groupMaps...) diff --git a/internal/web/actions/default/clusters/cluster/settings/cache/index.go b/internal/web/actions/default/clusters/cluster/settings/cache/index.go index c3038418..08a018c7 100644 --- a/internal/web/actions/default/clusters/cluster/settings/cache/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/cache/index.go @@ -2,6 +2,7 @@ package cache import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -57,7 +58,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("设置集群 %d 的缓存策略为 %d", params.ClusterId, params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCache_LogUpdateClusterCachePolicy, params.ClusterId, params.CachePolicyId) if params.CachePolicyId <= 0 { this.Fail("请选择缓存策略") diff --git a/internal/web/actions/default/clusters/cluster/settings/ddos-protection/index.go b/internal/web/actions/default/clusters/cluster/settings/ddos-protection/index.go index 5c1119f9..704b3ca0 100644 --- a/internal/web/actions/default/clusters/cluster/settings/ddos-protection/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/ddos-protection/index.go @@ -5,6 +5,7 @@ package ddosProtection import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs" @@ -54,7 +55,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改集群 %d 的DDOS防护设置", params.ClusterId) + defer this.CreateLogInfo(codes.DDoSProtection_LogUpdateClusterDDoSProtection, params.ClusterId) var ddosProtectionConfig = &ddosconfigs.ProtectionConfig{} err := json.Unmarshal(params.DdosProtectionJSON, ddosProtectionConfig) 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 f9d484d2..50bc0bd0 100644 --- a/internal/web/actions/default/clusters/cluster/settings/dns/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/dns/index.go @@ -1,9 +1,9 @@ package dns import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -90,7 +90,7 @@ func (this *IndexAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId) + defer this.CreateLogInfo(codes.DNS_LogUpdateClusterDNS, params.ClusterId) if !params.ConfirmResetDomain { if params.DnsDomainId <= 0 { diff --git a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go index eff26dc2..40ce70fe 100644 --- a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go +++ b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go @@ -3,6 +3,7 @@ package firewallActions import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/iwind/TeaGo/actions" @@ -51,7 +52,7 @@ func (this *CreatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("创建集群 %d 的WAF动作", params.ClusterId) + defer this.CreateLogInfo(codes.WAFAction_LogCreateWAFAction, params.ClusterId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/delete.go b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/delete.go index f369c1cd..eacd378d 100644 --- a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/delete.go +++ b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/delete.go @@ -2,6 +2,7 @@ package firewallActions import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { ActionId int64 }) { - defer this.CreateLogInfo("删除WAF动作 %d", params.ActionId) + defer this.CreateLogInfo(codes.WAFAction_LogDeleteWAFAction, params.ActionId) _, err := this.RPC().NodeClusterFirewallActionRPC().DeleteNodeClusterFirewallAction(this.AdminContext(), &pb.DeleteNodeClusterFirewallActionRequest{NodeClusterFirewallActionId: params.ActionId}) if err != nil { diff --git a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go index 9c012b27..b3fb93f0 100644 --- a/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go +++ b/internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go @@ -3,6 +3,7 @@ package firewallActions import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/iwind/TeaGo/actions" @@ -80,7 +81,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改WAF动作 %d", params.ActionId) + defer this.CreateLogInfo(codes.WAFAction_LogUpdateWAFAction, params.ActionId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go b/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go index 490bba68..2a7eacb9 100644 --- a/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go @@ -5,6 +5,7 @@ package globalServerConfig import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -100,7 +101,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改集群 %d 全局配置", params.ClusterId) + defer this.CreateLogInfo(codes.ServerGlobalSetting_LogUpdateClusterGlobalServerConfig, params.ClusterId) configResp, err := this.RPC().NodeClusterRPC().FindNodeClusterGlobalServerConfig(this.AdminContext(), &pb.FindNodeClusterGlobalServerConfigRequest{NodeClusterId: params.ClusterId}) if err != nil { diff --git a/internal/web/actions/default/clusters/cluster/settings/health/index.go b/internal/web/actions/default/clusters/cluster/settings/health/index.go index d0f64522..b2d6bd1d 100644 --- a/internal/web/actions/default/clusters/cluster/settings/health/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/health/index.go @@ -2,8 +2,8 @@ package health import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -46,7 +46,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改集群健康检查设置 %d", params.ClusterId) + defer this.CreateLogInfo(codes.NodeCluster_LogUpdateClusterHealthCheck, params.ClusterId) config := &serverconfigs.HealthCheckConfig{} err := json.Unmarshal(params.HealthCheckJSON, config) diff --git a/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go b/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go index 2642e565..b38f6488 100644 --- a/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go +++ b/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go @@ -1,8 +1,8 @@ package health import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -35,7 +35,7 @@ func (this *RunPopupAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "执行集群健康检查设置 %d", params.ClusterId) + defer this.CreateLogInfo(codes.NodeCluster_LogRunClusterHealthCheck, params.ClusterId) resp, err := this.RPC().NodeClusterRPC().ExecuteNodeClusterHealthCheck(this.AdminContext(), &pb.ExecuteNodeClusterHealthCheckRequest{NodeClusterId: 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 c371cb16..a95b36b8 100644 --- a/internal/web/actions/default/clusters/cluster/settings/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/index.go @@ -2,9 +2,9 @@ package settings 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/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -143,7 +143,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改集群基础设置 %d", params.ClusterId) + defer this.CreateLogInfo(codes.NodeCluster_LogUpdateClusterBasicSettings, params.ClusterId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go b/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go index 79c17b2a..7093d555 100644 --- a/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go +++ b/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go @@ -4,6 +4,7 @@ package metrics import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -86,7 +87,7 @@ func (this *CreatePopupAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("添加指标 %d 到集群 %d", params.ItemId, params.ClusterId) + defer this.CreateLogInfo(codes.MetricItem_LogAddMetricItemToCluster, params.ItemId, params.ClusterId) _, err := this.RPC().NodeClusterMetricItemRPC().EnableNodeClusterMetricItem(this.AdminContext(), &pb.EnableNodeClusterMetricItemRequest{ NodeClusterId: params.ClusterId, diff --git a/internal/web/actions/default/clusters/cluster/settings/metrics/delete.go b/internal/web/actions/default/clusters/cluster/settings/metrics/delete.go index 2efdbfaf..af01a992 100644 --- a/internal/web/actions/default/clusters/cluster/settings/metrics/delete.go +++ b/internal/web/actions/default/clusters/cluster/settings/metrics/delete.go @@ -4,6 +4,7 @@ package metrics import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +16,7 @@ func (this *DeleteAction) RunPost(params struct { ClusterId int64 ItemId int64 }) { - defer this.CreateLogInfo("从集群 %d 中移除指标 %d", params.ClusterId, params.ItemId) + defer this.CreateLogInfo(codes.MetricItem_LogDeleteMetricItemFromCluster, params.ClusterId, params.ItemId) _, err := this.RPC().NodeClusterMetricItemRPC().DisableNodeClusterMetricItem(this.AdminContext(), &pb.DisableNodeClusterMetricItemRequest{ NodeClusterId: params.ClusterId, diff --git a/internal/web/actions/default/clusters/cluster/settings/services/index.go b/internal/web/actions/default/clusters/cluster/settings/services/index.go index 2d714970..c29b801f 100644 --- a/internal/web/actions/default/clusters/cluster/settings/services/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/services/index.go @@ -3,6 +3,7 @@ package services import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -52,7 +53,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改集群 %d 的系统服务设置", params.ClusterId) + defer this.CreateLogInfo(codes.NodeSystemd_LogUpdateClusterSystemdSettings, params.ClusterId) serviceParams := &nodeconfigs.SystemdServiceConfig{ IsOn: params.SystemdIsOn, diff --git a/internal/web/actions/default/clusters/cluster/settings/toa/index.go b/internal/web/actions/default/clusters/cluster/settings/toa/index.go index fad92b4d..ae9b2fcb 100644 --- a/internal/web/actions/default/clusters/cluster/settings/toa/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/toa/index.go @@ -3,6 +3,7 @@ package toa import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -51,7 +52,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改集群 %d 的TOA设置", params.ClusterId) + defer this.CreateLogInfo(codes.NodeTOA_LogUpdateClusterTOA, params.ClusterId) config := &nodeconfigs.TOAConfig{ IsOn: params.IsOn, diff --git a/internal/web/actions/default/clusters/cluster/settings/waf/index.go b/internal/web/actions/default/clusters/cluster/settings/waf/index.go index 050fe8d5..800e7319 100644 --- a/internal/web/actions/default/clusters/cluster/settings/waf/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/waf/index.go @@ -2,6 +2,7 @@ package waf import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -57,7 +58,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("设置集群 %d 的WAF策略为 %d", params.ClusterId, params.HttpFirewallPolicyId) + defer this.CreateLogInfo(codes.WAFPolicy_LogUpdateClusterWAFPolicy, params.ClusterId, params.HttpFirewallPolicyId) if params.HttpFirewallPolicyId <= 0 { this.Fail("请选择WAF策略") diff --git a/internal/web/actions/default/clusters/cluster/settings/webp/index.go b/internal/web/actions/default/clusters/cluster/settings/webp/index.go index 019611e8..2270a0c4 100644 --- a/internal/web/actions/default/clusters/cluster/settings/webp/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/webp/index.go @@ -3,6 +3,7 @@ package webp import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -51,7 +52,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改集群 %d 的WebP设置", params.ClusterId) + defer this.CreateLogInfo(codes.ServerWebP_LogUpdateClusterWebPPolicy, params.ClusterId) var config = &nodeconfigs.WebPImagePolicy{ IsOn: params.IsOn, diff --git a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go index 25e530d2..d7bad381 100644 --- a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go +++ b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go @@ -2,9 +2,9 @@ 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/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -141,7 +141,7 @@ func (this *UpdateNodeSSHAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 配置", params.NodeId) + defer this.CreateLogInfo(codes.NodeSSH_LogUpdateNodeSSH, 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 1099ca92..a3e3907a 100644 --- a/internal/web/actions/default/clusters/cluster/upgradeRemote.go +++ b/internal/web/actions/default/clusters/cluster/upgradeRemote.go @@ -2,8 +2,8 @@ package cluster import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -69,7 +69,7 @@ func (this *UpgradeRemoteAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "远程升级节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.Node_LogUpgradeNodeRemotely, params.NodeId) this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/utils.go b/internal/web/actions/default/clusters/cluster/utils.go index 0643cb60..fb6ee271 100644 --- a/internal/web/actions/default/clusters/cluster/utils.go +++ b/internal/web/actions/default/clusters/cluster/utils.go @@ -32,22 +32,22 @@ func LeftMenuItemsForInstall(ctx context.Context, clusterId int64, selectedItem return []maps.Map{ { - "name": langs.Message(langCode, codes.AdminNodeMenuInstallManually), + "name": langs.Message(langCode, codes.NodeMenu_InstallManually), "url": "/clusters/cluster/installManual?clusterId=" + numberutils.FormatInt64(clusterId), "isActive": selectedItem == "manual", }, { - "name": langs.Message(langCode, codes.AdminNodeMenuInstallAutoRegister), + "name": langs.Message(langCode, codes.NodeMenu_InstallAutoRegister), "url": "/clusters/cluster/installNodes?clusterId=" + numberutils.FormatInt64(clusterId), "isActive": selectedItem == "register", }, { - "name": langs.Message(langCode, codes.AdminNodeMenuInstallRemote, countNotInstalled), + "name": langs.Message(langCode, codes.NodeMenu_InstallRemote, countNotInstalled), "url": "/clusters/cluster/installRemote?clusterId=" + numberutils.FormatInt64(clusterId), "isActive": selectedItem == "install", }, { - "name": langs.Message(langCode, codes.AdminNodeMenuInstallRemoteUpgrade, countUpgrade), + "name": langs.Message(langCode, codes.NodeMenu_InstallRemoteUpgrade, countUpgrade), "url": "/clusters/cluster/upgradeRemote?clusterId=" + numberutils.FormatInt64(clusterId), "isActive": selectedItem == "upgrade", }, diff --git a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go index 765d2052..171bee9f 100644 --- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go +++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go @@ -82,21 +82,21 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext } if teaconst.IsPlus { { - var item = tabbar.Add(this.Lang(actionPtr, codes.AdminClusterMenuTabClusterDashboard), "", "/clusters/cluster/boards?clusterId="+clusterIdString, "chart line area", selectedTabbar == "board") + var item = tabbar.Add(this.Lang(actionPtr, codes.NodeClusterMenu_TabClusterDashboard), "", "/clusters/cluster/boards?clusterId="+clusterIdString, "chart line area", selectedTabbar == "board") item.IsDisabled = !isInCluster } } { - var item = tabbar.Add(this.Lang(actionPtr, codes.AdminClusterMenuTabClusterNodes), "", "/clusters/cluster/nodes?clusterId="+clusterIdString, "server", selectedTabbar == "node") + var item = tabbar.Add(this.Lang(actionPtr, codes.NodeClusterMenu_TabClusterNodes), "", "/clusters/cluster/nodes?clusterId="+clusterIdString, "server", selectedTabbar == "node") item.IsDisabled = !isInCluster } { - var item = tabbar.Add(this.Lang(actionPtr, codes.AdminClusterMenuTabClusterSettings), "", "/clusters/cluster/settings?clusterId="+clusterIdString, "setting", selectedTabbar == "setting") + var item = tabbar.Add(this.Lang(actionPtr, codes.NodeClusterMenu_TabClusterSettings), "", "/clusters/cluster/settings?clusterId="+clusterIdString, "setting", selectedTabbar == "setting") item.IsDisabled = !isInCluster } { - var item = tabbar.Add(this.Lang(actionPtr, codes.AdminClusterMenuTabClusterDelete), "", "/clusters/cluster/delete?clusterId="+clusterIdString, "trash", selectedTabbar == "delete") + var item = tabbar.Add(this.Lang(actionPtr, codes.NodeClusterMenu_TabClusterDelete), "", "/clusters/cluster/delete?clusterId="+clusterIdString, "trash", selectedTabbar == "delete") item.IsDisabled = !isInCluster } actionutils.SetTabbar(action, tabbar) @@ -126,20 +126,20 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.FindEnabledNodeClusterConfigInfoResponse, selectedItem string, actionPtr actions.ActionWrapper) (items []maps.Map) { clusterId := numberutils.FormatInt64(cluster.Id) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingBasic), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingBasic), "url": "/clusters/cluster/settings?clusterId=" + clusterId, "isActive": selectedItem == "basic", "isOn": true, }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingDNS), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingDNS), "url": "/clusters/cluster/settings/dns?clusterId=" + clusterId, "isActive": selectedItem == "dns", "isOn": cluster.DnsDomainId > 0 || len(cluster.DnsName) > 0, }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingHealthCheck), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingHealthCheck), "url": "/clusters/cluster/settings/health?clusterId=" + clusterId, "isActive": selectedItem == "health", "isOn": info != nil && info.HealthCheckIsOn, @@ -150,34 +150,34 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingServiceGlobal), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingServiceGlobal), "url": "/clusters/cluster/settings/global-server-config?clusterId=" + clusterId, "isActive": selectedItem == "globalServerConfig", "isOn": true, }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingCachePolicy), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingCachePolicy), "url": "/clusters/cluster/settings/cache?clusterId=" + clusterId, "isActive": selectedItem == "cache", "isOn": cluster.HttpCachePolicyId > 0, }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingWAFPolicy), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingWAFPolicy), "url": "/clusters/cluster/settings/waf?clusterId=" + clusterId, "isActive": selectedItem == "waf", "isOn": cluster.HttpFirewallPolicyId > 0, }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingWAFActions), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingWAFActions), "url": "/clusters/cluster/settings/firewall-actions?clusterId=" + clusterId, "isActive": selectedItem == "firewallAction", "isOn": info != nil && info.HasFirewallActions, }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingWebP), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingWebP), "url": "/clusters/cluster/settings/webp?clusterId=" + clusterId, "isActive": selectedItem == "webp", "isOn": info != nil && info.WebpIsOn, @@ -186,7 +186,7 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F items = this.filterMenuItems1(items, info, clusterId, selectedItem, actionPtr) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingMetrics), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingMetrics), "url": "/clusters/cluster/settings/metrics?clusterId=" + clusterId, "isActive": selectedItem == "metric", "isOn": info != nil && info.HasMetricItems, @@ -199,7 +199,7 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F }) items = append(items, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminClusterMenuSettingDDoSProtection), + "name": this.Lang(actionPtr, codes.NodeClusterMenu_SettingDDoSProtection), "url": "/clusters/cluster/settings/ddos-protection?clusterId=" + clusterId, "isActive": selectedItem == "ddosProtection", "isOn": info != nil && info.HasDDoSProtection, diff --git a/internal/web/actions/default/clusters/create.go b/internal/web/actions/default/clusters/create.go index 25278920..cc3c6735 100644 --- a/internal/web/actions/default/clusters/create.go +++ b/internal/web/actions/default/clusters/create.go @@ -2,9 +2,9 @@ package clusters 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/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -139,7 +139,7 @@ func (this *CreateAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建节点集群：%d", createResp.NodeClusterId) + defer this.CreateLogInfo(codes.NodeCluster_LogCreateCluster, createResp.NodeClusterId) this.Data["clusterId"] = createResp.NodeClusterId diff --git a/internal/web/actions/default/clusters/grants/create.go b/internal/web/actions/default/clusters/grants/create.go index 565dd050..f10911fa 100644 --- a/internal/web/actions/default/clusters/grants/create.go +++ b/internal/web/actions/default/clusters/grants/create.go @@ -1,9 +1,9 @@ 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/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "golang.org/x/crypto/ssh" @@ -84,7 +84,7 @@ func (this *CreateAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.NodeGrantId) + defer this.CreateLogInfo(codes.NodeGrant_LogCreateSSHGrant, createResp.NodeGrantId) this.Success() } diff --git a/internal/web/actions/default/clusters/grants/createPopup.go b/internal/web/actions/default/clusters/grants/createPopup.go index c661e161..9207843c 100644 --- a/internal/web/actions/default/clusters/grants/createPopup.go +++ b/internal/web/actions/default/clusters/grants/createPopup.go @@ -1,9 +1,9 @@ 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/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -93,7 +93,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.NodeGrantId) + defer this.CreateLogInfo(codes.NodeGrant_LogCreateSSHGrant, createResp.NodeGrantId) this.Success() } diff --git a/internal/web/actions/default/clusters/grants/delete.go b/internal/web/actions/default/clusters/grants/delete.go index 42e6a1c5..438320cb 100644 --- a/internal/web/actions/default/clusters/grants/delete.go +++ b/internal/web/actions/default/clusters/grants/delete.go @@ -1,8 +1,7 @@ package grants -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *DeleteAction) RunPost(params struct { GrantId int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除SSH认证 %d", params.GrantId) + defer this.CreateLogInfo(codes.NodeGrant_LogDeleteSSHGrant, params.GrantId) // 检查是否有别的集群或节点正在使用 countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithNodeGrantIdRequest{ diff --git a/internal/web/actions/default/clusters/grants/grantutils/utils.go b/internal/web/actions/default/clusters/grants/grantutils/utils.go index 16c4f1d4..401fb151 100644 --- a/internal/web/actions/default/clusters/grants/grantutils/utils.go +++ b/internal/web/actions/default/clusters/grants/grantutils/utils.go @@ -10,11 +10,11 @@ import ( func AllGrantMethods(langCode langs.LangCode) []maps.Map { return []maps.Map{ { - "name": langs.Message(langCode, codes.AdminNodeGrantMethodUserPassword), + "name": langs.Message(langCode, codes.NodeGrant_MethodUserPassword), "value": "user", }, { - "name": langs.Message(langCode, codes.AdminNodeGrantMethodPrivateKey), + "name": langs.Message(langCode, codes.NodeGrant_MethodPrivateKey), "value": "privateKey", }, } diff --git a/internal/web/actions/default/clusters/grants/update.go b/internal/web/actions/default/clusters/grants/update.go index cf517b5a..1f609070 100644 --- a/internal/web/actions/default/clusters/grants/update.go +++ b/internal/web/actions/default/clusters/grants/update.go @@ -1,9 +1,8 @@ package grants -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -66,7 +65,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId) + defer this.CreateLogInfo(codes.NodeGrant_LogUpdateSSHGrant, 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 eb75e51e..9bc0d0c9 100644 --- a/internal/web/actions/default/clusters/grants/updatePopup.go +++ b/internal/web/actions/default/clusters/grants/updatePopup.go @@ -1,9 +1,8 @@ package grants -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -66,7 +65,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改SSH认证 %d", params.GrantId) + defer this.CreateLogInfo(codes.NodeGrant_LogUpdateSSHGrant, params.GrantId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/clusters/logs/deleteAll.go b/internal/web/actions/default/clusters/logs/deleteAll.go index e1c121f2..4c6d6eb7 100644 --- a/internal/web/actions/default/clusters/logs/deleteAll.go +++ b/internal/web/actions/default/clusters/logs/deleteAll.go @@ -5,6 +5,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -23,7 +24,7 @@ func (this *DeleteAllAction) RunPost(params struct { ClusterId int64 NodeId int64 }) { - defer this.CreateLogInfo("批量删除节点运行日志") + defer this.CreateLogInfo(codes.NodeLog_LogDeleteNodeLogsBatch) // 目前仅允许通过关键词删除，防止误删 if len(params.Keyword) == 0 { diff --git a/internal/web/actions/default/clusters/logs/fix.go b/internal/web/actions/default/clusters/logs/fix.go index 48608a2a..3465e178 100644 --- a/internal/web/actions/default/clusters/logs/fix.go +++ b/internal/web/actions/default/clusters/logs/fix.go @@ -5,6 +5,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/types" "strings" @@ -22,7 +23,7 @@ func (this *FixAction) RunPost(params struct { logIdStrings = append(logIdStrings, types.String(logId)) } - defer this.CreateLogInfo("设置日志 %s 为已修复", strings.Join(logIdStrings, ", ")) + defer this.CreateLogInfo(codes.NodeLog_LogFixNodeLogs, strings.Join(logIdStrings, ", ")) _, err := this.RPC().NodeLogRPC().FixNodeLogs(this.AdminContext(), &pb.FixNodeLogsRequest{NodeLogIds: params.LogIds}) if err != nil { diff --git a/internal/web/actions/default/clusters/logs/fixAll.go b/internal/web/actions/default/clusters/logs/fixAll.go index f393f52e..d91a0f5f 100644 --- a/internal/web/actions/default/clusters/logs/fixAll.go +++ b/internal/web/actions/default/clusters/logs/fixAll.go @@ -5,6 +5,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type FixAllAction struct { func (this *FixAllAction) RunPost(params struct { }) { - defer this.CreateLogInfo("设置所有日志为已修复") + defer this.CreateLogInfo(codes.NodeLog_LogFixAllLogs) _, err := this.RPC().NodeLogRPC().FixAllNodeLogs(this.AdminContext(), &pb.FixAllNodeLogsRequest{}) if err != nil { diff --git a/internal/web/actions/default/clusters/pin.go b/internal/web/actions/default/clusters/pin.go index 244f3918..3ce625d9 100644 --- a/internal/web/actions/default/clusters/pin.go +++ b/internal/web/actions/default/clusters/pin.go @@ -4,6 +4,7 @@ package clusters import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -16,9 +17,9 @@ func (this *PinAction) RunPost(params struct { IsPinned bool }) { if params.IsPinned { - defer this.CreateLogInfo("置顶集群 %d", params.ClusterId) + defer this.CreateLogInfo(codes.NodeCluster_LogPinCluster, params.ClusterId) } else { - defer this.CreateLogInfo("取消置顶集群 %d", params.ClusterId) + defer this.CreateLogInfo(codes.NodeCluster_LogUnpinCluster, params.ClusterId) } _, err := this.RPC().NodeClusterRPC().UpdateNodeClusterPinned(this.AdminContext(), &pb.UpdateNodeClusterPinnedRequest{ diff --git a/internal/web/actions/default/clusters/regions/createPopup.go b/internal/web/actions/default/clusters/regions/createPopup.go index e50831ac..42f1eb24 100644 --- a/internal/web/actions/default/clusters/regions/createPopup.go +++ b/internal/web/actions/default/clusters/regions/createPopup.go @@ -2,6 +2,7 @@ package regions import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -46,7 +47,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 日志 - defer this.CreateLogInfo("创建节点区域 %d", createResp.NodeRegionId) + defer this.CreateLogInfo(codes.NodeRegion_LogCreateNodeRegion, createResp.NodeRegionId) this.Success() } diff --git a/internal/web/actions/default/clusters/regions/delete.go b/internal/web/actions/default/clusters/regions/delete.go index ef81ef93..52cad7bd 100644 --- a/internal/web/actions/default/clusters/regions/delete.go +++ b/internal/web/actions/default/clusters/regions/delete.go @@ -2,6 +2,7 @@ package regions import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { RegionId int64 }) { - defer this.CreateLogInfo("删除节点区域 %d", params.RegionId) + defer this.CreateLogInfo(codes.NodeRegion_LogDeleteNodeRegion, params.RegionId) // 检查有无在使用 countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeRegionId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeRegionIdRequest{NodeRegionId: params.RegionId}) diff --git a/internal/web/actions/default/clusters/regions/sort.go b/internal/web/actions/default/clusters/regions/sort.go index 97eb4425..df743ba1 100644 --- a/internal/web/actions/default/clusters/regions/sort.go +++ b/internal/web/actions/default/clusters/regions/sort.go @@ -2,6 +2,7 @@ package regions import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type SortAction struct { func (this *SortAction) RunPost(params struct { RegionIds []int64 }) { - defer this.CreateLogInfo("修改节点区域排序") + defer this.CreateLogInfo(codes.NodeRegion_LogSortNodeRegions) _, err := this.RPC().NodeRegionRPC().UpdateNodeRegionOrders(this.AdminContext(), &pb.UpdateNodeRegionOrdersRequest{NodeRegionIds: params.RegionIds}) if err != nil { diff --git a/internal/web/actions/default/clusters/regions/updateNodeRegionPopup.go b/internal/web/actions/default/clusters/regions/updateNodeRegionPopup.go index 38fb9def..c14bc140 100644 --- a/internal/web/actions/default/clusters/regions/updateNodeRegionPopup.go +++ b/internal/web/actions/default/clusters/regions/updateNodeRegionPopup.go @@ -4,6 +4,7 @@ package regions import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -82,7 +83,7 @@ func (this *UpdateNodeRegionPopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改节点 %d 区域到 %d", params.RegionId) + defer this.CreateLogInfo(codes.NodeRegion_LogMoveNodeBetweenRegions, params.RegionId) _, err := this.RPC().NodeRPC().UpdateNodeRegionInfo(this.AdminContext(), &pb.UpdateNodeRegionInfoRequest{ NodeId: params.NodeId, diff --git a/internal/web/actions/default/clusters/regions/updatePopup.go b/internal/web/actions/default/clusters/regions/updatePopup.go index 55ce4d2e..add18a9b 100644 --- a/internal/web/actions/default/clusters/regions/updatePopup.go +++ b/internal/web/actions/default/clusters/regions/updatePopup.go @@ -2,6 +2,7 @@ package regions import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -49,7 +50,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改节点区域 %d", params.RegionId) + defer this.CreateLogInfo(codes.NodeRegion_LogUpdateNodeRegion, params.RegionId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/clusters/tasks/delete.go b/internal/web/actions/default/clusters/tasks/delete.go index 72a046bd..15de4dbb 100644 --- a/internal/web/actions/default/clusters/tasks/delete.go +++ b/internal/web/actions/default/clusters/tasks/delete.go @@ -2,6 +2,7 @@ package tasks import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { TaskId int64 }) { - defer this.CreateLogInfo("删除同步任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.NodeTask_LogDeleteNodeTask, params.TaskId) _, err := this.RPC().NodeTaskRPC().DeleteNodeTask(this.AdminContext(), &pb.DeleteNodeTaskRequest{NodeTaskId: params.TaskId}) if err != nil { diff --git a/internal/web/actions/default/clusters/tasks/deleteBatch.go b/internal/web/actions/default/clusters/tasks/deleteBatch.go index db72e2c1..1e8359e2 100644 --- a/internal/web/actions/default/clusters/tasks/deleteBatch.go +++ b/internal/web/actions/default/clusters/tasks/deleteBatch.go @@ -2,6 +2,7 @@ package tasks import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteBatchAction struct { func (this *DeleteBatchAction) RunPost(params struct { TaskIds []int64 }) { - defer this.CreateLogInfo("批量删除节点同步任务") + defer this.CreateLogInfo(codes.NodeTask_LogDeleteNodeTasksBatch) _, err := this.RPC().NodeTaskRPC().DeleteNodeTasks(this.AdminContext(), &pb.DeleteNodeTasksRequest{NodeTaskIds: params.TaskIds}) if err != nil { diff --git a/internal/web/actions/default/db/createPopup.go b/internal/web/actions/default/db/createPopup.go index e6252334..4fc9d8fb 100644 --- a/internal/web/actions/default/db/createPopup.go +++ b/internal/web/actions/default/db/createPopup.go @@ -1,8 +1,8 @@ package db import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -62,7 +62,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建数据库节点 %d", createResp.DbNodeId) + defer this.CreateLogInfo(codes.DBNode_LogCreateDBNode, createResp.DbNodeId) this.Success() } diff --git a/internal/web/actions/default/db/delete.go b/internal/web/actions/default/db/delete.go index 7abc97e4..879618a9 100644 --- a/internal/web/actions/default/db/delete.go +++ b/internal/web/actions/default/db/delete.go @@ -1,8 +1,8 @@ package db import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct { NodeId int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除数据库节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.DBNode_LogDeleteDBNode, params.NodeId) _, err := this.RPC().DBNodeRPC().DeleteDBNode(this.AdminContext(), &pb.DeleteDBNodeRequest{DbNodeId: params.NodeId}) if err != nil { diff --git a/internal/web/actions/default/db/deleteTable.go b/internal/web/actions/default/db/deleteTable.go index 2ff55227..471a96b6 100644 --- a/internal/web/actions/default/db/deleteTable.go +++ b/internal/web/actions/default/db/deleteTable.go @@ -2,6 +2,7 @@ package db import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -13,7 +14,7 @@ func (this *DeleteTableAction) RunPost(params struct { NodeId int64 Table string }) { - defer this.CreateLogInfo("删除数据库节点 %d 数据表 %s", params.NodeId, params.Table) + defer this.CreateLogInfo(codes.DBNode_LogDeleteTable, params.NodeId, params.Table) _, err := this.RPC().DBNodeRPC().DeleteDBNodeTable(this.AdminContext(), &pb.DeleteDBNodeTableRequest{ DbNodeId: params.NodeId, diff --git a/internal/web/actions/default/db/helper.go b/internal/web/actions/default/db/helper.go index 94d804a8..cb367262 100644 --- a/internal/web/actions/default/db/helper.go +++ b/internal/web/actions/default/db/helper.go @@ -22,6 +22,6 @@ func (this *Helper) BeforeAction(action *actions.ActionObject) { selectedTabbar, _ := action.Data["mainTab"] var tabbar = actionutils.NewTabbar() - tabbar.Add(this.Lang(action, codes.AdminDBNodeTabNodes), "", "/db", "", selectedTabbar == "db") + tabbar.Add(this.Lang(action, codes.DBNode_TabNodes), "", "/db", "", selectedTabbar == "db") actionutils.SetTabbar(action, tabbar) } diff --git a/internal/web/actions/default/db/truncateTable.go b/internal/web/actions/default/db/truncateTable.go index 156bed9a..4e8a3e70 100644 --- a/internal/web/actions/default/db/truncateTable.go +++ b/internal/web/actions/default/db/truncateTable.go @@ -2,6 +2,7 @@ package db import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -13,7 +14,7 @@ func (this *TruncateTableAction) RunPost(params struct { NodeId int64 Table string }) { - defer this.CreateLogInfo("清空数据库节点 %d 数据表 %s 数据", params.NodeId, params.Table) + defer this.CreateLogInfo(codes.DBNode_LogTruncateTable, params.NodeId, params.Table) _, err := this.RPC().DBNodeRPC().TruncateDBNodeTable(this.AdminContext(), &pb.TruncateDBNodeTableRequest{ DbNodeId: params.NodeId, diff --git a/internal/web/actions/default/db/update.go b/internal/web/actions/default/db/update.go index aabcfd7f..8f8dc082 100644 --- a/internal/web/actions/default/db/update.go +++ b/internal/web/actions/default/db/update.go @@ -1,8 +1,7 @@ package db -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -62,7 +61,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改数据库节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.DBNode_LogUpdateDBNode, 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 21ee3d92..f6549f9c 100644 --- a/internal/web/actions/default/dns/clusters/sync.go +++ b/internal/web/actions/default/dns/clusters/sync.go @@ -1,8 +1,7 @@ package clusters -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *SyncAction) RunPost(params struct { ClusterId int64 }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "同步集群 %d 的DNS设置", params.ClusterId) + defer this.CreateLogInfo(codes.DNS_LogSyncCluster, 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 a42ad05f..6ebbb336 100644 --- a/internal/web/actions/default/dns/domains/createPopup.go +++ b/internal/web/actions/default/dns/domains/createPopup.go @@ -1,9 +1,9 @@ package domains import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "strings" @@ -54,7 +54,7 @@ func (this *CreatePopupAction) RunPost(params struct { return } - defer this.CreateLog(oplogs.LevelInfo, "添加管理域名到DNS服务商 %d", createResp.DnsDomainId) + defer this.CreateLogInfo(codes.DNS_LogCreateDomain, 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 4ddb5b5d..f2139792 100644 --- a/internal/web/actions/default/dns/domains/delete.go +++ b/internal/web/actions/default/dns/domains/delete.go @@ -1,9 +1,8 @@ package domains -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct { DomainId int64 }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "从DNS服务商中删除域名 %d", params.DomainId) + defer this.CreateLogInfo(codes.DNS_LogDeleteDomain, params.DomainId) // 检查是否正在使用 countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithDNSDomainId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithDNSDomainIdRequest{DnsDomainId: params.DomainId}) diff --git a/internal/web/actions/default/dns/domains/recover.go b/internal/web/actions/default/dns/domains/recover.go index f42c4bcb..e1c3b4fd 100644 --- a/internal/web/actions/default/dns/domains/recover.go +++ b/internal/web/actions/default/dns/domains/recover.go @@ -1,8 +1,7 @@ package domains -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *RecoverAction) RunPost(params struct { DomainId int64 }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "从DNS服务商中恢复域名 %d", params.DomainId) + defer this.CreateLogInfo(codes.DNS_LogRecoverDomain, params.DomainId) // 执行恢复 _, err := this.RPC().DNSDomainRPC().RecoverDNSDomain(this.AdminContext(), &pb.RecoverDNSDomainRequest{DnsDomainId: params.DomainId}) diff --git a/internal/web/actions/default/dns/domains/sync.go b/internal/web/actions/default/dns/domains/sync.go index cd9fbf4c..669dd99e 100644 --- a/internal/web/actions/default/dns/domains/sync.go +++ b/internal/web/actions/default/dns/domains/sync.go @@ -1,8 +1,7 @@ package domains -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *SyncAction) RunPost(params struct { DomainId int64 }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "同步DNS域名数据 %d", params.DomainId) + defer this.CreateLogInfo(codes.DNS_LogSyncDomain, 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 569e832f..36262200 100644 --- a/internal/web/actions/default/dns/domains/updatePopup.go +++ b/internal/web/actions/default/dns/domains/updatePopup.go @@ -1,9 +1,8 @@ package domains -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -52,7 +51,7 @@ func (this *UpdatePopupAction) RunPost(params struct { // TODO 检查DomainId // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "修改DNS服务商域名 %d", params.DomainId) + defer this.CreateLogInfo(codes.DNS_LogUpdateDomain, params.DomainId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/dns/issues/syncDomain.go b/internal/web/actions/default/dns/issues/syncDomain.go index 80095f55..ff405c1d 100644 --- a/internal/web/actions/default/dns/issues/syncDomain.go +++ b/internal/web/actions/default/dns/issues/syncDomain.go @@ -1,8 +1,7 @@ package issues -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *SyncDomainAction) RunPost(params struct { DomainId int64 }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "同步DNS域名数据 %d", params.DomainId) + defer this.CreateLogInfo(codes.DNS_LogSyncDomain, params.DomainId) // 执行同步 resp, err := this.RPC().DNSDomainRPC().SyncDNSDomainData(this.AdminContext(), &pb.SyncDNSDomainDataRequest{DnsDomainId: params.DomainId}) diff --git a/internal/web/actions/default/dns/issues/updateNodePopup.go b/internal/web/actions/default/dns/issues/updateNodePopup.go index d86d841d..38ce583f 100644 --- a/internal/web/actions/default/dns/issues/updateNodePopup.go +++ b/internal/web/actions/default/dns/issues/updateNodePopup.go @@ -2,9 +2,9 @@ package issues 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/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -86,7 +86,7 @@ func (this *UpdateNodePopupAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 操作日志 - defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId) + defer this.CreateLogInfo(codes.DNS_LogUpdateNodeDNS, params.NodeId) var routes = []string{} if len(params.DnsRoutesJSON) > 0 { diff --git a/internal/web/actions/default/dns/providers/createPopup.go b/internal/web/actions/default/dns/providers/createPopup.go index 0084931f..3c50a197 100644 --- a/internal/web/actions/default/dns/providers/createPopup.go +++ b/internal/web/actions/default/dns/providers/createPopup.go @@ -5,8 +5,8 @@ package providers import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -166,7 +166,7 @@ func (this *CreatePopupAction) RunPost(params struct { return } - defer this.CreateLog(oplogs.LevelInfo, "创建DNS服务商 %d", createResp.DnsProviderId) + defer this.CreateLogInfo(codes.DNSProvider_LogCreateDNSProvider, 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 fda6ec12..1bd55076 100644 --- a/internal/web/actions/default/dns/providers/delete.go +++ b/internal/web/actions/default/dns/providers/delete.go @@ -1,9 +1,8 @@ package providers -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -17,7 +16,7 @@ func (this *DeleteAction) RunPost(params struct { // TODO 检查权限 // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "删除DNS服务商 %d", params.ProviderId) + defer this.CreateLogInfo(codes.DNSProvider_LogDeleteDNSProvider, 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 0081dc45..b78170b4 100644 --- a/internal/web/actions/default/dns/providers/updatePopup.go +++ b/internal/web/actions/default/dns/providers/updatePopup.go @@ -4,8 +4,8 @@ package providers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -110,7 +110,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLog(oplogs.LevelInfo, "修改DNS服务商 %d", params.ProviderId) + defer this.CreateLogInfo(codes.DNSProvider_LogUpdateDNSProvider, params.ProviderId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/dns/tasks/delete.go b/internal/web/actions/default/dns/tasks/delete.go index 21e12838..8f0a2c52 100644 --- a/internal/web/actions/default/dns/tasks/delete.go +++ b/internal/web/actions/default/dns/tasks/delete.go @@ -2,6 +2,7 @@ package tasks import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { TaskId int64 }) { - defer this.CreateLogInfo("删除DNS同步任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.DNSTask_LogDeleteDNSTask, params.TaskId) _, err := this.RPC().DNSTaskRPC().DeleteDNSTask(this.AdminContext(), &pb.DeleteDNSTaskRequest{DnsTaskId: params.TaskId}) if err != nil { diff --git a/internal/web/actions/default/dns/updateClusterPopup.go b/internal/web/actions/default/dns/updateClusterPopup.go index f81530dc..49d817ca 100644 --- a/internal/web/actions/default/dns/updateClusterPopup.go +++ b/internal/web/actions/default/dns/updateClusterPopup.go @@ -1,9 +1,9 @@ package dns import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -89,7 +89,7 @@ func (this *UpdateClusterPopupAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId) + defer this.CreateLogInfo(codes.DNS_LogUpdateClusterDNS, params.ClusterId) params.Must. Field("dnsName", params.DnsName). diff --git a/internal/web/actions/default/index/index.go b/internal/web/actions/default/index/index.go index 555cdddf..931d86be 100644 --- a/internal/web/actions/default/index/index.go +++ b/internal/web/actions/default/index/index.go @@ -14,6 +14,8 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" "github.com/TeaOSLab/EdgeCommon/pkg/iplibrary" + "github.com/TeaOSLab/EdgeCommon/pkg/langs" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -173,7 +175,7 @@ func (this *IndexAction) RunPost(params struct { }) if err != nil { - err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(0), oplogs.LevelError, this.Request.URL.Path, "登录时发生系统错误："+err.Error(), this.RequestRemoteIP()) + err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(0), oplogs.LevelError, this.Request.URL.Path, langs.DefaultMessage(codes.AdminLogin_LogSystemError, err.Error()), this.RequestRemoteIP(), codes.AdminLogin_LogSystemError, []any{err.Error()}) if err != nil { utils.PrintError(err) } @@ -183,7 +185,7 @@ func (this *IndexAction) RunPost(params struct { } if !resp.IsOk { - err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(0), oplogs.LevelWarn, this.Request.URL.Path, "登录失败，用户名："+params.Username, this.RequestRemoteIP()) + err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(0), oplogs.LevelWarn, this.Request.URL.Path, langs.DefaultMessage(codes.AdminLogin_LogFailed, params.Username), this.RequestRemoteIP(), codes.AdminLogin_LogFailed, []any{params.Username}) if err != nil { utils.PrintError(err) } @@ -223,7 +225,7 @@ func (this *IndexAction) RunPost(params struct { params.Auth.StoreAdmin(adminId, params.Remember) // 记录日志 - err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(adminId), oplogs.LevelInfo, this.Request.URL.Path, "成功登录系统，用户名："+params.Username, this.RequestRemoteIP()) + err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(adminId), oplogs.LevelInfo, this.Request.URL.Path, langs.DefaultMessage(codes.AdminLogin_LogSuccess, params.Username), this.RequestRemoteIP(), codes.AdminLogin_LogSuccess, []any{params.Username}) if err != nil { utils.PrintError(err) } diff --git a/internal/web/actions/default/index/otp.go b/internal/web/actions/default/index/otp.go index d0360bf2..c91cdd2c 100644 --- a/internal/web/actions/default/index/otp.go +++ b/internal/web/actions/default/index/otp.go @@ -13,6 +13,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -145,7 +146,7 @@ func (this *OtpAction) RunPost(params struct { this.ErrorPage(err) return } - err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(adminId), oplogs.LevelInfo, this.Request.URL.Path, "成功通过OTP验证登录系统", this.RequestRemoteIP()) + err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(adminId), oplogs.LevelInfo, this.Request.URL.Path, this.Lang(codes.AdminLogin_LogOtpVerifiedSuccess), this.RequestRemoteIP(), codes.AdminLogin_LogOtpVerifiedSuccess, nil) if err != nil { utils.PrintError(err) } diff --git a/internal/web/actions/default/log/clean.go b/internal/web/actions/default/log/clean.go index 7ac0e4e5..d6cbc1a3 100644 --- a/internal/web/actions/default/log/clean.go +++ b/internal/web/actions/default/log/clean.go @@ -5,6 +5,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -71,7 +72,7 @@ func (this *CleanAction) RunPost(params struct { switch params.Type { case "all": - defer this.CreateLogInfo("清除全部日志") + defer this.CreateLogInfo(codes.Log_LogCleanAllLogs) _, err := this.RPC().LogRPC().CleanLogsPermanently(this.AdminContext(), &pb.CleanLogsPermanentlyRequest{ Days: 0, @@ -82,7 +83,7 @@ func (this *CleanAction) RunPost(params struct { return } case "days": - defer this.CreateLogInfo("清除 %d 以前的日志", params.Days) + defer this.CreateLogInfo(codes.Log_LogCleanLogsDaysBefore, params.Days) _, err := this.RPC().LogRPC().CleanLogsPermanently(this.AdminContext(), &pb.CleanLogsPermanentlyRequest{ Days: params.Days, diff --git a/internal/web/actions/default/log/delete.go b/internal/web/actions/default/log/delete.go index a5ddc1da..78d8f668 100644 --- a/internal/web/actions/default/log/delete.go +++ b/internal/web/actions/default/log/delete.go @@ -3,6 +3,7 @@ package log import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ func (this *DeleteAction) RunPost(params struct { LogId int64 }) { // 记录日志 - defer this.CreateLogInfo("删除单个操作日志 %d", params.LogId) + defer this.CreateLogInfo(codes.Log_LogDeleteLog, params.LogId) // 读取配置 config, err := configloaders.LoadLogConfig() diff --git a/internal/web/actions/default/log/index.go b/internal/web/actions/default/log/index.go index c22c55dc..320ee880 100644 --- a/internal/web/actions/default/log/index.go +++ b/internal/web/actions/default/log/index.go @@ -42,15 +42,15 @@ func (this *IndexAction) RunGet(params struct { this.Data["levelOptions"] = []maps.Map{ { "code": "info", - "name": this.Lang(codes.AdminLevelInfo), + "name": this.Lang(codes.Level_Info), }, { "code": "warn", - "name": this.Lang(codes.AdminLevelWarn), + "name": this.Lang(codes.Level_Warn), }, { "code": "error", - "name": this.Lang(codes.AdminLevelError), + "name": this.Lang(codes.Level_Error), }, } diff --git a/internal/web/actions/default/log/settings.go b/internal/web/actions/default/log/settings.go index f2f9a428..febdfb3e 100644 --- a/internal/web/actions/default/log/settings.go +++ b/internal/web/actions/default/log/settings.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/iwind/TeaGo/actions" ) @@ -38,7 +39,7 @@ func (this *SettingsAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改日志相关配置") + defer this.CreateLogInfo(codes.Log_LogUpdateSettings) capacity := &shared.SizeCapacity{} err := json.Unmarshal(params.CapacityJSON, capacity) diff --git a/internal/web/actions/default/messages/readAll.go b/internal/web/actions/default/messages/readAll.go index f50dd9fb..ed16c29d 100644 --- a/internal/web/actions/default/messages/readAll.go +++ b/internal/web/actions/default/messages/readAll.go @@ -1,8 +1,8 @@ package messages import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +12,7 @@ type ReadAllAction struct { func (this *ReadAllAction) RunPost(params struct{}) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "将所有消息置为已读") + defer this.CreateLogInfo(codes.Message_LogReadAll) _, 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 9bda1c88..320e144a 100644 --- a/internal/web/actions/default/messages/readPage.go +++ b/internal/web/actions/default/messages/readPage.go @@ -1,8 +1,8 @@ package messages import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +14,7 @@ func (this *ReadPageAction) RunPost(params struct { MessageIds []int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "将一组消息置为已读") + defer this.CreateLogInfo(codes.Message_LogReadMessages) _, 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 1a4422b5..184c8de1 100644 --- a/internal/web/actions/default/nodes/delete.go +++ b/internal/web/actions/default/nodes/delete.go @@ -2,6 +2,7 @@ package nodes import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ func (this *DeleteAction) RunPost(params struct { NodeId int64 }) { // 创建日志 - defer this.CreateLogInfo("从集群 %d 中删除节点 %d", params.ClusterId, params.NodeId) + defer this.CreateLogInfo(codes.Node_LogDeleteNodeFromCluster, params.ClusterId, params.NodeId) _, err := this.RPC().NodeRPC().DeleteNodeFromNodeCluster(this.AdminContext(), &pb.DeleteNodeFromNodeClusterRequest{ NodeId: params.NodeId, diff --git a/internal/web/actions/default/servers/addOriginPopup.go b/internal/web/actions/default/servers/addOriginPopup.go index 3dcdaab6..793daeba 100644 --- a/internal/web/actions/default/servers/addOriginPopup.go +++ b/internal/web/actions/default/servers/addOriginPopup.go @@ -2,9 +2,9 @@ package servers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -181,7 +181,7 @@ func (this *AddOriginPopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建源站 %d", resp.OriginId) + defer this.CreateLogInfo(codes.ServerOrigin_LogCreateOrigin, resp.OriginId) this.Success() } diff --git a/internal/web/actions/default/servers/certs/acme/accounts/createPopup.go b/internal/web/actions/default/servers/certs/acme/accounts/createPopup.go index 0998c79d..65ac6cb5 100644 --- a/internal/web/actions/default/servers/certs/acme/accounts/createPopup.go +++ b/internal/web/actions/default/servers/certs/acme/accounts/createPopup.go @@ -4,6 +4,7 @@ package accounts import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -56,7 +57,7 @@ func (this *CreatePopupAction) RunPost(params struct { }) { var accountId int64 defer func() { - this.CreateLogInfo("创建ACME服务商账号 %d", accountId) + this.CreateLogInfo(codes.ACMEProviderAccount_LogCreateACMEProviderAccount, accountId) }() params.Must. diff --git a/internal/web/actions/default/servers/certs/acme/accounts/delete.go b/internal/web/actions/default/servers/certs/acme/accounts/delete.go index 37fb5cbb..b9f28bb1 100644 --- a/internal/web/actions/default/servers/certs/acme/accounts/delete.go +++ b/internal/web/actions/default/servers/certs/acme/accounts/delete.go @@ -4,6 +4,7 @@ package accounts import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { AccountId int64 }) { - defer this.CreateLogInfo("删除ACME服务商账号 %d", params.AccountId) + defer this.CreateLogInfo(codes.ACMEProviderAccount_LogDeleteACMEProviderAccount, params.AccountId) _, err := this.RPC().ACMEProviderAccountRPC().DeleteACMEProviderAccount(this.AdminContext(), &pb.DeleteACMEProviderAccountRequest{AcmeProviderAccountId: params.AccountId}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/acme/accounts/updatePopup.go b/internal/web/actions/default/servers/certs/acme/accounts/updatePopup.go index 5efd5a79..42352f02 100644 --- a/internal/web/actions/default/servers/certs/acme/accounts/updatePopup.go +++ b/internal/web/actions/default/servers/certs/acme/accounts/updatePopup.go @@ -4,6 +4,7 @@ package accounts import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -66,7 +67,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改ACME服务商账号 %d", params.AccountId) + defer this.CreateLogInfo(codes.ACMEProviderAccount_LogUpdateACMEProviderAccount, params.AccountId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/servers/certs/acme/create.go b/internal/web/actions/default/servers/certs/acme/create.go index 8f9964ff..898050ec 100644 --- a/internal/web/actions/default/servers/certs/acme/create.go +++ b/internal/web/actions/default/servers/certs/acme/create.go @@ -3,6 +3,7 @@ package acme import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -124,7 +125,7 @@ func (this *CreateAction) RunPost(params struct { return } params.TaskId = createResp.AcmeTaskId - defer this.CreateLogInfo("创建证书申请任务 %d", createResp.AcmeTaskId) + defer this.CreateLogInfo(codes.ACMETask_LogCreateACMETask, createResp.AcmeTaskId) } else { _, err := this.RPC().ACMETaskRPC().UpdateACMETask(this.AdminContext(), &pb.UpdateACMETaskRequest{ AcmeTaskId: params.TaskId, @@ -140,7 +141,7 @@ func (this *CreateAction) RunPost(params struct { return } - defer this.CreateLogInfo("修改证书申请任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.ACMETask_LogUpdateACMETask, params.TaskId) } this.Data["taskId"] = params.TaskId diff --git a/internal/web/actions/default/servers/certs/acme/deleteTask.go b/internal/web/actions/default/servers/certs/acme/deleteTask.go index c4c1ce0b..85ff7512 100644 --- a/internal/web/actions/default/servers/certs/acme/deleteTask.go +++ b/internal/web/actions/default/servers/certs/acme/deleteTask.go @@ -2,6 +2,7 @@ package acme import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteTaskAction struct { func (this *DeleteTaskAction) RunPost(params struct { TaskId int64 }) { - defer this.CreateLogInfo("删除证书申请任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.ACMETask_LogDeleteACMETask, params.TaskId) _, err := this.RPC().ACMETaskRPC().DeleteACMETask(this.AdminContext(), &pb.DeleteACMETaskRequest{AcmeTaskId: params.TaskId}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/acme/run.go b/internal/web/actions/default/servers/certs/acme/run.go index fbb5a8e5..65b610f4 100644 --- a/internal/web/actions/default/servers/certs/acme/run.go +++ b/internal/web/actions/default/servers/certs/acme/run.go @@ -2,6 +2,7 @@ package acme import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type RunAction struct { func (this *RunAction) RunPost(params struct { TaskId int64 }) { - defer this.CreateLogInfo("执行ACME任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.ACMETask_LogRunACMETask, params.TaskId) runResp, err := this.RPC().ACMETaskRPC().RunACMETask(this.AdminContext(), &pb.RunACMETaskRequest{AcmeTaskId: params.TaskId}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go b/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go index 5af40565..b943e8cc 100644 --- a/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go +++ b/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -101,7 +102,7 @@ func (this *UpdateTaskPopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改证书申请任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.ACMETask_LogUpdateACMETask, params.TaskId) if params.AuthType != "dns" && params.AuthType != "http" { this.Fail("无法识别的认证方式'" + params.AuthType + "'") diff --git a/internal/web/actions/default/servers/certs/acme/users/createPopup.go b/internal/web/actions/default/servers/certs/acme/users/createPopup.go index c87192dc..988d81bc 100644 --- a/internal/web/actions/default/servers/certs/acme/users/createPopup.go +++ b/internal/web/actions/default/servers/certs/acme/users/createPopup.go @@ -2,6 +2,7 @@ package users import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -126,7 +127,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 日志 - defer this.CreateLogInfo("创建ACME用户 %d", createResp.AcmeUserId) + defer this.CreateLogInfo(codes.ACMEUser_LogCreateACMEUser, createResp.AcmeUserId) this.Success() } diff --git a/internal/web/actions/default/servers/certs/acme/users/delete.go b/internal/web/actions/default/servers/certs/acme/users/delete.go index 048fef5e..219b41e9 100644 --- a/internal/web/actions/default/servers/certs/acme/users/delete.go +++ b/internal/web/actions/default/servers/certs/acme/users/delete.go @@ -2,6 +2,7 @@ package users import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { UserId int64 }) { - defer this.CreateLogInfo("删除ACME用户 %d", params.UserId) + defer this.CreateLogInfo(codes.ACMEUser_LogDeleteACMEUser, params.UserId) countResp, err := this.RPC().ACMETaskRPC().CountAllEnabledACMETasksWithACMEUserId(this.AdminContext(), &pb.CountAllEnabledACMETasksWithACMEUserIdRequest{AcmeUserId: params.UserId}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/acme/users/updatePopup.go b/internal/web/actions/default/servers/certs/acme/users/updatePopup.go index c2a7153e..8c369d2a 100644 --- a/internal/web/actions/default/servers/certs/acme/users/updatePopup.go +++ b/internal/web/actions/default/servers/certs/acme/users/updatePopup.go @@ -2,6 +2,7 @@ package users import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -65,7 +66,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改ACME用户 %d", params.UserId) + defer this.CreateLogInfo(codes.ACMEUser_LogUpdateACMEUser, params.UserId) _, err := this.RPC().ACMEUserRPC().UpdateACMEUser(this.AdminContext(), &pb.UpdateACMEUserRequest{ AcmeUserId: params.UserId, diff --git a/internal/web/actions/default/servers/certs/delete.go b/internal/web/actions/default/servers/certs/delete.go index bd74cad4..90d3572b 100644 --- a/internal/web/actions/default/servers/certs/delete.go +++ b/internal/web/actions/default/servers/certs/delete.go @@ -1,8 +1,7 @@ package certs -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *DeleteAction) RunPost(params struct { CertId int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除SSL证书 %d", params.CertId) + defer this.CreateLogInfo(codes.SSLCert_LogDeleteSSLCert, params.CertId) // 是否正在被服务使用 countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledServersWithSSLCertIdRequest{SslCertId: params.CertId}) diff --git a/internal/web/actions/default/servers/certs/downloadCert.go b/internal/web/actions/default/servers/certs/downloadCert.go index 9ffaa140..24a36831 100644 --- a/internal/web/actions/default/servers/certs/downloadCert.go +++ b/internal/web/actions/default/servers/certs/downloadCert.go @@ -3,6 +3,7 @@ package certs import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "strconv" @@ -19,7 +20,7 @@ func (this *DownloadCertAction) Init() { func (this *DownloadCertAction) RunGet(params struct { CertId int64 }) { - defer this.CreateLogInfo("下载SSL证书 %d", params.CertId) + defer this.CreateLogInfo(codes.SSLCert_LogDownloadSSLCert, params.CertId) certResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{SslCertId: params.CertId}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/downloadKey.go b/internal/web/actions/default/servers/certs/downloadKey.go index a0c3e9d1..fc04235a 100644 --- a/internal/web/actions/default/servers/certs/downloadKey.go +++ b/internal/web/actions/default/servers/certs/downloadKey.go @@ -3,6 +3,7 @@ package certs import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "strconv" @@ -19,7 +20,7 @@ func (this *DownloadKeyAction) Init() { func (this *DownloadKeyAction) RunGet(params struct { CertId int64 }) { - defer this.CreateLogInfo("下载SSL密钥 %d", params.CertId) + defer this.CreateLogInfo(codes.SSLCert_LogDownloadSSLCertKey, params.CertId) certResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{SslCertId: params.CertId}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/downloadZip.go b/internal/web/actions/default/servers/certs/downloadZip.go index 34cf1b15..f7b34eac 100644 --- a/internal/web/actions/default/servers/certs/downloadZip.go +++ b/internal/web/actions/default/servers/certs/downloadZip.go @@ -4,6 +4,7 @@ import ( "archive/zip" "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "strconv" @@ -20,7 +21,7 @@ func (this *DownloadZipAction) Init() { func (this *DownloadZipAction) RunGet(params struct { CertId int64 }) { - defer this.CreateLogInfo("下载SSL证书压缩包 %d", params.CertId) + defer this.CreateLogInfo(codes.SSLCert_LogDownloadSSLCertZip, params.CertId) certResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{SslCertId: params.CertId}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/helper.go b/internal/web/actions/default/servers/certs/helper.go index 30332a57..852bad67 100644 --- a/internal/web/actions/default/servers/certs/helper.go +++ b/internal/web/actions/default/servers/certs/helper.go @@ -36,19 +36,19 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) { } } - var ocspMenuName = this.Lang(actionPtr, codes.AdminCertMenuOCSP) + var ocspMenuName = this.Lang(actionPtr, codes.SSLCert_MenuOCSP) if countOCSP > 0 { ocspMenuName += "(" + types.String(countOCSP) + ")" } var menu = []maps.Map{ { - "name": this.Lang(actionPtr, codes.AdminCertMenuCerts), + "name": this.Lang(actionPtr, codes.SSLCert_MenuCerts), "url": "/servers/certs", "isActive": action.Data.GetString("leftMenuItem") == "cert", }, { - "name": this.Lang(actionPtr, codes.AdminCertMenuApply), + "name": this.Lang(actionPtr, codes.SSLCert_MenuApply), "url": "/servers/certs/acme", "isActive": action.Data.GetString("leftMenuItem") == "acme", }, diff --git a/internal/web/actions/default/servers/certs/ocsp/ignore.go b/internal/web/actions/default/servers/certs/ocsp/ignore.go index 8e564d8b..1147c4ad 100644 --- a/internal/web/actions/default/servers/certs/ocsp/ignore.go +++ b/internal/web/actions/default/servers/certs/ocsp/ignore.go @@ -4,6 +4,7 @@ package ocsp import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type IgnoreAction struct { func (this *IgnoreAction) RunPost(params struct { CertIds []int64 }) { - defer this.CreateLogInfo("忽略一组证书的OCSP状态") + defer this.CreateLogInfo(codes.SSLCert_LogOCSPIgnoreOCSPStatus) _, err := this.RPC().SSLCertRPC().IgnoreSSLCertsWithOCSPError(this.AdminContext(), &pb.IgnoreSSLCertsWithOCSPErrorRequest{SslCertIds: params.CertIds}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/ocsp/reset.go b/internal/web/actions/default/servers/certs/ocsp/reset.go index 963b8fc4..d7e4b947 100644 --- a/internal/web/actions/default/servers/certs/ocsp/reset.go +++ b/internal/web/actions/default/servers/certs/ocsp/reset.go @@ -4,6 +4,7 @@ package ocsp import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type ResetAction struct { func (this *ResetAction) RunPost(params struct { CertIds []int64 }) { - defer this.CreateLogInfo("重置一组证书的OCSP状态") + defer this.CreateLogInfo(codes.SSLCert_LogOCSPResetOCSPStatus) _, err := this.RPC().SSLCertRPC().ResetSSLCertsWithOCSPError(this.AdminContext(), &pb.ResetSSLCertsWithOCSPErrorRequest{SslCertIds: params.CertIds}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/ocsp/resetAll.go b/internal/web/actions/default/servers/certs/ocsp/resetAll.go index 606e8eb8..822a53c5 100644 --- a/internal/web/actions/default/servers/certs/ocsp/resetAll.go +++ b/internal/web/actions/default/servers/certs/ocsp/resetAll.go @@ -4,6 +4,7 @@ package ocsp import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type ResetAllAction struct { } func (this *ResetAllAction) RunPost(params struct{}) { - defer this.CreateLogInfo("忽略所有证书的OCSP状态") + defer this.CreateLogInfo(codes.SSLCert_LogOCSPResetAllOCSPStatus) _, err := this.RPC().SSLCertRPC().ResetAllSSLCertsWithOCSPError(this.AdminContext(), &pb.ResetAllSSLCertsWithOCSPErrorRequest{}) if err != nil { diff --git a/internal/web/actions/default/servers/certs/updatePopup.go b/internal/web/actions/default/servers/certs/updatePopup.go index 16bde78d..33f33554 100644 --- a/internal/web/actions/default/servers/certs/updatePopup.go +++ b/internal/web/actions/default/servers/certs/updatePopup.go @@ -2,8 +2,8 @@ package certs import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "github.com/iwind/TeaGo/actions" @@ -64,7 +64,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改SSL证书 %d", params.CertId) + defer this.CreateLogInfo(codes.SSLCert_LogUpdateSSLCert, params.CertId) // 查询Cert certConfigResp, err := this.RPC().SSLCertRPC().FindEnabledSSLCertConfig(this.AdminContext(), &pb.FindEnabledSSLCertConfigRequest{SslCertId: params.CertId}) diff --git a/internal/web/actions/default/servers/certs/uploadBatchPopup.go b/internal/web/actions/default/servers/certs/uploadBatchPopup.go index 6bec420e..3202e369 100644 --- a/internal/web/actions/default/servers/certs/uploadBatchPopup.go +++ b/internal/web/actions/default/servers/certs/uploadBatchPopup.go @@ -6,6 +6,7 @@ import ( "bytes" "crypto/tls" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "github.com/iwind/TeaGo/actions" @@ -53,7 +54,7 @@ func (this *UploadBatchPopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("批量上传证书") + defer this.CreateLogInfo(codes.SSLCert_LogUploadSSLCertBatch) var files = this.Request.MultipartForm.File["certFiles"] if len(files) == 0 { diff --git a/internal/web/actions/default/servers/certs/uploadPopup.go b/internal/web/actions/default/servers/certs/uploadPopup.go index 9f29d25d..41632de1 100644 --- a/internal/web/actions/default/servers/certs/uploadPopup.go +++ b/internal/web/actions/default/servers/certs/uploadPopup.go @@ -2,8 +2,8 @@ package certs import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "github.com/iwind/TeaGo/actions" @@ -165,7 +165,7 @@ func (this *UploadPopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "上传SSL证书 %d", certId) + defer this.CreateLogInfo(codes.SSLCert_LogUploadSSLCert, certId) this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/batch/deleteTask.go b/internal/web/actions/default/servers/components/cache/batch/deleteTask.go index e3079033..51ba9eb5 100644 --- a/internal/web/actions/default/servers/components/cache/batch/deleteTask.go +++ b/internal/web/actions/default/servers/components/cache/batch/deleteTask.go @@ -4,6 +4,7 @@ package cache import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type DeleteTaskAction struct { func (this *DeleteTaskAction) RunPost(params struct { TaskId int64 }) { - defer this.CreateLogInfo("删除缓存任务 %d", params.TaskId) + defer this.CreateLogInfo(codes.HTTPCacheTask_LogDeleteHTTPCacheTask, params.TaskId) _, err := this.RPC().HTTPCacheTaskRPC().DeleteHTTPCacheTask(this.AdminContext(), &pb.DeleteHTTPCacheTaskRequest{ HttpCacheTaskId: params.TaskId, diff --git a/internal/web/actions/default/servers/components/cache/batch/fetch.go b/internal/web/actions/default/servers/components/cache/batch/fetch.go index bb2ab206..a5936ba5 100644 --- a/internal/web/actions/default/servers/components/cache/batch/fetch.go +++ b/internal/web/actions/default/servers/components/cache/batch/fetch.go @@ -5,6 +5,7 @@ package cache import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" @@ -38,7 +39,7 @@ func (this *FetchAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("批量预热缓存Key") + defer this.CreateLogInfo(codes.HTTPCacheTask_LogCreateHTTPCacheTaskFetch) if len(params.Keys) == 0 { this.Fail("请输入要预热的Key列表") diff --git a/internal/web/actions/default/servers/components/cache/batch/index.go b/internal/web/actions/default/servers/components/cache/batch/index.go index b665f017..3833e1f3 100644 --- a/internal/web/actions/default/servers/components/cache/batch/index.go +++ b/internal/web/actions/default/servers/components/cache/batch/index.go @@ -5,6 +5,7 @@ package cache import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" @@ -43,7 +44,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("批量刷新缓存Key") + defer this.CreateLogInfo(codes.HTTPCacheTask_LogCreateHTTPCacheTaskPurge) if len(params.Keys) == 0 { this.Fail("请输入要刷新的Key列表") diff --git a/internal/web/actions/default/servers/components/cache/batch/resetTask.go b/internal/web/actions/default/servers/components/cache/batch/resetTask.go index c41b579e..ed43a1d9 100644 --- a/internal/web/actions/default/servers/components/cache/batch/resetTask.go +++ b/internal/web/actions/default/servers/components/cache/batch/resetTask.go @@ -4,6 +4,7 @@ package cache import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type ResetTaskAction struct { func (this *ResetTaskAction) RunPost(params struct { TaskId int64 }) { - this.CreateLogInfo("重置缓存任务 %d 状态", params.TaskId) + this.CreateLogInfo(codes.HTTPCacheTask_LogResetHTTPCacheTask, params.TaskId) _, err := this.RPC().HTTPCacheTaskRPC().ResetHTTPCacheTask(this.AdminContext(), &pb.ResetHTTPCacheTaskRequest{HttpCacheTaskId: params.TaskId}) if err != nil { diff --git a/internal/web/actions/default/servers/components/cache/clean.go b/internal/web/actions/default/servers/components/cache/clean.go index 07f24bdf..aace21c9 100644 --- a/internal/web/actions/default/servers/components/cache/clean.go +++ b/internal/web/actions/default/servers/components/cache/clean.go @@ -1,9 +1,8 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -92,7 +91,7 @@ func (this *CleanAction) RunPost(params struct { this.Data["results"] = results // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "清除缓存，缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogCleanAll, 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 2ede56c9..ec26f4f9 100644 --- a/internal/web/actions/default/servers/components/cache/createPopup.go +++ b/internal/web/actions/default/servers/components/cache/createPopup.go @@ -2,8 +2,8 @@ package cache import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -115,7 +115,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建缓存策略：%d", createResp.HttpCachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogCreateCachePolicy, createResp.HttpCachePolicyId) 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 3db023b3..3f4a0d0f 100644 --- a/internal/web/actions/default/servers/components/cache/delete.go +++ b/internal/web/actions/default/servers/components/cache/delete.go @@ -1,8 +1,8 @@ package cache import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -30,7 +30,7 @@ func (this *DeleteAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogDeleteCachePolicy, params.CachePolicyId) this.Success() } diff --git a/internal/web/actions/default/servers/components/cache/fetch.go b/internal/web/actions/default/servers/components/cache/fetch.go index f87529cd..8ef93089 100644 --- a/internal/web/actions/default/servers/components/cache/fetch.go +++ b/internal/web/actions/default/servers/components/cache/fetch.go @@ -1,9 +1,9 @@ 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/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" @@ -57,7 +57,7 @@ func (this *FetchAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "预热缓存，缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogFetchCaches, params.CachePolicyId) // 记录clusterId this.AddCookie(&http.Cookie{ diff --git a/internal/web/actions/default/servers/components/cache/purge.go b/internal/web/actions/default/servers/components/cache/purge.go index f9bdabf8..a74eb91f 100644 --- a/internal/web/actions/default/servers/components/cache/purge.go +++ b/internal/web/actions/default/servers/components/cache/purge.go @@ -1,9 +1,8 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" @@ -57,7 +56,7 @@ func (this *PurgeAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除缓存，缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogPurgeCaches, params.CachePolicyId) // 记录clusterId this.AddCookie(&http.Cookie{ diff --git a/internal/web/actions/default/servers/components/cache/stat.go b/internal/web/actions/default/servers/components/cache/stat.go index 33e59105..55bd35df 100644 --- a/internal/web/actions/default/servers/components/cache/stat.go +++ b/internal/web/actions/default/servers/components/cache/stat.go @@ -1,9 +1,8 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -92,7 +91,7 @@ func (this *StatAction) RunPost(params struct { this.Data["results"] = results // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "统计缓存，缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogStatCaches, 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 840c842f..b630d487 100644 --- a/internal/web/actions/default/servers/components/cache/testRead.go +++ b/internal/web/actions/default/servers/components/cache/testRead.go @@ -1,9 +1,8 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "net/http" @@ -58,7 +57,7 @@ func (this *TestReadAction) RunPost(params struct { this.Data["results"] = results // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "测试读取，缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogTestReading, 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 70061e6a..0726a40b 100644 --- a/internal/web/actions/default/servers/components/cache/testWrite.go +++ b/internal/web/actions/default/servers/components/cache/testWrite.go @@ -1,9 +1,8 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "net/http" @@ -61,7 +60,7 @@ func (this *TestWriteAction) RunPost(params struct { this.Data["results"] = results // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "测试写入，缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogTestWriting, 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 86e87398..6cf5e995 100644 --- a/internal/web/actions/default/servers/components/cache/update.go +++ b/internal/web/actions/default/servers/components/cache/update.go @@ -2,8 +2,8 @@ package cache import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -71,7 +71,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改缓存策略：%d", params.CachePolicyId) + defer this.CreateLogInfo(codes.ServerCachePolicy_LogUpdateCachePolicy, params.CachePolicyId) 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 5903e8e4..ce4a7c13 100644 --- a/internal/web/actions/default/servers/components/index.go +++ b/internal/web/actions/default/servers/components/index.go @@ -2,8 +2,8 @@ package components import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -64,7 +64,7 @@ func (this *IndexAction) RunPost(params struct { DefaultDomain string }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "保存网站全局配置") + defer this.CreateLogInfo(codes.Server_LogUpdateGlobalSettings) if len(params.GlobalConfigJSON) == 0 { this.Fail("错误的配置信息，请刷新当前页面后重试") diff --git a/internal/web/actions/default/servers/components/waf/createGroupPopup.go b/internal/web/actions/default/servers/components/waf/createGroupPopup.go index a8e56512..84e97126 100644 --- a/internal/web/actions/default/servers/components/waf/createGroupPopup.go +++ b/internal/web/actions/default/servers/components/waf/createGroupPopup.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -98,7 +97,7 @@ func (this *CreateGroupPopupAction) RunPost(params struct { } // 日志 - defer this.CreateLog(oplogs.LevelInfo, "创建规则分组 %d，名称：%s", groupId, params.Name) + defer this.CreateLogInfo(codes.WAFRuleGroup_LogCreateRuleGroup, 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 bc917ad2..7e5ccc96 100644 --- a/internal/web/actions/default/servers/components/waf/createPopup.go +++ b/internal/web/actions/default/servers/components/waf/createPopup.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/iwind/TeaGo/actions" @@ -64,7 +63,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 日志 - defer this.CreateLog(oplogs.LevelInfo, "创建WAF策略 %d", createResp.HttpFirewallPolicyId) + defer this.CreateLogInfo(codes.WAFPolicy_LogCreateWAFPolicy, createResp.HttpFirewallPolicyId) this.Success() } diff --git a/internal/web/actions/default/servers/components/waf/createSetPopup.go b/internal/web/actions/default/servers/components/waf/createSetPopup.go index 2465cbaa..231bde4a 100644 --- a/internal/web/actions/default/servers/components/waf/createSetPopup.go +++ b/internal/web/actions/default/servers/components/waf/createSetPopup.go @@ -42,14 +42,14 @@ func (this *CreateSetPopupAction) RunGet(params struct { // 一些配置 this.Data["connectors"] = []maps.Map{ { - "name": this.Lang(codes.AdminWAFConnectorAnd), + "name": this.Lang(codes.WAF_ConnectorAnd), "value": firewallconfigs.HTTPFirewallRuleConnectorAnd, - "description": this.Lang(codes.AdminWAFConnectorAndDescription), + "description": this.Lang(codes.WAF_ConnectorAndDescription), }, { - "name": this.Lang(codes.AdminWAFConnectorOr), + "name": this.Lang(codes.WAF_ConnectorOr), "value": firewallconfigs.HTTPFirewallRuleConnectorOr, - "description": this.Lang(codes.AdminWAFConnectorOrDescription), + "description": this.Lang(codes.WAF_ConnectorOrDescription), }, } diff --git a/internal/web/actions/default/servers/components/waf/delete.go b/internal/web/actions/default/servers/components/waf/delete.go index fe502355..12ece4ea 100644 --- a/internal/web/actions/default/servers/components/waf/delete.go +++ b/internal/web/actions/default/servers/components/waf/delete.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *DeleteAction) RunPost(params struct { FirewallPolicyId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAFPolicy_LogDeleteWAFPolicy, params.FirewallPolicyId) countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest{HttpFirewallPolicyId: 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 08243ba5..c6c25a57 100644 --- a/internal/web/actions/default/servers/components/waf/deleteGroup.go +++ b/internal/web/actions/default/servers/components/waf/deleteGroup.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -16,7 +15,7 @@ func (this *DeleteGroupAction) RunPost(params struct { GroupId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d 的规则分组 %d", params.FirewallPolicyId, params.GroupId) + defer this.CreateLogInfo(codes.WAFRuleGroup_LogDeleteRuleGroup, params.FirewallPolicyId, params.GroupId) firewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(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 60361164..8d134e02 100644 --- a/internal/web/actions/default/servers/components/waf/deleteSet.go +++ b/internal/web/actions/default/servers/components/waf/deleteSet.go @@ -2,8 +2,8 @@ package waf import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -18,7 +18,7 @@ func (this *DeleteSetAction) RunPost(params struct { SetId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "删除WAF规则分组 %d 中的规则集 %d", params.GroupId, params.SetId) + defer this.CreateLogInfo(codes.WAFRuleSet_LogDeleteRuleSet, params.GroupId, params.SetId) groupConfig, err := dao.SharedHTTPFirewallRuleGroupDAO.FindRuleGroupConfig(this.AdminContext(), params.GroupId) if err != nil { diff --git a/internal/web/actions/default/servers/components/waf/export.go b/internal/web/actions/default/servers/components/waf/export.go index c2ebbc36..d72e2528 100644 --- a/internal/web/actions/default/servers/components/waf/export.go +++ b/internal/web/actions/default/servers/components/waf/export.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/ttlcache" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/iwind/TeaGo/actions" @@ -74,7 +75,7 @@ func (this *ExportAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("导出WAF策略 %d", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAFPolicy_LogExportWAFPolicy, params.FirewallPolicyId) policy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), params.FirewallPolicyId) if err != nil { diff --git a/internal/web/actions/default/servers/components/waf/import.go b/internal/web/actions/default/servers/components/waf/import.go index d2bc5aca..79855a51 100644 --- a/internal/web/actions/default/servers/components/waf/import.go +++ b/internal/web/actions/default/servers/components/waf/import.go @@ -3,6 +3,7 @@ package waf import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/iwind/TeaGo/actions" @@ -27,7 +28,7 @@ func (this *ImportAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("从文件中导入规则到WAF策略 %d", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAFPolicy_LogImportWAFPolicy, params.FirewallPolicyId) if params.File == nil { this.Fail("请上传要导入的文件") 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 a5cf1dc2..0ea9d637 100644 --- a/internal/web/actions/default/servers/components/waf/ipadmin/deleteIP.go +++ b/internal/web/actions/default/servers/components/waf/ipadmin/deleteIP.go @@ -1,8 +1,7 @@ package ipadmin -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +14,7 @@ func (this *DeleteIPAction) RunPost(params struct { ItemId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "从WAF策略 %d 名单中删除IP %d", params.FirewallPolicyId, params.ItemId) + defer this.CreateLogInfo(codes.WAF_LogDeleteIPFromWAFPolicy, 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 bb5e86d2..c82e3d10 100644 --- a/internal/web/actions/default/servers/components/waf/ipadmin/index.go +++ b/internal/web/actions/default/servers/components/waf/ipadmin/index.go @@ -2,8 +2,8 @@ package ipadmin import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -67,7 +67,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的国家和地区", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAF_LogUpdateForbiddenCountries, params.FirewallPolicyId) policyConfig, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(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 abbb4ad3..4fa3a200 100644 --- a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go +++ b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go @@ -2,8 +2,8 @@ package ipadmin import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -69,7 +69,7 @@ func (this *ProvincesAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的省份", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAF_LogUpdateForbiddenProvinces, params.FirewallPolicyId) policyConfig, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(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 715a3804..a1e28b60 100644 --- a/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go +++ b/internal/web/actions/default/servers/components/waf/ipadmin/updateIPPopup.go @@ -1,9 +1,8 @@ package ipadmin -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/utils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -61,7 +60,7 @@ func (this *UpdateIPPopupAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 名单中的IP %d", params.FirewallPolicyId, params.ItemId) + defer this.CreateLogInfo(codes.WAF_LogUpdateIPFromWAFPolicy, params.FirewallPolicyId, params.ItemId) // TODO 校验ItemId所属用户 diff --git a/internal/web/actions/default/servers/components/waf/sortGroups.go b/internal/web/actions/default/servers/components/waf/sortGroups.go index 67648139..fa8aa04d 100644 --- a/internal/web/actions/default/servers/components/waf/sortGroups.go +++ b/internal/web/actions/default/servers/components/waf/sortGroups.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -18,7 +17,7 @@ func (this *SortGroupsAction) RunPost(params struct { GroupIds []int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 中的规则分组中的排序", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAFRuleGroup_LogSortRuleGroups, params.FirewallPolicyId) firewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(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 4bbc1b0f..835c3991 100644 --- a/internal/web/actions/default/servers/components/waf/sortSets.go +++ b/internal/web/actions/default/servers/components/waf/sortSets.go @@ -2,8 +2,8 @@ package waf import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -18,7 +18,7 @@ func (this *SortSetsAction) RunPost(params struct { SetIds []int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 中的规则集排序", params.GroupId) + defer this.CreateLogInfo(codes.WAFRuleSet_LogSortRuleSets, params.GroupId) groupConfig, err := dao.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 aec363a3..92a4b86e 100644 --- a/internal/web/actions/default/servers/components/waf/update.go +++ b/internal/web/actions/default/servers/components/waf/update.go @@ -2,8 +2,8 @@ package waf import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -114,7 +114,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略 %d 基本信息", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAFPolicy_LogUpdateWAFPolicy, 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 f039e773..f97c96d0 100644 --- a/internal/web/actions/default/servers/components/waf/updateGroupOn.go +++ b/internal/web/actions/default/servers/components/waf/updateGroupOn.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +14,7 @@ func (this *UpdateGroupOnAction) RunPost(params struct { IsOn bool }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "设置WAF规则分组 %d 开启状态", params.GroupId) + defer this.CreateLogInfo(codes.WAFRuleGroup_LogUpdateRuleGroupIsOn, 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 1ca565f4..18c98fb9 100644 --- a/internal/web/actions/default/servers/components/waf/updateGroupPopup.go +++ b/internal/web/actions/default/servers/components/waf/updateGroupPopup.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -51,7 +50,7 @@ func (this *UpdateGroupPopupAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则分组 %d 基本信息", params.GroupId) + defer this.CreateLogInfo(codes.WAFRuleGroup_LogUpdateRuleGroup, 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 87270c51..9f998989 100644 --- a/internal/web/actions/default/servers/components/waf/updateSetOn.go +++ b/internal/web/actions/default/servers/components/waf/updateSetOn.go @@ -1,8 +1,7 @@ package waf -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +14,7 @@ func (this *UpdateSetOnAction) RunPost(params struct { IsOn bool }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 开启状态", params.SetId) + defer this.CreateLogInfo(codes.WAFRuleSet_LogUpdateRuleSetIsOn, 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 417b6496..d9e82471 100644 --- a/internal/web/actions/default/servers/components/waf/updateSetPopup.go +++ b/internal/web/actions/default/servers/components/waf/updateSetPopup.go @@ -2,7 +2,6 @@ package waf import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" @@ -27,7 +26,7 @@ func (this *UpdateSetPopupAction) RunGet(params struct { SetId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF规则集 %d 基本信息", params.SetId) + defer this.CreateLogInfo(codes.WAFRuleSet_LogUpdateRuleSet, params.SetId) this.Data["groupId"] = params.GroupId this.Data["type"] = params.Type @@ -46,14 +45,14 @@ func (this *UpdateSetPopupAction) RunGet(params struct { // 一些配置 this.Data["connectors"] = []maps.Map{ { - "name": this.Lang(codes.AdminWAFConnectorAnd), + "name": this.Lang(codes.WAF_ConnectorAnd), "value": firewallconfigs.HTTPFirewallRuleConnectorAnd, - "description": this.Lang(codes.AdminWAFConnectorAndDescription), + "description": this.Lang(codes.WAF_ConnectorAndDescription), }, { - "name": this.Lang(codes.AdminWAFConnectorOr), + "name": this.Lang(codes.WAF_ConnectorOr), "value": firewallconfigs.HTTPFirewallRuleConnectorOr, - "description": this.Lang(codes.AdminWAFConnectorOrDescription), + "description": this.Lang(codes.WAF_ConnectorOrDescription), }, } diff --git a/internal/web/actions/default/servers/components/waf/upgradeTemplate.go b/internal/web/actions/default/servers/components/waf/upgradeTemplate.go index 50acc7c8..0c096a3c 100644 --- a/internal/web/actions/default/servers/components/waf/upgradeTemplate.go +++ b/internal/web/actions/default/servers/components/waf/upgradeTemplate.go @@ -5,6 +5,7 @@ package waf import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -17,7 +18,7 @@ type UpgradeTemplateAction struct { func (this *UpgradeTemplateAction) RunPost(params struct { PolicyId int64 }) { - defer this.CreateLogInfo("升级WAF %d 内置规则", params.PolicyId) + defer this.CreateLogInfo(codes.WAFPolicy_LogUpgradeWAFPolicy, params.PolicyId) policy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), params.PolicyId) if err != nil { diff --git a/internal/web/actions/default/servers/create.go b/internal/web/actions/default/servers/create.go index 19f27a0c..ebdfeb58 100644 --- a/internal/web/actions/default/servers/create.go +++ b/internal/web/actions/default/servers/create.go @@ -3,8 +3,8 @@ 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/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -606,7 +606,7 @@ func (this *CreateAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建代理服务 %d", createResp.ServerId) + defer this.CreateLogInfo(codes.Server_LogCreateServer, createResp.ServerId) this.Success() } diff --git a/internal/web/actions/default/servers/groups/createPopup.go b/internal/web/actions/default/servers/groups/createPopup.go index 6c420032..aa471bdd 100644 --- a/internal/web/actions/default/servers/groups/createPopup.go +++ b/internal/web/actions/default/servers/groups/createPopup.go @@ -1,8 +1,7 @@ package groups -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -42,7 +41,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建网站分组 %d", createResp.ServerGroupId) + defer this.CreateLogInfo(codes.ServerGroup_LogCreateServerGroup, createResp.ServerGroupId) this.Success() } diff --git a/internal/web/actions/default/servers/groups/group/delete.go b/internal/web/actions/default/servers/groups/group/delete.go index fe7730c7..e258f1c8 100644 --- a/internal/web/actions/default/servers/groups/group/delete.go +++ b/internal/web/actions/default/servers/groups/group/delete.go @@ -1,8 +1,7 @@ package group -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *DeleteAction) RunPost(params struct { GroupId int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除代理网站分组 %d", params.GroupId) + defer this.CreateLogInfo(codes.ServerGroup_LogDeleteServerGroup, params.GroupId) // 检查是否正在使用 countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithServerGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithServerGroupIdRequest{ServerGroupId: params.GroupId}) diff --git a/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go b/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go index 40cc6a3b..4bb101bb 100644 --- a/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go +++ b/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go @@ -38,19 +38,19 @@ func InitGroup(parent *actionutils.ParentAction, groupId int64, menuItem string) var urlPrefix = "/servers/groups/group/settings" var leftMenuItems = []maps.Map{ { - "name": parent.Lang(codes.AdminServerMenuSettingHTTPProxy), + "name": parent.Lang(codes.Server_MenuSettingHTTPProxy), "url": urlPrefix + "/httpReverseProxy?groupId=" + types.String(groupId), "isActive": menuItem == "httpReverseProxy", "isOn": configInfoResp.HasHTTPReverseProxy, }, { - "name": parent.Lang(codes.AdminServerMenuSettingTCPProxy), + "name": parent.Lang(codes.Server_MenuSettingTCPProxy), "url": urlPrefix + "/tcpReverseProxy?groupId=" + types.String(groupId), "isActive": menuItem == "tcpReverseProxy", "isOn": configInfoResp.HasTCPReverseProxy, }, { - "name": parent.Lang(codes.AdminServerMenuSettingUDPProxy), + "name": parent.Lang(codes.Server_MenuSettingUDPProxy), "url": urlPrefix + "/udpReverseProxy?groupId=" + types.String(groupId), "isActive": menuItem == "udpReverseProxy", "isOn": configInfoResp.HasUDPReverseProxy, @@ -64,7 +64,7 @@ func InitGroup(parent *actionutils.ParentAction, groupId int64, menuItem string) "url": "", }) leftMenuItems = append(leftMenuItems, maps.Map{ - "name": parent.Lang(codes.AdminServerMenuSettingClientIP), + "name": parent.Lang(codes.Server_MenuSettingClientIP), "url": urlPrefix + "/remoteAddr?groupId=" + types.String(groupId), "isActive": menuItem == "remoteAddr", "isOn": configInfoResp.HasRemoteAddrConfig, diff --git a/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go b/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go index 9c2b3a9f..bad1abb6 100644 --- a/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go @@ -1,9 +1,9 @@ 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/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -51,7 +51,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的访问日志设置", params.WebId) + defer this.CreateLogInfo(codes.ServerAccessLog_LogUpdateAccessLogSetting, params.WebId) // TODO 检查参数 diff --git a/internal/web/actions/default/servers/groups/group/settings/cache/fetch.go b/internal/web/actions/default/servers/groups/group/settings/cache/fetch.go index 17b0b9f3..beea431c 100644 --- a/internal/web/actions/default/servers/groups/group/settings/cache/fetch.go +++ b/internal/web/actions/default/servers/groups/group/settings/cache/fetch.go @@ -2,10 +2,9 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -48,7 +47,7 @@ func (this *FetchAction) RunPost(params struct { }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "预热服务 %d 缓存", params.ServerId) + defer this.CreateLogInfo(codes.ServerCache_LogFetchCaches, params.ServerId) webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithId(this.AdminContext(), params.WebId) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/cache/index.go b/internal/web/actions/default/servers/groups/group/settings/cache/index.go index 0e59d4d2..af697b3d 100644 --- a/internal/web/actions/default/servers/groups/group/settings/cache/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/cache/index.go @@ -2,9 +2,9 @@ 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/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -50,7 +50,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的缓存设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCache_LogUpdateCacheSettings, params.WebId) // 校验配置 cacheConfig := &serverconfigs.HTTPCacheConfig{} diff --git a/internal/web/actions/default/servers/groups/group/settings/cache/purge.go b/internal/web/actions/default/servers/groups/group/settings/cache/purge.go index 59faf87c..9b7abc11 100644 --- a/internal/web/actions/default/servers/groups/group/settings/cache/purge.go +++ b/internal/web/actions/default/servers/groups/group/settings/cache/purge.go @@ -2,10 +2,9 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -49,7 +48,7 @@ func (this *PurgeAction) RunPost(params struct { }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除服务 %d 缓存", params.ServerId) + defer this.CreateLogInfo(codes.ServerCache_LogPurgeCaches, params.ServerId) webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithId(this.AdminContext(), params.WebId) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/charset/index.go b/internal/web/actions/default/servers/groups/group/settings/charset/index.go index 15c36aaa..95f391c2 100644 --- a/internal/web/actions/default/servers/groups/group/settings/charset/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/charset/index.go @@ -1,10 +1,9 @@ package charset -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -49,7 +48,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的字符集设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCharset_LogUpdateCharsetSetting, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/groups/group/settings/compression/index.go b/internal/web/actions/default/servers/groups/group/settings/compression/index.go index 1d5d1f0b..4ba699ff 100644 --- a/internal/web/actions/default/servers/groups/group/settings/compression/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/compression/index.go @@ -6,6 +6,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -51,7 +52,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 的压缩设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCompression_LogUpdateCompressionSettings, params.WebId) // 校验配置 var compressionConfig = &serverconfigs.HTTPCompressionConfig{} diff --git a/internal/web/actions/default/servers/groups/group/settings/headers/index.go b/internal/web/actions/default/servers/groups/group/settings/headers/index.go index 49e75ee4..9cf02acc 100644 --- a/internal/web/actions/default/servers/groups/group/settings/headers/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/headers/index.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -117,7 +118,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的Header设置", params.WebId) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogUpdateHTTPHeaders, params.WebId) switch params.Type { case "request": diff --git a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go index 08849a28..83dda9a6 100644 --- a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go +++ b/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -61,7 +62,7 @@ func (this *SettingAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改分组 %d 的反向代理设置", params.GroupId) + defer this.CreateLogInfo(codes.ServerReverseProxy_LogUpdateServerGroupReverseProxySettings, params.GroupId) // TODO 校验配置 diff --git a/internal/web/actions/default/servers/groups/group/settings/pages/index.go b/internal/web/actions/default/servers/groups/group/settings/pages/index.go index 968a691f..edad89a5 100644 --- a/internal/web/actions/default/servers/groups/group/settings/pages/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/pages/index.go @@ -1,9 +1,8 @@ package pages -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -47,7 +46,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的设置", params.WebId) + defer this.CreateLogInfo(codes.ServerPage_LogUpdatePages, params.WebId) // TODO 检查配置 diff --git a/internal/web/actions/default/servers/groups/group/settings/requestLimit/index.go b/internal/web/actions/default/servers/groups/group/settings/requestLimit/index.go index 716550a3..9c76f57d 100644 --- a/internal/web/actions/default/servers/groups/group/settings/requestLimit/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/requestLimit/index.go @@ -5,6 +5,7 @@ package requestlimit import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -47,7 +48,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 请求限制", params.WebId) + defer this.CreateLogInfo(codes.ServerRequestLimit_LogUpdateRequestLimitSettings, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestLimit(this.AdminContext(), &pb.UpdateHTTPWebRequestLimitRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/groups/group/settings/stat/index.go b/internal/web/actions/default/servers/groups/group/settings/stat/index.go index 183eab93..e41efcd1 100644 --- a/internal/web/actions/default/servers/groups/group/settings/stat/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/stat/index.go @@ -3,6 +3,7 @@ package stat import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -44,7 +45,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的统计设置", params.WebId) + defer this.CreateLogInfo(codes.ServerStat_LogUpdateStatSettings, params.WebId) // TODO 校验配置 diff --git a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go index bf6fbd82..c6978b41 100644 --- a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go +++ b/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -61,7 +62,7 @@ func (this *SettingAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改分组 %d 的反向代理设置", params.GroupId) + defer this.CreateLogInfo(codes.ServerReverseProxy_LogUpdateServerGroupReverseProxySettings, params.GroupId) // TODO 校验配置 diff --git a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go index aeb7a676..e94a7afe 100644 --- a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go +++ b/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -61,7 +62,7 @@ func (this *SettingAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改分组 %d 的反向代理设置", params.GroupId) + defer this.CreateLogInfo(codes.ServerReverseProxy_LogUpdateServerGroupReverseProxySettings, params.GroupId) // TODO 校验配置 diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/index.go b/internal/web/actions/default/servers/groups/group/settings/waf/index.go index 013ae362..8a3e0ba9 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/index.go @@ -3,6 +3,7 @@ package waf import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -59,7 +60,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的WAF设置", params.WebId) + defer this.CreateLogInfo(codes.ServerWAF_LogUpdateWAFSettings, params.WebId) // TODO 检查配置 diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/countries.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/countries.go index 7e28e32d..c651dd05 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/countries.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/countries.go @@ -2,8 +2,8 @@ package ipadmin import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -80,7 +80,7 @@ func (this *CountriesAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的国家和地区", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAF_LogUpdateForbiddenCountries, params.FirewallPolicyId) policyConfig, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), params.FirewallPolicyId) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/deleteIP.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/deleteIP.go index a5cf1dc2..0ea9d637 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/deleteIP.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/deleteIP.go @@ -1,8 +1,7 @@ package ipadmin -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +14,7 @@ func (this *DeleteIPAction) RunPost(params struct { ItemId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "从WAF策略 %d 名单中删除IP %d", params.FirewallPolicyId, params.ItemId) + defer this.CreateLogInfo(codes.WAF_LogDeleteIPFromWAFPolicy, params.FirewallPolicyId, params.ItemId) // TODO 判断权限 diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go index b76d57dd..4d894063 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go @@ -2,8 +2,8 @@ package ipadmin import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -81,7 +81,7 @@ func (this *ProvincesAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的省份", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAF_LogUpdateForbiddenProvinces, params.FirewallPolicyId) policyConfig, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), params.FirewallPolicyId) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go index 4744fdbe..1a08ba6d 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.go @@ -1,9 +1,9 @@ package ipadmin import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -60,7 +60,7 @@ func (this *UpdateIPPopupAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略名单中的IP %d", params.ItemId) + defer this.CreateLogInfo(codes.IPItem_LogUpdateIPItem, params.ItemId) // TODO 校验ItemId所属用户 diff --git a/internal/web/actions/default/servers/groups/group/settings/web/index.go b/internal/web/actions/default/servers/groups/group/settings/web/index.go index 76f19841..bb4155d3 100644 --- a/internal/web/actions/default/servers/groups/group/settings/web/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/web/index.go @@ -3,6 +3,7 @@ package web import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -44,7 +45,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的首页文件名", params.WebId) + defer this.CreateLogInfo(codes.ServerRoot_LogUpdateRoot, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/groups/group/settings/websocket/index.go b/internal/web/actions/default/servers/groups/group/settings/websocket/index.go index f8ed7112..527fb61f 100644 --- a/internal/web/actions/default/servers/groups/group/settings/websocket/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/websocket/index.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -48,7 +49,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的Websocket设置", params.WebId) + defer this.CreateLogInfo(codes.ServerWebsocket_LogUpdateWebsocketSettings, params.WebId) // TODO 检查配置 diff --git a/internal/web/actions/default/servers/groups/group/update.go b/internal/web/actions/default/servers/groups/group/update.go index 21cda0fb..fcbd254e 100644 --- a/internal/web/actions/default/servers/groups/group/update.go +++ b/internal/web/actions/default/servers/groups/group/update.go @@ -1,9 +1,8 @@ package group -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -41,7 +40,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改网站分组 %d", params.GroupId) + defer this.CreateLogInfo(codes.ServerGroup_LogUpdateServerGroup, params.GroupId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/servers/groups/sort.go b/internal/web/actions/default/servers/groups/sort.go index 065108a3..1cd25d2b 100644 --- a/internal/web/actions/default/servers/groups/sort.go +++ b/internal/web/actions/default/servers/groups/sort.go @@ -1,8 +1,7 @@ package groups -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *SortAction) RunPost(params struct { GroupIds []int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改网站分组排序") + defer this.CreateLogInfo(codes.ServerGroup_LogSortServerGroups) _, err := this.RPC().ServerGroupRPC().UpdateServerGroupOrders(this.AdminContext(), &pb.UpdateServerGroupOrdersRequest{ServerGroupIds: params.GroupIds}) if err != nil { diff --git a/internal/web/actions/default/servers/ipbox/addIP.go b/internal/web/actions/default/servers/ipbox/addIP.go index 8d0064f6..a55bfd88 100644 --- a/internal/web/actions/default/servers/ipbox/addIP.go +++ b/internal/web/actions/default/servers/ipbox/addIP.go @@ -4,6 +4,7 @@ package ipbox import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "strings" "time" @@ -21,7 +22,7 @@ func (this *AddIPAction) RunPost(params struct { var itemId int64 = 0 defer func() { - this.CreateLogInfo("在名单 %d 中创建IP %d", params.ListId, itemId) + this.CreateLogInfo(codes.IPItem_LogCreateIPItem, params.ListId, itemId) }() var ipType = "ipv4" diff --git a/internal/web/actions/default/servers/ipbox/deleteFromList.go b/internal/web/actions/default/servers/ipbox/deleteFromList.go index 80a6fd5e..202acd4e 100644 --- a/internal/web/actions/default/servers/ipbox/deleteFromList.go +++ b/internal/web/actions/default/servers/ipbox/deleteFromList.go @@ -4,6 +4,7 @@ package ipbox import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +16,7 @@ func (this *DeleteFromListAction) RunPost(params struct { ListId int64 ItemId int64 }) { - defer this.CreateLogInfo("从IP名单 %d 中删除IP %d", params.ListId, params.ItemId) + defer this.CreateLogInfo(codes.IPItem_LogDeleteIPItem, params.ListId, params.ItemId) _, err := this.RPC().IPItemRPC().DeleteIPItem(this.AdminContext(), &pb.DeleteIPItemRequest{IpItemId: params.ItemId}) if err != nil { diff --git a/internal/web/actions/default/servers/iplists/bindHTTPFirewallPopup.go b/internal/web/actions/default/servers/iplists/bindHTTPFirewallPopup.go index 4ea80e30..7c6eac32 100644 --- a/internal/web/actions/default/servers/iplists/bindHTTPFirewallPopup.go +++ b/internal/web/actions/default/servers/iplists/bindHTTPFirewallPopup.go @@ -5,6 +5,7 @@ package iplists import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -99,7 +100,7 @@ func (this *BindHTTPFirewallPopupAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("绑定IP名单 %d 到WAF策略 %d", params.ListId, params.HttpFirewallPolicyId) + defer this.CreateLogInfo(codes.IPList_LogBindIPListWAFPolicy, params.ListId, params.HttpFirewallPolicyId) // List类型 listResp, err := this.RPC().IPListRPC().FindEnabledIPList(this.AdminContext(), &pb.FindEnabledIPListRequest{IpListId: params.ListId}) diff --git a/internal/web/actions/default/servers/iplists/createIPPopup.go b/internal/web/actions/default/servers/iplists/createIPPopup.go index e8e31c83..cd299892 100644 --- a/internal/web/actions/default/servers/iplists/createIPPopup.go +++ b/internal/web/actions/default/servers/iplists/createIPPopup.go @@ -1,10 +1,9 @@ package iplists -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/utils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/iwind/TeaGo/actions" @@ -256,7 +255,7 @@ func (this *CreateIPPopupAction) RunPost(params struct { } // 日志 - defer this.CreateLog(oplogs.LevelInfo, "在IP名单中批量添加IP %d", params.ListId) + defer this.CreateLogInfo(codes.IPList_LogCreateIPItemsBatch, params.ListId) } else { createResp, err := this.RPC().IPItemRPC().CreateIPItem(this.AdminContext(), &pb.CreateIPItemRequest{ IpListId: params.ListId, @@ -274,7 +273,7 @@ func (this *CreateIPPopupAction) RunPost(params struct { itemId := createResp.IpItemId // 日志 - defer this.CreateLog(oplogs.LevelInfo, "在IP名单 %d 中添加IP %d", params.ListId, itemId) + defer this.CreateLogInfo(codes.IPItem_LogCreateIPItem, params.ListId, itemId) } this.Success() diff --git a/internal/web/actions/default/servers/iplists/createPopup.go b/internal/web/actions/default/servers/iplists/createPopup.go index f03b972b..31892272 100644 --- a/internal/web/actions/default/servers/iplists/createPopup.go +++ b/internal/web/actions/default/servers/iplists/createPopup.go @@ -4,6 +4,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -36,7 +37,7 @@ func (this *CreatePopupAction) RunPost(params struct { }) { var listId int64 = 0 defer func() { - defer this.CreateLogInfo("创建IP名单 %d", listId) + defer this.CreateLogInfo(codes.IPList_LogCreateIPList, listId) }() params.Must. diff --git a/internal/web/actions/default/servers/iplists/delete.go b/internal/web/actions/default/servers/iplists/delete.go index c385b3a8..193c9427 100644 --- a/internal/web/actions/default/servers/iplists/delete.go +++ b/internal/web/actions/default/servers/iplists/delete.go @@ -5,6 +5,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +16,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { ListId int64 }) { - defer this.CreateLogInfo("删除IP名单 %d", params.ListId) + defer this.CreateLogInfo(codes.IPList_LogDeleteIPList, params.ListId) // 删除 _, err := this.RPC().IPListRPC().DeleteIPList(this.AdminContext(), &pb.DeleteIPListRequest{IpListId: params.ListId}) diff --git a/internal/web/actions/default/servers/iplists/deleteIP.go b/internal/web/actions/default/servers/iplists/deleteIP.go index c99555dc..756f926c 100644 --- a/internal/web/actions/default/servers/iplists/deleteIP.go +++ b/internal/web/actions/default/servers/iplists/deleteIP.go @@ -1,9 +1,8 @@ package iplists -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +14,7 @@ func (this *DeleteIPAction) RunPost(params struct { ItemId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "从IP名单中删除IP %d", params.ItemId) + defer this.CreateLogInfo(codes.IPItem_LogDeleteIPItem, params.ItemId) _, err := this.RPC().IPItemRPC().DeleteIPItem(this.AdminContext(), &pb.DeleteIPItemRequest{IpItemId: params.ItemId}) if err != nil { diff --git a/internal/web/actions/default/servers/iplists/deleteItems.go b/internal/web/actions/default/servers/iplists/deleteItems.go index 2cfe2d86..0a500a48 100644 --- a/internal/web/actions/default/servers/iplists/deleteItems.go +++ b/internal/web/actions/default/servers/iplists/deleteItems.go @@ -5,6 +5,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/types" "strings" @@ -26,7 +27,7 @@ func (this *DeleteItemsAction) RunPost(params struct { itemIdStrings = append(itemIdStrings, types.String(itemId)) } - defer this.CreateLogInfo("批量删除IP名单中的IP：" + strings.Join(itemIdStrings, ", ")) + defer this.CreateLogInfo(codes.IPList_LogDeleteIPBatch, strings.Join(itemIdStrings, ", ")) _, err := this.RPC().IPItemRPC().DeleteIPItems(this.AdminContext(), &pb.DeleteIPItemsRequest{IpItemIds: params.ItemIds}) if err != nil { diff --git a/internal/web/actions/default/servers/iplists/exportData.go b/internal/web/actions/default/servers/iplists/exportData.go index a8000323..d47664ce 100644 --- a/internal/web/actions/default/servers/iplists/exportData.go +++ b/internal/web/actions/default/servers/iplists/exportData.go @@ -8,6 +8,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/types" @@ -27,7 +28,7 @@ func (this *ExportDataAction) RunGet(params struct { ListId int64 Format string }) { - defer this.CreateLogInfo("导出IP名单 %d", params.ListId) + defer this.CreateLogInfo(codes.IPList_LogExportIPList, params.ListId) var err error var ext = "" diff --git a/internal/web/actions/default/servers/iplists/import.go b/internal/web/actions/default/servers/iplists/import.go index 79cb40d7..3c77b4c9 100644 --- a/internal/web/actions/default/servers/iplists/import.go +++ b/internal/web/actions/default/servers/iplists/import.go @@ -8,6 +8,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" @@ -46,7 +47,7 @@ func (this *ImportAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("导入IP名单 %d", params.ListId) + defer this.CreateLogInfo(codes.IPList_LogImportIPList, params.ListId) existsResp, err := this.RPC().IPListRPC().ExistsEnabledIPList(this.AdminContext(), &pb.ExistsEnabledIPListRequest{IpListId: params.ListId}) if err != nil { diff --git a/internal/web/actions/default/servers/iplists/readAll.go b/internal/web/actions/default/servers/iplists/readAll.go index ddd78f75..34b9099b 100644 --- a/internal/web/actions/default/servers/iplists/readAll.go +++ b/internal/web/actions/default/servers/iplists/readAll.go @@ -5,6 +5,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -13,7 +14,7 @@ type ReadAllAction struct { } func (this *ReadAllAction) RunPost(params struct{}) { - defer this.CreateLogInfo("将IP名单置为已读") + defer this.CreateLogInfo(codes.IPItem_LogReadAllIPItems) _, err := this.RPC().IPItemRPC().UpdateIPItemsRead(this.AdminContext(), &pb.UpdateIPItemsReadRequest{}) if err != nil { diff --git a/internal/web/actions/default/servers/iplists/unbindHTTPFirewall.go b/internal/web/actions/default/servers/iplists/unbindHTTPFirewall.go index 1e8656c8..e169c959 100644 --- a/internal/web/actions/default/servers/iplists/unbindHTTPFirewall.go +++ b/internal/web/actions/default/servers/iplists/unbindHTTPFirewall.go @@ -5,6 +5,7 @@ package iplists import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -18,7 +19,7 @@ func (this *UnbindHTTPFirewallAction) RunPost(params struct { HttpFirewallPolicyId int64 ListId int64 }) { - defer this.CreateLogInfo("接触绑定IP名单 %d WAF策略 %d", params.ListId, params.HttpFirewallPolicyId) + defer this.CreateLogInfo(codes.IPList_LogUnbindIPListWAFPolicy, params.ListId, params.HttpFirewallPolicyId) // List类型 listResp, err := this.RPC().IPListRPC().FindEnabledIPList(this.AdminContext(), &pb.FindEnabledIPListRequest{IpListId: params.ListId}) diff --git a/internal/web/actions/default/servers/iplists/update.go b/internal/web/actions/default/servers/iplists/update.go index dcd40e59..fdcae2d4 100644 --- a/internal/web/actions/default/servers/iplists/update.go +++ b/internal/web/actions/default/servers/iplists/update.go @@ -4,6 +4,7 @@ package iplists import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -37,7 +38,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改IP名单 %d", params.ListId) + defer this.CreateLogInfo(codes.IPList_LogUpdateIPList, params.ListId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/servers/iplists/updateIPPopup.go b/internal/web/actions/default/servers/iplists/updateIPPopup.go index 6a098c43..e2921baa 100644 --- a/internal/web/actions/default/servers/iplists/updateIPPopup.go +++ b/internal/web/actions/default/servers/iplists/updateIPPopup.go @@ -1,9 +1,8 @@ package iplists -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/utils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -60,7 +59,7 @@ func (this *UpdateIPPopupAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改IP名单中IP %d", params.ItemId) + defer this.CreateLogInfo(codes.IPItem_LogUpdateIPItem, params.ItemId) // TODO 校验ItemId所属用户 diff --git a/internal/web/actions/default/servers/metrics/charts/createPopup.go b/internal/web/actions/default/servers/metrics/charts/createPopup.go index c52fbd18..d2db7109 100644 --- a/internal/web/actions/default/servers/metrics/charts/createPopup.go +++ b/internal/web/actions/default/servers/metrics/charts/createPopup.go @@ -4,6 +4,7 @@ package charts import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -40,7 +41,7 @@ func (this *CreatePopupAction) RunPost(params struct { }) { var chartId int64 defer func() { - this.CreateLogInfo("创建指标图表 %d", chartId) + this.CreateLogInfo(codes.MetricChart_LogCreateMetricChart, chartId) }() params.Must. diff --git a/internal/web/actions/default/servers/metrics/charts/delete.go b/internal/web/actions/default/servers/metrics/charts/delete.go index 1cca2d26..ad950157 100644 --- a/internal/web/actions/default/servers/metrics/charts/delete.go +++ b/internal/web/actions/default/servers/metrics/charts/delete.go @@ -4,6 +4,7 @@ package charts import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { ChartId int64 }) { - defer this.CreateLogInfo("删除指标图表 %d", params.ChartId) + defer this.CreateLogInfo(codes.MetricChart_LogDeleteMetricChart, params.ChartId) _, err := this.RPC().MetricChartRPC().DeleteMetricChart(this.AdminContext(), &pb.DeleteMetricChartRequest{MetricChartId: params.ChartId}) if err != nil { diff --git a/internal/web/actions/default/servers/metrics/charts/update.go b/internal/web/actions/default/servers/metrics/charts/update.go index 54dbe862..ae2782ca 100644 --- a/internal/web/actions/default/servers/metrics/charts/update.go +++ b/internal/web/actions/default/servers/metrics/charts/update.go @@ -6,6 +6,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/metrics/charts/chartutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/metrics/metricutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -52,7 +53,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改指标图表 %d", params.ChartId) + defer this.CreateLogInfo(codes.MetricChart_LogUpdateMetricChart, params.ChartId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/servers/metrics/createPopup.go b/internal/web/actions/default/servers/metrics/createPopup.go index 34395844..ba653c08 100644 --- a/internal/web/actions/default/servers/metrics/createPopup.go +++ b/internal/web/actions/default/servers/metrics/createPopup.go @@ -5,6 +5,7 @@ package metrics import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -88,6 +89,6 @@ func (this *CreatePopupAction) RunPost(params struct { this.ErrorPage(err) return } - defer this.CreateLogInfo("创建统计指标 %d", createResp.MetricItemId) + defer this.CreateLogInfo(codes.MetricItem_LogCreateMetricItem, createResp.MetricItemId) this.Success() } diff --git a/internal/web/actions/default/servers/metrics/delete.go b/internal/web/actions/default/servers/metrics/delete.go index 64c35f89..f8fb85cd 100644 --- a/internal/web/actions/default/servers/metrics/delete.go +++ b/internal/web/actions/default/servers/metrics/delete.go @@ -4,6 +4,7 @@ package metrics import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { ItemId int64 }) { - defer this.CreateLogInfo("删除统计指标") + defer this.CreateLogInfo(codes.MetricItem_LogDeleteMetricItem) _, err := this.RPC().MetricItemRPC().DeleteMetricItem(this.AdminContext(), &pb.DeleteMetricItemRequest{MetricItemId: params.ItemId}) if err != nil { diff --git a/internal/web/actions/default/servers/metrics/update.go b/internal/web/actions/default/servers/metrics/update.go index aa77b81c..cf9bd755 100644 --- a/internal/web/actions/default/servers/metrics/update.go +++ b/internal/web/actions/default/servers/metrics/update.go @@ -6,6 +6,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/metrics/metricutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -91,6 +92,6 @@ func (this *UpdateAction) RunPost(params struct { this.ErrorPage(err) return } - defer this.CreateLogInfo("修改统计指标 %d", params.ItemId) + defer this.CreateLogInfo(codes.MetricItem_LogUpdateMetricItem, params.ItemId) 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 0c41c53c..b5981b88 100644 --- a/internal/web/actions/default/servers/server/delete/index.go +++ b/internal/web/actions/default/servers/server/delete/index.go @@ -1,8 +1,7 @@ package delete -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -25,7 +24,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "删除代理服务 %d", params.ServerId) + defer this.CreateLogInfo(codes.Server_LogDeleteServer, params.ServerId) // 执行删除 _, err := this.RPC().ServerRPC().DeleteServer(this.AdminContext(), &pb.DeleteServerRequest{ServerId: params.ServerId}) diff --git a/internal/web/actions/default/servers/server/settings/access/createPopup.go b/internal/web/actions/default/servers/server/settings/access/createPopup.go index 06005153..50644063 100644 --- a/internal/web/actions/default/servers/server/settings/access/createPopup.go +++ b/internal/web/actions/default/servers/server/settings/access/createPopup.go @@ -7,6 +7,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -141,7 +142,7 @@ func (this *CreatePopupAction) RunPost(params struct { this.ErrorPage(err) return } - defer this.CreateLogInfo("创建HTTP鉴权 %d", createResp.HttpAuthPolicyId) + defer this.CreateLogInfo(codes.HTTPAuthPolicy_LogCreateHTTPAuthPolicy, createResp.HttpAuthPolicyId) ref.AuthPolicyId = createResp.HttpAuthPolicyId ref.AuthPolicy = &serverconfigs.HTTPAuthPolicy{ Id: createResp.HttpAuthPolicyId, diff --git a/internal/web/actions/default/servers/server/settings/access/index.go b/internal/web/actions/default/servers/server/settings/access/index.go index 93570c1b..7b9d2251 100644 --- a/internal/web/actions/default/servers/server/settings/access/index.go +++ b/internal/web/actions/default/servers/server/settings/access/index.go @@ -3,6 +3,7 @@ package access import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -62,7 +63,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的鉴权设置", params.WebId) + defer this.CreateLogInfo(codes.ServerAuth_LogUpdateHTTPAuthSettings, params.WebId) var authConfig = &serverconfigs.HTTPAuthConfig{} err := json.Unmarshal(params.AuthJSON, authConfig) diff --git a/internal/web/actions/default/servers/server/settings/access/updatePopup.go b/internal/web/actions/default/servers/server/settings/access/updatePopup.go index dbfdf081..8d6f7f2d 100644 --- a/internal/web/actions/default/servers/server/settings/access/updatePopup.go +++ b/internal/web/actions/default/servers/server/settings/access/updatePopup.go @@ -7,6 +7,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -79,7 +80,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改HTTP鉴权 %d", params.PolicyId) + defer this.CreateLogInfo(codes.HTTPAuthPolicy_LogUpdateHTTPAuthPolicy, params.PolicyId) policyResp, err := this.RPC().HTTPAuthPolicyRPC().FindEnabledHTTPAuthPolicy(this.AdminContext(), &pb.FindEnabledHTTPAuthPolicyRequest{HttpAuthPolicyId: params.PolicyId}) if err != nil { 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 7cdc396f..a15df934 100644 --- a/internal/web/actions/default/servers/server/settings/accessLog/index.go +++ b/internal/web/actions/default/servers/server/settings/accessLog/index.go @@ -1,8 +1,7 @@ package accessLog -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -56,7 +55,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的访问日志设置", params.WebId) + defer this.CreateLogInfo(codes.ServerAccessLog_LogUpdateAccessLogSetting, params.WebId) // TODO 检查参数 diff --git a/internal/web/actions/default/servers/server/settings/cache/fetch.go b/internal/web/actions/default/servers/server/settings/cache/fetch.go index 7f6054ce..1a22222a 100644 --- a/internal/web/actions/default/servers/server/settings/cache/fetch.go +++ b/internal/web/actions/default/servers/server/settings/cache/fetch.go @@ -3,9 +3,9 @@ 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/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -48,7 +48,7 @@ func (this *FetchAction) RunPost(params struct { }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "预热服务 %d 缓存", params.ServerId) + defer this.CreateLogInfo(codes.ServerCache_LogFetchCaches, params.ServerId) webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithId(this.AdminContext(), params.WebId) if err != nil { 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 093d410a..95c91901 100644 --- a/internal/web/actions/default/servers/server/settings/cache/index.go +++ b/internal/web/actions/default/servers/server/settings/cache/index.go @@ -2,8 +2,8 @@ package cache import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -70,7 +70,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的缓存设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCache_LogUpdateCacheSettings, params.WebId) // 校验配置 cacheConfig := &serverconfigs.HTTPCacheConfig{} diff --git a/internal/web/actions/default/servers/server/settings/cache/purge.go b/internal/web/actions/default/servers/server/settings/cache/purge.go index 59faf87c..9b7abc11 100644 --- a/internal/web/actions/default/servers/server/settings/cache/purge.go +++ b/internal/web/actions/default/servers/server/settings/cache/purge.go @@ -2,10 +2,9 @@ package cache -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -49,7 +48,7 @@ func (this *PurgeAction) RunPost(params struct { }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除服务 %d 缓存", params.ServerId) + defer this.CreateLogInfo(codes.ServerCache_LogPurgeCaches, params.ServerId) webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithId(this.AdminContext(), params.WebId) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/cache/updateRefs.go b/internal/web/actions/default/servers/server/settings/cache/updateRefs.go index 045452a9..b59a7f20 100644 --- a/internal/web/actions/default/servers/server/settings/cache/updateRefs.go +++ b/internal/web/actions/default/servers/server/settings/cache/updateRefs.go @@ -5,8 +5,8 @@ package cache import ( "encoding/json" "errors" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" ) @@ -20,7 +20,7 @@ func (this *UpdateRefsAction) RunPost(params struct { RefsJSON []byte }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的缓存设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCache_LogUpdateCacheSettings, params.WebId) this.Data["isUpdated"] = false 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 fd02fcb8..7a609839 100644 --- a/internal/web/actions/default/servers/server/settings/charset/index.go +++ b/internal/web/actions/default/servers/server/settings/charset/index.go @@ -1,9 +1,8 @@ package charset -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -54,7 +53,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的字符集设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCharset_LogUpdateCharsetSetting, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/server/settings/common/index.go b/internal/web/actions/default/servers/server/settings/common/index.go index 199444a7..a79d53b6 100644 --- a/internal/web/actions/default/servers/server/settings/common/index.go +++ b/internal/web/actions/default/servers/server/settings/common/index.go @@ -4,6 +4,7 @@ package common import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -46,7 +47,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改服务Web %d 设置的其他设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCommon_LogUpdateCommonSettings, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCommon(this.AdminContext(), &pb.UpdateHTTPWebCommonRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/server/settings/compression/index.go b/internal/web/actions/default/servers/server/settings/compression/index.go index ee8be48c..6d6fec4d 100644 --- a/internal/web/actions/default/servers/server/settings/compression/index.go +++ b/internal/web/actions/default/servers/server/settings/compression/index.go @@ -5,6 +5,7 @@ package compression import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -56,7 +57,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 的压缩设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCompression_LogUpdateCompressionSettings, params.WebId) // 校验配置 var compressionConfig = &serverconfigs.HTTPCompressionConfig{} diff --git a/internal/web/actions/default/servers/server/settings/dns/index.go b/internal/web/actions/default/servers/server/settings/dns/index.go index 56ec72b6..fa4980dd 100644 --- a/internal/web/actions/default/servers/server/settings/dns/index.go +++ b/internal/web/actions/default/servers/server/settings/dns/index.go @@ -2,6 +2,7 @@ package dns import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -41,7 +42,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改服务 %d 的DNS设置", params.ServerId) + defer this.CreateLogInfo(codes.ServerDNS_LogUpdateDNSSettings, params.ServerId) _, err := this.RPC().ServerRPC().UpdateServerDNS(this.AdminContext(), &pb.UpdateServerDNSRequest{ ServerId: params.ServerId, diff --git a/internal/web/actions/default/servers/server/settings/dns/regenerateCNAME.go b/internal/web/actions/default/servers/server/settings/dns/regenerateCNAME.go index be2ed3c0..b64de93a 100644 --- a/internal/web/actions/default/servers/server/settings/dns/regenerateCNAME.go +++ b/internal/web/actions/default/servers/server/settings/dns/regenerateCNAME.go @@ -4,6 +4,7 @@ package dns import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +15,7 @@ type RegenerateCNAMEAction struct { func (this *RegenerateCNAMEAction) RunPost(params struct { ServerId int64 }) { - defer this.CreateLogInfo("重新生成服务 %d 的CNAME", params.ServerId) + defer this.CreateLogInfo(codes.ServerDNS_LogRegenerateDNSName, params.ServerId) _, err := this.RPC().ServerRPC().RegenerateServerDNSName(this.AdminContext(), &pb.RegenerateServerDNSNameRequest{ServerId: params.ServerId}) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go b/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go index 13c38e76..50c5dd2b 100644 --- a/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go +++ b/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go @@ -4,6 +4,7 @@ package dns import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/types" "regexp" @@ -33,7 +34,7 @@ func (this *UpdateCNAMEPopupAction) RunPost(params struct { ServerId int64 DnsName string }) { - defer this.CreateLogInfo("修改服务 %d CNAME为 %s", params.ServerId, params.DnsName) + defer this.CreateLogInfo(codes.ServerDNS_LogUpdateDNSName, params.ServerId, params.DnsName) var dnsName = strings.ToLower(params.DnsName) if len(dnsName) == 0 { diff --git a/internal/web/actions/default/servers/server/settings/fastcgi/createPopup.go b/internal/web/actions/default/servers/server/settings/fastcgi/createPopup.go index 6a2b754f..204bed76 100644 --- a/internal/web/actions/default/servers/server/settings/fastcgi/createPopup.go +++ b/internal/web/actions/default/servers/server/settings/fastcgi/createPopup.go @@ -5,6 +5,7 @@ package fastcgi import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -37,11 +38,7 @@ func (this *CreatePopupAction) RunPost(params struct { }) { var fastcgiId = int64(0) defer func() { - if fastcgiId > 0 { - this.CreateLogInfo("创建Fastcgi %d", fastcgiId) - } else { - this.CreateLogInfo("创建Fastcgi") - } + this.CreateLogInfo(codes.HTTPFastcgi_LogCreateHTTPFastcgi, fastcgiId) }() params.Must. diff --git a/internal/web/actions/default/servers/server/settings/fastcgi/index.go b/internal/web/actions/default/servers/server/settings/fastcgi/index.go index 273a9e33..f8f236bd 100644 --- a/internal/web/actions/default/servers/server/settings/fastcgi/index.go +++ b/internal/web/actions/default/servers/server/settings/fastcgi/index.go @@ -3,6 +3,7 @@ package fastcgi import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -41,7 +42,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的Fastcgi设置", params.WebId) + defer this.CreateLogInfo(codes.ServerFastcgi_LogUpdateHTTPFastcgi, params.WebId) // TODO 检查配置 diff --git a/internal/web/actions/default/servers/server/settings/fastcgi/updatePopup.go b/internal/web/actions/default/servers/server/settings/fastcgi/updatePopup.go index 962f3189..38bf165d 100644 --- a/internal/web/actions/default/servers/server/settings/fastcgi/updatePopup.go +++ b/internal/web/actions/default/servers/server/settings/fastcgi/updatePopup.go @@ -5,6 +5,7 @@ package fastcgi import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -52,7 +53,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Fastcgi %d", params.FastcgiId) + defer this.CreateLogInfo(codes.HTTPFastcgi_LogUpdateHTTPFastcgi, params.FastcgiId) params.Must. Field("address", params.Address). 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 60fb17a7..be1f429e 100644 --- a/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go +++ b/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go @@ -2,8 +2,8 @@ package headers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/iwind/TeaGo/actions" @@ -34,7 +34,7 @@ func (this *CreateDeletePopupAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "添加删除的Header HeaderPolicyId: %d, Name: %s", params.HeaderPolicyId, params.Name) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogCreateDeletingHeader, params.HeaderPolicyId, params.Name) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/servers/server/settings/headers/createNonStandardHeaderPopup.go b/internal/web/actions/default/servers/server/settings/headers/createNonStandardHeaderPopup.go index 6bfbeb62..d044f853 100644 --- a/internal/web/actions/default/servers/server/settings/headers/createNonStandardHeaderPopup.go +++ b/internal/web/actions/default/servers/server/settings/headers/createNonStandardHeaderPopup.go @@ -2,8 +2,8 @@ package headers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/iwind/TeaGo/actions" @@ -34,7 +34,7 @@ func (this *CreateNonStandardPopupAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "添加非标的Header HeaderPolicyId: %d, Name: %s", params.HeaderPolicyId, params.Name) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogCreateNonStandardHeader, params.HeaderPolicyId, params.Name) params.Must. Field("name", params.Name). 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 9934da0d..e05f3e1b 100644 --- a/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go +++ b/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go @@ -2,8 +2,8 @@ package headers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/iwind/TeaGo/actions" @@ -44,7 +44,7 @@ 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) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogCreateSettingHeader, params.HeaderPolicyId, params.Name, params.Value) params.Name = strings.TrimSuffix(params.Name, ":") 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 9c428983..4ae297eb 100644 --- a/internal/web/actions/default/servers/server/settings/headers/delete.go +++ b/internal/web/actions/default/servers/server/settings/headers/delete.go @@ -2,8 +2,8 @@ package headers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" ) @@ -18,7 +18,7 @@ func (this *DeleteAction) RunPost(params struct { Type string HeaderId int64 }) { - defer this.CreateLog(oplogs.LevelInfo, "删除请求Header，HeaderPolicyId:%d, HeaderId:%d", params.HeaderPolicyId, params.HeaderId) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogDeleteHeader, params.HeaderPolicyId, params.HeaderId) policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{ HttpHeaderPolicyId: 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 36a71936..a2fe6bac 100644 --- a/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go +++ b/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go @@ -2,8 +2,8 @@ package headers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" ) @@ -17,7 +17,7 @@ func (this *DeleteDeletingHeaderAction) RunPost(params struct { HeaderName string }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "删除需要删除的Header，HeaderPolicyId:%d, HeaderName:%s", params.HeaderPolicyId, params.HeaderName) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogDeleteDeletingHeader, params.HeaderPolicyId, params.HeaderName) policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HttpHeaderPolicyId: params.HeaderPolicyId}) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/headers/deleteNonStandardHeader.go b/internal/web/actions/default/servers/server/settings/headers/deleteNonStandardHeader.go index 3cc596e9..958354a9 100644 --- a/internal/web/actions/default/servers/server/settings/headers/deleteNonStandardHeader.go +++ b/internal/web/actions/default/servers/server/settings/headers/deleteNonStandardHeader.go @@ -2,8 +2,8 @@ package headers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" ) @@ -17,7 +17,7 @@ func (this *DeleteNonStandardHeaderAction) RunPost(params struct { HeaderName string }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "删除需要非标的Header，HeaderPolicyId:%d, HeaderName:%s", params.HeaderPolicyId, params.HeaderName) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogDeleteNonStandardHeader, params.HeaderPolicyId, params.HeaderName) policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HttpHeaderPolicyId: params.HeaderPolicyId}) if err != nil { 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 2db415ee..d0f03320 100644 --- a/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go +++ b/internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go @@ -2,8 +2,8 @@ package headers import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/iwind/TeaGo/actions" @@ -59,7 +59,7 @@ 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) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogUpdateSettingHeader, params.HeaderId, params.Name, params.Value) params.Name = strings.TrimSuffix(params.Name, ":") 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 e0901031..b708202e 100644 --- a/internal/web/actions/default/servers/server/settings/http/index.go +++ b/internal/web/actions/default/servers/server/settings/http/index.go @@ -2,9 +2,9 @@ package http 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/serverutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -91,7 +91,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTP设置", params.ServerId) + defer this.CreateLogInfo(codes.ServerHTTP_LogUpdateHTTPSettings, params.ServerId) var 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 8b93b759..0f7a04e9 100644 --- a/internal/web/actions/default/servers/server/settings/https/index.go +++ b/internal/web/actions/default/servers/server/settings/https/index.go @@ -3,9 +3,9 @@ package https import ( "encoding/json" "errors" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" @@ -117,7 +117,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTPS设置", params.ServerId) + defer this.CreateLogInfo(codes.ServerHTTPS_LogUpdateHTTPSSettings, params.ServerId) var addresses = []*serverconfigs.NetworkAddressConfig{} err := json.Unmarshal([]byte(params.Addresses), &addresses) diff --git a/internal/web/actions/default/servers/server/settings/https/requestCertPopup.go b/internal/web/actions/default/servers/server/settings/https/requestCertPopup.go index 80fa02f7..a96802ee 100644 --- a/internal/web/actions/default/servers/server/settings/https/requestCertPopup.go +++ b/internal/web/actions/default/servers/server/settings/https/requestCertPopup.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" @@ -113,7 +114,7 @@ func (this *RequestCertPopupAction) RunPost(params struct { this.ErrorPage(err) return } - defer this.CreateLogInfo("创建ACME用户 %d", createUserResp.AcmeUserId) + defer this.CreateLogInfo(codes.ACMEUser_LogCreateACMEUser, createUserResp.AcmeUserId) acmeUserId = createUserResp.AcmeUserId this.Data["acmeUser"] = maps.Map{ @@ -139,7 +140,7 @@ func (this *RequestCertPopupAction) RunPost(params struct { taskId := createTaskResp.AcmeTaskId - defer this.CreateLogInfo("自动申请证书，任务 %d", taskId) + defer this.CreateLogInfo(codes.ACMETask_LogRunACMETask, taskId) runResp, err := this.RPC().ACMETaskRPC().RunACMETask(this.AdminContext(), &pb.RunACMETaskRequest{AcmeTaskId: taskId}) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go index 1df6a9eb..d40a8a36 100644 --- a/internal/web/actions/default/servers/server/settings/index.go +++ b/internal/web/actions/default/servers/server/settings/index.go @@ -2,8 +2,8 @@ package settings import ( "errors" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -136,7 +136,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 基本信息", params.ServerId) + defer this.CreateLogInfo(codes.Server_LogUpdateServerBasic, params.ServerId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/servers/server/settings/locations/access/index.go b/internal/web/actions/default/servers/server/settings/locations/access/index.go index 3469b7b3..394a32f5 100644 --- a/internal/web/actions/default/servers/server/settings/locations/access/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/access/index.go @@ -3,6 +3,7 @@ package access import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -62,7 +63,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的认证设置", params.WebId) + defer this.CreateLogInfo(codes.ServerAuth_LogUpdateHTTPAuthSettings, params.WebId) var authConfig = &serverconfigs.HTTPAuthConfig{} err := json.Unmarshal(params.AuthJSON, authConfig) 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 ecdd1bfe..e6e55555 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 @@ -2,6 +2,7 @@ package accessLog import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -40,7 +41,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的访问日志设置", params.WebId) + defer this.CreateLogInfo(codes.ServerAccessLog_LogUpdateAccessLogSetting, params.WebId) // TODO 检查参数 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 cfb340eb..1f4e6c1c 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 @@ -3,6 +3,7 @@ package cache import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -55,7 +56,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的缓存设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCache_LogUpdateCacheSettings, params.WebId) // 校验配置 cacheConfig := &serverconfigs.HTTPCacheConfig{} 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 474aca4c..55e88282 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 @@ -3,6 +3,7 @@ package charset import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -39,7 +40,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的字符集设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCharset_LogUpdateCharsetSetting, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/server/settings/locations/compression/index.go b/internal/web/actions/default/servers/server/settings/locations/compression/index.go index 7bb29b43..c4c0464e 100644 --- a/internal/web/actions/default/servers/server/settings/locations/compression/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/compression/index.go @@ -5,6 +5,7 @@ package compression import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -42,7 +43,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 的压缩设置", params.WebId) + defer this.CreateLogInfo(codes.ServerCompression_LogUpdateCompressionSettings, params.WebId) // 校验配置 var compressionConfig = &serverconfigs.HTTPCompressionConfig{} diff --git a/internal/web/actions/default/servers/server/settings/locations/create.go b/internal/web/actions/default/servers/server/settings/locations/create.go index 39adb890..105fe112 100644 --- a/internal/web/actions/default/servers/server/settings/locations/create.go +++ b/internal/web/actions/default/servers/server/settings/locations/create.go @@ -3,6 +3,7 @@ package locations import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -55,7 +56,7 @@ func (this *CreateAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("创建路由规则：%s", params.Pattern) + defer this.CreateLogInfo(codes.HTTPLocation_LogCreateHTTPLocation, params.Pattern) params.Must. Field("pattern", params.Pattern). diff --git a/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go b/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go index 21caae30..ed4ca4c9 100644 --- a/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go @@ -3,6 +3,7 @@ package fastcgi import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -40,7 +41,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的Fastcgi设置", params.WebId) + defer this.CreateLogInfo(codes.ServerFastcgi_LogUpdateHTTPFastcgi, params.WebId) // TODO 检查配置 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 1323dff8..66863aee 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 @@ -3,6 +3,7 @@ package headers import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -102,7 +103,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的Header设置", params.WebId) + defer this.CreateLogInfo(codes.ServerHTTPHeader_LogUpdateHTTPHeaders, params.WebId) // TODO 检查配置 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 c0737eba..f31db8f6 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 @@ -2,6 +2,7 @@ package http import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -35,7 +36,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的通用设置", params.WebId) + defer this.CreateLogInfo(codes.ServerRedirect_LogUpdateRedirects, params.WebId) // 设置跳转到HTTPS // TODO 校验设置 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 7da35d40..627a61c4 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 @@ -3,6 +3,7 @@ package location import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -55,7 +56,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改路由规则 %d 设置", params.LocationId) + defer this.CreateLogInfo(codes.HTTPLocation_LogUpdateHTTPLocation, params.LocationId) params.Must. Field("pattern", params.Pattern). diff --git a/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go b/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go index e9c4ad8a..b3f7763d 100644 --- a/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go +++ b/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go @@ -57,19 +57,19 @@ func (this *LocationHelper) BeforeAction(actionPtr actions.ActionWrapper) { func (this *LocationHelper) createMenus(serverIdString string, locationIdString string, secondMenuItem string, locationConfig *serverconfigs.HTTPLocationConfig, actionPtr actions.ActionWrapper) []maps.Map { menuItems := []maps.Map{} menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingBasic), + "name": this.Lang(actionPtr, codes.Server_MenuSettingBasic), "url": "/servers/server/settings/locations/location?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "basic", "isOff": locationConfig != nil && !locationConfig.IsOn, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingHTTP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingHTTP), "url": "/servers/server/settings/locations/http?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "http", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.RedirectToHttps != nil && locationConfig.Web.RedirectToHttps.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingOrigins), + "name": this.Lang(actionPtr, codes.Server_MenuSettingOrigins), "url": "/servers/server/settings/locations/reverseProxy?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": locationConfig != nil && locationConfig.ReverseProxyRef != nil && locationConfig.ReverseProxyRef.IsPrior, @@ -83,97 +83,97 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "isActive": false, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingRewriteRules), + "name": this.Lang(actionPtr, codes.Server_MenuSettingRewriteRules), "url": "/servers/server/settings/locations/rewrite?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "rewrite", "isOn": locationConfig != nil && locationConfig.Web != nil && len(locationConfig.Web.RewriteRefs) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingWAF), + "name": this.Lang(actionPtr, codes.Server_MenuSettingWAF), "url": "/servers/server/settings/locations/waf?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "waf", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.FirewallRef != nil && locationConfig.Web.FirewallRef.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingCache), + "name": this.Lang(actionPtr, codes.Server_MenuSettingCache), "url": "/servers/server/settings/locations/cache?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "cache", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Cache != nil && locationConfig.Web.Cache.IsPrior && locationConfig.Web.Cache.IsOn, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingAuth), + "name": this.Lang(actionPtr, codes.Server_MenuSettingAuth), "url": "/servers/server/settings/locations/access?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "access", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Auth != nil && locationConfig.Web.Auth.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingReferers), + "name": this.Lang(actionPtr, codes.Server_MenuSettingReferers), "url": "/servers/server/settings/locations/referers?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "referer", "isOn": locationConfig.Web != nil && locationConfig.Web.Referers != nil && locationConfig.Web.Referers.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingUserAgents), + "name": this.Lang(actionPtr, codes.Server_MenuSettingUserAgents), "url": "/servers/server/settings/locations/userAgent?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "userAgent", "isOn": locationConfig.Web != nil && locationConfig.Web.UserAgent != nil && locationConfig.Web.UserAgent.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingCharset), + "name": this.Lang(actionPtr, codes.Server_MenuSettingCharset), "url": "/servers/server/settings/locations/charset?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "charset", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Charset != nil && locationConfig.Web.Charset.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingAccessLog), + "name": this.Lang(actionPtr, codes.Server_MenuSettingAccessLog), "url": "/servers/server/settings/locations/accessLog?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "accessLog", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.AccessLogRef != nil && locationConfig.Web.AccessLogRef.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingStat), + "name": this.Lang(actionPtr, codes.Server_MenuSettingStat), "url": "/servers/server/settings/locations/stat?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "stat", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.StatRef != nil && locationConfig.Web.StatRef.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingCompress), + "name": this.Lang(actionPtr, codes.Server_MenuSettingCompress), "url": "/servers/server/settings/locations/compression?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "compression", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Compression != nil && locationConfig.Web.Compression.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingPages), + "name": this.Lang(actionPtr, codes.Server_MenuSettingPages), "url": "/servers/server/settings/locations/pages?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "pages", "isOn": locationConfig != nil && locationConfig.Web != nil && (len(locationConfig.Web.Pages) > 0 || (locationConfig.Web.Shutdown != nil && locationConfig.Web.Shutdown.IsPrior)), }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingHTTPHeaders), + "name": this.Lang(actionPtr, codes.Server_MenuSettingHTTPHeaders), "url": "/servers/server/settings/locations/headers?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "header", "isOn": locationConfig != nil && this.hasHTTPHeaders(locationConfig.Web), }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingWebsocket), + "name": this.Lang(actionPtr, codes.Server_MenuSettingWebsocket), "url": "/servers/server/settings/locations/websocket?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "websocket", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.WebsocketRef != nil && locationConfig.Web.WebsocketRef.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingWebP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingWebP), "url": "/servers/server/settings/locations/webp?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "webp", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.WebP != nil && locationConfig.Web.WebP.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingRoot), + "name": this.Lang(actionPtr, codes.Server_MenuSettingRoot), "url": "/servers/server/settings/locations/web?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "web", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Root != nil && locationConfig.Web.Root.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingFastcgi), + "name": this.Lang(actionPtr, codes.Server_MenuSettingFastcgi), "url": "/servers/server/settings/locations/fastcgi?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "fastcgi", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.FastcgiRef != nil && locationConfig.Web.FastcgiRef.IsPrior, @@ -188,14 +188,14 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingClientIP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingClientIP), "url": "/servers/server/settings/locations/remoteAddr?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "remoteAddr", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.RemoteAddr != nil && locationConfig.Web.RemoteAddr.IsOn, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingRequestLimit), + "name": this.Lang(actionPtr, codes.Server_MenuSettingRequestLimit), "url": "/servers/server/settings/locations/requestLimit?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "requestLimit", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.RequestLimit != nil && locationConfig.Web.RequestLimit.IsOn, 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 114e3f7e..33700a37 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 @@ -2,6 +2,7 @@ package pages import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -36,7 +37,7 @@ func (this *IndexAction) RunPost(params struct { ShutdownJSON string Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的自定义页面设置", params.WebId) + defer this.CreateLogInfo(codes.ServerPage_LogUpdatePages, params.WebId) // TODO 检查配置 diff --git a/internal/web/actions/default/servers/server/settings/locations/referers/index.go b/internal/web/actions/default/servers/server/settings/locations/referers/index.go index ffc8946e..65522ac0 100644 --- a/internal/web/actions/default/servers/server/settings/locations/referers/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/referers/index.go @@ -4,6 +4,7 @@ package referers import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -54,7 +55,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 防盗链设置", params.WebId) + defer this.CreateLogInfo(codes.ServerReferer_LogUpdateReferers, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebReferers(this.AdminContext(), &pb.UpdateHTTPWebReferersRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/server/settings/locations/requestLimit/index.go b/internal/web/actions/default/servers/server/settings/locations/requestLimit/index.go index af47ce3d..47a8f0e6 100644 --- a/internal/web/actions/default/servers/server/settings/locations/requestLimit/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/requestLimit/index.go @@ -4,6 +4,7 @@ package requestlimit import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -40,7 +41,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 请求限制", params.WebId) + defer this.CreateLogInfo(codes.ServerRequestLimit_LogUpdateRequestLimitSettings, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestLimit(this.AdminContext(), &pb.UpdateHTTPWebRequestLimitRequest{ HttpWebId: params.WebId, 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 7b98accf..6524e12a 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 @@ -3,6 +3,7 @@ package reverseProxy import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -52,7 +53,7 @@ func (this *SettingAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改路由规则 %d 的反向代理设置", params.LocationId) + defer this.CreateLogInfo(codes.ServerReverseProxy_LogUpdateLocationReverseProxySettings, params.LocationId) // TODO 校验配置 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 c6def53d..63ee00ca 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 @@ -2,6 +2,7 @@ package stat import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -35,7 +36,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的统计设置", params.WebId) + defer this.CreateLogInfo(codes.ServerStat_LogUpdateStatSettings, params.WebId) // TODO 校验配置 diff --git a/internal/web/actions/default/servers/server/settings/locations/userAgent/index.go b/internal/web/actions/default/servers/server/settings/locations/userAgent/index.go index b579b020..754ebe05 100644 --- a/internal/web/actions/default/servers/server/settings/locations/userAgent/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/userAgent/index.go @@ -4,6 +4,7 @@ package userAgent import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -47,7 +48,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d User-Agent设置", params.WebId) + defer this.CreateLogInfo(codes.ServerUserAgent_LogUpdateUserAgents, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebUserAgent(this.AdminContext(), &pb.UpdateHTTPWebUserAgentRequest{ HttpWebId: params.WebId, 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 4459e235..20769838 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 @@ -2,6 +2,7 @@ package waf import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -56,7 +57,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的WAF设置", params.WebId) + defer this.CreateLogInfo(codes.ServerWAF_LogUpdateWAFSettings, params.WebId) // TODO 检查配置 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 620a35c8..ff5eaacb 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 @@ -2,6 +2,7 @@ package web import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -35,7 +36,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的根目录等设置", params.WebId) + defer this.CreateLogInfo(codes.ServerRoot_LogUpdateRoot, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{ HttpWebId: 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 b572cdbe..95ff521f 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 @@ -3,6 +3,7 @@ package websocket import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -40,7 +41,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的Websocket设置", params.WebId) + defer this.CreateLogInfo(codes.ServerWebsocket_LogUpdateWebsocketSettings, params.WebId) // TODO 检查配置 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 68828fa6..c08de1cc 100644 --- a/internal/web/actions/default/servers/server/settings/origins/addPopup.go +++ b/internal/web/actions/default/servers/server/settings/origins/addPopup.go @@ -3,9 +3,9 @@ package origins import ( "encoding/json" "errors" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -315,7 +315,7 @@ func (this *AddPopupAction) RunPost(params struct { } // 日志 - defer this.CreateLog(oplogs.LevelInfo, "为反向代理服务 %d 添加源站 %d", params.ReverseProxyId, originId) + defer this.CreateLogInfo(codes.ServerOrigin_LogCreateOrigin, 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 904f3832..c6d93f23 100644 --- a/internal/web/actions/default/servers/server/settings/origins/delete.go +++ b/internal/web/actions/default/servers/server/settings/origins/delete.go @@ -3,8 +3,8 @@ package origins import ( "encoding/json" "errors" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" ) @@ -83,7 +83,7 @@ func (this *DeleteAction) RunPost(params struct { } // 日志 - defer this.CreateLog(oplogs.LevelInfo, "删除反向代理服务 %d 的源站 %d", params.ReverseProxyId, params.OriginId) + defer this.CreateLogInfo(codes.ServerOrigin_LogDeleteOrigin, 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 cbb6a5dd..c4c0b5f1 100644 --- a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go +++ b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go @@ -2,9 +2,9 @@ package origins import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -333,7 +333,7 @@ func (this *UpdatePopupAction) RunPost(params struct { } // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改反向代理服务 %d 的源站 %d", params.ReverseProxyId, params.OriginId) + defer this.CreateLogInfo(codes.ServerOrigin_LogUpdateOrigin, 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 1c1473e5..405d496b 100644 --- a/internal/web/actions/default/servers/server/settings/pages/createPopup.go +++ b/internal/web/actions/default/servers/server/settings/pages/createPopup.go @@ -2,8 +2,8 @@ package pages import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -80,7 +80,7 @@ func (this *CreatePopupAction) RunPost(params struct { this.Data["page"] = pageConfig // 日志 - defer this.CreateLog(oplogs.LevelInfo, "创建自定义页面 %d", pageId) + defer this.CreateLogInfo(codes.ServerPage_LogCreatePage, 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 5b953aad..ad3120d0 100644 --- a/internal/web/actions/default/servers/server/settings/pages/index.go +++ b/internal/web/actions/default/servers/server/settings/pages/index.go @@ -1,8 +1,7 @@ package pages -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -52,7 +51,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的设置", params.WebId) + defer this.CreateLogInfo(codes.ServerPage_LogUpdatePages, params.WebId) // TODO 检查配置 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 63e1da81..972b6545 100644 --- a/internal/web/actions/default/servers/server/settings/pages/updatePopup.go +++ b/internal/web/actions/default/servers/server/settings/pages/updatePopup.go @@ -2,8 +2,8 @@ package pages import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -55,7 +55,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改自定义页面 %d", params.PageId) + defer this.CreateLogInfo(codes.ServerPage_LogUpdatePage, params.PageId) params.Must. Field("status", params.Status). diff --git a/internal/web/actions/default/servers/server/settings/redirects/index.go b/internal/web/actions/default/servers/server/settings/redirects/index.go index a5a014ce..e3a10a18 100644 --- a/internal/web/actions/default/servers/server/settings/redirects/index.go +++ b/internal/web/actions/default/servers/server/settings/redirects/index.go @@ -2,6 +2,7 @@ package redirects import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -39,7 +40,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的URL跳转设置", params.WebId) + defer this.CreateLogInfo(codes.ServerRedirect_LogUpdateRedirects, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebHostRedirects(this.AdminContext(), &pb.UpdateHTTPWebHostRedirectsRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/server/settings/referers/index.go b/internal/web/actions/default/servers/server/settings/referers/index.go index 040cd783..e9a5dee1 100644 --- a/internal/web/actions/default/servers/server/settings/referers/index.go +++ b/internal/web/actions/default/servers/server/settings/referers/index.go @@ -4,6 +4,7 @@ package referers import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -56,7 +57,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 防盗链设置", params.WebId) + defer this.CreateLogInfo(codes.ServerReferer_LogUpdateReferers, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebReferers(this.AdminContext(), &pb.UpdateHTTPWebReferersRequest{ HttpWebId: params.WebId, diff --git a/internal/web/actions/default/servers/server/settings/requestLimit/index.go b/internal/web/actions/default/servers/server/settings/requestLimit/index.go index c8ecdd5e..cdf00e5f 100644 --- a/internal/web/actions/default/servers/server/settings/requestLimit/index.go +++ b/internal/web/actions/default/servers/server/settings/requestLimit/index.go @@ -4,6 +4,7 @@ package requestlimit import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -54,7 +55,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d 请求限制", params.WebId) + defer this.CreateLogInfo(codes.ServerRequestLimit_LogUpdateRequestLimitSettings, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestLimit(this.AdminContext(), &pb.UpdateHTTPWebRequestLimitRequest{ HttpWebId: params.WebId, 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 1f5b0bed..6648779e 100644 --- a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go +++ b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go @@ -3,6 +3,7 @@ package reverseProxy import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -53,7 +54,7 @@ func (this *SettingAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改代理服务 %d 的反向代理设置", params.ServerId) + defer this.CreateLogInfo(codes.ServerReverseProxy_LogUpdateServerReverseProxySettings, params.ServerId) var reverseProxyConfig = &serverconfigs.ReverseProxyConfig{} err := json.Unmarshal(params.ReverseProxyJSON, 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 13947dfb..c6a99c31 100644 --- a/internal/web/actions/default/servers/server/settings/reverseProxy/updateSchedulingPopup.go +++ b/internal/web/actions/default/servers/server/settings/reverseProxy/updateSchedulingPopup.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/schedulingconfigs" @@ -118,7 +119,7 @@ func (this *UpdateSchedulingPopupAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改反向代理 %d 负载均衡算法", params.ReverseProxyId) + defer this.CreateLogInfo(codes.ReverseProxy_LogUpdateReverseProxyScheduling, params.ReverseProxyId) reverseProxyResp, err := this.RPC().ReverseProxyRPC().FindEnabledReverseProxyConfig(this.AdminContext(), &pb.FindEnabledReverseProxyConfigRequest{ReverseProxyId: params.ReverseProxyId}) if err != nil { 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 ee215fa4..cc43ea59 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go @@ -3,6 +3,7 @@ package rewrite import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -117,7 +118,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 日志 - defer this.CreateLogInfo("在Web %d 中创建重写规则 %d", params.WebId, createResp.RewriteRuleId) + defer this.CreateLogInfo(codes.HTTPRewriteRule_LogCreateRewriteRule, 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 3609ebde..1081bdb5 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/delete.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/delete.go @@ -3,6 +3,7 @@ package rewrite import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -16,7 +17,7 @@ func (this *DeleteAction) RunPost(params struct { WebId int64 RewriteRuleId int64 }) { - defer this.CreateLogInfo("从Web %d 中删除重写规则 %d", params.WebId, params.RewriteRuleId) + defer this.CreateLogInfo(codes.HTTPRewriteRule_LogDeleteRewriteRule, params.WebId, params.RewriteRuleId) webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithId(this.AdminContext(), params.WebId) if err != nil { 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 9712da3c..b751fd7e 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/sort.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/sort.go @@ -3,6 +3,7 @@ package rewrite import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -16,7 +17,7 @@ func (this *SortAction) RunPost(params struct { WebId int64 RewriteRuleIds []int64 }) { - defer this.CreateLogInfo("对Web %d 中的重写规则进行排序", params.WebId) + defer this.CreateLogInfo(codes.HTTPRewriteRule_LogSortRewriteRules, params.WebId) webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithId(this.AdminContext(), params.WebId) if err != nil { 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 0b543977..c7c8bfaa 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go @@ -3,6 +3,7 @@ package rewrite import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -62,7 +63,7 @@ func (this *UpdatePopupAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 中的重写规则 %d", params.WebId, params.RewriteRuleId) + defer this.CreateLogInfo(codes.HTTPRewriteRule_LogUpdateRewriteRule, params.WebId, params.RewriteRuleId) params.Must. Field("pattern", params.Pattern). diff --git a/internal/web/actions/default/servers/server/settings/serverNames/audit.go b/internal/web/actions/default/servers/server/settings/serverNames/audit.go index 5eb439a9..bd00229e 100644 --- a/internal/web/actions/default/servers/server/settings/serverNames/audit.go +++ b/internal/web/actions/default/servers/server/settings/serverNames/audit.go @@ -2,6 +2,7 @@ package serverNames import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -17,7 +18,7 @@ func (this *AuditAction) RunPost(params struct { CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("提交服务 %d 域名审核", params.ServerId) + defer this.CreateLogInfo(codes.Server_LogSubmitAuditingServer, params.ServerId) if !params.AuditingOK && len(params.AuditingReason) == 0 { this.FailField("auditingReason", "请输入审核不通过原因") 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 6c31e6fb..099eea78 100644 --- a/internal/web/actions/default/servers/server/settings/serverNames/index.go +++ b/internal/web/actions/default/servers/server/settings/serverNames/index.go @@ -2,8 +2,8 @@ package serverNames import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -88,7 +88,7 @@ func (this *IndexAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 记录日志 - defer this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 域名", params.ServerId) + defer this.CreateLogInfo(codes.Server_ServerNamesLogUpdateServerNames, 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 1d7b572b..5bfdf90c 100644 --- a/internal/web/actions/default/servers/server/settings/stat/index.go +++ b/internal/web/actions/default/servers/server/settings/stat/index.go @@ -2,6 +2,7 @@ package stat import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -49,7 +50,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的统计设置", params.WebId) + defer this.CreateLogInfo(codes.ServerStat_LogUpdateStatSettings, params.WebId) // TODO 校验配置 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 222327ba..8189a41b 100644 --- a/internal/web/actions/default/servers/server/settings/tcp/index.go +++ b/internal/web/actions/default/servers/server/settings/tcp/index.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -49,7 +50,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改代理服务 %d TCP设置", params.ServerId) + defer this.CreateLogInfo(codes.ServerTCP_LogUpdateTCPSettings, params.ServerId) server, _, isOk := serverutils.FindServer(this.Parent(), params.ServerId) if !isOk { 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 bbc38b06..d16a5721 100644 --- a/internal/web/actions/default/servers/server/settings/tls/index.go +++ b/internal/web/actions/default/servers/server/settings/tls/index.go @@ -5,6 +5,7 @@ import ( "errors" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" @@ -81,7 +82,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改代理服务 %d TLS设置", params.ServerId) + defer this.CreateLogInfo(codes.ServerTLS_LogUpdateTLSSettings, params.ServerId) server, _, isOk := serverutils.FindServer(this.Parent(), params.ServerId) if !isOk { diff --git a/internal/web/actions/default/servers/server/settings/udp/index.go b/internal/web/actions/default/servers/server/settings/udp/index.go index 17e03544..58940e4d 100644 --- a/internal/web/actions/default/servers/server/settings/udp/index.go +++ b/internal/web/actions/default/servers/server/settings/udp/index.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -49,7 +50,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改代理服务 %d UDP设置", params.ServerId) + defer this.CreateLogInfo(codes.NSCluster_LogUpdateNSClusterSettingsUDP, params.ServerId) server, _, isOk := serverutils.FindServer(this.Parent(), params.ServerId) if !isOk { diff --git a/internal/web/actions/default/servers/server/settings/userAgent/index.go b/internal/web/actions/default/servers/server/settings/userAgent/index.go index 15cac26c..7c7e4654 100644 --- a/internal/web/actions/default/servers/server/settings/userAgent/index.go +++ b/internal/web/actions/default/servers/server/settings/userAgent/index.go @@ -4,6 +4,7 @@ package userAgent import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -49,7 +50,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改Web %d User-Agent设置", params.WebId) + defer this.CreateLogInfo(codes.ServerUserAgent_LogUpdateUserAgents, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebUserAgent(this.AdminContext(), &pb.UpdateHTTPWebUserAgentRequest{ HttpWebId: params.WebId, 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 d9b6237f..e41c5852 100644 --- a/internal/web/actions/default/servers/server/settings/waf/index.go +++ b/internal/web/actions/default/servers/server/settings/waf/index.go @@ -2,6 +2,7 @@ package waf import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -81,7 +82,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的WAF设置", params.WebId) + defer this.CreateLogInfo(codes.ServerWAF_LogUpdateWAFSettings, params.WebId) // TODO 检查配置 diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go index 3479cffb..e2f0a09e 100644 --- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go @@ -2,8 +2,8 @@ package ipadmin import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -96,7 +96,7 @@ func (this *CountriesAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的国家和地区", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAF_LogUpdateForbiddenCountries, params.FirewallPolicyId) policyConfig, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), params.FirewallPolicyId) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/deleteIP.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/deleteIP.go index a5cf1dc2..0ea9d637 100644 --- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/deleteIP.go +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/deleteIP.go @@ -1,8 +1,7 @@ package ipadmin -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -15,7 +14,7 @@ func (this *DeleteIPAction) RunPost(params struct { ItemId int64 }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "从WAF策略 %d 名单中删除IP %d", params.FirewallPolicyId, params.ItemId) + defer this.CreateLogInfo(codes.WAF_LogDeleteIPFromWAFPolicy, params.FirewallPolicyId, params.ItemId) // TODO 判断权限 diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go index caa6a0cd..cb2070a5 100644 --- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go @@ -2,8 +2,8 @@ package ipadmin import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" @@ -97,7 +97,7 @@ func (this *ProvincesAction) RunPost(params struct { Must *actions.Must }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "WAF策略 %d 设置禁止访问的省份", params.FirewallPolicyId) + defer this.CreateLogInfo(codes.WAF_LogUpdateForbiddenProvinces, params.FirewallPolicyId) policyConfig, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), params.FirewallPolicyId) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go index 4744fdbe..26d783b7 100644 --- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/updateIPPopup.go @@ -1,9 +1,8 @@ package ipadmin -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/utils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -60,7 +59,7 @@ func (this *UpdateIPPopupAction) RunPost(params struct { CSRF *actionutils.CSRF }) { // 日志 - defer this.CreateLog(oplogs.LevelInfo, "修改WAF策略名单中的IP %d", params.ItemId) + defer this.CreateLogInfo(codes.IPItem_LogUpdateIPItem, params.ItemId) // TODO 校验ItemId所属用户 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 1b3ed146..9cff4535 100644 --- a/internal/web/actions/default/servers/server/settings/web/index.go +++ b/internal/web/actions/default/servers/server/settings/web/index.go @@ -2,6 +2,7 @@ package web import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" @@ -50,7 +51,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的首页文件名", params.WebId) + defer this.CreateLogInfo(codes.ServerRoot_LogUpdateRoot, params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{ HttpWebId: 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 1ddccb65..66b5b5c3 100644 --- a/internal/web/actions/default/servers/server/settings/websocket/index.go +++ b/internal/web/actions/default/servers/server/settings/websocket/index.go @@ -3,6 +3,7 @@ package websocket import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -53,7 +54,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改Web %d 的Websocket设置", params.WebId) + defer this.CreateLogInfo(codes.ServerWebsocket_LogUpdateWebsocketSettings, params.WebId) // TODO 检查配置 diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index bbae8a2d..0200b883 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -60,7 +60,7 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { return } - serverResp, err := rpcClient.ServerRPC().FindEnabledServer(rpcClient.Context(action.Context.GetInt64("adminId")), &pb.FindEnabledServerRequest{ + serverResp, err := rpcClient.ServerRPC().FindEnabledServer(rpcClient.Context(action.Context.GetInt64(teaconst.SessionAdminId)), &pb.FindEnabledServerRequest{ ServerId: serverId, IgnoreSSLCerts: true, }) @@ -117,16 +117,16 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { } if teaconst.IsPlus { - tabbar.Add(this.Lang(action, codes.AdminServerTabDashboard), "", "/servers/server/boards?serverId="+serverIdString, "dashboard", selectedTabbar == "board") + tabbar.Add(this.Lang(action, codes.Server_TabDashboard), "", "/servers/server/boards?serverId="+serverIdString, "dashboard", selectedTabbar == "board") } if family == "http" { - tabbar.Add(this.Lang(action, codes.AdminServerTabStat), "", "/servers/server/stat?serverId="+serverIdString, "chart area", selectedTabbar == "stat") + tabbar.Add(this.Lang(action, codes.Server_TabStat), "", "/servers/server/stat?serverId="+serverIdString, "chart area", selectedTabbar == "stat") } if family == "http" { - tabbar.Add(this.Lang(action, codes.AdminServerTabAccessLogs), "", "/servers/server/log?serverId="+serverIdString, "history", selectedTabbar == "log") + tabbar.Add(this.Lang(action, codes.Server_TabAccessLogs), "", "/servers/server/log?serverId="+serverIdString, "history", selectedTabbar == "log") } - tabbar.Add(this.Lang(action, codes.AdminServerTabSettings), "", "/servers/server/settings?serverId="+serverIdString, "setting", selectedTabbar == "setting") - tabbar.Add(this.Lang(action, codes.AdminServerTabDelete), "", "/servers/server/delete?serverId="+serverIdString, "trash", selectedTabbar == "delete") + tabbar.Add(this.Lang(action, codes.Server_TabSettings), "", "/servers/server/settings?serverId="+serverIdString, "setting", selectedTabbar == "setting") + tabbar.Add(this.Lang(action, codes.Server_TabDelete), "", "/servers/server/delete?serverId="+serverIdString, "trash", selectedTabbar == "delete") actionutils.SetTabbar(action, tabbar) @@ -159,7 +159,7 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { func (this *ServerHelper) createBoardMenu(secondMenuItem string, serverIdString string, serverConfig *serverconfigs.ServerConfig, actionPtr actions.ActionWrapper) []maps.Map { menuItems := []maps.Map{} menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuDashboard), + "name": this.Lang(actionPtr, codes.Server_MenuDashboard), "url": "/servers/server/board?serverId=" + serverIdString, "isActive": secondMenuItem == "index", }) @@ -170,17 +170,17 @@ func (this *ServerHelper) createBoardMenu(secondMenuItem string, serverIdString func (this *ServerHelper) createLogMenu(secondMenuItem string, serverIdString string, serverConfig *serverconfigs.ServerConfig, actionPtr actions.ActionWrapper) []maps.Map { menuItems := []maps.Map{} menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuAccesslogRealtime), + "name": this.Lang(actionPtr, codes.Server_MenuAccesslogRealtime), "url": "/servers/server/log?serverId=" + serverIdString, "isActive": secondMenuItem == "index", }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuAccesslogToday), + "name": this.Lang(actionPtr, codes.Server_MenuAccesslogToday), "url": "/servers/server/log/today?serverId=" + serverIdString, "isActive": secondMenuItem == "today", }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuAccesslogHistory), + "name": this.Lang(actionPtr, codes.Server_MenuAccesslogHistory), "url": "/servers/server/log/history?serverId=" + serverIdString, "isActive": secondMenuItem == "history", }) @@ -191,27 +191,27 @@ func (this *ServerHelper) createLogMenu(secondMenuItem string, serverIdString st func (this *ServerHelper) createStatMenu(secondMenuItem string, serverIdString string, serverConfig *serverconfigs.ServerConfig, actionPtr actions.ActionWrapper) []maps.Map { var menuItems = []maps.Map{} menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuStatTraffic), + "name": this.Lang(actionPtr, codes.Server_MenuStatTraffic), "url": "/servers/server/stat?serverId=" + serverIdString, "isActive": secondMenuItem == "index", }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuStatRegions), + "name": this.Lang(actionPtr, codes.Server_MenuStatRegions), "url": "/servers/server/stat/regions?serverId=" + serverIdString, "isActive": secondMenuItem == "region", }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuStatProviders), + "name": this.Lang(actionPtr, codes.Server_MenuStatProviders), "url": "/servers/server/stat/providers?serverId=" + serverIdString, "isActive": secondMenuItem == "provider", }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuStatClients), + "name": this.Lang(actionPtr, codes.Server_MenuStatClients), "url": "/servers/server/stat/clients?serverId=" + serverIdString, "isActive": secondMenuItem == "client", }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuStatWAF), + "name": this.Lang(actionPtr, codes.Server_MenuStatWAF), "url": "/servers/server/stat/waf?serverId=" + serverIdString, "isActive": secondMenuItem == "waf", }) @@ -222,13 +222,13 @@ func (this *ServerHelper) createStatMenu(secondMenuItem string, serverIdString s func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdString string, serverConfig *serverconfigs.ServerConfig, actionPtr actions.ActionWrapper) (items []maps.Map) { var menuItems = []maps.Map{ { - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingBasic), + "name": this.Lang(actionPtr, codes.Server_MenuSettingBasic), "url": "/servers/server/settings?serverId=" + serverIdString, "isActive": secondMenuItem == "basic", "isOff": !serverConfig.IsOn, }, { - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingDNS), + "name": this.Lang(actionPtr, codes.Server_MenuSettingDNS), "url": "/servers/server/settings/dns?serverId=" + serverIdString, "isActive": secondMenuItem == "dns", }, @@ -237,27 +237,27 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri // HTTP if serverConfig.IsHTTPFamily() { menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingDomains), + "name": this.Lang(actionPtr, codes.Server_MenuSettingDomains), "url": "/servers/server/settings/serverNames?serverId=" + serverIdString, "isActive": secondMenuItem == "serverName", "isOn": len(serverConfig.ServerNames) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingHTTP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingHTTP), "url": "/servers/server/settings/http?serverId=" + serverIdString, "isActive": secondMenuItem == "http", "isOn": (serverConfig.HTTP != nil && serverConfig.HTTP.IsOn && len(serverConfig.HTTP.Listen) > 0) || (serverConfig.Web != nil && serverConfig.Web.RedirectToHttps != nil && serverConfig.Web.RedirectToHttps.IsOn), "isOff": serverConfig.HTTP != nil && !serverConfig.HTTP.IsOn, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingHTTPS), + "name": this.Lang(actionPtr, codes.Server_MenuSettingHTTPS), "url": "/servers/server/settings/https?serverId=" + serverIdString, "isActive": secondMenuItem == "https", "isOn": serverConfig.HTTPS != nil && serverConfig.HTTPS.IsOn && len(serverConfig.HTTPS.Listen) > 0, "isOff": serverConfig.HTTPS != nil && !serverConfig.HTTPS.IsOn, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingOrigins), + "name": this.Lang(actionPtr, codes.Server_MenuSettingOrigins), "url": "/servers/server/settings/reverseProxy?serverId=" + serverIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": serverConfig.ReverseProxyRef != nil && serverConfig.ReverseProxyRef.IsOn, @@ -272,108 +272,108 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isActive": false, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingRedirects), + "name": this.Lang(actionPtr, codes.Server_MenuSettingRedirects), "url": "/servers/server/settings/redirects?serverId=" + serverIdString, "isActive": secondMenuItem == "redirects", "isOn": serverConfig.Web != nil && len(serverConfig.Web.HostRedirects) > 0, "configCode": serverconfigs.ConfigCodeHostRedirects, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingLocations), + "name": this.Lang(actionPtr, codes.Server_MenuSettingLocations), "url": "/servers/server/settings/locations?serverId=" + serverIdString, "isActive": secondMenuItem == "locations", "isOn": serverConfig.Web != nil && len(serverConfig.Web.Locations) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingRewriteRules), + "name": this.Lang(actionPtr, codes.Server_MenuSettingRewriteRules), "url": "/servers/server/settings/rewrite?serverId=" + serverIdString, "isActive": secondMenuItem == "rewrite", "isOn": serverConfig.Web != nil && len(serverConfig.Web.RewriteRefs) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingWAF), + "name": this.Lang(actionPtr, codes.Server_MenuSettingWAF), "url": "/servers/server/settings/waf?serverId=" + serverIdString, "isActive": secondMenuItem == "waf", "isOn": serverConfig.Web != nil && serverConfig.Web.FirewallRef != nil && serverConfig.Web.FirewallRef.IsOn, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingCache), + "name": this.Lang(actionPtr, codes.Server_MenuSettingCache), "url": "/servers/server/settings/cache?serverId=" + serverIdString, "isActive": secondMenuItem == "cache", "isOn": serverConfig.Web != nil && serverConfig.Web.Cache != nil && serverConfig.Web.Cache.IsOn, "configCode": serverconfigs.ConfigCodeCache, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingAuth), + "name": this.Lang(actionPtr, codes.Server_MenuSettingAuth), "url": "/servers/server/settings/access?serverId=" + serverIdString, "isActive": secondMenuItem == "access", "isOn": serverConfig.Web != nil && serverConfig.Web.Auth != nil && serverConfig.Web.Auth.IsOn, "configCode": serverconfigs.ConfigCodeAuth, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingReferers), + "name": this.Lang(actionPtr, codes.Server_MenuSettingReferers), "url": "/servers/server/settings/referers?serverId=" + serverIdString, "isActive": secondMenuItem == "referer", "isOn": serverConfig.Web != nil && serverConfig.Web.Referers != nil && serverConfig.Web.Referers.IsOn, "configCode": serverconfigs.ConfigCodeReferers, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingUserAgents), + "name": this.Lang(actionPtr, codes.Server_MenuSettingUserAgents), "url": "/servers/server/settings/userAgent?serverId=" + serverIdString, "isActive": secondMenuItem == "userAgent", "isOn": serverConfig.Web != nil && serverConfig.Web.UserAgent != nil && serverConfig.Web.UserAgent.IsOn, "configCode": serverconfigs.ConfigCodeUserAgent, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingCharset), + "name": this.Lang(actionPtr, codes.Server_MenuSettingCharset), "url": "/servers/server/settings/charset?serverId=" + serverIdString, "isActive": secondMenuItem == "charset", "isOn": serverConfig.Web != nil && serverConfig.Web.Charset != nil && serverConfig.Web.Charset.IsOn, "configCode": serverconfigs.ConfigCodeCharset, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingAccessLog), + "name": this.Lang(actionPtr, codes.Server_MenuSettingAccessLog), "url": "/servers/server/settings/accessLog?serverId=" + serverIdString, "isActive": secondMenuItem == "accessLog", "isOn": serverConfig.Web != nil && serverConfig.Web.AccessLogRef != nil && serverConfig.Web.AccessLogRef.IsOn, "configCode": serverconfigs.ConfigCodeAccessLog, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingStat), + "name": this.Lang(actionPtr, codes.Server_MenuSettingStat), "url": "/servers/server/settings/stat?serverId=" + serverIdString, "isActive": secondMenuItem == "stat", "isOn": serverConfig.Web != nil && serverConfig.Web.StatRef != nil && serverConfig.Web.StatRef.IsOn, "configCode": serverconfigs.ConfigCodeStat, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingCompress), + "name": this.Lang(actionPtr, codes.Server_MenuSettingCompress), "url": "/servers/server/settings/compression?serverId=" + serverIdString, "isActive": secondMenuItem == "compression", "isOn": serverConfig.Web != nil && serverConfig.Web.Compression != nil && serverConfig.Web.Compression.IsOn, "configCode": serverconfigs.ConfigCodeCompression, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingPages), + "name": this.Lang(actionPtr, codes.Server_MenuSettingPages), "url": "/servers/server/settings/pages?serverId=" + serverIdString, "isActive": secondMenuItem == "pages", "isOn": serverConfig.Web != nil && (len(serverConfig.Web.Pages) > 0 || (serverConfig.Web.Shutdown != nil && serverConfig.Web.Shutdown.IsOn)), "configCode": serverconfigs.ConfigCodePages, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingHTTPHeaders), + "name": this.Lang(actionPtr, codes.Server_MenuSettingHTTPHeaders), "url": "/servers/server/settings/headers?serverId=" + serverIdString, "isActive": secondMenuItem == "header", "isOn": this.hasHTTPHeaders(serverConfig.Web), }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingWebsocket), + "name": this.Lang(actionPtr, codes.Server_MenuSettingWebsocket), "url": "/servers/server/settings/websocket?serverId=" + serverIdString, "isActive": secondMenuItem == "websocket", "isOn": serverConfig.Web != nil && serverConfig.Web.WebsocketRef != nil && serverConfig.Web.WebsocketRef.IsOn, "configCode": serverconfigs.ConfigCodeWebsocket, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingWebP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingWebP), "url": "/servers/server/settings/webp?serverId=" + serverIdString, "isActive": secondMenuItem == "webp", "isOn": serverConfig.Web != nil && serverConfig.Web.WebP != nil && serverConfig.Web.WebP.IsOn, @@ -381,14 +381,14 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingRoot), + "name": this.Lang(actionPtr, codes.Server_MenuSettingRoot), "url": "/servers/server/settings/web?serverId=" + serverIdString, "isActive": secondMenuItem == "web", "isOn": serverConfig.Web != nil && serverConfig.Web.Root != nil && serverConfig.Web.Root.IsOn, "configCode": serverconfigs.ConfigCodeRoot, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingFastcgi), + "name": this.Lang(actionPtr, codes.Server_MenuSettingFastcgi), "url": "/servers/server/settings/fastcgi?serverId=" + serverIdString, "isActive": secondMenuItem == "fastcgi", "isOn": serverConfig.Web != nil && serverConfig.Web.FastcgiRef != nil && serverConfig.Web.FastcgiRef.IsOn, @@ -401,7 +401,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingClientIP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingClientIP), "url": "/servers/server/settings/remoteAddr?serverId=" + serverIdString, "isActive": secondMenuItem == "remoteAddr", "isOn": serverConfig.Web != nil && serverConfig.Web.RemoteAddr != nil && serverConfig.Web.RemoteAddr.IsOn, @@ -409,7 +409,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingRequestLimit), + "name": this.Lang(actionPtr, codes.Server_MenuSettingRequestLimit), "url": "/servers/server/settings/requestLimit?serverId=" + serverIdString, "isActive": secondMenuItem == "requestLimit", "isOn": serverConfig.Web != nil && serverConfig.Web.RequestLimit != nil && serverConfig.Web.RequestLimit.IsOn, @@ -425,46 +425,46 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingOthers), + "name": this.Lang(actionPtr, codes.Server_MenuSettingOthers), "url": "/servers/server/settings/common?serverId=" + serverIdString, "isActive": secondMenuItem == "common", "isOn": serverConfig.Web != nil && serverConfig.Web.MergeSlashes, }) } else if serverConfig.IsTCPFamily() { menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingTCP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingTCP), "url": "/servers/server/settings/tcp?serverId=" + serverIdString, "isActive": secondMenuItem == "tcp", "isOn": serverConfig.TCP != nil && serverConfig.TCP.IsOn && len(serverConfig.TCP.Listen) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingTLS), + "name": this.Lang(actionPtr, codes.Server_MenuSettingTLS), "url": "/servers/server/settings/tls?serverId=" + serverIdString, "isActive": secondMenuItem == "tls", "isOn": serverConfig.TLS != nil && serverConfig.TLS.IsOn && len(serverConfig.TLS.Listen) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingOrigins), + "name": this.Lang(actionPtr, codes.Server_MenuSettingOrigins), "url": "/servers/server/settings/reverseProxy?serverId=" + serverIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": serverConfig.ReverseProxyRef != nil && serverConfig.ReverseProxyRef.IsOn, }) } else if serverConfig.IsUnixFamily() { menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingUnix), + "name": this.Lang(actionPtr, codes.Server_MenuSettingUnix), "url": "/servers/server/settings/unix?serverId=" + serverIdString, "isActive": secondMenuItem == "unix", "isOn": serverConfig.Unix != nil && serverConfig.Unix.IsOn && len(serverConfig.Unix.Listen) > 0, }) } else if serverConfig.IsUDPFamily() { menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingUDP), + "name": this.Lang(actionPtr, codes.Server_MenuSettingUDP), "url": "/servers/server/settings/udp?serverId=" + serverIdString, "isActive": secondMenuItem == "udp", "isOn": serverConfig.UDP != nil && serverConfig.UDP.IsOn && len(serverConfig.UDP.Listen) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingOrigins), + "name": this.Lang(actionPtr, codes.Server_MenuSettingOrigins), "url": "/servers/server/settings/reverseProxy?serverId=" + serverIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": serverConfig.ReverseProxyRef != nil && serverConfig.ReverseProxyRef.IsOn, @@ -478,7 +478,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri func (this *ServerHelper) createDeleteMenu(secondMenuItem string, serverIdString string, serverConfig *serverconfigs.ServerConfig, actionPtr actions.ActionWrapper) []maps.Map { menuItems := []maps.Map{} menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.AdminServerMenuSettingDelete), + "name": this.Lang(actionPtr, codes.Server_MenuSettingDelete), "url": "/servers/server/delete?serverId=" + serverIdString, "isActive": secondMenuItem == "index", }) diff --git a/internal/web/actions/default/settings/api/delete.go b/internal/web/actions/default/settings/api/delete.go index d11501cd..199ca69c 100644 --- a/internal/web/actions/default/settings/api/delete.go +++ b/internal/web/actions/default/settings/api/delete.go @@ -1,8 +1,7 @@ package api -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,7 +13,7 @@ func (this *DeleteAction) RunPost(params struct { NodeId int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除API节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.APINode_LogDeleteAPINode, params.NodeId) // 检查是否是唯一的节点 nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId}) diff --git a/internal/web/actions/default/settings/api/node/createPopup.go b/internal/web/actions/default/settings/api/node/createPopup.go index ed2c7c58..01ef43f3 100644 --- a/internal/web/actions/default/settings/api/node/createPopup.go +++ b/internal/web/actions/default/settings/api/node/createPopup.go @@ -2,9 +2,9 @@ package node import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" @@ -211,7 +211,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建API节点 %d", createResp.ApiNodeId) + defer this.CreateLogInfo(codes.APINode_LogCreateAPINode, createResp.ApiNodeId) this.Success() } diff --git a/internal/web/actions/default/settings/api/node/update.go b/internal/web/actions/default/settings/api/node/update.go index ecb64e8b..2506c2d4 100644 --- a/internal/web/actions/default/settings/api/node/update.go +++ b/internal/web/actions/default/settings/api/node/update.go @@ -2,9 +2,9 @@ package node import ( "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" @@ -335,7 +335,7 @@ func (this *UpdateAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改API节点 %d", params.NodeId) + defer this.CreateLogInfo(codes.APINode_LogUpdateAPINode, params.NodeId) this.Success() } diff --git a/internal/web/actions/default/settings/database/cleanSetting.go b/internal/web/actions/default/settings/database/cleanSetting.go index df9a0a69..216de840 100644 --- a/internal/web/actions/default/settings/database/cleanSetting.go +++ b/internal/web/actions/default/settings/database/cleanSetting.go @@ -3,6 +3,7 @@ package database import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" "github.com/iwind/TeaGo/actions" @@ -42,7 +43,7 @@ func (this *CleanSettingAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改数据库自动清理设置") + defer this.CreateLogInfo(codes.Database_LogUpdateCleanDays) days := params.Days if days < 0 { diff --git a/internal/web/actions/default/settings/database/deleteTable.go b/internal/web/actions/default/settings/database/deleteTable.go index b41ac843..eb989498 100644 --- a/internal/web/actions/default/settings/database/deleteTable.go +++ b/internal/web/actions/default/settings/database/deleteTable.go @@ -2,6 +2,7 @@ package database import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteTableAction struct { func (this *DeleteTableAction) RunPost(params struct { Table string }) { - defer this.CreateLogInfo("删除数据表 %s", params.Table) + defer this.CreateLogInfo(codes.Database_LogDeleteTable, params.Table) _, err := this.RPC().DBRPC().DeleteDBTable(this.AdminContext(), &pb.DeleteDBTableRequest{DbTable: params.Table}) if err != nil { diff --git a/internal/web/actions/default/settings/database/truncateTable.go b/internal/web/actions/default/settings/database/truncateTable.go index 07b1b3b8..aca862fa 100644 --- a/internal/web/actions/default/settings/database/truncateTable.go +++ b/internal/web/actions/default/settings/database/truncateTable.go @@ -2,6 +2,7 @@ package database import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type TruncateTableAction struct { func (this *TruncateTableAction) RunPost(params struct { Table string }) { - defer this.CreateLogInfo("清空数据表 %s 数据", params.Table) + defer this.CreateLogInfo(codes.Database_LogTruncateTable, params.Table) _, err := this.RPC().DBRPC().TruncateDBTable(this.AdminContext(), &pb.TruncateDBTableRequest{DbTable: params.Table}) if err != nil { diff --git a/internal/web/actions/default/settings/database/update.go b/internal/web/actions/default/settings/database/update.go index 1f2064da..6f05adea 100644 --- a/internal/web/actions/default/settings/database/update.go +++ b/internal/web/actions/default/settings/database/update.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/go-sql-driver/mysql" "github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/actions" @@ -99,7 +100,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改API节点数据库设置") + defer this.CreateLogInfo(codes.Database_LogUpdateAPINodeDatabaseConfig) params.Must. Field("host", params.Host). diff --git a/internal/web/actions/default/settings/login/index.go b/internal/web/actions/default/settings/login/index.go index 5f55c507..54c1bc0f 100644 --- a/internal/web/actions/default/settings/login/index.go +++ b/internal/web/actions/default/settings/login/index.go @@ -3,6 +3,7 @@ package login import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -42,7 +43,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改登录设置") + defer this.CreateLogInfo(codes.AdminLogin_LogUpdateLogin) params.Must. Field("username", params.Username). diff --git a/internal/web/actions/default/settings/profile/index.go b/internal/web/actions/default/settings/profile/index.go index da55a8f4..4c5dbb22 100644 --- a/internal/web/actions/default/settings/profile/index.go +++ b/internal/web/actions/default/settings/profile/index.go @@ -3,6 +3,7 @@ package database import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -40,7 +41,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改个人资料") + defer this.CreateLogInfo(codes.AdminProfile_LogUpdateProfile) params.Must. Field("fullname", params.Fullname). diff --git a/internal/web/actions/default/settings/security/index.go b/internal/web/actions/default/settings/security/index.go index 0381a6f1..1835b2f4 100644 --- a/internal/web/actions/default/settings/security/index.go +++ b/internal/web/actions/default/settings/security/index.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/iwind/TeaGo/actions" @@ -87,7 +88,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改管理界面安全设置") + defer this.CreateLogInfo(codes.AdminSecurity_LogUpdateSecuritySettings) config, err := configloaders.LoadSecurityConfig() if err != nil { diff --git a/internal/web/actions/default/settings/server/updateHTTPPopup.go b/internal/web/actions/default/settings/server/updateHTTPPopup.go index 8cbf7c23..1c942bb2 100644 --- a/internal/web/actions/default/settings/server/updateHTTPPopup.go +++ b/internal/web/actions/default/settings/server/updateHTTPPopup.go @@ -4,6 +4,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" adminserverutils "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/server/admin-server-utils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/iwind/TeaGo/actions" "net" ) @@ -33,7 +34,7 @@ func (this *UpdateHTTPPopupAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改管理界面的HTTP设置") + defer this.CreateLogInfo(codes.AdminServer_LogUpdateServerHTTPSettings) if len(params.Listens) == 0 { this.Fail("请输入绑定地址") diff --git a/internal/web/actions/default/settings/server/updateHTTPSPopup.go b/internal/web/actions/default/settings/server/updateHTTPSPopup.go index 27311530..3b2a2f1b 100644 --- a/internal/web/actions/default/settings/server/updateHTTPSPopup.go +++ b/internal/web/actions/default/settings/server/updateHTTPSPopup.go @@ -5,6 +5,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" adminserverutils "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/server/admin-server-utils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "github.com/iwind/TeaGo/Tea" @@ -65,7 +66,7 @@ func (this *UpdateHTTPSPopupAction) RunPost(params struct { Must *actions.Must }) { - defer this.CreateLogInfo("修改管理界面的HTTPS设置") + defer this.CreateLogInfo(codes.AdminServer_LogUpdateServerHTTPSSettings) if len(params.Listens) == 0 { this.Fail("请输入绑定地址") diff --git a/internal/web/actions/default/settings/settingutils/advanced_helper.go b/internal/web/actions/default/settings/settingutils/advanced_helper.go index 84695cf1..2a4b89bf 100644 --- a/internal/web/actions/default/settings/settingutils/advanced_helper.go +++ b/internal/web/actions/default/settings/settingutils/advanced_helper.go @@ -4,6 +4,7 @@ package settingutils import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" @@ -34,12 +35,12 @@ func (this *AdvancedHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNex // 标签栏 var tabbar = actionutils.NewTabbar() var session = action.Session() - var adminId = session.GetInt64("adminId") + var adminId = session.GetInt64(teaconst.SessionAdminId) if configloaders.AllowModule(adminId, configloaders.AdminModuleCodeSetting) { - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabTransfer), "", "/settings/database", "", this.tab == "database") - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabAPINodes), "", "/settings/api", "", this.tab == "apiNodes") - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabAccessLogDatabases), "", "/db", "", this.tab == "dbNodes") - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabTransfer), "", "/settings/transfer", "", this.tab == "transfer") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabTransfer), "", "/settings/database", "", this.tab == "database") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAPINodes), "", "/settings/api", "", this.tab == "apiNodes") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAccessLogDatabases), "", "/db", "", this.tab == "dbNodes") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabTransfer), "", "/settings/transfer", "", this.tab == "transfer") //tabbar.Add(codes.AdminSettingsTabBackup, "", "/settings/backup", "", this.tab == "backup") } diff --git a/internal/web/actions/default/settings/settingutils/helper.go b/internal/web/actions/default/settings/settingutils/helper.go index ef70d142..1066e5e7 100644 --- a/internal/web/actions/default/settings/settingutils/helper.go +++ b/internal/web/actions/default/settings/settingutils/helper.go @@ -4,6 +4,7 @@ package settingutils import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" @@ -34,15 +35,15 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) // 标签栏 var tabbar = actionutils.NewTabbar() var session = action.Session() - var adminId = session.GetInt64("adminId") + var adminId = session.GetInt64(teaconst.SessionAdminId) if configloaders.AllowModule(adminId, configloaders.AdminModuleCodeSetting) { - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabAdminServer), "", "/settings/server", "", this.tab == "server") - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabAdminUI), "", "/settings/ui", "", this.tab == "ui") - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabAdminSecuritySettings), "", "/settings/security", "", this.tab == "security") - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabUpdates), "", "/settings/updates", "", this.tab == "updates") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAdminServer), "", "/settings/server", "", this.tab == "server") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAdminUI), "", "/settings/ui", "", this.tab == "ui") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabAdminSecuritySettings), "", "/settings/security", "", this.tab == "security") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabUpdates), "", "/settings/updates", "", this.tab == "updates") } - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabProfile), "", "/settings/profile", "", this.tab == "profile") - tabbar.Add(this.Lang(actionPtr, codes.AdminSettingsTabLogin), "", "/settings/login", "", this.tab == "login") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabProfile), "", "/settings/profile", "", this.tab == "profile") + tabbar.Add(this.Lang(actionPtr, codes.AdminSetting_TabLogin), "", "/settings/login", "", this.tab == "login") actionutils.SetTabbar(actionPtr, tabbar) return diff --git a/internal/web/actions/default/settings/ui/index.go b/internal/web/actions/default/settings/ui/index.go index 658127be..84c93443 100644 --- a/internal/web/actions/default/settings/ui/index.go +++ b/internal/web/actions/default/settings/ui/index.go @@ -3,6 +3,7 @@ package ui import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/userconfigs" @@ -61,7 +62,7 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改管理界面设置") + defer this.CreateLogInfo(codes.AdminUI_LogUpdateUISettings) params.Must. Field("productName", params.ProductName). diff --git a/internal/web/actions/default/settings/updates/ignoreVersion.go b/internal/web/actions/default/settings/updates/ignoreVersion.go index 7e8959a5..aa67887b 100644 --- a/internal/web/actions/default/settings/updates/ignoreVersion.go +++ b/internal/web/actions/default/settings/updates/ignoreVersion.go @@ -6,6 +6,7 @@ import ( "encoding/json" teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" ) @@ -17,7 +18,7 @@ type IgnoreVersionAction struct { func (this *IgnoreVersionAction) RunPost(params struct { Version string }) { - defer this.CreateLogInfo("忽略升级版本 %s", params.Version) + defer this.CreateLogInfo(codes.AdminUpdate_LogIgnoreVersion, params.Version) if len(params.Version) == 0 { this.Fail("请输入要忽略的版本号") diff --git a/internal/web/actions/default/settings/updates/resetIgnoredVersion.go b/internal/web/actions/default/settings/updates/resetIgnoredVersion.go index 106a5bb0..f0b5b075 100644 --- a/internal/web/actions/default/settings/updates/resetIgnoredVersion.go +++ b/internal/web/actions/default/settings/updates/resetIgnoredVersion.go @@ -5,6 +5,7 @@ package updates import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" ) @@ -14,7 +15,7 @@ type ResetIgnoredVersionAction struct { } func (this *ResetIgnoredVersionAction) RunPost(params struct{}) { - defer this.CreateLogInfo("重置忽略升级版本") + defer this.CreateLogInfo(codes.AdminUpdate_LogResetIgnoreVersion) valueResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeCheckUpdates}) if err != nil { diff --git a/internal/web/actions/default/settings/updates/update.go b/internal/web/actions/default/settings/updates/update.go index e3863f3e..cfa4e3e7 100644 --- a/internal/web/actions/default/settings/updates/update.go +++ b/internal/web/actions/default/settings/updates/update.go @@ -6,6 +6,7 @@ import ( "encoding/json" teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" ) @@ -17,7 +18,7 @@ type UpdateAction struct { func (this *UpdateAction) RunPost(params struct { AutoCheck bool }) { - defer this.CreateLogInfo("修改检查更新设置") + defer this.CreateLogInfo(codes.AdminUpdate_LogUpdateCheckSettings) // 读取当前设置 valueResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeCheckUpdates}) diff --git a/internal/web/actions/default/users/accesskeys/createPopup.go b/internal/web/actions/default/users/accesskeys/createPopup.go index 6cc7e7cd..4b7e0155 100644 --- a/internal/web/actions/default/users/accesskeys/createPopup.go +++ b/internal/web/actions/default/users/accesskeys/createPopup.go @@ -4,6 +4,7 @@ package accesskeys import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -43,7 +44,7 @@ func (this *CreatePopupAction) RunPost(params struct { return } - defer this.CreateLogInfo("创建AccessKey %d", accessKeyIdResp.UserAccessKeyId) + defer this.CreateLogInfo(codes.UserAccessKey_LogCreateUserAccessKey, accessKeyIdResp.UserAccessKeyId) this.Success() } diff --git a/internal/web/actions/default/users/accesskeys/delete.go b/internal/web/actions/default/users/accesskeys/delete.go index fd84da1c..dc837b6f 100644 --- a/internal/web/actions/default/users/accesskeys/delete.go +++ b/internal/web/actions/default/users/accesskeys/delete.go @@ -2,6 +2,7 @@ package accesskeys import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { AccessKeyId int64 }) { - defer this.CreateLogInfo("删除AccessKey %d", params.AccessKeyId) + defer this.CreateLogInfo(codes.UserAccessKey_LogDeleteUserAccessKey, params.AccessKeyId) _, err := this.RPC().UserAccessKeyRPC().DeleteUserAccessKey(this.AdminContext(), &pb.DeleteUserAccessKeyRequest{UserAccessKeyId: params.AccessKeyId}) if err != nil { diff --git a/internal/web/actions/default/users/accesskeys/updateIsOn.go b/internal/web/actions/default/users/accesskeys/updateIsOn.go index 7720cecf..e4f4b0c8 100644 --- a/internal/web/actions/default/users/accesskeys/updateIsOn.go +++ b/internal/web/actions/default/users/accesskeys/updateIsOn.go @@ -2,6 +2,7 @@ package accesskeys import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -13,7 +14,7 @@ func (this *UpdateIsOnAction) RunPost(params struct { AccessKeyId int64 IsOn bool }) { - defer this.CreateLogInfo("设置AccessKey %d 启用状态", params.AccessKeyId) + defer this.CreateLogInfo(codes.UserAccessKey_LogUpdateUserAccessKeyIsOn, params.AccessKeyId) _, err := this.RPC().UserAccessKeyRPC().UpdateUserAccessKeyIsOn(this.AdminContext(), &pb.UpdateUserAccessKeyIsOnRequest{ UserAccessKeyId: params.AccessKeyId, diff --git a/internal/web/actions/default/users/createPopup.go b/internal/web/actions/default/users/createPopup.go index e7ae5c0f..889efe8f 100644 --- a/internal/web/actions/default/users/createPopup.go +++ b/internal/web/actions/default/users/createPopup.go @@ -5,6 +5,7 @@ import ( teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/userconfigs" @@ -46,7 +47,7 @@ func (this *CreatePopupAction) RunPost(params struct { var userId int64 defer func() { - this.CreateLogInfo("创建用户 %d", userId) + this.CreateLogInfo(codes.User_LogCreateUser, userId) }() params.Must. diff --git a/internal/web/actions/default/users/delete.go b/internal/web/actions/default/users/delete.go index 10c1769d..0c0a8057 100644 --- a/internal/web/actions/default/users/delete.go +++ b/internal/web/actions/default/users/delete.go @@ -2,6 +2,7 @@ package users import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -12,7 +13,7 @@ type DeleteAction struct { func (this *DeleteAction) RunPost(params struct { UserId int64 }) { - defer this.CreateLogInfo("删除用户 %d", params.UserId) + defer this.CreateLogInfo(codes.User_LogDeleteUser, params.UserId) // TODO 检查用户是否有未完成的业务 diff --git a/internal/web/actions/default/users/features.go b/internal/web/actions/default/users/features.go index f35a99ce..9afc2a4d 100644 --- a/internal/web/actions/default/users/features.go +++ b/internal/web/actions/default/users/features.go @@ -3,6 +3,7 @@ package users import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/users/userutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" @@ -64,7 +65,7 @@ func (this *FeaturesAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("设置用户 %d 的功能列表", params.UserId) + defer this.CreateLogInfo(codes.User_LogUpdateUserFeatures, params.UserId) _, err := this.RPC().UserRPC().UpdateUserFeatures(this.AdminContext(), &pb.UpdateUserFeaturesRequest{ UserId: params.UserId, diff --git a/internal/web/actions/default/users/update.go b/internal/web/actions/default/users/update.go index 7e487728..8ab6687c 100644 --- a/internal/web/actions/default/users/update.go +++ b/internal/web/actions/default/users/update.go @@ -3,6 +3,7 @@ package users import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/users/userutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/maps" @@ -107,7 +108,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("修改用户 %d", params.UserId) + defer this.CreateLogInfo(codes.User_LogUpdateUser, params.UserId) params.Must. Field("username", params.Username). diff --git a/internal/web/actions/default/users/verifyPopup.go b/internal/web/actions/default/users/verifyPopup.go index cdd9b275..a6944b7d 100644 --- a/internal/web/actions/default/users/verifyPopup.go +++ b/internal/web/actions/default/users/verifyPopup.go @@ -4,6 +4,7 @@ package users import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" ) @@ -28,7 +29,7 @@ func (this *VerifyPopupAction) RunPost(params struct { Must *actions.Must CSRF *actionutils.CSRF }) { - defer this.CreateLogInfo("审核用户：%d 结果：%s", params.UserId, params.Result) + defer this.CreateLogInfo(codes.User_LogVerifyUser, params.UserId, params.Result) if params.Result == "pass" { params.RejectReason = "" diff --git a/internal/web/helpers/helper_lang.go b/internal/web/helpers/helper_lang.go index 68f65d56..87b43b59 100644 --- a/internal/web/helpers/helper_lang.go +++ b/internal/web/helpers/helper_lang.go @@ -4,6 +4,7 @@ package helpers import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeCommon/pkg/langs" "github.com/iwind/TeaGo/actions" ) @@ -12,7 +13,7 @@ type LangHelper struct { } func (this *LangHelper) Lang(actionPtr actions.ActionWrapper, messageCode langs.MessageCode, args ...any) string { - var langCode = configloaders.FindAdminLang(actionPtr.Object().Session().GetInt64("adminId")) + var langCode = configloaders.FindAdminLang(actionPtr.Object().Session().GetInt64(teaconst.SessionAdminId)) if len(langCode) == 0 { langCode = langs.ParseLangFromAction(actionPtr) } diff --git a/internal/web/helpers/menu.go b/internal/web/helpers/menu.go index a953f8ce..b7fe5b62 100644 --- a/internal/web/helpers/menu.go +++ b/internal/web/helpers/menu.go @@ -15,28 +15,28 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i { "code": "dashboard", "module": configloaders.AdminModuleCodeDashboard, - "name": langs.Message(langCode, codes.AdminMenuDashboard), + "name": langs.Message(langCode, codes.AdminMenu_Dashboard), "icon": "dashboard", }, { "code": "servers", "module": configloaders.AdminModuleCodeServer, - "name": langs.Message(langCode, codes.AdminMenuServers), + "name": langs.Message(langCode, codes.AdminMenu_Servers), "subtitle": "", "icon": "clone outsize", "subItems": []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuServerAccessLogs), + "name": langs.Message(langCode, codes.AdminMenu_ServerAccessLogs), "url": "/servers/logs", "code": "log", }, { - "name": langs.Message(langCode, codes.AdminMenuServerCerts), + "name": langs.Message(langCode, codes.AdminMenu_ServerCerts), "url": "/servers/certs", "code": "cert", }, { - "name": langs.Message(langCode, codes.AdminMenuServerGroups), + "name": langs.Message(langCode, codes.AdminMenu_ServerGroups), "url": "/servers/groups", "code": "group", }, @@ -46,12 +46,12 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i "code": "", }, { - "name": langs.Message(langCode, codes.AdminMenuServerCachePolicies), + "name": langs.Message(langCode, codes.AdminMenu_ServerCachePolicies), "url": "/servers/components/cache", "code": "cache", }, { - "name": langs.Message(langCode, codes.AdminMenuServerPurgeFetchCaches), + "name": langs.Message(langCode, codes.AdminMenu_ServerPurgeFetchCaches), "url": "/servers/components/cache/batch", "code": "cacheBatch", }, @@ -61,12 +61,12 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i "code": "", }, { - "name": langs.Message(langCode, codes.AdminMenuServerWAFPolicies), + "name": langs.Message(langCode, codes.AdminMenu_ServerWAFPolicies), "url": "/servers/components/waf", "code": "waf", }, { - "name": langs.Message(langCode, codes.AdminMenuServerIPLists), + "name": langs.Message(langCode, codes.AdminMenu_ServerIPLists), "url": "/servers/iplists", "code": "iplist", "badge": countUnreadIPItems, @@ -77,12 +77,12 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i "code": "", }, { - "name": langs.Message(langCode, codes.AdminMenuServerMetrics), + "name": langs.Message(langCode, codes.AdminMenu_ServerMetrics), "url": "/servers/metrics", "code": "metric", }, { - "name": langs.Message(langCode, codes.AdminMenuServerGlobalSettings), + "name": langs.Message(langCode, codes.AdminMenu_ServerGlobalSettings), "url": "/servers/components", "code": "global", }, @@ -91,28 +91,28 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i { "code": "clusters", "module": configloaders.AdminModuleCodeNode, - "name": langs.Message(langCode, codes.AdminMenuNodes), + "name": langs.Message(langCode, codes.AdminMenu_Nodes), "subtitle": "", "icon": "cloud", "subItems": []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuNodeClusters), + "name": langs.Message(langCode, codes.AdminMenu_NodeClusters), "url": "/clusters", "code": "cluster", }, { - "name": langs.Message(langCode, codes.AdminMenuNodeLogs), + "name": langs.Message(langCode, codes.AdminMenu_NodeLogs), "url": "/clusters/logs?type=" + nodeLogsType, "code": "log", "badge": countUnreadNodeLogs, }, { - "name": langs.Message(langCode, codes.AdminMenuNodeRegions), + "name": langs.Message(langCode, codes.AdminMenu_NodeRegions), "url": "/clusters/regions", "code": "region", }, { - "name": langs.Message(langCode, codes.AdminMenuNodeSSHGrants), + "name": langs.Message(langCode, codes.AdminMenu_NodeSSHGrants), "url": "/clusters/grants", "code": "grant", }, @@ -121,22 +121,22 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i { "code": "dns", "module": configloaders.AdminModuleCodeDNS, - "name": langs.Message(langCode, codes.AdminMenuDNS), + "name": langs.Message(langCode, codes.AdminMenu_DNS), "subtitle": "", "icon": "globe", "subItems": []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuDNSClusters), + "name": langs.Message(langCode, codes.AdminMenu_DNSClusters), "url": "/dns", "code": "cluster", }, { - "name": langs.Message(langCode, codes.AdminMenuDNSProviders), + "name": langs.Message(langCode, codes.AdminMenu_DNSProviders), "url": "/dns/providers", "code": "provider", }, { - "name": langs.Message(langCode, codes.AdminMenuDNSIssues), + "name": langs.Message(langCode, codes.AdminMenu_DNSIssues), "url": "/dns/issues", "code": "issue", }, @@ -145,36 +145,36 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i { "code": "users", "module": configloaders.AdminModuleCodeUser, - "name": langs.Message(langCode, codes.AdminMenuUsers), + "name": langs.Message(langCode, codes.AdminMenu_Users), "icon": "users", }, { "code": "admins", "module": configloaders.AdminModuleCodeAdmin, - "name": langs.Message(langCode, codes.AdminMenuAdmins), + "name": langs.Message(langCode, codes.AdminMenu_Admins), "subtitle": "", "icon": "user secret", }, { "code": "log", "module": configloaders.AdminModuleCodeLog, - "name": langs.Message(langCode, codes.AdminMenuLogs), + "name": langs.Message(langCode, codes.AdminMenu_Logs), "icon": "history", }, { "code": "settings", "module": configloaders.AdminModuleCodeSetting, - "name": langs.Message(langCode, codes.AdminMenuSettings), + "name": langs.Message(langCode, codes.AdminMenu_Settings), "subtitle": "", "icon": "setting", "subItems": []maps.Map{ { - "name": langs.Message(langCode, codes.AdminMenuSettingBasicSettings), + "name": langs.Message(langCode, codes.AdminMenu_SettingBasicSettings), "url": "/settings", "code": "basic", }, { - "name": langs.Message(langCode, codes.AdminMenuSettingAdvancedSettings), + "name": langs.Message(langCode, codes.AdminMenu_SettingAdvancedSettings), "url": "/settings/advanced", "code": "advanced", }, diff --git a/internal/web/helpers/user_must_auth.go b/internal/web/helpers/user_must_auth.go index e000f820..88422fd5 100644 --- a/internal/web/helpers/user_must_auth.go +++ b/internal/web/helpers/user_must_auth.go @@ -168,7 +168,7 @@ func (this *userMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam } var session = action.Session() - var adminId = session.GetInt64("adminId") + var adminId = session.GetInt64(teaconst.SessionAdminId) if adminId <= 0 { var errString = session.GetString("@error") diff --git a/web/public/js/langs/zh-cn.js b/web/public/js/langs/zh-cn.js index 941737f2..833c1eac 100644 --- a/web/public/js/langs/zh-cn.js +++ b/web/public/js/langs/zh-cn.js @@ -1,2 +1,2 @@ // generated by 'langs generate' -window.LANG_MESSAGES = {"admin_cert_menu_apply":"申请证书","admin_cert_menu_certs":"证书","admin_cert_menu_ocsp":"OCSP日志","admin_cluster_menu_setting_basic":"基础设置","admin_cluster_menu_setting_cache_policy":"缓存策略","admin_cluster_menu_setting_cc":"CC防护","admin_cluster_menu_setting_ddos_protection":"DDoS防护","admin_cluster_menu_setting_dns":"DNS设置","admin_cluster_menu_setting_health_check":"健康检查","admin_cluster_menu_setting_http3":"HTTP/3","admin_cluster_menu_setting_metrics":"统计指标","admin_cluster_menu_setting_notification":"消息通知","admin_cluster_menu_setting_pages":"自定义页面","admin_cluster_menu_setting_schedule":"智能调度","admin_cluster_menu_setting_service_global":"网站设置","admin_cluster_menu_setting_system_service":"系统服务","admin_cluster_menu_setting_thresholds":"阈值设置","admin_cluster_menu_setting_toa":"TOA设置","admin_cluster_menu_setting_uam":"5秒盾","admin_cluster_menu_setting_waf_actions":"WAF动作","admin_cluster_menu_setting_waf_policy":"WAF策略","admin_cluster_menu_setting_webp":"WebP","admin_cluster_menu_tab_cluster_dashboard":"集群看板","admin_cluster_menu_tab_cluster_delete":"删除集群","admin_cluster_menu_tab_cluster_nodes":"节点列表","admin_cluster_menu_tab_cluster_settings":"集群设置","admin_common_canceled":"已取消","admin_common_menu_setting_basic":"基础设置","admin_common_menu_setting_cache":"缓存设置","admin_common_menu_setting_cache_policy":"缓存策略","admin_common_menu_setting_ddos_protection":"DDoS防护","admin_common_menu_setting_dns":"DNS设置","admin_common_menu_setting_health_check":"健康检查","admin_common_menu_setting_metrics":"统计指标","admin_common_menu_setting_waf_policy":"WAF策略","admin_common_menu_setting_webp":"WebP","admin_common_system":"系统","admin_dashboard_dns":"DNS","admin_dashboard_events":"事件","admin_dashboard_overview":"概况","admin_dashboard_user":"用户","admin_dashboard_waf":"WAF","admin_db_node_tab_nodes":"数据库节点","admin_level_error":"错误","admin_level_info":"信息","admin_level_warn":"警告","admin_log_tag_access_log":"访问日志","admin_log_tag_listener":"端口监听","admin_log_tag_script":"脚本","admin_log_tag_waf":"WAF","admin_menu_admin_recipients":"通知媒介","admin_menu_admins":"系统用户","admin_menu_dashboard":"数据看板","admin_menu_dns":"域名解析","admin_menu_dns_clusters":"集群列表","admin_menu_dns_issues":"问题修复","admin_menu_dns_providers":"DNS服务商","admin_menu_finance":"财务管理","admin_menu_finance_accounts":"用户账户","admin_menu_finance_bills":"费用账单","admin_menu_finance_fee":"计费设置","admin_menu_finance_income":"统计报表","admin_menu_finance_logs":"收支明细","admin_menu_finance_orders":"订单管理","admin_menu_finance_packages":"流量包","admin_menu_logs":"日志审计","admin_menu_node_anti_ddos_products":"高防IP","admin_menu_node_clusters":"集群列表","admin_menu_node_distributed_monitors":"区域监控","admin_menu_node_ip_list":"节点IP","admin_menu_node_logs":"节点日志","admin_menu_node_regions":"区域设置","admin_menu_node_ssh_grants":"节点SSH","admin_menu_nodes":"边缘节点","admin_menu_ns":"智能DNS","admin_menu_ns_access_logs":"访问日志","admin_menu_ns_clusters":"集群管理","admin_menu_ns_domain_batch_operations":"批量操作","admin_menu_ns_domain_groups":"域名分组","admin_menu_ns_domains":"域名管理","admin_menu_ns_node_logs":"运行日志","admin_menu_ns_plans":"套餐设置","admin_menu_ns_resolve_test":"解析测试","admin_menu_ns_routes":"线路管理","admin_menu_ns_settings":"全局配置","admin_menu_ns_user_plans":"用户套餐","admin_menu_plan_user_plans":"已购套餐","admin_menu_plans":"套餐管理","admin_menu_server_access_log_policies":"日志策略","admin_menu_server_access_logs":"访问日志","admin_menu_server_cache_policies":"缓存策略","admin_menu_server_certs":"证书管理","admin_menu_server_global_settings":"通用设置","admin_menu_server_groups":"网站分组","admin_menu_server_ip_lists":"IP名单","admin_menu_server_metrics":"统计指标","admin_menu_server_purge_fetch_caches":"刷新预热","admin_menu_server_scripts":"脚本库","admin_menu_server_traffic_stats":"用量统计","admin_menu_server_waf_policies":"WAF策略","admin_menu_servers":"网站列表","admin_menu_setting_advanced_settings":"高级设置","admin_menu_setting_authority":"商业版本","admin_menu_setting_basic_settings":"基础设置","admin_menu_settings":"系统设置","admin_menu_ticket_category":"分类","admin_menu_tickets":"工单系统","admin_menu_user_settings":"用户设置","admin_menu_users":"平台用户","admin_node_grant_method_private_key":"私钥","admin_node_grant_method_user_password":"用户名+密码","admin_node_menu_create_multiple_nodes":"批量创建","admin_node_menu_create_single_node":"单个创建","admin_node_menu_install_auto_register":"自动注册","admin_node_menu_install_manually":"手动安装","admin_node_menu_install_remote":"远程安装(%d)","admin_node_menu_install_remote_upgrade":"远程升级(%d)","admin_node_menu_setting_basic":"基础设置","admin_node_menu_setting_cache":"缓存设置","admin_node_menu_setting_ddos_protection":"DDoS防护","admin_node_menu_setting_dns":"DNS设置","admin_node_menu_setting_schedule":"智能调度","admin_node_menu_setting_ssh":"SSH设置","admin_node_menu_setting_system":"系统设置","admin_node_menu_setting_thresholds":"阈值设置","admin_node_ungrouped_label":"未分组","admin_ns_cluster_menu_access_logs":"访问日志","admin_ns_cluster_menu_answer_setting":"应答模式","admin_ns_cluster_menu_basic":"基础设置","admin_ns_cluster_menu_ddos_protection":"DDoS防护","admin_ns_cluster_menu_dns_recursion":"递归DNS","admin_ns_cluster_menu_doh":"DoH","admin_ns_cluster_menu_soa":"SOA","admin_ns_cluster_menu_tcp":"TCP","admin_ns_cluster_menu_tls":"TLS","admin_ns_cluster_menu_udp":"UDP","admin_ns_cluster_tab_delete":"删除集群","admin_ns_cluster_tab_nodes":"节点列表","admin_ns_cluster_tab_setting":"集群设置","admin_ns_setting_access_logs":"访问日志设置","admin_ns_setting_user":"用户设置","admin_server_copy_setting_current_cluster":"当前集群：%s","admin_server_copy_setting_current_group":"当前分组：%s","admin_server_copy_setting_current_user":"当前用户：%s","admin_server_copy_setting_select_cluster":"选择集群","admin_server_copy_setting_select_group":"选择分组","admin_server_copy_setting_select_server":"选择网站","admin_server_copy_setting_select_user":"选择用户","admin_server_menu_accesslog_history":"历史","admin_server_menu_accesslog_realtime":"实时","admin_server_menu_accesslog_today":"今天","admin_server_menu_dashboard":"看板","admin_server_menu_setting_access_log":"访问日志","admin_server_menu_setting_auth":"访问鉴权","admin_server_menu_setting_basic":"基本信息","admin_server_menu_setting_cache":"缓存","admin_server_menu_setting_cc":"CC防护","admin_server_menu_setting_charset":"字符编码","admin_server_menu_setting_client_ip":"访客IP地址","admin_server_menu_setting_compress":"内容压缩","admin_server_menu_setting_delete":"删除","admin_server_menu_setting_dns":"DNS","admin_server_menu_setting_domains":"域名","admin_server_menu_setting_fastcgi":"Fastcgi","admin_server_menu_setting_http":"HTTP","admin_server_menu_setting_http_headers":"HTTP Header","admin_server_menu_setting_http_proxy":"HTTP代理","admin_server_menu_setting_https":"HTTPS","admin_server_menu_setting_locations":"路由规则","admin_server_menu_setting_origins":"源站","admin_server_menu_setting_others":"其他设置","admin_server_menu_setting_pages":"自定义页面","admin_server_menu_setting_redirects":"URL跳转","admin_server_menu_setting_referers":"防盗链","admin_server_menu_setting_request_limit":"请求限制","admin_server_menu_setting_rewrite_rules":"重写规则","admin_server_menu_setting_root":"静态分发","admin_server_menu_setting_scripts":"边缘脚本","admin_server_menu_setting_stat":"统计","admin_server_menu_setting_tcp":"TCP","admin_server_menu_setting_tcp_proxy":"TCP代理","admin_server_menu_setting_tls":"TLS","admin_server_menu_setting_traffic_limit":"流量限制","admin_server_menu_setting_uam":"5秒盾","admin_server_menu_setting_udp":"UDP","admin_server_menu_setting_udp_proxy":"UDP代理","admin_server_menu_setting_unix":"Unix","admin_server_menu_setting_user_agents":"UA名单","admin_server_menu_setting_waf":"WAF","admin_server_menu_setting_webp":"WebP","admin_server_menu_setting_websocket":"Websocket","admin_server_menu_stat_clients":"终端","admin_server_menu_stat_providers":"运营商","admin_server_menu_stat_regions":"地域分布","admin_server_menu_stat_traffic":"流量统计","admin_server_menu_stat_waf":"WAF","admin_server_tab_access_logs":"日志","admin_server_tab_dashboard":"看板","admin_server_tab_delete":"删除","admin_server_tab_settings":"设置","admin_server_tab_stat":"统计","admin_server_traffic_stat_all_servers":"全部网站（%d）","admin_settings_tab_access_log_databases":"日志数据库","admin_settings_tab_admin_security_settings":"安全设置","admin_settings_tab_admin_server":"Web服务","admin_settings_tab_admin_ui":"管理界面设置","admin_settings_tab_api_nodes":"API节点","admin_settings_tab_authority":"商业版认证","admin_settings_tab_backup":"备份","admin_settings_tab_client_browsers":"浏览器库","admin_settings_tab_client_operation_systems":"操作系统库","admin_settings_tab_database":"数据库","admin_settings_tab_ip_library":"IP库","admin_settings_tab_login":"登录设置","admin_settings_tab_monitor_nodes":"监控节点","admin_settings_tab_profile":"个人资料","admin_settings_tab_transfer":"迁移","admin_settings_tab_updates":"检查更新","admin_settings_tab_user_nodes":"用户节点","admin_settings_tab_user_ui":"用户界面设置","admin_waf_connector_and":"和(AND)","admin_waf_connector_and_description":"所有规则都满足才视为匹配","admin_waf_connector_or":"或(OR)","admin_waf_connector_or_description":"任一规则满足了就视为匹配"}; +window.LANG_MESSAGES = {"admin_dashboard@ui_dns":"DNS","admin_dashboard@ui_events":"事件","admin_dashboard@ui_overview":"概况","admin_dashboard@ui_user":"用户","admin_dashboard@ui_waf":"WAF"};