部分中文转换为多语言代号

2026-04-18 00:55:21 +08:00 · 2023-06-30 18:08:30 +08:00
parent 4724f2ac96
commit 29f87ab9c4
322 changed files with 884 additions and 733 deletions
--- 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.
--- 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 {
--- 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).
--- 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
--- 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 {
--- 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 {
--- 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 + "'")
--- 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()
 }
--- 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 {
--- 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,
--- 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})
--- 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 {
--- 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 {
--- 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 {
--- 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",
 		},
--- 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 {
--- 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 {
--- 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 {
--- 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})
--- 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 {
--- 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()
 }