From 740da06972e886d5aa8d1332d4beaae2c26a516b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Wed, 28 Jul 2021 13:51:09 +0800
Subject: [PATCH] !91 【轻量级PR】 [SysUser] 返回给前端数据的时候，隐藏密码和加盐，防止别人猜测加密方式 或者 暴力破击 Merge pull request !91 from dazer007/master
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index e73a0e0..11c56fd 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -5,9 +5,10 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
@@ -56,9 +57,11 @@
private String avatar;
/** 密码 */
+ @JsonIgnore
private String password;
/** 盐加密 */
+ @JsonIgnore
private String salt;
/** 帐号状态（0正常 1停用） */
@@ -68,12 +71,12 @@
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
- /** 最后登陆IP */
- @Excel(name = "最后登陆IP", type = Type.EXPORT)
+ /** 最后登录IP */
+ @Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp;
- /** 最后登陆时间 */
- @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ /** 最后登录时间 */
+ @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
/** 部门对象 */
@@ -91,6 +94,9 @@
/** 岗位组 */
private Long[] postIds;
+
+ /** 角色ID */
+ private Long roleId;
public SysUser()
{
@@ -198,7 +204,6 @@
this.avatar = avatar;
}
- @JsonIgnore
@JsonProperty
public String getPassword()
{
@@ -299,7 +304,16 @@
{
this.postIds = postIds;
}
-
+
+ public Long getRoleId()
+ {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId)
+ {
+ this.roleId = roleId;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3