diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserSignController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserSignController.java index a6474845..2aaf5faa 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppUserSignController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserSignController.java @@ -1,7 +1,7 @@ package com.sqx.modules.app.controller.app; -import cn.hutool.core.convert.Convert; import com.sqx.common.utils.Result; +import com.sqx.modules.app.annotation.Login; import com.sqx.modules.userSign.dto.UserSignDTO; import com.sqx.modules.userSign.service.UserSignRecordService; import io.swagger.annotations.Api; @@ -9,11 +9,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; - /** * @author tankaikai * @since 2024-12-19 15:23 @@ -31,10 +30,10 @@ public class AppUserSignController { /** * 获取用户连续签到数据 */ + @Login @GetMapping("/getUserSignData") @ApiOperation("获取用户连续签到数据") - public Result getUserSignData(HttpServletRequest request) { - long userId = Convert.toLong(request.getAttribute("userId")); + public Result getUserSignData(@RequestAttribute("userId") Long userId) { UserSignDTO data = userSignRecordService.getUserSignData(userId); return Result.success().put("data", data); } @@ -42,6 +41,7 @@ public class AppUserSignController { /** * 获取连续签到奖励配置 */ + @Login @GetMapping("/getUserSignAwardConfig") @ApiOperation(value = "获取连续签到奖励配置", notes = "如:[7,7] = 连续签到7天奖励7元") public Result getUserSignAwardConfig() {