From bd05f6d593d8e69f462690643995f32cffdff034 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Fri, 15 May 2026 15:52:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(personal-center):=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oauth2/vo/user/OAuth2UserUpdateReqVO.java      | 14 +++++++++-----
 .../user/vo/profile/UserProfileUpdateReqVO.java    |  8 +++-----
 .../system/service/user/AdminUserServiceImpl.java  |  8 ++++----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java
index 38c13ba..272293a 100644
--- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java
+++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java
@@ -1,13 +1,13 @@
 package com.njcn.rdms.module.system.controller.admin.oauth2.vo.user;
 
+import com.njcn.rdms.framework.common.validation.Mobile;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Length;
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Size;
+import org.hibernate.validator.constraints.URL;
 
 @Schema(description = "管理后台 - OAuth2 更新用户基本信息 Request VO")
 @Data
@@ -25,10 +25,14 @@ public class OAuth2UserUpdateReqVO {
     private String email;
 
     @Schema(description = "手机号码", example = "15601691300")
-    @Length(min = 11, max = 11, message = "手机号长度必须 11 位")
+    @Mobile
     private String mobile;
 
     @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
 
+    @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
+    @URL(message = "头像地址格式不正确")
+    private String avatar;
+
 }
diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
index 9c12611..5bad564 100644
--- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
+++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
@@ -1,14 +1,12 @@
 package com.njcn.rdms.module.system.controller.admin.user.vo.profile;
 
+import com.njcn.rdms.framework.common.validation.Mobile;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Size;
+import lombok.Data;
 import org.hibernate.validator.constraints.URL;
 
-
 @Schema(description = "管理后台 - 用户个人信息更新 Request VO")
 @Data
 public class UserProfileUpdateReqVO {
@@ -23,7 +21,7 @@ public class UserProfileUpdateReqVO {
     private String email;
 
     @Schema(description = "手机号码", example = "15601691300")
-    @Length(min = 11, max = 11, message = "手机号长度必须 11 位")
+    @Mobile
     private String mobile;
 
     @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/user/AdminUserServiceImpl.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/user/AdminUserServiceImpl.java
index a708dca..b195790 100644
--- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/user/AdminUserServiceImpl.java
+++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/service/user/AdminUserServiceImpl.java
@@ -152,10 +152,10 @@ public class AdminUserServiceImpl implements AdminUserService {
     public void updateUserPassword(Long id, UserProfileUpdatePasswordReqVO reqVO) {
         // 校验旧密码
         validateOldPassword(id, reqVO.getOldPassword());
-        // 执行更新
-        AdminUserDO updateObj = new AdminUserDO().setId(id);
-        updateObj.setPassword(encodePassword(reqVO.getNewPassword())); // 加密密码
-        userMapper.updateById(updateObj);
+        // 复用已有的密码更新逻辑，保留审计日志
+        updateUserPassword(id, reqVO.getNewPassword());
+        // 密码变更后强制使原有令牌失效
+        oauth2TokenService.removeAccessToken(id, UserTypeEnum.ADMIN.getValue());
     }
 
     @Override