IRC_NewDev
parent
75367ae727
commit
3da3b9de45
|
@ -37,7 +37,12 @@ namespace IRaCIS.Application.Contracts
|
||||||
public string RealName { get; set; } = string.Empty;
|
public string RealName { get; set; } = string.Empty;
|
||||||
public int Sex { get; set; } // 1-男 2-女
|
public int Sex { get; set; } // 1-男 2-女
|
||||||
|
|
||||||
public UserTypeEnum UserTypeEnum { get; set; }
|
/// <summary>
|
||||||
|
/// LastLoginIP
|
||||||
|
/// </summary>
|
||||||
|
public string LastLoginIP { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
public UserTypeEnum UserTypeEnum { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 上一次修改密码的时间
|
/// 上一次修改密码的时间
|
||||||
|
|
|
@ -714,11 +714,11 @@ namespace IRaCIS.Application.Services
|
||||||
//登录成功 清除缓存
|
//登录成功 清除缓存
|
||||||
_cache.Set(cacheKey, 0, TimeSpan.FromMinutes(lockoutMinutes));
|
_cache.Set(cacheKey, 0, TimeSpan.FromMinutes(lockoutMinutes));
|
||||||
|
|
||||||
var lastLoginLog = await _userLogRepository.Where(x => x.LoginUserId == loginUser.Id).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync();
|
|
||||||
if (lastLoginLog!=null)
|
if (loginUser.LastLoginIP != string.Empty)
|
||||||
{
|
{
|
||||||
// 与上一次IP不一致
|
// 与上一次IP不一致
|
||||||
if (lastLoginLog.IP != _userInfo.IP)
|
if (loginUser.LastLoginIP != _userInfo.IP)
|
||||||
{
|
{
|
||||||
loginUser.LoginState = 2;
|
loginUser.LoginState = 2;
|
||||||
}
|
}
|
||||||
|
@ -740,13 +740,17 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await _userRepository.BatchUpdateNoTrackingAsync(x => x.Id == loginUser.Id, x => new User()
|
||||||
|
{
|
||||||
|
LastLoginIP = _userInfo.IP
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// 登录 清除缓存
|
||||||
|
//_cache.Remove(userLoginReturnModel.BasicInfo.Id.ToString());
|
||||||
|
|
||||||
// 登录 清除缓存
|
var userId = loginUser.Id;
|
||||||
//_cache.Remove(userLoginReturnModel.BasicInfo.Id.ToString());
|
|
||||||
|
|
||||||
var userId = loginUser.Id;
|
|
||||||
await _cache.SetAsync($"{userId.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
|
await _cache.SetAsync($"{userId.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -83,6 +83,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime? LastChangePassWordTime { get; set; }
|
public DateTime? LastChangePassWordTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// LastLoginIP
|
||||||
|
/// </summary>
|
||||||
|
public string LastLoginIP { get; set; } = string.Empty;
|
||||||
|
|
||||||
//医生生成账号后,会有值
|
//医生生成账号后,会有值
|
||||||
public Guid? DoctorId { get; set; }
|
public Guid? DoctorId { get; set; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue