update

server/api/v1/course/course_action_users.go

@@ -322,8 +322,14 @@ func (courseActionUsersApi *CourseActionUsersApi) WebSignAction(c *gin.Context)
 		return
 	}
 
+	token,err := jwtService.GetRedisJWT(reqCode.DeviceCode)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+
 	j := utils.NewJWT()
-	cliams,err := j.ParseToken(reqCode.DeviceCode)
+	claims,err := j.ParseToken(token)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
@@ -335,7 +341,7 @@ func (courseActionUsersApi *CourseActionUsersApi) WebSignAction(c *gin.Context)
 		return
 	}
 
-	user,err := courseUsersService.GetCourseUsersByAddr(cliams.Username)
+	user,err := courseUsersService.GetCourseUsersByAddr(claims.Username)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return

server/api/v1/course/course_users.go

@@ -310,27 +310,27 @@ func (courseUsersApi *CourseUsersApi) MetaMaskLogin(c *gin.Context) {
 	}
 
 
-	// if deviceStr, err := jwtService.GetRedisJWT(deviceCode); err == redis.Nil {
-	// 	if err := jwtService.SetRedisJWT(deviceAddr, deviceCode); err != nil {
-	// 		global.GVA_LOG.Error("设置登录状态失败!", zap.Error(err))
-	// 		response.FailWithMessage("设置登录状态失败", c)
-	// 		return
-	// 	}
-	// } else if err != nil {
-	// 	global.GVA_LOG.Error("设置设备码状态失败!", zap.Error(err))
-	// 	response.FailWithMessage("设置设备码状态失败", c)
-	// } else {
-	// 	var blackJWT system.JwtBlacklist
-	// 	blackJWT.Jwt = deviceStr
-	// 	if err := jwtService.JsonInBlacklist(blackJWT); err != nil {
-	// 		response.FailWithMessage("device code作废失败", c)
-	// 		return
-	// 	}
-	// 	if err := jwtService.SetRedisJWT(deviceAddr, deviceCode); err != nil {
-	// 		response.FailWithMessage("设置设备码状态失败", c)
-	// 		return
-	// 	}
-	// }
+	if deviceStr, err := jwtService.GetRedisJWT(deviceCode); err == redis.Nil {
+		if err := jwtService.SetRedisJWT(loginUser.Addr, deviceCode); err != nil {
+			global.GVA_LOG.Error("设置登录状态失败!", zap.Error(err))
+			response.FailWithMessage("设置登录状态失败", c)
+			return
+		}
+	} else if err != nil {
+		global.GVA_LOG.Error("设置设备码状态失败!", zap.Error(err))
+		response.FailWithMessage("设置设备码状态失败", c)
+	} else {
+		var blackJWT system.JwtBlacklist
+		blackJWT.Jwt = deviceStr
+		if err := jwtService.JsonInBlacklist(blackJWT); err != nil {
+			response.FailWithMessage("device code作废失败", c)
+			return
+		}
+		if err := jwtService.SetRedisJWT(loginUser.Addr, deviceCode); err != nil {
+			response.FailWithMessage("设置设备码状态失败", c)
+			return
+		}
+	}
 
 	_,err = courseUsersService.GetCourseUsersByAddr(loginUser.Invitor)
 	if err != nil && err == gorm.ErrRecordNotFound{