From c5631375775b4e99c7ee411844c97c0caaf9cf2b Mon Sep 17 00:00:00 2001 From: ruibaby Date: Fri, 31 May 2019 22:36:11 +0800 Subject: [PATCH] Translate some exception message. --- .../run/halo/app/controller/admin/api/UserController.java | 4 +++- src/main/java/run/halo/app/service/impl/UserServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/run/halo/app/controller/admin/api/UserController.java b/src/main/java/run/halo/app/controller/admin/api/UserController.java index aeac27e38..df98f8490 100644 --- a/src/main/java/run/halo/app/controller/admin/api/UserController.java +++ b/src/main/java/run/halo/app/controller/admin/api/UserController.java @@ -5,6 +5,7 @@ import run.halo.app.model.dto.UserDTO; import run.halo.app.model.entity.User; import run.halo.app.model.params.PasswordParam; import run.halo.app.model.params.UserParam; +import run.halo.app.model.support.BaseResponse; import run.halo.app.model.support.UpdateCheck; import run.halo.app.service.UserService; import run.halo.app.utils.ValidationUtils; @@ -45,7 +46,8 @@ public class UserController { } @PutMapping("profiles/password") - public void updatePassword(@RequestBody @Valid PasswordParam passwordParam, User user) { + public BaseResponse updatePassword(@RequestBody @Valid PasswordParam passwordParam, User user) { userService.updatePassword(passwordParam.getOldPassword(), passwordParam.getNewPassword(), user.getId()); + return BaseResponse.ok("密码修改成功"); } } diff --git a/src/main/java/run/halo/app/service/impl/UserServiceImpl.java b/src/main/java/run/halo/app/service/impl/UserServiceImpl.java index 8912fbb8f..8b785b04a 100644 --- a/src/main/java/run/halo/app/service/impl/UserServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/UserServiceImpl.java @@ -106,7 +106,7 @@ public class UserServiceImpl extends AbstractCrudService implemen Assert.notNull(userId, "User id must not be blank"); if (oldPassword.equals(newPassword)) { - throw new BadRequestException("There is nothing changed because new password is equal to old password"); + throw new BadRequestException("新密码和旧密码不能相同"); } // Get the user @@ -114,7 +114,7 @@ public class UserServiceImpl extends AbstractCrudService implemen // Check the user old password if (!BCrypt.checkpw(oldPassword, user.getPassword())) { - throw new BadRequestException("Old password is mismatch").setErrorData(oldPassword); + throw new BadRequestException("旧密码错误").setErrorData(oldPassword); } // Set new password