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

---
 middleware/jwt.go |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/middleware/jwt.go b/middleware/jwt.go
index 673087c..ec143b0 100644
--- a/middleware/jwt.go
+++ b/middleware/jwt.go
@@ -82,10 +82,12 @@
 
 func JWTAuth2() gin.HandlerFunc {
 	return func(c *gin.Context) {
+		ctx := new(contextx.Context).SetCtx(c)
 		// 鎴戜滑杩欓噷jwt閴存潈鍙栧ご閮ㄤ俊鎭� Authorization 鐧诲綍鏃跺洖杩斿洖token淇℃伅 杩欓噷鍓嶇闇�瑕佹妸token瀛樺偍鍒癱ookie鎴栬�呮湰鍦發ocalStorage涓� 涓嶈繃闇�瑕佽窡鍚庣鍗忓晢杩囨湡鏃堕棿 鍙互绾﹀畾鍒锋柊浠ょ墝鎴栬�呴噸鏂扮櫥褰�
 		token := c.Request.Header.Get("Authorization")
 		if token == "" {
-			c.Next()
+			ctx.Fail(ecode.JWTEmpty)
+			c.Abort()
 			return
 		}
 		slices := strings.Split(token, " ")
@@ -103,8 +105,20 @@
 			c.Next()
 			return
 		}
-
+		userInfo := service.GetUserBaseCache(claims.UserId)
+		if userInfo == nil {
+			SyncUserInfo()
+			userInfo = service.GetUserBaseCache(claims.UserId)
+		}
+		claims.CrmUserId = userInfo.UserId
+		claims.NickName = userInfo.NickName
 		c.Set("claims", claims)
-		c.Next()
+		if CheckAuth(c.Request.RequestURI, token) {
+			c.Next()
+		} else {
+			ctx.Fail(ecode.JWTDisabled)
+			c.Abort()
+			return
+		}
 	}
 }

--
Gitblit v1.8.0