Browse Source

升级commons.io到最新版本v2.11.0

tags/v3.1.0
RuoYi 3 years ago
parent
commit
f6c5c91eb1
  1. 2
      pom.xml
  2. 16
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

2
pom.xml

@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
<pagehelper.boot.version>1.3.1</pagehelper.boot.version>
<druid.version>1.2.6</druid.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version>
<commons.io.version>2.10.0</commons.io.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<velocity.version>1.7</velocity.version>
<fastjson.version>1.2.76</fastjson.version>

16
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@ -5,7 +5,6 @@ import java.util.List; @@ -5,7 +5,6 @@ import java.util.List;
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;
@ -60,10 +59,6 @@ public class SysUser extends BaseEntity @@ -60,10 +59,6 @@ public class SysUser extends BaseEntity
@JsonIgnore
private String password;
/** 盐加密 */
@JsonIgnore
private String salt;
/** 帐号状态(0正常 1停用) */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
private String status;
@ -215,16 +210,6 @@ public class SysUser extends BaseEntity @@ -215,16 +210,6 @@ public class SysUser extends BaseEntity
this.password = password;
}
public String getSalt()
{
return salt;
}
public void setSalt(String salt)
{
this.salt = salt;
}
public String getStatus()
{
return status;
@ -326,7 +311,6 @@ public class SysUser extends BaseEntity @@ -326,7 +311,6 @@ public class SysUser extends BaseEntity
.append("sex", getSex())
.append("avatar", getAvatar())
.append("password", getPassword())
.append("salt", getSalt())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())

Loading…
Cancel
Save