diff --git a/go.mod b/go.mod index 9d28e7e..e4e8631 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.23.0 toolchain go1.23.2 require ( + github.com/ArtisanCloud/PowerLibs/v3 v3.3.2 github.com/ArtisanCloud/PowerSocialite/v3 v3.0.8 github.com/ArtisanCloud/PowerWeChat/v3 v3.4.21 github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.7 @@ -64,7 +65,6 @@ require ( require ( filippo.io/edwards25519 v1.1.0 // indirect - github.com/ArtisanCloud/PowerLibs/v3 v3.3.2 // indirect github.com/BurntSushi/toml v1.4.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/STARRY-S/zip v0.1.0 // indirect diff --git a/utils/user_jwt/claims.go b/utils/user_jwt/claims.go index 0cc3d29..8865c2b 100644 --- a/utils/user_jwt/claims.go +++ b/utils/user_jwt/claims.go @@ -7,7 +7,6 @@ import ( "time" "git.echol.cn/loser/lckt/global" - systemReq "git.echol.cn/loser/lckt/model/user/request" "github.com/gin-gonic/gin" ) @@ -54,28 +53,25 @@ func GetToken(c *gin.Context) string { return token } -func GetClaims(c *gin.Context) (*systemReq.CustomClaims, error) { +func GetClaims(c *gin.Context) (*request.CustomClaims, error) { token := GetToken(c) j := NewUserJWT() claims, err := j.ParseToken(token) if err != nil { - global.GVA_LOG.Error("从Gin的Context中获取从jwt解析信息失败, 请检查请求头是否存在Authorization且claims是否为规定结构") + global.GVA_LOG.Error(err.Error()) } return claims, err } // GetUserID 从Gin的Context中获取从jwt解析出来的用户ID func GetUserID(c *gin.Context) uint { - if claims, exists := c.Get("claims"); !exists { - if cl, err := GetClaims(c); err != nil { - return 0 - } else { - return cl.BaseClaims.ID - } + + if cl, err := GetClaims(c); err != nil { + return 0 } else { - waitUse := claims.(*systemReq.CustomClaims) - return waitUse.BaseClaims.ID + return cl.BaseClaims.ID } + } // GetNickName 从Gin的Context中获取从jwt解析出来的用户名 @@ -87,7 +83,7 @@ func GetNickName(c *gin.Context) string { return cl.NickName } } else { - waitUse := claims.(*systemReq.CustomClaims) + waitUse := claims.(*request.CustomClaims) return waitUse.NickName } }