diff --git a/jwtutil/go.mod b/jwtutil/go.mod index 041f433..4e22d48 100644 --- a/jwtutil/go.mod +++ b/jwtutil/go.mod @@ -5,13 +5,16 @@ go 1.23.0 toolchain go1.24.1 require ( + github.com/go-kratos/kratos/v2 v2.8.4 github.com/golang-jwt/jwt/v5 v5.1.0 github.com/stretchr/testify v1.10.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/jwtutil/go.sum b/jwtutil/go.sum index 5e73975..2ddfa69 100644 --- a/jwtutil/go.sum +++ b/jwtutil/go.sum @@ -1,12 +1,28 @@ +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-kratos/kratos/v2 v2.8.4 h1:eIJLE9Qq9WSoKx+Buy2uPyrahtF/lPh+Xf4MTpxhmjs= +github.com/go-kratos/kratos/v2 v2.8.4/go.mod h1:mq62W2101a5uYyRxe+7IdWubu7gZCGYqSNKwGFiiRcw= github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU= github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/jwtutil/jwt.go b/jwtutil/jwt.go index be55e7e..d7c8cd1 100644 --- a/jwtutil/jwt.go +++ b/jwtutil/jwt.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "encoding/json" + "github.com/go-kratos/kratos/v2/encoding" "github.com/golang-jwt/jwt/v5" ) @@ -40,14 +40,16 @@ func ParseJWTClaimsToStruct[T any](tokenString string) (*T, error) { return nil, fmt.Errorf("invalid token claims") } + codec := encoding.GetCodec("json") + // 将 claims 转换为目标类型 - claimsBytes, err := json.Marshal(claims) + claimsBytes, err := codec.Marshal(claims) if err != nil { return nil, fmt.Errorf("failed to marshal claims: %v", err) } var ret T - err = json.Unmarshal(claimsBytes, &ret) + err = codec.Unmarshal(claimsBytes, &ret) if err != nil { return nil, fmt.Errorf("failed to unmarshal claims: %v", err) } @@ -132,13 +134,15 @@ func GenerateGenericJWT[T any](payload T, secretKey []byte, signingMethod jwt.Si // ToMapClaims 将泛型 payload 转换为 jwt.MapClaims func ToMapClaims[T any](payload T) (jwt.MapClaims, error) { - payloadBytes, err := json.Marshal(payload) + codec := encoding.GetCodec("json") + + payloadBytes, err := codec.Marshal(payload) if err != nil { return nil, err } var claims jwt.MapClaims - err = json.Unmarshal(payloadBytes, &claims) + err = codec.Unmarshal(payloadBytes, &claims) if err != nil { return nil, err } diff --git a/jwtutil/jwt_test.go b/jwtutil/jwt_test.go index e33dc36..38bdd7b 100644 --- a/jwtutil/jwt_test.go +++ b/jwtutil/jwt_test.go @@ -8,6 +8,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" + + _ "github.com/go-kratos/kratos/v2/encoding/json" + _ "github.com/go-kratos/kratos/v2/encoding/proto" ) func TestParseJWTPayload(t *testing.T) { diff --git a/tag.bat b/tag.bat index 1d0cfe7..e61705a 100644 --- a/tag.bat +++ b/tag.bat @@ -4,7 +4,7 @@ git tag bank_card/v1.1.5 git tag geoip/v1.1.5 git tag translator/v1.1.2 git tag copierutil/v0.0.3 -git tag jwtutil/v0.0.1 +git tag jwtutil/v0.0.2 git tag entgo/v1.1.28 git tag gorm/v1.1.6