From 4f1c9f433e06105347e19e51bd94ee43f0378e60 Mon Sep 17 00:00:00 2001
From: liangwen <2357318727@qq.com>
Date: Fri, 29 Aug 2025 16:32:44 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B3=A8=E5=86=8C=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=81=8C?=
=?UTF-8?q?=E4=BD=8D=E5=8F=82=E6=95=B0=EF=BC=9B=202=E3=80=81=E6=B3=A8?=
=?UTF-8?q?=E5=86=8C=E7=94=B3=E8=AF=B7=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=81=8C?=
=?UTF-8?q?=E4=BD=8D=E8=BF=94=E5=9B=9E=EF=BC=9B=203=E3=80=81=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E3=80=81=E5=88=97=E8=A1=A8=E5=8F=8A=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=81=8C=E4=BD=8D=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=EF=BC=9B=204=E3=80=81=E5=8F=91=E9=80=81=E6=B3=A8?=
=?UTF-8?q?=E5=86=8C=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8F=8A=E9=87=8D=E7=BD=AE?=
=?UTF-8?q?=E5=AF=86=E7=A0=81=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/system/SysLoginController.java | 2 +-
.../controller/system/SysRegisterController.java | 2 +-
.../ruoyi/common/core/domain/entity/SysUser.java | 12 ++++++++++++
.../common/core/domain/model/RegisterBody.java | 10 ++++++++++
.../framework/web/service/EmailService.java | 7 ++++---
.../web/service/SysRegisterService.java | 3 ++-
.../resources/mapper/system/SysUserMapper.xml | 16 ++++++++++------
7 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index fb5e697..294cf60 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -198,7 +198,7 @@ public class SysLoginController extends BaseController
{
AjaxResult ajax = AjaxResult.success();
String uuid = IdUtils.simpleUUID();
- emailService.sendVerifyCode(email, uuid);
+ emailService.sendEmailCode(email, uuid, "重置密码验证码");
ajax.put("uuid", uuid);
return ajax;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
index aa7f521..46226fd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -49,7 +49,7 @@ public class SysRegisterController extends BaseController
{
AjaxResult ajax = AjaxResult.success();
String uuid = IdUtils.simpleUUID();
- emailService.sendVerifyCode(email, uuid);
+ emailService.sendEmailCode(email, uuid, "注册验证码");
ajax.put("uuid", uuid);
return ajax;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 6d75aec..9bff46c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -50,6 +50,10 @@ public class SysUser extends BaseEntity
@Excel(name = "用户邮箱")
private String email;
+ /** 职位 */
+ @Excel(name = "职位")
+ private String position;
+
/** 手机号码 */
@Excel(name = "手机号码")
private String phonenumber;
@@ -190,6 +194,14 @@ public class SysUser extends BaseEntity
this.email = email;
}
+ public String getPosition() {
+ return position;
+ }
+
+ public void setPosition(String position) {
+ this.position = position;
+ }
+
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
public String getPhonenumber()
{
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
index 8ac82f6..e8ac3a5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
@@ -13,6 +13,8 @@ public class RegisterBody extends LoginBody
private String email;
+ private String position;
+
public String getNickname() {
return nickname;
}
@@ -36,4 +38,12 @@ public class RegisterBody extends LoginBody
public void setEmail(String email) {
this.email = email;
}
+
+ public String getPosition() {
+ return position;
+ }
+
+ public void setPosition(String position) {
+ this.position = position;
+ }
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/EmailService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/EmailService.java
index 72c449c..e5a6e5d 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/EmailService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/EmailService.java
@@ -22,19 +22,20 @@ public class EmailService {
private RedisCache redisCache;
/**
- * 发送邮箱验证码
+ * 发送注册邮箱验证码
*
* @param email 邮箱
* @param uuid 唯一标识
+ * @param subject 邮件主题
*/
- public void sendVerifyCode(String email, String uuid) {
+ public void sendEmailCode(String email, String uuid, String subject) {
String code = String.valueOf(new Random().nextInt(899999) + 100000);
String verifyKey = CacheConstants.EMAIL_CODE_KEY + email + ":" + StringUtils.nvl(uuid, "");
redisCache.setCacheObject(verifyKey, code, 5, TimeUnit.MINUTES);
SimpleMailMessage message = new SimpleMailMessage();
message.setFrom("adamlawen@qq.com");
message.setTo(email);
- message.setSubject("注册验证码");
+ message.setSubject(subject);
message.setText("您的验证码是：" + code + "，5分钟内有效。");
mailSender.send(message);
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
index b9351a0..77a296b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -54,7 +54,7 @@ public class SysRegisterService
{
String msg = "", username = registerBody.getUsername(), nickname = registerBody.getNickname(),
password = registerBody.getPassword(), company = registerBody.getCompany(),
- email = registerBody.getEmail();
+ email = registerBody.getEmail(), position = registerBody.getPosition();
SysUser sysUser = new SysUser();
sysUser.setUserName(username);
sysUser.setEmail(email);
@@ -99,6 +99,7 @@ public class SysRegisterService
sysUser.setNickName(StringUtils.isNotEmpty(nickname) ? nickname : username);
sysUser.setCompany(company);
+ sysUser.setPosition(position);
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser.setStatus("3"); //设置为审核中
boolean regFlag = userService.registerUser(sysUser);
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 25e7382..14e9c78 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -7,10 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
-
+
@@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select u.user_id, u.dept_id, u.company, u.user_name, u.nick_name, u.nick_name_en,u.email, u.avatar, u.phonenumber, u.language,
+ select u.user_id, u.dept_id, u.company, u.position, u.user_name, u.nick_name, u.nick_name_en, u.email, u.avatar, u.phonenumber, u.language,
u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"