From ab303cfeef7aa82bff941a353b0fec1ac62edacb Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 13 Jan 2025 10:55:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=9B=BD=E5=AE=B6=E3=80=81=E8=81=8C?= =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/model/dto/AccountBindEmailDTO.java | 8 -------- src/main/java/com/ai/da/model/dto/EmailSendDTO.java | 6 ++++++ .../java/com/ai/da/service/impl/AccountServiceImpl.java | 9 +++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java index 67394ebf..b5559769 100644 --- a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java @@ -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; } diff --git a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java index eed614bb..9a111e87 100644 --- a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java +++ b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java @@ -21,4 +21,10 @@ public class EmailSendDTO { @ApiModelProperty("异常ip") private String ip; + @ApiModelProperty("国家") + private String country; + + @ApiModelProperty("职业") + private String occupation; + } diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 58c1a93a..4dc03dbf 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -418,6 +418,15 @@ public class AccountServiceImpl extends ServiceImpl 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, From cd89a77189608f1eb590486ad07b0cb0fcff6f50 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 13 Jan 2025 10:56:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=BC=8F=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/AccountServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 4dc03dbf..682ba6d2 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -305,8 +305,6 @@ public class AccountServiceImpl extends ServiceImpl impl } //绑定 account.setUserEmail(accountBindEmailDTO.getUserEmail()); - account.setCountry(accountBindEmailDTO.getCountry()); - account.setOccupation(accountBindEmailDTO.getOccupation()); accountMapper.updateById(account); // updatePwdByUserId(accountBindEmailDTO.getUserEmail(), accountBindEmailDTO.getUserId()); return Boolean.TRUE; From 51e2c9af0237851b75e7e10de95c9c599c552111 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 13 Jan 2025 11:11:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=AA=E5=A1=AB=E5=86=99=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6=E5=92=8C=E8=81=8C=E4=B8=9A=EF=BC=88=E4=B8=8D=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/AuthenticationOperationTypeEnum.java | 6 +++++- .../com/ai/da/service/impl/AccountServiceImpl.java | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java b/src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java index a8300691..784edb63 100644 --- a/src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java +++ b/src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java @@ -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); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 682ba6d2..1bf8ec30 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -424,12 +424,21 @@ public class AccountServiceImpl extends ServiceImpl impl 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) {