From b3a47cb555076c25c64d83dd455a472509291245 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 13 十一月 2023 16:09:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 middleware/jwt.go |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/middleware/jwt.go b/middleware/jwt.go
index 5007bac..907a1d0 100644
--- a/middleware/jwt.go
+++ b/middleware/jwt.go
@@ -98,11 +98,8 @@
 		// parseToken 瑙f瀽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)
@@ -110,6 +107,11 @@
 			SyncUserInfo([]string{claims.UserId})
 			userInfo = service.GetUserBaseCache(claims.UserId)
 		}
+		if userInfo == nil {
+			ctx.Fail(ecode.JWTDisabled)
+			c.Abort()
+			return
+		}
 
 		SetActiveTime(claims.UserId)
 

--
Gitblit v1.8.0