diff --git a/go.mod b/go.mod index b71be37e..1a1697d1 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/DATA-DOG/go-sqlmock v1.4.1 github.com/alicebob/miniredis/v2 v2.14.1 github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect - github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/emicklei/proto v1.9.0 github.com/fatih/color v1.9.0 // indirect github.com/fatih/structtag v1.2.0 @@ -16,6 +15,7 @@ require ( github.com/go-redis/redis v6.15.7+incompatible github.com/go-sql-driver/mysql v1.5.0 github.com/go-xorm/builder v0.3.4 + github.com/golang-jwt/jwt/v4 v4.0.0 github.com/golang/mock v1.4.3 github.com/google/uuid v1.1.2 github.com/iancoleman/strcase v0.1.2 diff --git a/go.sum b/go.sum index 6e295fc4..8e563f8a 100644 --- a/go.sum +++ b/go.sum @@ -83,7 +83,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= @@ -147,6 +146,8 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o= +github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= diff --git a/rest/handler/authhandler.go b/rest/handler/authhandler.go index 14dd7e7f..67de18e9 100644 --- a/rest/handler/authhandler.go +++ b/rest/handler/authhandler.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httputil" - "github.com/dgrijalva/jwt-go" + "github.com/golang-jwt/jwt/v4" "github.com/tal-tech/go-zero/core/logx" "github.com/tal-tech/go-zero/rest/token" ) diff --git a/rest/handler/authhandler_test.go b/rest/handler/authhandler_test.go index 16e13d74..1ef83112 100644 --- a/rest/handler/authhandler_test.go +++ b/rest/handler/authhandler_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/dgrijalva/jwt-go" + "github.com/golang-jwt/jwt/v4" "github.com/stretchr/testify/assert" ) diff --git a/rest/token/tokenparser.go b/rest/token/tokenparser.go index 4326ae80..675894c4 100644 --- a/rest/token/tokenparser.go +++ b/rest/token/tokenparser.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "time" - "github.com/dgrijalva/jwt-go" - "github.com/dgrijalva/jwt-go/request" + "github.com/golang-jwt/jwt/v4" + "github.com/golang-jwt/jwt/v4/request" "github.com/tal-tech/go-zero/core/timex" ) diff --git a/rest/token/tokenparser_test.go b/rest/token/tokenparser_test.go index 215b4db5..2e240f3b 100644 --- a/rest/token/tokenparser_test.go +++ b/rest/token/tokenparser_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/dgrijalva/jwt-go" + "github.com/golang-jwt/jwt/v4" "github.com/stretchr/testify/assert" "github.com/tal-tech/go-zero/core/timex" )