1333

api/middlewares/auth.go

@@ -12,17 +12,17 @@ import (
 func Auth() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		// 获取用户id
-		userId := c.GetInt64("UserId")
+		adminUserId := c.GetInt64("AdminUserId")
-		if userId == 0 {
+		if adminUserId == 0 {
 			responses.Fail(c)
 			c.Abort()
 			return
 		}
 
 		// 获取用户数据
-		userDao := dao.UserDao{}
+		adminUserDao := dao.AdminUserDao{}
-		user, err := userDao.GetUserById(userId)
+		adminUser, err := adminUserDao.GetAdminUserById(adminUserId)
-		if err != nil || user == nil {
+		if err != nil || adminUser == nil {
 			c.JSON(http.StatusUnauthorized, gin.H{
 				"message": "用户数据错误",
 				"code":    consts.UserStatusError,
@@ -32,9 +32,9 @@ func Auth() gin.HandlerFunc {
 			return
 		}
 
-		if user.UserStatus == 2 {
+		if adminUser.Status == 2 {
 			c.JSON(http.StatusUnauthorized, gin.H{
-				"message": "用户已禁用",
+				"message": "用户审核中",
 				"code":    consts.UserStatusError,
 				"data":    "",
 			})
@@ -42,6 +42,38 @@ func Auth() gin.HandlerFunc {
 			return
 		}
 
+		if adminUser.Status == 3 {
+			c.JSON(http.StatusUnauthorized, gin.H{
+				"message": "用户状态异常",
+				"code":    consts.UserStatusError,
+				"data":    "",
+			})
+			c.Abort()
+			return
+		}
+
+		if adminUser.IsDisabled == 1 {
+			c.JSON(http.StatusUnauthorized, gin.H{
+				"message": "用户已被禁用",
+				"code":    consts.UserStatusError,
+				"data":    "",
+			})
+			c.Abort()
+			return
+		}
+
+		if adminUser.IsDeleted == 1 {
+			c.JSON(http.StatusUnauthorized, gin.H{
+				"message": "用户状态异常",
+				"code":    consts.UserStatusError,
+				"data":    "",
+			})
+			c.Abort()
+			return
+		}
+
+		c.Set("AdminUserId", adminUserId) // 用户id
+
 		c.Next()
 	}
 }

api/middlewares/jwt.go

@@ -76,7 +76,7 @@ func Jwt() gin.HandlerFunc {
 			return
 		}
 
-		c.Set("UserId", userId) // 用户id
+		c.Set("AdminUserId", userId) // 用户id
 		c.Next()
 	}
 }