From 877722e08ae42cddc4048578561b8e8999523e0d Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 13 二月 2025 14:43:43 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 29 +++++++++++++++--------------
rsf-server/src/main/resources/mapper/system/UserMapper.xml | 8 ++------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index 76c5b80..7b999b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -5,13 +5,12 @@
import com.vincent.rsf.framework.common.BaseRes;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.config.ConfigProperties;
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.service.EmailService;
-import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.common.service.RedisService;
+import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import com.vincent.rsf.server.system.controller.param.RegisterParam;
import com.vincent.rsf.server.system.controller.param.UpdatePasswordParam;
@@ -33,7 +32,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -107,6 +105,7 @@
if (Cools.isEmpty(param.getUsername(), param.getPassword(), param.getEmail(), param.getCode())) {
return R.parse(BaseRes.PARAM);
}
+ // verify code
String cacheCode = redisService.getValue(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
if (Cools.isEmpty(cacheCode)) {
return R.error("The verification code has expired.");
@@ -114,19 +113,21 @@
if (!cacheCode.equals(param.getCode())) {
return R.error("The verification code is incorrect.");
}
+ redisService.delete(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
+ // register
- User user = new User();
- user.setUsername(param.getUsername());
- user.setNickname(param.getUsername());
- user.setPassword(userService.encodePassword(param.getPassword()));
- user.setEmail(param.getEmail());
- user.setEmailVerified(1);
- user.setStatus(StatusType.ENABLE.val);
- user.setCreateTime(new Date());
- if (!userService.save(user)) {
- throw new CoolException("");
- }
+// User user = new User();
+// user.setUsername(param.getUsername());
+// user.setNickname(param.getUsername());
+// user.setPassword(userService.encodePassword(param.getPassword()));
+// user.setEmail(param.getEmail());
+// user.setEmailVerified(1);
+// user.setStatus(StatusType.ENABLE.val);
+// user.setCreateTime(new Date());
+// if (!userService.save(user)) {
+// throw new CoolException("");
+// }
return R.ok();
}
diff --git a/rsf-server/src/main/resources/mapper/system/UserMapper.xml b/rsf-server/src/main/resources/mapper/system/UserMapper.xml
index b469199..fd60018 100644
--- a/rsf-server/src/main/resources/mapper/system/UserMapper.xml
+++ b/rsf-server/src/main/resources/mapper/system/UserMapper.xml
@@ -4,14 +4,10 @@
<select id="selectPageRel" resultType="com.vincent.rsf.server.system.entity.User">
select
- su.*
+ DISTINCT su.*
from sys_user su
left join sys_dept sd on su.dept_id = sd.id
- left join (
- select *
- from sys_user_role sur
- group by sur.user_id
- ) sur on sur.user_id = su.id
+ left join sys_user_role sur on sur.user_id = su.id
where 1=1
and su.deleted = 0
--
Gitblit v1.9.1