--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/user/UserController.java

@@ -66,22 +66,22 @@ public class UserController {
 		userSerivce.save(user);
 		return CallBack.success(user.getUserId());
 	}
-//	@ApiOperation(value = "修改密码", notes = "0：成功；")
-//	@PostMapping(value = "/update")
-//	public CallBack<String> updatePassword(UpdatePasswordForm form) {
-//		com.zrqx.sysuser.commons.model.user.User user = userSerivce.selectByPrimaryKey(redis.getUser().getUserId());
-//		if (!user.getPassword().toLowerCase().equals(form.getOldPassword().toLowerCase())) {
-//			throw new BaseException(1, "旧密码错误");
-//		}
-//		if (!form.getNewPassword1().equals(form.getNewPassword2())) {
-//			throw new BaseException(2, "两次密码不一致");
-//		}
-//		User m = new User();
-//		m.setUserId(user.getUserId());
-//		m.setPassword(form.getNewPassword1().toLowerCase());
-//		userSerivce.updateByPrimaryKeySelective(m);
-//		return CallBack.success("成功");
-//	}
+	@ApiOperation(value = "修改密码", notes = "0：成功；")
+	@PostMapping(value = "/update")
+	public CallBack<String> updatePassword(UpdatePasswordForm form) {
+		User user = userSerivce.selectByPrimaryKey(redis.getUser().getUserId());
+		if (!user.getPassword().toLowerCase().equals(form.getOldPassword().toLowerCase())) {
+			throw new BaseException(1, "旧密码错误");
+		}
+		if (!form.getNewPassword1().equals(form.getNewPassword2())) {
+			throw new BaseException(2, "两次密码不一致");
+		}
+		User m = new User();
+		m.setUserId(user.getUserId());
+		m.setPassword(form.getNewPassword1().toLowerCase());
+		userSerivce.updateByPrimaryKeySelective(m);
+		return CallBack.success("成功");
+	}
 	@ApiOperation(value = "分页查询用户信息" , notes ="分页查询用户信息")
 	@GetMapping(value = "/page")
 	public CallBack<PageInfo<UserVO>> getUserPage(QueryUserForm form, PageParam pageParam){