From f6c5c91eb132d58f58e0fedbe14b93e1550aaff5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 28 Jul 2021 14:00:32 +0800
Subject: [PATCH] 升级commons.io到最新版本v2.11.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 16 ----------------
pom.xml | 2 +-
2 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 294e464..5c75934 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
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 11c56fd..187cf75 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,7 +5,6 @@
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;
@@ -59,10 +58,6 @@
/** 密码 */
@JsonIgnore
private String password;
-
- /** 盐加密 */
- @JsonIgnore
- private String salt;
/** 帐号状态（0正常 1停用） */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
@@ -215,16 +210,6 @@
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 @@
.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