fix: AbortWithJsonError获取Code错误BUG

Author: TBXark

server/ginx/error.go

@@ -0,0 +1,61 @@
+package ginx
+
+import (
+	"errors"
+	"net/http"
+)
+
+var internalServerError = NewError(http.StatusInternalServerError, 500, "Internal Server Error")
+
+type statusError interface {
+	error
+	Status() int
+}
+
+type codeError interface {
+	error
+	Code() int
+}
+
+type Error struct {
+	status  int
+	code    int
+	message string
+}
+
+func NewError(status, code int, message string) error {
+	return &Error{
+		status:  status,
+		code:    code,
+		message: message,
+	}
+}
+
+func (e *Error) Error() string {
+	return e.message
+}
+
+func (e *Error) Status() int {
+	return e.status
+}
+
+func (e *Error) Code() int {
+	return e.code
+}
+
+func parseError(err error) (code int, status int, message string) {
+	var se statusError
+	if errors.As(err, &se) {
+		status = se.Status()
+	} else {
+		status = http.StatusInternalServerError
+	}
+	var ce codeError
+	if errors.As(err, &ce) {
+		code = ce.Code()
+	} else {
+		code = 500
+	}
+	message = err.Error()
+	return
+}

server/ginx/with.go

@@ -1,20 +1,12 @@
 package ginx
 
 import (
-	"errors"
 	"github.com/TBXark/sphere/log"
 	"github.com/TBXark/sphere/log/logfields"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
 
-var internalServerError = errors.New("internal server error")
-
-type statusError interface {
-	error
-	Status() int
-}
-
 type Context = gin.Context
 
 func Value[T any](key string, ctx *gin.Context) (*T, bool) {
@@ -28,19 +20,12 @@ func Value[T any](key string, ctx *gin.Context) (*T, bool) {
 	return nil, false
 }
 
-func AbortWithJsonError(ctx *gin.Context, code int, err error) {
-	var hErr statusError
-	if errors.As(err, &hErr) {
-		ctx.AbortWithStatusJSON(hErr.Status(), ErrorResponse{
-			Code:    hErr.Status(),
-			Message: hErr.Error(),
-		})
-	} else {
-		ctx.AbortWithStatusJSON(code, ErrorResponse{
-			Code:    hErr.Status(),
-			Message: err.Error(),
-		})
-	}
+func AbortWithJsonError(ctx *gin.Context, err error) {
+	code, status, message := parseError(err)
+	ctx.AbortWithStatusJSON(status, ErrorResponse{
+		Code:    code,
+		Message: message,
+	})
 }
 
 func WithRecover(message string, handler func(ctx *gin.Context)) func(ctx *gin.Context) {
@@ -51,7 +36,7 @@ func WithRecover(message string, handler func(ctx *gin.Context)) func(ctx *gin.C
 					message,
 					logfields.Any("error", err),
 				)
-				AbortWithJsonError(ctx, http.StatusInternalServerError, internalServerError)
+				AbortWithJsonError(ctx, internalServerError)
 			}
 		}()
 		handler(ctx)
@@ -62,7 +47,7 @@ func WithJson[T any](handler func(ctx *gin.Context) (T, error)) func(ctx *gin.Co
 	return WithRecover("WithJson panic", func(ctx *gin.Context) {
 		data, err := handler(ctx)
 		if err != nil {
-			AbortWithJsonError(ctx, http.StatusBadRequest, err)
+			AbortWithJsonError(ctx, err)
 		} else {
 			ctx.JSON(200, DataResponse[T]{
 				Success: true,
@@ -76,7 +61,7 @@ func WithText(handler func(ctx *gin.Context) (string, error)) func(ctx *gin.Cont
 	return WithRecover("WithText panic", func(ctx *gin.Context) {
 		data, err := handler(ctx)
 		if err != nil {
-			AbortWithJsonError(ctx, http.StatusBadRequest, err)
+			AbortWithJsonError(ctx, err)
 		} else {
 			ctx.String(200, data)
 		}