From f2a45f123bbb346995173e2b3375ecdf20563285 Mon Sep 17 00:00:00 2001
From: bruce <sunzhiye01@outlook.com>
Date: Fri, 14 Feb 2025 12:28:10 +0800
Subject: [PATCH] =?UTF-8?q?v0.1.6=20=E5=AE=8C=E5=96=84=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97RESTful=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bruce/sams/controller/UserController.java    | 2 +-
 .../com/bruce/sams/controller/UserProfileController.java  | 8 ++++++++
 .../bruce/sams/exception/PasswordIncorrectException.java  | 4 ++++
 .../java/com/bruce/sams/service/impl/UserServiceImpl.java | 8 ++++----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/bruce/sams/controller/UserController.java b/src/main/java/com/bruce/sams/controller/UserController.java
index 6f08f367..3d6a784a 100644
--- a/src/main/java/com/bruce/sams/controller/UserController.java
+++ b/src/main/java/com/bruce/sams/controller/UserController.java
@@ -20,7 +20,7 @@ public class UserController {
 
     /**
      * 批量导入用户
-     *
+     * todo 准备引入Excel导入机制
      * @param users 用户列表
      * @return 操作结果
      */
diff --git a/src/main/java/com/bruce/sams/controller/UserProfileController.java b/src/main/java/com/bruce/sams/controller/UserProfileController.java
index 77b53c83..341d0142 100644
--- a/src/main/java/com/bruce/sams/controller/UserProfileController.java
+++ b/src/main/java/com/bruce/sams/controller/UserProfileController.java
@@ -18,6 +18,10 @@ public class UserProfileController {
 
     /**
      * 修改密码
+     *
+     * @param userId
+     * @param oldPassword
+     * @param newPassword
      */
     @PutMapping("/change-password")
     public AjaxResult changePassword(@RequestAttribute Long userId,
@@ -29,6 +33,10 @@ public class UserProfileController {
 
     /**
      * 修改个人信息
+     *
+     * @param userId
+     * @param user
+     * @return
      */
     @PutMapping("/update")
     public AjaxResult updateProfile(@RequestAttribute Long userId, @RequestBody User user) {
diff --git a/src/main/java/com/bruce/sams/exception/PasswordIncorrectException.java b/src/main/java/com/bruce/sams/exception/PasswordIncorrectException.java
index 6b7f8b7e..7d28e6b4 100644
--- a/src/main/java/com/bruce/sams/exception/PasswordIncorrectException.java
+++ b/src/main/java/com/bruce/sams/exception/PasswordIncorrectException.java
@@ -9,4 +9,8 @@ public class PasswordIncorrectException extends CustomException {
     public PasswordIncorrectException() {
         super(HttpStatus.UNAUTHORIZED, "账号或密码错误");
     }
+
+    public PasswordIncorrectException(String message) {
+        super(HttpStatus.UNAUTHORIZED, message);
+    }
 }
diff --git a/src/main/java/com/bruce/sams/service/impl/UserServiceImpl.java b/src/main/java/com/bruce/sams/service/impl/UserServiceImpl.java
index 25d8e98e..2f1be5b8 100644
--- a/src/main/java/com/bruce/sams/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/bruce/sams/service/impl/UserServiceImpl.java
@@ -83,7 +83,7 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, User>
 
         // 验证旧密码
         if (!PasswordUtil.matches(oldPassword, user.getPassword())) {
-            throw new PasswordIncorrectException();
+            throw new PasswordIncorrectException("原密码错误");
         }
 
         // 更新新密码（加密存储）
@@ -92,10 +92,10 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, User>
     }
 
     /**
-     * 用户修改个人信息（昵称、邮箱、头像）
+     * 修改个人信息（昵称、邮箱、头像）
      *
-     * @param userId      用户ID（从 JWT 获取）
-     * @param updatedUser 用户提交的新信息（昵称、邮箱、头像）
+     * @param userId      用户ID
+     * @param updatedUser 用户提交的新信息
      */
     public void updateProfile(Long userId, User updatedUser) {
         User user = userMapper.selectById(userId);