From faa8de7dc2783766a2b0fae26825463fbff0946f Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Fri, 9 Oct 2020 16:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=80=BC=EF=BC=8Clevel=E5=80=BC=E4=B8=8D?= =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/apis/api.go | 6 +++--- logger/logger.go | 2 +- tools/app/return.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/apis/api.go b/common/apis/api.go index db4868d..59ffbe6 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -27,7 +27,7 @@ func (e *Api) Error(c *gin.Context, code int, err error, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnError(code)) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnError(code)) } // OK 通常成功数据处理 @@ -38,7 +38,7 @@ func (e *Api) OK(c *gin.Context, data interface{}, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnOK()) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnOK()) } // PageOK 分页数据处理 @@ -53,5 +53,5 @@ func (e *Api) PageOK(c *gin.Context, result interface{}, count int, pageIndex in // Custom 兼容函数 func (e *Api) Custom(c *gin.Context, data gin.H) { - c.JSON(http.StatusOK, data) + c.AbortWithStatusJSON(http.StatusOK, data) } diff --git a/logger/logger.go b/logger/logger.go index ad3b41a..627f1ba 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -3,7 +3,7 @@ package logger var ( // Default logger - DefaultLogger Logger = NewHelper(NewLogger()) + DefaultLogger Logger ) // Logger is a generic logging interface diff --git a/tools/app/return.go b/tools/app/return.go index 2e2aded..94a05a4 100644 --- a/tools/app/return.go +++ b/tools/app/return.go @@ -18,7 +18,7 @@ func Error(c *gin.Context, code int, err error, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnError(code)) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnError(code)) } // 通常成功数据处理 @@ -29,7 +29,7 @@ func OK(c *gin.Context, data interface{}, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnOK()) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnOK()) } // 分页数据处理 @@ -44,5 +44,5 @@ func PageOK(c *gin.Context, result interface{}, count int, pageIndex int, pageSi // 兼容函数 func Custum(c *gin.Context, data gin.H) { - c.JSON(http.StatusOK, data) + c.AbortWithStatusJSON(http.StatusOK, data) }