diff --git a/pom.xml b/pom.xml index 2992b837..d1cf3c11 100644 --- a/pom.xml +++ b/pom.xml @@ -18,13 +18,13 @@ UTF-8 1.8 3.1.1 - 1.2.8 + 1.2.11 1.21 3.0.0 2.3.2 2.2.2 1.4.1 - 2.0.4 + 2.0.7 6.1.6 2.11.0 1.4 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 80f39542..8d4d4c56 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -55,9 +55,6 @@ public class SysUser extends BaseEntity /** 密码 */ private String password; - /** 盐加密 */ - private String salt; - /** 帐号状态(0正常 1停用) */ @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") private String status; @@ -210,16 +207,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; @@ -322,7 +309,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()) diff --git a/ruoyi-ui/babel.config.js b/ruoyi-ui/babel.config.js index 58e8793d..d33f9ea4 100644 --- a/ruoyi-ui/babel.config.js +++ b/ruoyi-ui/babel.config.js @@ -4,7 +4,7 @@ module.exports = { '@vue/cli-plugin-babel/preset' ], 'env': { - 'production': { + 'development': { // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). // This plugin can significantly increase the speed of hot updates, when you have a large number of pages. 'plugins': ['dynamic-import-node']