From 413575c1b9447c541802399f024c68fbdaf73baf Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 19 Sep 2016 14:59:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/controller/UsersController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 1571f7e..ba98325 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -1073,7 +1073,8 @@ public class UsersController extends BaseController { */ @RequestMapping(value = "/passwords/reset", method = RequestMethod.PUT) @TokenRequired - public void updatePassword(HttpServletResponse response, @RequestParam(value = "userId") String id, @RequestParam(value = "pwd", required = false) String pwd) { + public void updatePassword(HttpServletResponse response, @RequestParam(value = "userId") String id, + @RequestParam(value = "pwd", required = false) String pwd) { Users users = usersService.getUsers(Integer.valueOf(id)); if (users == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "用户ID不存在"); @@ -1081,7 +1082,7 @@ public class UsersController extends BaseController { } if (StringUtils.isNotBlank(pwd)) { if (MD5Utils.md5(pwd).equals(users.getPwd())) { - ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.USER_PASSWORD_ERROR, "新密码不能和老密码相同"); + ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.USER_PASSWORD_ERROR, "新密码不能和初始密码相同"); return; } users.setPwd(MD5Utils.md5(pwd)); -- 1.8.3.1