From 04d286ca03ea1be8fec3c1894b1f8f750228fb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Fri, 16 May 2025 00:29:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8E=A5=E5=8F=A3=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=E4=B8=BAmsg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/service/helper.go | 14 +++++++------- web/src/utils/http/helpers.ts | 16 ++++++++-------- web/src/utils/http/index.ts | 20 ++++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/service/helper.go b/internal/service/helper.go index d6873efc..8e5df27b 100644 --- a/internal/service/helper.go +++ b/internal/service/helper.go @@ -14,13 +14,13 @@ import ( // SuccessResponse 通用成功响应 type SuccessResponse struct { - Message string `json:"message"` - Data any `json:"data"` + Msg string `json:"msg"` + Data any `json:"data"` } // ErrorResponse 通用错误响应 type ErrorResponse struct { - Message string `json:"message"` + Msg string `json:"msg"` } // Success 响应成功 @@ -28,8 +28,8 @@ func Success(w http.ResponseWriter, data any) { render := chix.NewRender(w) defer render.Release() render.JSON(&SuccessResponse{ - Message: "success", - Data: data, + Msg: "success", + Data: data, }) } @@ -43,7 +43,7 @@ func Error(w http.ResponseWriter, code int, format string, args ...any) { format = fmt.Sprintf(format, args...) } render.JSON(&ErrorResponse{ - Message: format, + Msg: format, }) } @@ -54,7 +54,7 @@ func ErrorSystem(w http.ResponseWriter) { render.Header(chix.HeaderContentType, chix.MIMEApplicationJSONCharsetUTF8) // must before Status() render.Status(http.StatusInternalServerError) render.JSON(&ErrorResponse{ - Message: http.StatusText(http.StatusInternalServerError), + Msg: http.StatusText(http.StatusInternalServerError), }) } diff --git a/web/src/utils/http/helpers.ts b/web/src/utils/http/helpers.ts index ccd6df43..81782f19 100644 --- a/web/src/utils/http/helpers.ts +++ b/web/src/utils/http/helpers.ts @@ -1,27 +1,27 @@ import { useUserStore } from '@/store' -export function resolveResError(code: number | string | undefined, message = ''): string { +export function resolveResError(code: number | string | undefined, msg = ''): string { switch (code) { case 400: case 422: - message = message ?? '请求参数错误' + msg = msg ?? '请求参数错误' break case 401: - message = message ?? '登录已过期' + msg = msg ?? '登录已过期' useUserStore().logout() break case 403: - message = message ?? '没有权限' + msg = msg ?? '没有权限' break case 404: - message = message ?? '资源或接口不存在' + msg = msg ?? '资源或接口不存在' break case 500: - message = message ?? '服务器异常' + msg = msg ?? '服务器异常' break default: - message = message ?? `【${code}】: 未知异常!` + msg = msg ?? `【${code}】: 未知异常!` break } - return message + return msg } diff --git a/web/src/utils/http/index.ts b/web/src/utils/http/index.ts index c0c9edcc..a9263aaa 100644 --- a/web/src/utils/http/index.ts +++ b/web/src/utils/http/index.ts @@ -18,45 +18,45 @@ export const http = createAlova({ if (ct && ct.includes('application/json')) { json = typeof response.data === 'string' ? JSON.parse(response.data) : response.data } else { - json = { code: response.status, message: response.data } + json = { code: response.status, msg: response.data } } } catch (error) { - json = { code: response.status, message: 'JSON 解析失败' } + json = { code: response.status, msg: 'failed to parse response' } } const { status, statusText } = response const { meta } = method if (status !== 200) { const code = json?.code ?? status - const message = resolveResError( + const msg = resolveResError( code, - (typeof json?.message === 'string' && json.message.trim()) || statusText + (typeof json?.msg === 'string' && json.msg.trim()) || statusText ) const noAlert = meta?.noAlert if (!noAlert) { if (code === 422) { - window.$message.error(message) + window.$message.error(msg) } else if (code !== 401) { window.$dialog.error({ title: '错误', - content: message, + content: msg, maskClosable: false }) } } - throw new Error(message) + throw new Error(msg) } return json.data }, onError: (error: any, method: Method) => { - const { code, message } = error + const { code, msg } = error const { meta } = method - const errorMessage = resolveResError(code, message) + const errorMsg = resolveResError(code, msg) const noAlert = meta?.noAlert if (!noAlert) { window.$dialog.error({ title: '接口请求失败', - content: errorMessage, + content: errorMsg, maskClosable: false }) }