diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index ad772196..a2c7da8c 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -159,7 +159,7 @@ public class LoginController { //update-begin--Author:wangshuai Date:20200714 for:登录日志没有记录人员 LoginUser loginUser = new LoginUser(); BeanUtils.copyProperties(sysUser, loginUser); - baseCommonService.addLog("用户名: " + username + ",登录成功!", CommonConstant.LOG_TYPE_1, null, loginUser); + baseCommonService.addLog("账号: " + username + ",登录成功!", CommonConstant.LOG_TYPE_1, null, loginUser); //update-end--Author:wangshuai Date:20200714 for:登录日志没有记录人员 return result; } @@ -182,9 +182,9 @@ public class LoginController { LoginUser sysUser = sysBaseAPI.getUserByName(username); if (sysUser != null) { //update-begin--Author:wangshuai Date:20200714 for:登出日志没有记录人员 - baseCommonService.addLog("用户名: " + sysUser.getRealname() + ",退出成功!", CommonConstant.LOG_TYPE_1, null, sysUser); + baseCommonService.addLog("账号: " + sysUser.getRealname() + ",退出成功!", CommonConstant.LOG_TYPE_1, null, sysUser); //update-end--Author:wangshuai Date:20200714 for:登出日志没有记录人员 - log.info(" 用户名: " + sysUser.getRealname() + ",退出成功! "); + log.info(" 账号: " + sysUser.getRealname() + ",退出成功! "); //清空用户登录Token缓存 redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token); //清空用户登录Shiro权限缓存 @@ -390,7 +390,7 @@ public class LoginController { //用户信息 userInfo(sysUser, result); //添加日志 - baseCommonService.addLog("用户名: " + sysUser.getUsername() + ",登录成功!", CommonConstant.LOG_TYPE_1, null); + baseCommonService.addLog("账号: " + sysUser.getUsername() + ",登录成功!", CommonConstant.LOG_TYPE_1, null); return result; } @@ -503,7 +503,7 @@ public class LoginController { String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String syspassword = sysUser.getPassword(); if (!syspassword.equals(userpassword)) { - result.error500("用户名或密码错误"); + result.error500("账号或密码错误"); return result; } @@ -609,7 +609,7 @@ public class LoginController { queryWrapper.eq(SysUser::getUsername, userName); SysUser sysUser = sysUserService.getOne(queryWrapper); if (Objects.isNull(sysUser)){ - throw new JeroBootException("手机号或用户名不存在"); + throw new JeroBootException("手机号或账号不存在"); } sysBaseAPI.sendVerificationCode(phone,"2","300",null); String string = redisUtil.get("_verification:_phone:" + phone).toString();