update 优化 个人信息接口 改为 Bo 规避不应该接收的参数 更改其他实体作者名

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.controller.system;
 
 import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.domain.R;
@@ -11,6 +12,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.satoken.utils.LoginHelper;
 import com.ruoyi.common.web.core.BaseController;
 import com.ruoyi.system.domain.bo.SysUserBo;
+import com.ruoyi.system.domain.bo.SysUserProfileBo;
 import com.ruoyi.system.domain.vo.AvatarVo;
 import com.ruoyi.system.domain.vo.ProfileVo;
 import com.ruoyi.system.domain.vo.SysOssVo;
@@ -57,7 +59,8 @@ public class SysProfileController extends BaseController {
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> updateProfile(@RequestBody SysUserBo user) {
+    public R<Void> updateProfile(@RequestBody SysUserProfileBo profile) {
+        SysUserBo user = BeanUtil.copyProperties(profile, SysUserBo.class);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
             && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
@@ -67,10 +70,6 @@ public class SysProfileController extends BaseController {
             return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUserId(LoginHelper.getUserId());
-        user.setUserName(null);
-        user.setPassword(null);
-        user.setAvatar(null);
-        user.setDeptId(null);
         if (userService.updateUserProfile(user) > 0) {
             return R.ok();
         }
@@ -117,7 +116,7 @@ public class SysProfileController extends BaseController {
             }
             SysOssVo oss = iSysOssService.upload(avatarfile);
             String avatar = oss.getUrl();
-            if (userService.updateUserAvatar(LoginHelper.getUsername(), avatar)) {
+            if (userService.updateUserAvatar(LoginHelper.getUsername(), oss.getOssId())) {
                 AvatarVo avatarVo = new AvatarVo();
                 avatarVo.setImgUrl(avatar);
                 return R.ok(avatarVo);

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysConfigBo.java

@@ -11,8 +11,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 /**
  * 参数配置业务对象 sys_config
  *
- * @author ruoyi
- * @date 2023-01-31
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java

@@ -13,8 +13,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 部门业务对象 sys_dept
  *
- * @author ruoyi
- * @date 2023-01-31
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictDataBo.java

@@ -12,8 +12,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 字典数据业务对象 sys_dict_data
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictTypeBo.java

@@ -13,8 +13,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 字典类型业务对象 sys_dict_type
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java

@@ -13,8 +13,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 菜单权限业务对象 sys_menu
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java

@@ -13,8 +13,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 通知公告业务对象 sys_notice
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java

@@ -12,8 +12,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 岗位信息业务对象 sys_post
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java

@@ -13,8 +13,7 @@ import lombok.NoArgsConstructor;
 /**
  * 角色信息业务对象 sys_role
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java

@@ -17,8 +17,7 @@ import java.util.Date;
 /**
  * 用户信息业务对象 sys_user
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserProfileBo.java

@@ -0,0 +1,55 @@
+package com.ruoyi.system.domain.bo;
+
+import com.ruoyi.common.core.xss.Xss;
+import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.common.sensitive.annotation.Sensitive;
+import com.ruoyi.common.sensitive.core.SensitiveStrategy;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 个人信息业务处理
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysUserProfileBo extends BaseEntity {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户昵称
+     */
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
+    private String nickName;
+
+    /**
+     * 用户邮箱
+     */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL)
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @Sensitive(strategy = SensitiveStrategy.PHONE)
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysConfigVo.java

@@ -14,8 +14,7 @@ import java.util.Date;
 /**
  * 参数配置视图对象 sys_config
  *
- * @author ruoyi
- * @date 2023-01-31
+ * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDeptVo.java

@@ -13,8 +13,7 @@ import java.util.Date;
 /**
  * 部门视图对象 sys_dept
  *
- * @author ruoyi
- * @date 2023-01-31
+ * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictDataVo.java

@@ -14,8 +14,7 @@ import java.util.Date;
 /**
  * 字典数据视图对象 sys_dict_data
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictTypeVo.java

@@ -14,8 +14,7 @@ import java.util.Date;
 /**
  * 字典类型视图对象 sys_dict_type
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysMenuVo.java

@@ -12,8 +12,7 @@ import java.util.List;
 /**
  * 菜单权限视图对象 sys_menu
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 @Data
 public class SysMenuVo implements Serializable {

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java

@@ -13,8 +13,7 @@ import java.util.Date;
 /**
  * 通知公告视图对象 sys_notice
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 @Data
 public class SysNoticeVo implements Serializable {

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java

@@ -15,8 +15,7 @@ import java.util.Date;
 /**
  * 岗位信息视图对象 sys_post
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java

@@ -15,8 +15,7 @@ import java.util.Set;
 /**
  * 角色信息视图对象 sys_role
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java

@@ -14,8 +14,7 @@ import java.util.List;
 /**
  * 用户信息视图对象 sys_user
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 @Data
 public class SysUserVo implements Serializable {

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -373,7 +373,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(String userName, String avatar) {
+    public boolean updateUserAvatar(String userName, Long avatar) {
         return baseMapper.update(null,
             new LambdaUpdateWrapper<SysUser>()
                 .set(SysUser::getAvatar, avatar)