From 8b2e767347d19fc8d51ea403a037aa9c18a7c52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F=E4=B9=90?= <mogfee@163.com>
Date: Thu, 16 Mar 2023 10:59:57 +0800
Subject: [PATCH] x

---
 internal/token/token_test.go                | 18 ------------------
 {internal/token => middleware/jwt}/aes.go   |  2 +-
 middleware/jwt/jwt.go                       | 11 +++++------
 {internal/token => middleware/jwt}/token.go |  2 +-
 4 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 internal/token/token_test.go
 rename {internal/token => middleware/jwt}/aes.go (99%)
 rename {internal/token => middleware/jwt}/token.go (99%)

diff --git a/internal/token/token_test.go b/internal/token/token_test.go
deleted file mode 100644
index a36b691..0000000
--- a/internal/token/token_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package token
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestGetToken(t *testing.T) {
-	tokenKey := "JssLx22bjQwnyqby"
-	token, uniqId, err := GetToken(tokenKey, &UserInfo{
-		UserId:      111,
-		UserType:    "admin",
-		Permissions: []string{"user:search"},
-	})
-	fmt.Println(token)
-	fmt.Println(uniqId, err)
-	fmt.Println(Parse(tokenKey, token))
-}
diff --git a/internal/token/aes.go b/middleware/jwt/aes.go
similarity index 99%
rename from internal/token/aes.go
rename to middleware/jwt/aes.go
index 2fb53b7..7a8b6ab 100644
--- a/internal/token/aes.go
+++ b/middleware/jwt/aes.go
@@ -1,4 +1,4 @@
-package token
+package jwt
 
 import (
 	"bytes"
diff --git a/middleware/jwt/jwt.go b/middleware/jwt/jwt.go
index 12d5a63..0625394 100644
--- a/middleware/jwt/jwt.go
+++ b/middleware/jwt/jwt.go
@@ -3,7 +3,6 @@ package jwt
 import (
 	"context"
 	"git.diulo.com/mogfee/kit/errors"
-	"git.diulo.com/mogfee/kit/internal/token"
 	"git.diulo.com/mogfee/kit/middleware"
 	"git.diulo.com/mogfee/kit/transport"
 )
@@ -16,7 +15,7 @@ type userIdKey struct{}
 type authKey struct {
 }
 
-type ParseFunc func(key string, tokenStr string) (*token.UserInfo, error)
+type ParseFunc func(key string, tokenStr string) (*UserInfo, error)
 type JwtOption func(o *options)
 
 func WithJwtKey(jwtKey string) JwtOption {
@@ -54,7 +53,7 @@ func JWT(opts ...JwtOption) middleware.Middleware {
 	var cfg = &options{
 		jwtKey:             "JssLx22bjQwnyqby",
 		validatePermission: InSlice,
-		parseFunc:          token.Parse,
+		parseFunc:          Parse,
 	}
 	for _, o := range opts {
 		o(cfg)
@@ -99,11 +98,11 @@ func InSlice(validatePermission []string, key string) bool {
 	}
 	return false
 }
-func SetUserContext(ctx context.Context, user *token.UserInfo) context.Context {
+func SetUserContext(ctx context.Context, user *UserInfo) context.Context {
 	return context.WithValue(ctx, userIdKey{}, user)
 }
-func FromUserContext(ctx context.Context) (user *token.UserInfo, ok bool) {
-	user, ok = ctx.Value(userIdKey{}).(*token.UserInfo)
+func FromUserContext(ctx context.Context) (user *UserInfo, ok bool) {
+	user, ok = ctx.Value(userIdKey{}).(*UserInfo)
 	return
 }
 
diff --git a/internal/token/token.go b/middleware/jwt/token.go
similarity index 99%
rename from internal/token/token.go
rename to middleware/jwt/token.go
index df4fb20..2597a1b 100644
--- a/internal/token/token.go
+++ b/middleware/jwt/token.go
@@ -1,4 +1,4 @@
-package token
+package jwt
 
 import (
 	"encoding/json"