ソースを参照

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

RuoYi 4 年 前
コミット
f6c5c91eb1
共有2 個のファイルを変更した1 個の追加17 個の削除を含む
  1. 1 1
      pom.xml
  2. 0 16
      ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

+ 1 - 1
pom.xml

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

+ 0 - 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 5
 import javax.validation.constraints.Email;
6 6
 import javax.validation.constraints.NotBlank;
7 7
 import javax.validation.constraints.Size;
8
-
9 8
 import com.fasterxml.jackson.annotation.JsonIgnore;
10 9
 import org.apache.commons.lang3.builder.ToStringBuilder;
11 10
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -60,10 +59,6 @@ public class SysUser extends BaseEntity
60 59
     @JsonIgnore
61 60
     private String password;
62 61
 
63
-    /** 盐加密 */
64
-    @JsonIgnore
65
-    private String salt;
66
-
67 62
     /** 帐号状态(0正常 1停用) */
68 63
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
69 64
     private String status;
@@ -215,16 +210,6 @@ public class SysUser extends BaseEntity
215 210
         this.password = password;
216 211
     }
217 212
 
218
-    public String getSalt()
219
-    {
220
-        return salt;
221
-    }
222
-
223
-    public void setSalt(String salt)
224
-    {
225
-        this.salt = salt;
226
-    }
227
-
228 213
     public String getStatus()
229 214
     {
230 215
         return status;
@@ -326,7 +311,6 @@ public class SysUser extends BaseEntity
326 311
             .append("sex", getSex())
327 312
             .append("avatar", getAvatar())
328 313
             .append("password", getPassword())
329
-            .append("salt", getSalt())
330 314
             .append("status", getStatus())
331 315
             .append("delFlag", getDelFlag())
332 316
             .append("loginIp", getLoginIp())