diff --git a/pom.xml b/pom.xml
index 57b71c2d..74b55bf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,12 @@
cn.afterturn
easypoi-spring-boot-starter
4.0.0
+
+
+ javassist
+ org.javassist
+
+
com.github.qcloudsms
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
new file mode 100644
index 00000000..a6474845
--- /dev/null
+++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserSignController.java
@@ -0,0 +1,51 @@
+package com.sqx.modules.app.controller.app;
+
+import cn.hutool.core.convert.Convert;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.userSign.dto.UserSignDTO;
+import com.sqx.modules.userSign.service.UserSignRecordService;
+import io.swagger.annotations.Api;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author tankaikai
+ * @since 2024-12-19 15:23
+ */
+
+@Slf4j
+@RestController
+@Api(value = "用户签到", tags = {"用户签到"})
+@RequestMapping(value = "/app/userSignRecord")
+public class AppUserSignController {
+
+ @Autowired
+ private UserSignRecordService userSignRecordService;
+
+ /**
+ * 获取用户连续签到数据
+ */
+ @GetMapping("/getUserSignData")
+ @ApiOperation("获取用户连续签到数据")
+ public Result getUserSignData(HttpServletRequest request) {
+ long userId = Convert.toLong(request.getAttribute("userId"));
+ UserSignDTO data = userSignRecordService.getUserSignData(userId);
+ return Result.success().put("data", data);
+ }
+
+ /**
+ * 获取连续签到奖励配置
+ */
+ @GetMapping("/getUserSignAwardConfig")
+ @ApiOperation(value = "获取连续签到奖励配置", notes = "如:[7,7] = 连续签到7天奖励7元")
+ public Result getUserSignAwardConfig() {
+ String[] data = userSignRecordService.getUserSignAwardConfig();
+ return Result.success().put("data", data);
+ }
+}
diff --git a/src/main/java/com/sqx/modules/userSign/controller/UserSignRecordController.java b/src/main/java/com/sqx/modules/userSign/controller/UserSignRecordController.java
index 6c6ef4fa..6d472b8e 100644
--- a/src/main/java/com/sqx/modules/userSign/controller/UserSignRecordController.java
+++ b/src/main/java/com/sqx/modules/userSign/controller/UserSignRecordController.java
@@ -3,7 +3,6 @@ package com.sqx.modules.userSign.controller;
import com.sqx.common.utils.Result;
import com.sqx.modules.sys.controller.AbstractController;
-import com.sqx.modules.userSign.dto.UserSignDTO;
import com.sqx.modules.userSign.service.UserSignRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -30,8 +29,8 @@ public class UserSignRecordController extends AbstractController {
@GetMapping("/getUserSignData")
@ApiOperation("获取用户连续签到数据")
public Result getUserSignData() {
- UserSignDTO data = userSignRecordService.getUserSignData();
- return Result.success().put("data", data);
+ //UserSignDTO data = userSignRecordService.getUserSignData();
+ return Result.success().put("data", null);
}
/**
diff --git a/src/main/java/com/sqx/modules/userSign/service/UserSignRecordService.java b/src/main/java/com/sqx/modules/userSign/service/UserSignRecordService.java
index cbd9b000..7228f376 100644
--- a/src/main/java/com/sqx/modules/userSign/service/UserSignRecordService.java
+++ b/src/main/java/com/sqx/modules/userSign/service/UserSignRecordService.java
@@ -6,7 +6,7 @@ import com.sqx.modules.userSign.entity.UserSignRecord;
public interface UserSignRecordService extends IService {
- UserSignDTO getUserSignData();
+ UserSignDTO getUserSignData(long userId);
String[] getUserSignAwardConfig();
diff --git a/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java b/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java
index ecf66cc5..a20f07ac 100644
--- a/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java
+++ b/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java
@@ -7,15 +7,15 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sqx.common.exception.SqxException;
+import com.sqx.modules.app.dao.UserDao;
+import com.sqx.modules.app.entity.UserEntity;
import com.sqx.modules.common.dao.CommonInfoDao;
import com.sqx.modules.common.entity.CommonInfo;
-import com.sqx.modules.sys.entity.SysUserEntity;
import com.sqx.modules.userSign.dao.UserSignRecordDao;
import com.sqx.modules.userSign.dto.UserSignDTO;
import com.sqx.modules.userSign.dto.UserSignRecordDTO;
import com.sqx.modules.userSign.entity.UserSignRecord;
import com.sqx.modules.userSign.service.UserSignRecordService;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,13 +35,16 @@ public class UserSignRecordServiceImpl extends ServiceImpl