diff --git a/internal/middleware/globalMiddleware.go b/internal/middleware/globalMiddleware.go index 42729f2..909a411 100644 --- a/internal/middleware/globalMiddleware.go +++ b/internal/middleware/globalMiddleware.go @@ -1,8 +1,9 @@ package middleware import ( + "PersonalMain/utility/ErrorCode" + "PersonalMain/utility/ResultUtil" "github.com/gogf/gf/v2/errors/gerror" - "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/text/gregex" "net/http" @@ -29,20 +30,12 @@ func TimestampMiddleware(r *ghttp.Request) { r.Middleware.Next() } else { if err != nil { - r.Response.WriteJson(g.Map{ - "code": 40011, - "message": "时间戳过期", - "data": nil, - }) + ResultUtil.ErrorNoData(r, ErrorCode.TimestampExpired) } } } else { if err != nil { - r.Response.WriteJson(g.Map{ - "code": 40010, - "message": "时间戳格式错误", - "data": nil, - }) + ResultUtil.ErrorNoData(r, ErrorCode.TimestampVerifyFailed) } } } diff --git a/utility/ErrorCode/ErrorCode.go b/utility/ErrorCode/ErrorCode.go index cb1d033..943066f 100644 --- a/utility/ErrorCode/ErrorCode.go +++ b/utility/ErrorCode/ErrorCode.go @@ -13,8 +13,10 @@ type Errors interface { } var ( - TokenExpired = ErrorCode{output: "error", code: 40100, message: "Token 已过期"} - TokenVerifyFailed = ErrorCode{output: "error", code: 40101, message: "Token 验证失败"} + TimestampVerifyFailed = ErrorCode{output: "error", code: 40010, message: "时间戳格式错误"} + TimestampExpired = ErrorCode{output: "error", code: 40011, message: "时间戳过期"} + TokenExpired = ErrorCode{output: "error", code: 40100, message: "Token 已过期"} + TokenVerifyFailed = ErrorCode{output: "error", code: 40101, message: "Token 验证失败"} ) func (e ErrorCode) Output() string {