密码设置
This commit is contained in:
@@ -84,21 +84,27 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
|
|||||||
dto.setRoleId(userDto.getRoles().stream().findFirst().get().getId());
|
dto.setRoleId(userDto.getRoles().stream().findFirst().get().getId());
|
||||||
}
|
}
|
||||||
dto.setPhone(userDto.getPhone());
|
dto.setPhone(userDto.getPhone());
|
||||||
|
dto.setPassword("");//不返回密码
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public TbPlussShopStaffDto create(TbPlussShopStaff resources) {
|
public TbPlussShopStaffDto create(TbPlussShopStaff resources) {
|
||||||
if (!PhoneUtil.validator(resources.getAccount())){
|
if (!PhoneUtil.validator(resources.getPhone())){
|
||||||
throw new BadRequestException("手机号格式有误");
|
throw new BadRequestException("手机号格式有误");
|
||||||
}
|
}
|
||||||
resources.setPassword(MD5Utils.md5("123456"));
|
|
||||||
resources.setCreatedAt(Instant.now().toEpochMilli());
|
resources.setCreatedAt(Instant.now().toEpochMilli());
|
||||||
|
|
||||||
//添加收银系统后台账号
|
//添加收银系统后台账号
|
||||||
User user = new User();
|
User user = new User();
|
||||||
user.setPassword(passwordEncoder.encode(resources.getPassword()));
|
if (StringUtils.isBlank(resources.getPassword())) {
|
||||||
|
resources.setPassword(MD5Utils.md5("123456"));
|
||||||
|
user.setPassword(passwordEncoder.encode("123456"));
|
||||||
|
}else {
|
||||||
|
user.setPassword(passwordEncoder.encode(resources.getPassword()));
|
||||||
|
resources.setPassword(MD5Utils.md5(resources.getPassword()));
|
||||||
|
}
|
||||||
user.setUsername(resources.getAccount());
|
user.setUsername(resources.getAccount());
|
||||||
user.setNickName(resources.getName());
|
user.setNickName(resources.getName());
|
||||||
user.setPhone(resources.getPhone());
|
user.setPhone(resources.getPhone());
|
||||||
@@ -134,6 +140,9 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
|
|||||||
resources.setUpdatedAt(Instant.now().toEpochMilli());
|
resources.setUpdatedAt(Instant.now().toEpochMilli());
|
||||||
ValidationUtil.isNull( tbPlussShopStaff.getId(),"TbPlussShopStaff","id",resources.getId());
|
ValidationUtil.isNull( tbPlussShopStaff.getId(),"TbPlussShopStaff","id",resources.getId());
|
||||||
tbPlussShopStaff.copy(resources);
|
tbPlussShopStaff.copy(resources);
|
||||||
|
if (StringUtils.isNotBlank(resources.getPassword())) {
|
||||||
|
tbPlussShopStaff.setPassword(MD5Utils.md5(resources.getPassword()));
|
||||||
|
}
|
||||||
tbPlussShopStaffRepository.save(tbPlussShopStaff);
|
tbPlussShopStaffRepository.save(tbPlussShopStaff);
|
||||||
//修改 sysUser账号
|
//修改 sysUser账号
|
||||||
User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount());
|
User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount());
|
||||||
@@ -143,6 +152,9 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
|
|||||||
roles.add(role);
|
roles.add(role);
|
||||||
sysUser.setRoles(roles);
|
sysUser.setRoles(roles);
|
||||||
sysUser.setNickName(resources.getName());
|
sysUser.setNickName(resources.getName());
|
||||||
|
if (StringUtils.isNotBlank(resources.getPassword())) {
|
||||||
|
sysUser.setPassword(passwordEncoder.encode(resources.getPassword()));
|
||||||
|
}
|
||||||
sysUser.setPhone(resources.getPhone());
|
sysUser.setPhone(resources.getPhone());
|
||||||
userRepository.save(sysUser);
|
userRepository.save(sysUser);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user