Compare commits

...

1 Commits

Author SHA1 Message Date
芋道源码
3b34074ce6 Add email and password registration
---

For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/YunaiV/ruoyi-vue-pro?shareId=XXXX-XXXX-XXXX-XXXX).
2024-08-12 17:26:32 +08:00
5 changed files with 82 additions and 0 deletions

View File

@@ -154,4 +154,14 @@ public class AuthController {
return success(authService.socialLogin(reqVO));
}
// ========== 邮箱注册相关 ==========
@PostMapping("/register")
@PermitAll
@Operation(summary = "使用邮箱和密码注册")
public CommonResult<Boolean> register(@RequestBody @Valid AuthRegisterReqVO reqVO) {
userService.registerUser(reqVO);
return success(true);
}
}

View File

@@ -0,0 +1,24 @@
package cn.iocoder.yudao.module.system.controller.admin.auth.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
@Schema(description = "管理后台 - 用户注册 Request VO")
@Data
public class AuthRegisterReqVO {
@Schema(description = "用户邮箱", requiredMode = Schema.RequiredMode.REQUIRED, example = "test@example.com")
@NotBlank(message = "用户邮箱不能为空")
@Email(message = "邮箱格式不正确")
private String email;
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
@NotBlank(message = "密码不能为空")
@Size(min = 4, max = 16, message = "密码长度为 4-16 位")
private String password;
}

View File

@@ -77,4 +77,16 @@ public class UserSaveReqVO {
|| (ObjectUtil.isAllNotEmpty(password)); // 新增时,必须都传递 password
}
// ========== 新增字段 ==========
@Schema(description = "用户邮箱", requiredMode = Schema.RequiredMode.REQUIRED, example = "test@example.com")
@NotBlank(message = "用户邮箱不能为空")
@Email(message = "邮箱格式不正确")
private String registrationEmail;
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
@NotBlank(message = "密码不能为空")
@Size(min = 4, max = 16, message = "密码长度为 4-16 位")
private String registrationPassword;
}

View File

@@ -201,4 +201,12 @@ public interface AdminUserService {
*/
boolean isPasswordMatch(String rawPassword, String encodedPassword);
/**
* 注册用户
*
* @param registerReqVO 注册信息
* @return 用户编号
*/
Long registerUser(@Valid AuthRegisterReqVO registerReqVO);
}

View File

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
import cn.iocoder.yudao.module.infra.api.file.FileApi;
import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthRegisterReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportExcelVO;
@@ -21,12 +22,14 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqV
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.dept.PostService;
import cn.iocoder.yudao.module.system.service.permission.PermissionService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
import cn.iocoder.yudao.module.system.service.tenant.TenantService;
import com.google.common.annotations.VisibleForTesting;
import com.mzt.logapi.context.LogRecordContext;
@@ -84,6 +87,9 @@ public class AdminUserServiceImpl implements AdminUserService {
@Resource
private ConfigApi configApi;
@Resource
private RoleService roleService;
@Override
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_CREATE_SUB_TYPE, bizNo = "{{#user.id}}",
@@ -492,6 +498,28 @@ public class AdminUserServiceImpl implements AdminUserService {
return passwordEncoder.matches(rawPassword, encodedPassword);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Long registerUser(AuthRegisterReqVO registerReqVO) {
// 1. 校验邮箱是否已被使用
validateEmailUnique(null, registerReqVO.getEmail());
// 2. 创建用户
AdminUserDO user = new AdminUserDO();
user.setEmail(registerReqVO.getEmail());
user.setPassword(encodePassword(registerReqVO.getPassword()));
user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认启用
userMapper.insert(user);
// 3. 赋予 'normal' 角色
RoleDO normalRole = roleService.getRoleByCode("normal");
if (normalRole != null) {
permissionService.assignRoleToUser(user.getId(), normalRole.getId());
}
return user.getId();
}
/**
* 对密码进行加密
*