src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -489,4 +489,15 @@ return R.data(userService.getPoliceUser(longitude, latitude, houseCode)); } /** * 注册用户 */ @PostMapping("/register-user") @ApiOperationSupport(order = 15) @ApiOperation(value = "注册用户", notes = "传入user") public R registerUser(@RequestBody UserVO user ) { return R.status(userService.registerUser(user )); } } src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -207,10 +207,9 @@ /** * 注册新用户 * @param user * @param oauthId * @return */ boolean registerUser(User user, Long oauthId); boolean registerUser(UserVO user ); /** * 配置用户平台 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -343,7 +343,6 @@ } /** * * @param user * @param type 登录类型 2:pc 3:app * @return @@ -539,6 +538,28 @@ } @Override public boolean registerUser(UserVO user) { if (StringUtils.isEmpty(user.getAccount())) { throw new ServiceException("账号不能为空!"); } if (StringUtils.isEmpty(user.getPassword())) { throw new ServiceException("密码不能为空!"); } if (!StringUtils.equals(user.getPassword(), user.getPassword2())) { throw new ServiceException("两次的密码不一致!"); } long count = count(Wrappers.<User>lambdaQuery().eq(User::getAccount, user.getAccount())); if (count > 0) { throw new ServiceException("改账号已存在,请更换其他账号!"); } user.setPassword(DigestUtil.encrypt(user.getPassword())); user.setRoleId("1759487358708310017"); boolean oauthTemp = save(user); return (oauthTemp); } @Override public boolean updatePlatform(Long userId, Integer userType, String userExt) { if (userType.equals(UserEnum.WEB.getCategory())) { UserWeb userWeb = new UserWeb(); @@ -684,7 +705,6 @@ } /** * 处理漏绑定的user_dept */ @@ -786,6 +806,7 @@ /** * 设置性别 * * @param user * @param userExcel */ src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -41,11 +41,8 @@ @JsonSerialize(using = ToStringSerializer.class) private Long id; /** * 密码 */ @JsonIgnore private String password; private String password2; /** * 租户名