From 9ed5b521d613edb51b160cca931ee680019e2896 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 07 三月 2023 22:26:13 +0800
Subject: [PATCH] fix 修复 用户密码暴露问题

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java |   53 ++++-------------------------------------------------
 1 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
index 77c1770..18e11c5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
@@ -1,20 +1,13 @@
 package com.ruoyi.system.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.common.core.annotation.Sensitive;
 import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.enums.SensitiveStrategy;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import com.ruoyi.common.tenant.core.TenantEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 鐢ㄦ埛瀵硅薄 sys_user
@@ -26,7 +19,7 @@
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_user")
-public class SysUser extends BaseEntity {
+public class SysUser extends TenantEntity {
 
     /**
      * 鐢ㄦ埛ID
@@ -42,16 +35,11 @@
     /**
      * 鐢ㄦ埛璐﹀彿
      */
-    @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
-    @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
-    @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
     private String userName;
 
     /**
      * 鐢ㄦ埛鏄电О
      */
-    @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
-    @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
     private String nickName;
 
     /**
@@ -62,15 +50,11 @@
     /**
      * 鐢ㄦ埛閭
      */
-    @Sensitive(strategy = SensitiveStrategy.EMAIL)
-    @Email(message = "閭鏍煎紡涓嶆纭�")
-    @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
     private String email;
 
     /**
      * 鎵嬫満鍙风爜
      */
-    @Sensitive(strategy = SensitiveStrategy.PHONE)
     private String phonenumber;
 
     /**
@@ -81,7 +65,7 @@
     /**
      * 鐢ㄦ埛澶村儚
      */
-    private String avatar;
+    private Long avatar;
 
     /**
      * 瀵嗙爜
@@ -119,41 +103,12 @@
      */
     private String remark;
 
-    /**
-     * 閮ㄩ棬瀵硅薄
-     */
-    @TableField(exist = false)
-    private SysDept dept;
-
-    /**
-     * 瑙掕壊瀵硅薄
-     */
-    @TableField(exist = false)
-    private List<SysRole> roles;
-
-    /**
-     * 瑙掕壊缁�
-     */
-    @TableField(exist = false)
-    private Long[] roleIds;
-
-    /**
-     * 宀椾綅缁�
-     */
-    @TableField(exist = false)
-    private Long[] postIds;
-
-    /**
-     * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
-     */
-    @TableField(exist = false)
-    private Long roleId;
 
     public SysUser(Long userId) {
         this.userId = userId;
     }
 
-    public boolean isAdmin() {
+    public boolean isSuperAdmin() {
         return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
     }
 

--
Gitblit v1.9.3