ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 修改所有datetimeoffset类型为datetime

Browse Source
This commit is contained in:
Ky_Gyt
2021-04-30 11:35:08 +08:00
parent a2589676cb
commit df2e5c51fc
29 changed files with 72 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Api/Ewide.Core/Service/Auth/AuthService.cs
View File

@@ -115,10 +115,14 @@ namespace Ewide.Core.Service
var httpContext = App.GetService<IHttpContextAccessor>().HttpContext;
var loginOutput = user.Adapt<LoginOutput>();
loginOutput.LastLoginTime = user.LastLoginTime = DateTimeOffset.Now;
loginOutput.LastLoginTime = user.LastLoginTime = DateTime.Now;
var ip = httpContext.Request.Headers["X-Real-IP"].FirstOrDefault();
loginOutput.LastLoginIp = user.LastLoginIp = string.IsNullOrEmpty(user.LastLoginIp) ? httpContext.GetRemoteIpAddressToIPv4() : ip;
///如果真实ip为空的话，就获取客户端主机IPv4地址
if (string.IsNullOrEmpty(ip))
{
loginOutput.LastLoginIp = httpContext.GetRemoteIpAddressToIPv4();
}
//var ipInfo = IpTool.Search(loginOutput.LastLoginIp);
//loginOutput.LastLoginAddress = ipInfo.Country + ipInfo.Province + ipInfo.City + "[" + ipInfo.NetworkOperator + "][" + ipInfo.Latitude + ipInfo.Longitude + "]";
@@ -174,14 +178,34 @@ namespace Ewide.Core.Service
{
_httpContextAccessor.SignoutToSwagger();
//_httpContextAccessor.HttpContext.Response.Headers["access-token"] = "invalid token";
var user = _userManager.User;
var userId = user.Id;
var httpContext = App.GetService<IHttpContextAccessor>().HttpContext;
var loginOutput = user.Adapt<LoginOutput>();
var ip = httpContext.Request.Headers["X-Real-IP"];
var LastLoginIp = user.LastLoginIp = string.IsNullOrEmpty(user.LastLoginIp) ? httpContext.GetRemoteIpAddressToIPv4() : ip;
var clent = Parser.GetDefault().Parse(httpContext.Request.Headers["User-Agent"]);
loginOutput.LastLoginBrowser = clent.UA.Family + clent.UA.Major;
///如果真实ip为空的话，就获取客户端主机IPv4地址
if (string.IsNullOrEmpty(ip))
{
LastLoginIp = httpContext.GetRemoteIpAddressToIPv4();
}
// 增加退出日志
await new SysLogVis
{
Name = "退出",
VisTime = DateTime.Now,
Success = true,
Message = "退出成功",
VisType = 2
VisType = 2,
Browser = loginOutput.LastLoginBrowser,
Os = loginOutput.LastLoginOs,
Ip = LastLoginIp,
Account = loginOutput.Account
}.InsertAsync();
await Task.CompletedTask;

4
Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs
View File

@@ -38,7 +38,7 @@ namespace Ewide.Core.Service
/// <summary>
/// 生日
/// </summary>
public DateTimeOffset Birthday { get; set; }
public DateTime? Birthday { get; set; }
/// <summary>
/// 性别(字典 1男 2女)
@@ -73,7 +73,7 @@ namespace Ewide.Core.Service
/// <summary>
/// 最后登陆时间
/// </summary>
public DateTimeOffset LastLoginTime { get; set; }
public DateTime LastLoginTime { get; set; }
/// <summary>
/// 最后登陆地址