aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-01-13 11:13:31 +08:00
parent 07004a7415 51e2c9af02
commit cff8227228
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java
View File

@@ -27,7 +27,11 @@ public enum AuthenticationOperationTypeEnum {
/**
* 更改邮箱
*/
CHANGE_MAILBOX;
CHANGE_MAILBOX,
/**
* 填写用户国家和职业
*/
UPDATE_USERINFO;
public static AuthenticationOperationTypeEnum of(String name) {
return Stream.of(AuthenticationOperationTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null);

8
src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java
View File

@@ -21,12 +21,4 @@ public class AccountBindEmailDTO {
@NotBlank(message = "emailVerifyCode.cannot.be.empty")
@ApiModelProperty("邮箱验证码")
private String emailVerifyCode;
@NotBlank(message = "country cannot be empty" )
@ApiModelProperty("国家")
private String country;
@NotBlank(message = "occupation cannot be empty")
@ApiModelProperty("职业")
private String occupation;
}

6
src/main/java/com/ai/da/model/dto/EmailSendDTO.java
View File

@@ -21,4 +21,10 @@ public class EmailSendDTO {
@ApiModelProperty("异常ip")
private String ip;
@ApiModelProperty("国家")
private String country;
@ApiModelProperty("职业")
private String occupation;
}

20
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -305,8 +305,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
}
//绑定
account.setUserEmail(accountBindEmailDTO.getUserEmail());
account.setCountry(accountBindEmailDTO.getCountry());
account.setOccupation(accountBindEmailDTO.getOccupation());
accountMapper.updateById(account);
// updatePwdByUserId(accountBindEmailDTO.getUserEmail(), accountBindEmailDTO.getUserId());
return Boolean.TRUE;
@@ -418,11 +416,29 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
}
result = SendEmailUtil.send(emailSendDTO.getEmail(), null,
SendEmailUtil.BIND_MAILBOX_TEMPLATE_ID, randomVerifyCode);
if (!StringUtil.isNullOrEmpty(emailSendDTO.getCountry()) || !StringUtil.isNullOrEmpty(emailSendDTO.getOccupation())){
Long accountId = UserContext.getUserHolder().getId();
Account account = baseMapper.selectById(accountId);
account.setCountry(emailSendDTO.getCountry());
account.setOccupation(emailSendDTO.getOccupation());
baseMapper.updateById(account);
}
break;
case CHANGE_MAILBOX:
result = SendEmailUtil.send(emailSendDTO.getEmail(), null,
SendEmailUtil.CHANGE_MAILBOX_TEMPLATE_ID, randomVerifyCode);
break;
case UPDATE_USERINFO:
if (!StringUtil.isNullOrEmpty(emailSendDTO.getCountry()) || !StringUtil.isNullOrEmpty(emailSendDTO.getOccupation())){
Long accountId = UserContext.getUserHolder().getId();
Account account = baseMapper.selectById(accountId);
account.setCountry(emailSendDTO.getCountry());
account.setOccupation(emailSendDTO.getOccupation());
baseMapper.updateById(account);
result = true;
}
break;
default:
}
if (!result) {