From af8d62e5e20b8a8d131bdf326b7d2304d0a96b88 Mon Sep 17 00:00:00 2001
From: PowderSnow <1109835296@qq.com>
Date: Mon, 13 May 2024 03:21:59 +0800
Subject: [PATCH] update ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java. 目前报”验证码已失效“的场景是uuid为空，应通过判断captcha是否为null得出验证码是否已过期的结果。
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 a9bc15e..b00838c 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
@@ -2,17 +2,15 @@
import java.util.Date;
import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.annotation.Excel.Type;
import com.ruoyi.common.core.annotation.Excels;
import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.core.xss.Xss;
/**
* 用户对象 sys_user
@@ -44,7 +42,7 @@
private String email;
/** 手机号码 */
- @Excel(name = "手机号码")
+ @Excel(name = "手机号码", cellType = ColumnType.TEXT)
private String phonenumber;
/** 用户性别 */
@@ -56,9 +54,6 @@
/** 密码 */
private String password;
-
- /** 盐加密 */
- private String salt;
/** 帐号状态（0正常 1停用） */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
@@ -90,6 +85,9 @@
/** 岗位组 */
private Long[] postIds;
+
+ /** 角色ID */
+ private Long roleId;
public SysUser()
{
@@ -131,6 +129,7 @@
this.deptId = deptId;
}
+ @Xss(message = "用户昵称不能包含脚本字符")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
public String getNickName()
{
@@ -142,6 +141,7 @@
this.nickName = nickName;
}
+ @Xss(message = "用户账号不能包含脚本字符")
@NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
public String getUserName()
@@ -197,7 +197,6 @@
this.avatar = avatar;
}
- @JsonProperty
public String getPassword()
{
return password;
@@ -206,16 +205,6 @@
public void setPassword(String password)
{
this.password = password;
- }
-
- public String getSalt()
- {
- return salt;
- }
-
- public void setSalt(String salt)
- {
- this.salt = salt;
}
public String getStatus()
@@ -297,7 +286,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)
@@ -310,7 +308,6 @@
.append("sex", getSex())
.append("avatar", getAvatar())
.append("password", getPassword())
- .append("salt", getSalt())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())
--
Gitblit v1.9.3