From ac2454fd0efd81a29897d810b40e5a02ca3f054b Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 10 Jan 2025 17:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=82=AE=E7=AE=B1=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E5=AE=B6=E3=80=81=E8=81=8C=E4=B8=9A?= =?UTF-8?q?=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/controller/AccountController.java | 4 ++-- .../java/com/ai/da/model/dto/AccountBindEmailDTO.java | 9 ++++++++- src/main/java/com/ai/da/service/AccountService.java | 2 +- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 51b1c3f6..7a4f4d84 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -326,8 +326,8 @@ public class AccountController { @GetMapping("/bindEmail") @ApiOperation(value = "绑定邮箱") - public Response bindEmail(@RequestParam("email") String email, @RequestParam("country") String country, @RequestParam("occupation") String occupation) { - return Response.success(accountService.bindEmail(email, country, occupation)); + public Response bindEmail(@RequestParam("email") String email) { + return Response.success(accountService.bindEmail(email)); } @GetMapping("/unbindWeChat") 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 d0b67792..67394ebf 100644 --- a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; @Data @ApiModel("绑定邮箱") @@ -22,4 +21,12 @@ 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/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index 2e579451..972458a4 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -49,7 +49,7 @@ public interface AccountService extends IService { */ Boolean bindEmail(AccountBindEmailDTO accountBindEmailDTO); - Boolean bindEmail(String email, String country, String occupation); + Boolean bindEmail(String email); /** * 忘记密码 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 e4c31f14..58c1a93a 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -305,6 +305,8 @@ 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; @@ -2586,12 +2588,10 @@ public class AccountServiceImpl extends ServiceImpl impl } @Override - public Boolean bindEmail(String email, String country, String occupation) { + public Boolean bindEmail(String email) { AuthPrincipalVo userHolder = UserContext.getUserHolder(); Account account = accountMapper.selectById(userHolder.getId()); account.setUserEmail(email); - account.setCountry(country); - account.setOccupation(occupation); accountMapper.updateById(account); return Boolean.TRUE; }