From d28815a491eac43ad9153b7a83f27ce72d64a47e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 06 二月 2024 14:47:29 +0800
Subject: [PATCH] 兼容

---
 middleware/reset_pwd.go |   10 ++++++++--
 model/request/jwt.go    |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/middleware/reset_pwd.go b/middleware/reset_pwd.go
index 741b3ca..2c835e4 100644
--- a/middleware/reset_pwd.go
+++ b/middleware/reset_pwd.go
@@ -16,8 +16,14 @@
 			return
 		}
 		claims := params.(*request.CustomClaims)
-		if !claims.ModifiedPwd {
-			ctx.Fail(ecode.DBErr)
+		if claims.ModifiedPwd == nil { //鍏煎娌℃湁ModifiedPwd鍊肩殑token
+			ctx.Fail(ecode.JWTExpire)
+			c.Abort()
+			return
+		}
+
+		if !*claims.ModifiedPwd {
+			ctx.Fail(ecode.ResetPwd)
 			c.Abort()
 			return
 		}
diff --git a/model/request/jwt.go b/model/request/jwt.go
index b257697..09b0caa 100644
--- a/model/request/jwt.go
+++ b/model/request/jwt.go
@@ -21,5 +21,5 @@
 	ParentId    string
 	UserType    constvar.UserType
 	AuthorityId uint
-	ModifiedPwd bool
+	ModifiedPwd *bool
 }

--
Gitblit v1.8.0