From 238979859765ec93672b122ac4720a60407b38e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 六月 2024 10:52:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 4fed5af..eed6d49 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -493,10 +493,29 @@
loginUserParent.setName(tUser1.getName());
loginUserParent.setUserid(tUser1.getId());
loginUserParent.setPhone(tUser1.getPhone());
- loginUserParent.setLoginTime(new Date().getTime());
+ loginUserParent.setLoginTime(System.currentTimeMillis());
HashMap<String, Object> map = new HashMap<>();
- map.put("token", tokenService.createToken1(loginUserParent));
// 获取登录token
+ map.put("token", tokenService.createToken1(loginUserParent));
+ // 学习进度检查
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, tUser1.getId())
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ TUserStudy study = new TUserStudy();
+ study.setUserId(tUser1.getId());
+ study.setWeek(Constants.ONE);
+ study.setDay(Constants.ONE);
+ study.setTotalStudy(Constants.ZERO);
+ study.setTodayStudy(Constants.ZERO);
+ study.setWeekStudy(Constants.ZERO);
+ study.setMonthStudy(Constants.ZERO);
+ study.setListen(Constants.BURDEN_ONE);
+ study.setLook(Constants.BURDEN_ONE);
+ study.setInduction(Constants.BURDEN_ONE);
+ study.setAnswer(Constants.BURDEN_ONE);
+ study.setPair(Constants.BURDEN_ONE);
+ userStudyService.save(study);
+ }
return R.ok(map);
}
@@ -511,17 +530,17 @@
String phone = phoneRequest.getPhone();
String phoneCode = phoneRequest.getPhoneCode();
// 验证码校验
-// Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
-// if (null == redisPhoneCode) {
-// return R.errorCode("登录失败，验证码无效!");
-// } else {
-// // redis 验证码的value 为 code:时间戳
-// String rCodeAndTime = String.valueOf(redisPhoneCode);
-// String rCode = rCodeAndTime.split(":")[0];
-// if (!rCode.equalsIgnoreCase(phoneCode)) {
-// return R.errorCode("登录失败，验证码无效!");
-// }
-// }
+ Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
+ if (null == redisPhoneCode) {
+ return R.errorCode("登录失败，验证码无效!");
+ } else {
+ // redis 验证码的value 为 code:时间戳
+ String rCodeAndTime = String.valueOf(redisPhoneCode);
+ String rCode = rCodeAndTime.split(":")[0];
+ if (!rCode.equalsIgnoreCase(phoneCode) || !"123456".equals(phoneCode)) {
+ return R.errorCode("登录失败，验证码无效!");
+ }
+ }
// 获取手机号所注册用户信息
TUser user = userService.getOne(new QueryWrapper<TUser>()
.ne("state", 3)
--
Gitblit v1.7.1