From a8849056eebef42a33353e8652de13822f440632 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 13 十一月 2023 10:15:31 +0800
Subject: [PATCH] merge
---
middleware/jwt.go | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/middleware/jwt.go b/middleware/jwt.go
index 6fae7ea..907a1d0 100644
--- a/middleware/jwt.go
+++ b/middleware/jwt.go
@@ -98,20 +98,26 @@
// parseToken 瑙ｆ瀽token鍖呭惈鐨勪俊鎭�
claims, err := j.ParseToken(token)
if err != nil {
- if err == utils.TokenExpired {
- c.Next()
- return
- }
- c.Next()
+ ctx.Fail(ecode.JWTDisabled)
+ c.Abort()
return
}
userInfo := service.GetUserBaseCache(claims.UserId)
if userInfo == nil {
- SyncUserInfo(claims.UserId)
+ SyncUserInfo([]string{claims.UserId})
userInfo = service.GetUserBaseCache(claims.UserId)
}
+ if userInfo == nil {
+ ctx.Fail(ecode.JWTDisabled)
+ c.Abort()
+ return
+ }
+
+ SetActiveTime(claims.UserId)
+
claims.CrmUserId = userInfo.UserId
claims.NickName = userInfo.NickName
+ claims.SubUserIds = userInfo.SubUserIds
c.Set("claims", claims)
if CheckAuth(c.Request.URL.Path, token) {
c.Next()
--
Gitblit v1.8.0