From 941caf616bded8ff1faa0a0875f2f37a11d9913d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 15:52:56 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java | 2 +-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 20 ++++++++++++--------
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java | 2 +-
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java
index beaea87..bb606be 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java
@@ -63,7 +63,7 @@
* key为 --> phone_code:手机号码 (phone_code表示该业务为 验证码登录)
* value为 --> 随机验证码:时间戳 (时间戳用于计算是否超过1分钟的重发时间)
*/
- redisTemplate.opsForValue().set(RedisConstants.PHONE_CODE + phone, phoneCode + ":" + System.currentTimeMillis(), 3, TimeUnit.MINUTES);
+ redisTemplate.opsForValue().set(RedisConstants.PHONE_CODE + phone, phoneCode + ":" + System.currentTimeMillis(), 5, TimeUnit.MINUTES);
String sendMessage = "验证码发送成功，您的验证码为：" + phoneCode + "，该验证码三分钟内有效，请及时完成登陆";
// todo 发送此消息
System.out.println(sendMessage);
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 2c85d99..c0a7ef0 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
@@ -451,13 +451,14 @@
return R.ok("反馈成功");
}
+
@PostMapping("/parentLogin")
@ApiOperation(value = "登录", tags = {"家长端-登录"})
@ApiImplicitParams({
@ApiImplicitParam(value = "手机号", name = "phone", dataType = "string", required = true),
@ApiImplicitParam(value = "验证码", name = "phoneCode", dataType = "string", required = true)
})
- public R<Map<String, Object>> login(String phone, String phoneCode) {
+ public R<Map<String, Object>> login(String phone, String phoneCode) throws Exception {
TUser tUser1 = userService.getOne(new QueryWrapper<TUser>()
.ne("state", 3)
.eq("phone", phone));
@@ -480,16 +481,18 @@
} else {
tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
tUser1 = getUser(phone);
- tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
- tUser1.setName("用户"+UUIDUtil.getNumberRandom(6));
+ String upperCase = UUIDUtil.getRandomCode(6).toUpperCase();
+ tUser1.setAccount("用户"+upperCase);
+ tUser1.setName("用户"+upperCase);
userService.save(tUser1);
}
}
} else {
+ String upperCase = UUIDUtil.getRandomCode(6).toUpperCase();
tUser1 = getUser(phone);
tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
- tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
- tUser1.setName("用户"+UUIDUtil.getNumberRandom(6));
+ tUser1.setAccount("用户"+upperCase);
+ tUser1.setName("用户"+upperCase);
userService.save(tUser1);
}
}
@@ -533,7 +536,7 @@
*/
@PostMapping("/studyLogin")
@ApiOperation(value = "学习端-登录", tags = {"学习端-登录"})
- public R<Map<String, Object>> studyLogin(@RequestBody RegisterPhoneRequest phoneRequest) {
+ public R<Map<String, Object>> studyLogin(@RequestBody RegisterPhoneRequest phoneRequest) throws Exception {
String phone = phoneRequest.getPhone();
String phoneCode = phoneRequest.getPhoneCode();
if (!"123456".equals(phoneCode)) {
@@ -561,8 +564,9 @@
} else {
user = getUser(phone);
user.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
- user.setAccount("用户"+UUIDUtil.getNumberRandom(6));
- user.setName("用户"+UUIDUtil.getNumberRandom(6));
+ String upperCase = UUIDUtil.getRandomCode(6).toUpperCase();
+ user.setAccount("用户"+upperCase);
+ user.setName("用户"+upperCase);
userService.save(user);
}
// 生成登录用户信息
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
index 11118d4..2d1236e 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
@@ -81,7 +81,7 @@
* key为 --> phone_code:手机号码 (phone_code表示该业务为 验证码登录)
* value为 --> 随机验证码:时间戳 (时间戳用于计算是否超过1分钟的重发时间)
*/
- redisTemplate.opsForValue().set(RedisConstants.PHONE_CODE + phone, phoneCode + ":" + System.currentTimeMillis(), 3, TimeUnit.MINUTES);
+ redisTemplate.opsForValue().set(RedisConstants.PHONE_CODE + phone, phoneCode + ":" + System.currentTimeMillis(), 5, TimeUnit.MINUTES);
String sendMessage = "验证码发送成功，您的验证码为：" + phoneCode + "，该验证码三分钟内有效，请及时完成登陆";
// todo 发送此消息
System.out.println(sendMessage);
--
Gitblit v1.7.1