diff --git a/internal/common/errors.go b/internal/common/errors.go index fbf907a..0f6bd5e 100644 --- a/internal/common/errors.go +++ b/internal/common/errors.go @@ -11,7 +11,7 @@ var ( ErrInvalidCred = errors.New("邮箱或密码错误") ErrUserNotFound = errors.New("用户不存在") ErrUserBanned = errors.New("该账号已被封禁") - ErrUserDeleted = errors.New("该账号已申请注销,登录即自动恢复") + ErrUserDeleted = errors.New("该账号正在注销中,登录即撤销注销") // 统一返回,避免泄露用户存在性、软删除状态等内部信息 ErrUserLocked = errors.New("邮箱或密码错误") ErrWeakPassword = errors.New("密码需至少 8 位,且包含字母和数字") @@ -32,7 +32,7 @@ var ( // 密码 & 注销相关 ErrIncorrectPassword = errors.New("当前密码错误") ErrLoginBeforeDelete = errors.New("请先登录再注销") - ErrNeedsConfirmRestore = errors.New("需要二次确认恢复账号") + ErrNeedsConfirmRestore = errors.New("需要二次确认撤销注销") ErrOwnerCannotDelete = errors.New("站长不可自主注销,请先转让站长权限") ErrRegistrationDisabled = errors.New("注册功能已关闭") ErrMaintenanceMode = errors.New("社区正在维护中,仅站长可登录") diff --git a/internal/controller/auth_api_login.go b/internal/controller/auth_api_login.go index 53bcf6b..693cd52 100644 --- a/internal/controller/auth_api_login.go +++ b/internal/controller/auth_api_login.go @@ -69,7 +69,7 @@ func (ac *AuthController) Login(c *gin.Context) { c.JSON(http.StatusOK, gin.H{ "success": true, "action": "confirm_restore", - "message": "你的账号正在注销中,登录将中止注销流程", + "message": "你的账号正在注销中,登录将撤销注销并恢复账号", }) default: common.Error(c, http.StatusInternalServerError, "登录失败,请稍后重试") @@ -118,5 +118,5 @@ func (ac *AuthController) ConfirmRestore(c *gin.Context) { } common.SetSessionCookie(c, sid, req.RememberMe, ac.cfg) - common.OkWithMessage(c, user, "账号已恢复,欢迎回来") + common.OkWithMessage(c, user, "注销已撤销,欢迎回来") } diff --git a/internal/controller/settings_api_account.go b/internal/controller/settings_api_account.go index 69dba5d..f60ba03 100644 --- a/internal/controller/settings_api_account.go +++ b/internal/controller/settings_api_account.go @@ -55,5 +55,5 @@ func (sc *SettingsController) DeleteAccount(c *gin.Context) { return } - common.OkMessage(c, "账号已注销,7 天内重新登录即可恢复") + common.OkMessage(c, "账号已注销,7 天内重新登录即可撤销注销") } diff --git a/templates/MetaLab-2026/html/settings/index.html b/templates/MetaLab-2026/html/settings/index.html index e43ae58..bf31516 100644 --- a/templates/MetaLab-2026/html/settings/index.html +++ b/templates/MetaLab-2026/html/settings/index.html @@ -212,7 +212,7 @@
账号将在 7 天后正式注销,期间可随时重新登录恢复
+账号将在 7 天后正式注销,期间可随时重新登录撤销注销