diff --git a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java
index a4112ff..d220992 100644
--- a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java
+++ b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java
@@ -23,6 +23,10 @@ public class SysLogininfor extends BaseEntity
@Excel(name = "用户账号")
private String userName;
+ /** 姓名 */
+ @Excel(name = "姓名")
+ private String nickName;
+
/** 状态 0成功 1失败 */
@Excel(name = "状态", readConverterExp = "0=成功,1=失败")
private String status;
@@ -60,6 +64,14 @@ public class SysLogininfor extends BaseEntity
this.userName = userName;
}
+ public String getNickName() {
+ return nickName;
+ }
+
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+
public String getStatus()
{
return status;
diff --git a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java
index 114bcd2..448ff3e 100644
--- a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java
+++ b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java
@@ -54,28 +54,28 @@ public class SysLoginService
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password))
{
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
+ recordLogService.recordLogininfor(username,null, Constants.LOGIN_FAIL, "用户/密码必须填写");
throw new ServiceException("用户/密码必须填写");
}
// 密码如果不在指定范围内 错误
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH)
{
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
+ recordLogService.recordLogininfor(username,null, Constants.LOGIN_FAIL, "用户密码不在指定范围");
throw new ServiceException("用户密码不在指定范围");
}
// 用户名不在指定范围内 错误
if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|| username.length() > UserConstants.USERNAME_MAX_LENGTH)
{
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
+ recordLogService.recordLogininfor(username,null, Constants.LOGIN_FAIL, "用户名不在指定范围");
throw new ServiceException("用户名不在指定范围");
}
// IP黑名单校验
String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
{
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾,访问IP已被列入系统黑名单");
+ recordLogService.recordLogininfor(username,null, Constants.LOGIN_FAIL, "很遗憾,访问IP已被列入系统黑名单");
throw new ServiceException("很遗憾,访问IP已被列入系统黑名单");
}
// 查询用户信息
@@ -91,12 +91,12 @@ public class SysLoginService
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起,您的账号已被删除");
+ recordLogService.recordLogininfor(username,user.getNickName(), Constants.LOGIN_FAIL, "对不起,您的账号已被删除");
throw new ServiceException("对不起,您的账号:" + username + " 已被删除");
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用,请联系管理员");
+ recordLogService.recordLogininfor(username,user.getNickName(), Constants.LOGIN_FAIL, "用户已停用,请联系管理员");
throw new ServiceException("对不起,您的账号:" + username + " 已停用");
}
passwordService.validate(user, password);
@@ -117,7 +117,7 @@ public class SysLoginService
}
}
- recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+ recordLogService.recordLogininfor(username,user.getNickName(), Constants.LOGIN_SUCCESS, "登录成功");
recordLoginInfo(user.getUserId());
return userInfo;
}
@@ -140,7 +140,7 @@ public class SysLoginService
public void logout(String loginName)
{
- recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
+ recordLogService.recordLogininfor(loginName,null, Constants.LOGOUT, "退出成功");
}
/**
@@ -176,6 +176,6 @@ public class SysLoginService
{
throw new ServiceException(registerResult.getMsg());
}
- recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
+ recordLogService.recordLogininfor(username,null, Constants.REGISTER, "注册成功");
}
}
diff --git a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java
index ab225ff..b0e0210 100644
--- a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java
+++ b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java
@@ -60,7 +60,7 @@ public class SysPasswordService
if (!matches(user, password))
{
retryCount = retryCount + 1;
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount));
+ recordLogService.recordLogininfor(username,user.getNickName(), Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount));
redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
throw new ServiceException("用户不存在/密码错误");
}
diff --git a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java
index 572f710..b6cc877 100644
--- a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java
+++ b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java
@@ -22,16 +22,18 @@ public class SysRecordLogService
/**
* 记录登录信息
- *
+ *
* @param username 用户名
+ * @param nickName 姓名
* @param status 状态
* @param message 消息内容
* @return
*/
- public void recordLogininfor(String username, String status, String message)
+ public void recordLogininfor(String username,String nickName, String status, String message)
{
SysLogininfor logininfor = new SysLogininfor();
logininfor.setUserName(username);
+ logininfor.setNickName(nickName);
logininfor.setIpaddr(IpUtils.getIpAddr());
logininfor.setMsg(message);
// 日志状态
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index 931e9a5..ef1894b 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -14,12 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- insert into sys_logininfor (user_name, status, ipaddr, msg, access_time)
- values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate())
+ insert into sys_logininfor (user_name,nick_name, status, ipaddr, msg, access_time)
+ values (#{userName},#{nickName}, #{status}, #{ipaddr}, #{msg}, sysdate())