From 70175d309ed86f13a4c046752de5ecb9f2f87a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Fri, 16 May 2025 00:35:48 +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/http/middleware/entrance.go | 10 +++++----- internal/http/middleware/must_install.go | 4 ++-- internal/http/middleware/must_login.go | 10 +++++----- internal/http/middleware/status.go | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/http/middleware/entrance.go b/internal/http/middleware/entrance.go index f7f909a2..cfbe91eb 100644 --- a/internal/http/middleware/entrance.go +++ b/internal/http/middleware/entrance.go @@ -26,7 +26,7 @@ func Entrance(t *gotext.Locale, conf *koanf.Koanf, session *sessions.Manager) fu defer render.Release() render.Status(http.StatusInternalServerError) render.JSON(chix.M{ - "message": err.Error(), + "msg": err.Error(), }) return } @@ -54,7 +54,7 @@ func Entrance(t *gotext.Locale, conf *koanf.Koanf, session *sessions.Manager) fu defer render.Release() render.Status(http.StatusTeapot) render.JSON(chix.M{ - "message": t.Get("invalid request domain: %s", r.Host), + "msg": t.Get("invalid request domain: %s", r.Host), }) return } @@ -67,7 +67,7 @@ func Entrance(t *gotext.Locale, conf *koanf.Koanf, session *sessions.Manager) fu defer render.Release() render.Status(http.StatusTeapot) render.JSON(chix.M{ - "message": t.Get("invalid request ip: %s", ip), + "msg": t.Get("invalid request ip: %s", ip), }) return } @@ -76,7 +76,7 @@ func Entrance(t *gotext.Locale, conf *koanf.Koanf, session *sessions.Manager) fu defer render.Release() render.Status(http.StatusTeapot) render.JSON(chix.M{ - "message": t.Get("invalid request user agent: %s", r.UserAgent()), + "msg": t.Get("invalid request user agent: %s", r.UserAgent()), }) return } @@ -111,7 +111,7 @@ func Entrance(t *gotext.Locale, conf *koanf.Koanf, session *sessions.Manager) fu defer render.Release() render.Status(http.StatusTeapot) render.JSON(chix.M{ - "message": t.Get("invalid access entrance"), + "msg": t.Get("invalid access entrance"), }) return } diff --git a/internal/http/middleware/must_install.go b/internal/http/middleware/must_install.go index 20cf7b7e..7e8a654d 100644 --- a/internal/http/middleware/must_install.go +++ b/internal/http/middleware/must_install.go @@ -26,7 +26,7 @@ func MustInstall(t *gotext.Locale, app biz.AppRepo) func(next http.Handler) http defer render.Release() render.Status(http.StatusForbidden) render.JSON(chix.M{ - "message": t.Get("app not found"), + "msg": t.Get("app not found"), }) return } @@ -45,7 +45,7 @@ func MustInstall(t *gotext.Locale, app biz.AppRepo) func(next http.Handler) http defer render.Release() render.Status(http.StatusForbidden) render.JSON(chix.M{ - "message": t.Get("app %s not installed", slugs), + "msg": t.Get("app %s not installed", slugs), }) return } diff --git a/internal/http/middleware/must_login.go b/internal/http/middleware/must_login.go index e723b2c2..0cf92626 100644 --- a/internal/http/middleware/must_login.go +++ b/internal/http/middleware/must_login.go @@ -36,7 +36,7 @@ func MustLogin(t *gotext.Locale, session *sessions.Manager, userToken biz.UserTo defer render.Release() render.Status(http.StatusInternalServerError) render.JSON(chix.M{ - "message": err.Error(), + "msg": err.Error(), }) return } @@ -55,7 +55,7 @@ func MustLogin(t *gotext.Locale, session *sessions.Manager, userToken biz.UserTo defer render.Release() render.Status(http.StatusUnauthorized) render.JSON(chix.M{ - "message": err.Error(), + "msg": err.Error(), }) return } @@ -65,7 +65,7 @@ func MustLogin(t *gotext.Locale, session *sessions.Manager, userToken biz.UserTo defer render.Release() render.Status(http.StatusUnauthorized) render.JSON(chix.M{ - "message": t.Get("session expired, please login again"), + "msg": t.Get("session expired, please login again"), }) return } @@ -80,7 +80,7 @@ func MustLogin(t *gotext.Locale, session *sessions.Manager, userToken biz.UserTo defer render.Release() render.Status(http.StatusUnauthorized) render.JSON(chix.M{ - "message": t.Get("client ip/ua changed, please login again"), + "msg": t.Get("client ip/ua changed, please login again"), }) return } @@ -94,7 +94,7 @@ func MustLogin(t *gotext.Locale, session *sessions.Manager, userToken biz.UserTo defer render.Release() render.Status(http.StatusUnauthorized) render.JSON(chix.M{ - "message": t.Get("invalid user id, please login again"), + "msg": t.Get("invalid user id, please login again"), }) return } diff --git a/internal/http/middleware/status.go b/internal/http/middleware/status.go index d2653156..439bd4d9 100644 --- a/internal/http/middleware/status.go +++ b/internal/http/middleware/status.go @@ -19,7 +19,7 @@ func Status(t *gotext.Locale) func(next http.Handler) http.Handler { defer render.Release() render.Status(http.StatusServiceUnavailable) render.JSON(chix.M{ - "message": t.Get("panel is upgrading, please refresh later"), + "msg": t.Get("panel is upgrading, please refresh later"), }) return case app.StatusMaintain: @@ -27,7 +27,7 @@ func Status(t *gotext.Locale) func(next http.Handler) http.Handler { defer render.Release() render.Status(http.StatusServiceUnavailable) render.JSON(chix.M{ - "message": t.Get("panel is maintaining, please refresh later"), + "msg": t.Get("panel is maintaining, please refresh later"), }) return case app.StatusClosed: @@ -35,7 +35,7 @@ func Status(t *gotext.Locale) func(next http.Handler) http.Handler { defer render.Release() render.Status(http.StatusForbidden) render.JSON(chix.M{ - "message": t.Get("panel is closed"), + "msg": t.Get("panel is closed"), }) return case app.StatusFailed: @@ -43,7 +43,7 @@ func Status(t *gotext.Locale) func(next http.Handler) http.Handler { defer render.Release() render.Status(http.StatusInternalServerError) render.JSON(chix.M{ - "message": t.Get("panel run error, please check or contact support"), + "msg": t.Get("panel run error, please check or contact support"), }) return default: