feat: add public usdt user registration
This commit is contained in:
1 parent
2316d48224
commit
b52c8d7dbf
6 files changed
+245
No files matched your search
@@ -34,6 +34,7 @@ import com.ruoyi.framework.web.service.TokenService;
|
||||
import com.ruoyi.system.service.ISysPostService;
|
||||
import com.ruoyi.system.service.ISysRoleService;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.web.controller.system.dto.UsdtUserRegisterRequest;
|
||||
|
||||
/**
|
||||
* 用户信息
|
||||
@@ -44,6 +45,10 @@ import com.ruoyi.system.service.ISysUserService;
|
||||
@RequestMapping("/system/user")
|
||||
public class SysUserController extends BaseController
|
||||
{
|
||||
private static final Long USDT_PORTAL_DEPT_ID = 103L;
|
||||
private static final String USDT_ROLE_KEY = "usdt";
|
||||
private static final String WEB_CREATE_BY = "web";
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
|
||||
@@ -56,6 +61,52 @@ public class SysUserController extends BaseController
|
||||
@Autowired
|
||||
private TokenService tokenService;
|
||||
|
||||
/**
|
||||
* USDT用户门户公开注册。
|
||||
* 部门、性别、状态、角色和创建来源全部由服务端固定,客户端不能覆盖。
|
||||
*/
|
||||
@PostMapping("/usdt/register")
|
||||
public AjaxResult registerUsdtUser(@Validated @RequestBody UsdtUserRegisterRequest request)
|
||||
{
|
||||
String userName = request.getUserName().trim();
|
||||
String email = request.getEmail().trim();
|
||||
String nickName = request.getNickName().trim();
|
||||
if (StringUtils.isEmpty(nickName))
|
||||
{
|
||||
return AjaxResult.error("昵称不能为空");
|
||||
}
|
||||
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(userName)))
|
||||
{
|
||||
return AjaxResult.error("注册失败,用户名已存在");
|
||||
}
|
||||
|
||||
SysUser user = new SysUser();
|
||||
user.setUserName(userName);
|
||||
user.setEmail(email);
|
||||
if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
||||
{
|
||||
return AjaxResult.error("注册失败,邮箱已存在");
|
||||
}
|
||||
|
||||
SysRole usdtRole = roleService.selectRoleByRoleKey(USDT_ROLE_KEY);
|
||||
if (StringUtils.isNull(usdtRole) || UserConstants.ROLE_DISABLE.equals(usdtRole.getStatus())
|
||||
|| !UserConstants.NORMAL.equals(usdtRole.getDelFlag()))
|
||||
{
|
||||
return AjaxResult.error("USDT用户角色未配置或已停用,请联系管理员");
|
||||
}
|
||||
|
||||
user.setNickName(nickName);
|
||||
user.setDeptId(USDT_PORTAL_DEPT_ID);
|
||||
user.setSex("0");
|
||||
user.setStatus(UserConstants.NORMAL);
|
||||
user.setDelFlag(UserConstants.NORMAL);
|
||||
user.setCreateBy(WEB_CREATE_BY);
|
||||
user.setRoleIds(new Long[] { usdtRole.getRoleId() });
|
||||
user.setPostIds(new Long[0]);
|
||||
user.setPassword(SecurityUtils.encryptPassword(request.getPassword()));
|
||||
return toAjax(userService.insertUser(user));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户列表
|
||||
*/
|
||||
|
||||
+57
@@ -0,0 +1,57 @@
|
||||
package com.ruoyi.web.controller.system.dto;
|
||||
|
||||
import javax.validation.constraints.Email;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
/** USDT用户门户公开注册请求,只接收用户必须填写的字段。 */
|
||||
public class UsdtUserRegisterRequest {
|
||||
@NotBlank(message = "用户名不能为空")
|
||||
@Size(min = 2, max = 30, message = "用户名长度必须在2到30个字符之间")
|
||||
private String userName;
|
||||
|
||||
@NotBlank(message = "密码不能为空")
|
||||
@Size(min = 6, max = 100, message = "密码长度必须在6到100个字符之间")
|
||||
private String password;
|
||||
|
||||
@NotBlank(message = "邮箱不能为空")
|
||||
@Email(message = "邮箱格式不正确")
|
||||
@Size(max = 50, message = "邮箱长度不能超过50个字符")
|
||||
private String email;
|
||||
|
||||
@NotBlank(message = "昵称不能为空")
|
||||
@Size(max = 30, message = "昵称长度不能超过30个字符")
|
||||
private String nickName;
|
||||
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
|
||||
public void setUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public String getNickName() {
|
||||
return nickName;
|
||||
}
|
||||
|
||||
public void setNickName(String nickName) {
|
||||
this.nickName = nickName;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
package com.ruoyi.web.controller.system;
|
||||
|
||||
import com.ruoyi.common.constant.UserConstants;
|
||||
import com.ruoyi.common.core.domain.entity.SysRole;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.system.service.ISysPostService;
|
||||
import com.ruoyi.system.service.ISysRoleService;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.framework.web.service.TokenService;
|
||||
import com.ruoyi.web.controller.system.dto.UsdtUserRegisterRequest;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class SysUserControllerTest {
|
||||
@Mock
|
||||
private ISysUserService userService;
|
||||
@Mock
|
||||
private ISysRoleService roleService;
|
||||
@Mock
|
||||
private ISysPostService postService;
|
||||
@Mock
|
||||
private TokenService tokenService;
|
||||
@InjectMocks
|
||||
private SysUserController controller;
|
||||
|
||||
private UsdtUserRegisterRequest request;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
request = new UsdtUserRegisterRequest();
|
||||
request.setUserName(" portal-user ");
|
||||
request.setPassword("Secret123");
|
||||
request.setEmail(" portal@example.com ");
|
||||
request.setNickName(" Portal User ");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldCreateUsdtPortalUserWithServerControlledFields() {
|
||||
SysRole role = activeUsdtRole();
|
||||
when(userService.checkUserNameUnique("portal-user")).thenReturn(UserConstants.UNIQUE);
|
||||
when(userService.checkEmailUnique(any(SysUser.class))).thenReturn(UserConstants.UNIQUE);
|
||||
when(userService.insertUser(any(SysUser.class))).thenReturn(1);
|
||||
when(roleService.selectRoleByRoleKey("usdt")).thenReturn(role);
|
||||
|
||||
controller.registerUsdtUser(request);
|
||||
|
||||
ArgumentCaptor<SysUser> captor = ArgumentCaptor.forClass(SysUser.class);
|
||||
verify(userService).insertUser(captor.capture());
|
||||
SysUser user = captor.getValue();
|
||||
assertEquals("portal-user", user.getUserName());
|
||||
assertEquals("portal@example.com", user.getEmail());
|
||||
assertEquals("Portal User", user.getNickName());
|
||||
assertEquals(Long.valueOf(103L), user.getDeptId());
|
||||
assertEquals("0", user.getSex());
|
||||
assertEquals(UserConstants.NORMAL, user.getStatus());
|
||||
assertEquals("web", user.getCreateBy());
|
||||
assertEquals(Long.valueOf(9L), user.getRoleIds()[0]);
|
||||
assertNotEquals("Secret123", user.getPassword());
|
||||
assertFalse(user.getPassword().isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldRejectDuplicateUserName() {
|
||||
when(userService.checkUserNameUnique("portal-user")).thenReturn(UserConstants.NOT_UNIQUE);
|
||||
|
||||
controller.registerUsdtUser(request);
|
||||
|
||||
verify(userService, never()).insertUser(any(SysUser.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldRejectDuplicateEmail() {
|
||||
when(userService.checkUserNameUnique("portal-user")).thenReturn(UserConstants.UNIQUE);
|
||||
when(userService.checkEmailUnique(any(SysUser.class))).thenReturn(UserConstants.NOT_UNIQUE);
|
||||
|
||||
controller.registerUsdtUser(request);
|
||||
|
||||
verify(userService, never()).insertUser(any(SysUser.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldRejectDisabledUsdtRole() {
|
||||
SysRole role = activeUsdtRole();
|
||||
role.setStatus(UserConstants.ROLE_DISABLE);
|
||||
when(userService.checkUserNameUnique("portal-user")).thenReturn(UserConstants.UNIQUE);
|
||||
when(userService.checkEmailUnique(any(SysUser.class))).thenReturn(UserConstants.UNIQUE);
|
||||
when(roleService.selectRoleByRoleKey("usdt")).thenReturn(role);
|
||||
|
||||
controller.registerUsdtUser(request);
|
||||
|
||||
verify(userService, never()).insertUser(any(SysUser.class));
|
||||
}
|
||||
|
||||
private SysRole activeUsdtRole() {
|
||||
SysRole role = new SysRole();
|
||||
role.setRoleId(9L);
|
||||
role.setRoleKey("usdt");
|
||||
role.setStatus(UserConstants.NORMAL);
|
||||
role.setDelFlag(UserConstants.NORMAL);
|
||||
return role;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user