From e0dcc49f5b23618103c5ee15e13758164d2eddf2 Mon Sep 17 00:00:00 2001 From: Sun <95302870@qq.com> Date: Wed, 24 Jan 2024 13:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/api/api_v1/common/apiReturn/ErrorCode.go | 5 ++++- service/api/api_v1/panel/itemIcon.go | 3 ++- service/api/api_v1/system/user.go | 2 +- src/components/apps/UserInfo/index.vue | 8 -------- src/locales/en-US.json | 1 + src/locales/zh-CN.json | 3 ++- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/service/api/api_v1/common/apiReturn/ErrorCode.go b/service/api/api_v1/common/apiReturn/ErrorCode.go index fb61e08..185fb34 100644 --- a/service/api/api_v1/common/apiReturn/ErrorCode.go +++ b/service/api/api_v1/common/apiReturn/ErrorCode.go @@ -1,12 +1,15 @@ package apiReturn var ErrorCodeMap = map[int]string{ - // -1:操作失败 + // -1:操作失败(前端会自动弹窗) + // 100: "operation failed", + 1000: "Not logged in yet", // 还未登录 1003: "Incorrect username or password", // 用户名或密码错误 1004: "Account disabled or not activated", // 账号已停用或未激活 1005: "No current permission for operation", // 当前无权限操作 1006: "Account does not exist", // 账号不存在 + 1007: "Old password error", // 旧密码不正确 // 数据类 1200: "Database error", // 数据库错误 diff --git a/service/api/api_v1/panel/itemIcon.go b/service/api/api_v1/panel/itemIcon.go index b00c92a..4b7bf07 100644 --- a/service/api/api_v1/panel/itemIcon.go +++ b/service/api/api_v1/panel/itemIcon.go @@ -28,7 +28,8 @@ func (a *ItemIcon) Edit(c *gin.Context) { } if req.ItemIconGroupId == 0 { - apiReturn.Error(c, "Group is mandatory") + // apiReturn.Error(c, "Group is mandatory") + apiReturn.ErrorParamFomat(c, "Group is mandatory") return } diff --git a/service/api/api_v1/system/user.go b/service/api/api_v1/system/user.go index 9594929..bafe228 100644 --- a/service/api/api_v1/system/user.go +++ b/service/api/api_v1/system/user.go @@ -97,7 +97,7 @@ func (a *UserApi) UpdatePasssword(c *gin.Context) { } else { if v.Password != cmn.PasswordEncryption(params.OldPassword) { // 旧密码不正确 - apiReturn.Error(c, global.Lang.Get("user.api_old_pass_error")) + apiReturn.ErrorByCode(c, 1007) return } } diff --git a/src/components/apps/UserInfo/index.vue b/src/components/apps/UserInfo/index.vue index 94ce97a..8d65fdb 100644 --- a/src/components/apps/UserInfo/index.vue +++ b/src/components/apps/UserInfo/index.vue @@ -104,14 +104,6 @@ function handleUpdatePassword(e: MouseEvent) { updatePasswordModalState.value.show = false ms.success(t('common.success')) } - else if (code === 0) { - // 旧密码错误 - - } - else { - // 其他错误 - ms.error(`${t('common.failed')}:${msg}`) - } }).finally(() => { updatePasswordModalState.value.loading = false }).catch(() => { diff --git a/src/locales/en-US.json b/src/locales/en-US.json index aab014a..4b31a96 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -25,6 +25,7 @@ "1004": "Account has been deactivated or inactivated", "1005": "Currently no permission to operate", "1006": "Account does not exist", + "1007": "Old password error", "1200": "database error", "1201": "Please keep at least one", "1202": "Data record not found", diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index b9008d4..e5036fe 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -25,6 +25,7 @@ "1004": "账号已停用或未激活", "1005": "当前无权限操作", "1006": "账号不存在", + "1007": "旧密码错误", "1200": "数据库出错", "1201": "请至少保留一个", "1202": "未找到数据记录", @@ -55,7 +56,7 @@ "configFailed": "配置保存失败,{message}", "configSaved": "配置已保存", "contentArea": "内容区域", - "customFooter": "自定义footer", + "customFooter": "自定义页脚", "customImageAddress": "展开图片链接输入框", "detailIcon": "详情图标", "hideDescription": "隐藏描述信息",