BUGFIX:注册用户登录没有邮件发送记录和登录记录
This commit is contained in:
@@ -176,8 +176,9 @@ public class AccountController {
|
|||||||
@CrossOrigin
|
@CrossOrigin
|
||||||
@ApiOperation(value = "广场用户注册")
|
@ApiOperation(value = "广场用户注册")
|
||||||
@PostMapping("/designWorksRegisterCode")
|
@PostMapping("/designWorksRegisterCode")
|
||||||
public Response<AccountLoginVO> designWorksRegisterCode(@Valid @RequestBody AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) {
|
public Response<AccountLoginVO> designWorksRegisterCode(@Valid @RequestBody AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO,
|
||||||
return Response.success(accountService.designWorksRegisterCode(accountDesignWorksRegisterDTO));
|
HttpServletRequest request) {
|
||||||
|
return Response.success(accountService.designWorksRegisterCode(accountDesignWorksRegisterDTO, request));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -50,4 +50,12 @@ public class AccountLoginLog implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private Date createDate;
|
private Date createDate;
|
||||||
|
|
||||||
|
public AccountLoginLog() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public AccountLoginLog(Long accountId, String ip, Date createDate) {
|
||||||
|
this.accountId = accountId;
|
||||||
|
this.ip = ip;
|
||||||
|
this.createDate = createDate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -145,7 +145,8 @@ public interface AccountService extends IService<Account> {
|
|||||||
|
|
||||||
Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO);
|
Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO);
|
||||||
|
|
||||||
AccountLoginVO designWorksRegisterCode(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO);
|
AccountLoginVO designWorksRegisterCode(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO,
|
||||||
|
HttpServletRequest request);
|
||||||
|
|
||||||
Boolean extendValidityForCC();
|
Boolean extendValidityForCC();
|
||||||
|
|
||||||
|
|||||||
@@ -1308,6 +1308,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) {
|
public Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) {
|
||||||
|
log.info("注册账号。邮箱:{}", accountDesignWorksRegisterDTO.getUserEmail() );
|
||||||
QueryWrapper<Account> qw = new QueryWrapper<>();
|
QueryWrapper<Account> qw = new QueryWrapper<>();
|
||||||
qw.eq("BINARY user_email", accountDesignWorksRegisterDTO.getUserEmail());
|
qw.eq("BINARY user_email", accountDesignWorksRegisterDTO.getUserEmail());
|
||||||
List<Account> accountList = accountMapper.selectList(qw);
|
List<Account> accountList = accountMapper.selectList(qw);
|
||||||
@@ -1322,11 +1323,13 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
|||||||
if (!b) {
|
if (!b) {
|
||||||
throw new BusinessException("failed.to.send.mail");
|
throw new BusinessException("failed.to.send.mail");
|
||||||
}
|
}
|
||||||
|
log.info("注册账号。成功向 {} 账号发送验证码:{}", accountDesignWorksRegisterDTO.getUserEmail(), randomVerifyCode);
|
||||||
return Boolean.TRUE;
|
return Boolean.TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AccountLoginVO designWorksRegisterCode(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) {
|
public AccountLoginVO designWorksRegisterCode(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO,
|
||||||
|
HttpServletRequest request) {
|
||||||
|
|
||||||
String verifyCode = LocalCacheUtils.getVerifyCodeCache("DesignWorksRegister" + "_" + accountDesignWorksRegisterDTO.getUserEmail());
|
String verifyCode = LocalCacheUtils.getVerifyCodeCache("DesignWorksRegister" + "_" + accountDesignWorksRegisterDTO.getUserEmail());
|
||||||
if (StringUtils.isBlank(verifyCode)) {
|
if (StringUtils.isBlank(verifyCode)) {
|
||||||
@@ -1368,6 +1371,10 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
|||||||
}
|
}
|
||||||
response.setUserId(account.getId());
|
response.setUserId(account.getId());
|
||||||
response.setSystemUser(account.getSystemUser());
|
response.setSystemUser(account.getSystemUser());
|
||||||
|
|
||||||
|
// 添加登录日志
|
||||||
|
String ipAddress = RequestInfoUtil.getIpAddress(request);
|
||||||
|
accountLoginLogService.save(new AccountLoginLog(account.getId(), ipAddress, new Date()));
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user