From 231202713cec2ec3a230035cef48f2df2417f794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F=E4=B9=90?= <mogfee@163.com>
Date: Wed, 18 Oct 2023 09:56:16 +0800
Subject: [PATCH] auto commit

---
 middleware/jwt/jwt.go           |  5 +++--
 middleware/jwt/token.go         | 17 +++++++++--------
 middleware/validate/validate.go |  3 ++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/middleware/jwt/jwt.go b/middleware/jwt/jwt.go
index 5ea42f2..d7f1029 100644
--- a/middleware/jwt/jwt.go
+++ b/middleware/jwt/jwt.go
@@ -2,6 +2,7 @@ package jwt
 
 import (
 	"context"
+	"git.diulo.com/mogfee/kit/errors"
 	"git.diulo.com/mogfee/kit/middleware"
 )
 
@@ -60,7 +61,7 @@ func JWT(opts ...JwtOption) middleware.Middleware {
 			// 解析token
 			tokenStr := cfg.validate.GetToken(ctx, cfg.fromKey)
 			if tokenStr == "" && needAuth {
-				return nil, errorx.Unauthorized("NO_TOKEN", "")
+				return nil, errors.Unauthorized("NO_TOKEN", "")
 			}
 
 			if tokenStr != "" {
@@ -70,7 +71,7 @@ func JWT(opts ...JwtOption) middleware.Middleware {
 						return err
 					}
 					if needAuth && userInfo.UserId == "" {
-						return errorx.Unauthorized("TOKEN_BAD", "")
+						return errors.Unauthorized("TOKEN_BAD", "")
 					}
 					if authKey != "" {
 						if err = cfg.validate.Validate(ctx, authKey, userInfo.Permissions); err != nil {
diff --git a/middleware/jwt/token.go b/middleware/jwt/token.go
index f02e458..cf50924 100644
--- a/middleware/jwt/token.go
+++ b/middleware/jwt/token.go
@@ -2,6 +2,7 @@ package jwt
 
 import (
 	"encoding/json"
+	"git.diulo.com/mogfee/kit/errors"
 	"git.diulo.com/mogfee/kit/internal/xuuid"
 	"github.com/golang-jwt/jwt/v5"
 	"time"
@@ -58,16 +59,16 @@ func Parse(key string, tokenStr string) (*UserInfo, error) {
 	}
 	str, err := Decrypt(tokenStr, []byte(key), key)
 	if err != nil {
-		return nil, errorx.Unauthorized("TOKEN_ERROR", err.Error())
+		return nil, errors.Unauthorized("TOKEN_ERROR", err.Error())
 	}
 	token, err := jwt.Parse(str, func(token *jwt.Token) (interface{}, error) {
 		return []byte(key), nil
 	})
 	if err != nil {
-		if errorx.Is(err, jwt.ErrTokenExpired) {
-			return nil, errorx.Unauthorized("TOKEN_EXPIRED", "")
+		if errors.Is(err, jwt.ErrTokenExpired) {
+			return nil, errors.Unauthorized("TOKEN_EXPIRED", "")
 		}
-		return nil, errorx.Unauthorized("TOKEN_ERROR", err.Error())
+		return nil, errors.Unauthorized("TOKEN_ERROR", err.Error())
 	}
 
 	if token.Valid {
@@ -76,11 +77,11 @@ func Parse(key string, tokenStr string) (*UserInfo, error) {
 		}{}
 		b, _ := json.Marshal(token.Claims)
 		if err = json.Unmarshal(b, &row); err != nil {
-			return nil, errorx.Unauthorized("TOKEN_ERROR", err.Error())
+			return nil, errors.Unauthorized("TOKEN_ERROR", err.Error())
 		}
 		return row.Info, nil
-	} else if errorx.Is(err, jwt.ErrTokenExpired) || errorx.Is(err, jwt.ErrTokenNotValidYet) {
-		return nil, errorx.Unauthorized("TOKEN_EXPIRED", "")
+	} else if errors.Is(err, jwt.ErrTokenExpired) || errors.Is(err, jwt.ErrTokenNotValidYet) {
+		return nil, errors.Unauthorized("TOKEN_EXPIRED", "")
 	}
-	return nil, errorx.Unauthorized("TOKEN_ERROR", "")
+	return nil, errors.Unauthorized("TOKEN_ERROR", "")
 }
diff --git a/middleware/validate/validate.go b/middleware/validate/validate.go
index 12772f3..a70f1a7 100644
--- a/middleware/validate/validate.go
+++ b/middleware/validate/validate.go
@@ -2,6 +2,7 @@ package validate
 
 import (
 	"context"
+	"git.diulo.com/mogfee/kit/errors"
 	"git.diulo.com/mogfee/kit/middleware"
 	"strings"
 )
@@ -18,7 +19,7 @@ func Server() middleware.Middleware {
 						Reason() string
 					}); ok {
 						field := a.Field()
-						return nil, errorx.BadRequest("InvalidArgument", "").WithMetadata(map[string]string{
+						return nil, errors.BadRequest("InvalidArgument", "").WithMetadata(map[string]string{
 							strings.ToLower(field[0:1]) + field[1:]: a.Reason(),
 						})
 					}