diff --git a/campus-admin/pom.xml b/campus-admin/pom.xml index 6dd28ba..5034b1f 100644 --- a/campus-admin/pom.xml +++ b/campus-admin/pom.xml @@ -5,7 +5,7 @@ campus com.oddfar.campus - 1.1.4 + 1.1.5 4.0.0 diff --git a/campus-common/pom.xml b/campus-common/pom.xml index 759fb5a..4a29987 100644 --- a/campus-common/pom.xml +++ b/campus-common/pom.xml @@ -5,7 +5,7 @@ campus com.oddfar.campus - 1.1.4 + 1.1.5 4.0.0 diff --git a/campus-framework/pom.xml b/campus-framework/pom.xml index 3169b53..bee4541 100644 --- a/campus-framework/pom.xml +++ b/campus-framework/pom.xml @@ -5,7 +5,7 @@ campus com.oddfar.campus - 1.1.4 + 1.1.5 4.0.0 diff --git a/campus-framework/src/main/java/com/oddfar/campus/framework/service/impl/SysUserServiceImpl.java b/campus-framework/src/main/java/com/oddfar/campus/framework/service/impl/SysUserServiceImpl.java index b5d4ba1..2e30239 100644 --- a/campus-framework/src/main/java/com/oddfar/campus/framework/service/impl/SysUserServiceImpl.java +++ b/campus-framework/src/main/java/com/oddfar/campus/framework/service/impl/SysUserServiceImpl.java @@ -5,6 +5,7 @@ import com.oddfar.campus.common.domain.entity.SysUserEntity; import com.oddfar.campus.common.domain.entity.SysUserRoleEntity; import com.oddfar.campus.common.exception.ServiceException; +import com.oddfar.campus.common.utils.SecurityUtils; import com.oddfar.campus.common.utils.StringUtils; import com.oddfar.campus.framework.api.sysconfig.ConfigExpander; import com.oddfar.campus.framework.mapper.SysRoleMapper; @@ -97,6 +98,7 @@ public int insertUser(SysUserEntity user) { && !(checkEmailUnique(user))) { throw new ServiceException("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在"); } + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); // 新增用户信息 int rows = userMapper.insert(user); // 新增用户与角色管理 diff --git a/campus-framework/src/main/java/com/oddfar/campus/framework/web/service/SysRegisterService.java b/campus-framework/src/main/java/com/oddfar/campus/framework/web/service/SysRegisterService.java index 4e0804f..ce0c027 100644 --- a/campus-framework/src/main/java/com/oddfar/campus/framework/web/service/SysRegisterService.java +++ b/campus-framework/src/main/java/com/oddfar/campus/framework/web/service/SysRegisterService.java @@ -56,7 +56,7 @@ public String register(RegisterBody registerBody) { } else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { msg = "密码长度必须在5到20个字符之间"; - } else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(sysUser))) { + } else if (!(userService.checkUserNameUnique(sysUser))) { msg = "保存用户'" + username + "'失败,注册账号已存在"; } else { sysUser.setNickName(username); diff --git a/campus-modular/pom.xml b/campus-modular/pom.xml index 7852c7a..0e2d90e 100644 --- a/campus-modular/pom.xml +++ b/campus-modular/pom.xml @@ -5,7 +5,7 @@ campus com.oddfar.campus - 1.1.4 + 1.1.5 4.0.0 diff --git a/pom.xml b/pom.xml index 8d344ee..91301a9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.oddfar.campus campus - 1.1.4 + 1.1.5 pom campus @@ -21,7 +21,7 @@ - 1.1.4 + 1.1.5 UTF-8 1.8 1.21 diff --git a/vue_campus_admin/src/views/index.vue b/vue_campus_admin/src/views/index.vue index b469b3d..8931041 100644 --- a/vue_campus_admin/src/views/index.vue +++ b/vue_campus_admin/src/views/index.vue @@ -10,7 +10,7 @@ export default { data() { return { // 版本号 - version: "3.8.4", + version: "1.1.5", }; }, methods: {