diff --git a/Bootstrap.Admin/Controllers/AccountController.cs b/Bootstrap.Admin/Controllers/AccountController.cs index bea7827a..ff4b7af6 100644 --- a/Bootstrap.Admin/Controllers/AccountController.cs +++ b/Bootstrap.Admin/Controllers/AccountController.cs @@ -71,7 +71,7 @@ namespace Bootstrap.Admin.Controllers { loginUser.UserAgent = context.Request.Headers["User-Agent"]; var agent = new UserAgent(loginUser.UserAgent); - loginUser.Ip = (context.Connection.RemoteIpAddress ?? IPAddress.IPv6Loopback).ToString(); + loginUser.Ip = context.Connection.RemoteIpAddress.ToIPv4String(); loginUser.City = ipLocator.Locate(loginUser.Ip); loginUser.Browser = $"{agent.Browser?.Name} {agent.Browser?.Version}"; loginUser.OS = $"{agent.OS?.Name} {agent.OS?.Version}"; @@ -94,4 +94,4 @@ namespace Bootstrap.Admin.Controllers [ResponseCache(Duration = 600)] public ActionResult AccessDenied() => View("Error", ErrorModel.CreateById(403)); } -} \ No newline at end of file +} diff --git a/Bootstrap.Admin/Controllers/Api/LogsController.cs b/Bootstrap.Admin/Controllers/Api/LogsController.cs index dc654858..eea1839e 100644 --- a/Bootstrap.Admin/Controllers/Api/LogsController.cs +++ b/Bootstrap.Admin/Controllers/Api/LogsController.cs @@ -37,7 +37,7 @@ namespace Bootstrap.Admin.Controllers.Api { value.UserAgent = Request.Headers["User-Agent"]; var agent = new UserAgent(value.UserAgent); - value.Ip = (HttpContext.Connection.RemoteIpAddress ?? IPAddress.IPv6Loopback).ToString(); + value.Ip = HttpContext.Connection.RemoteIpAddress.ToIPv4String(); value.Browser = $"{agent.Browser?.Name} {agent.Browser?.Version}"; value.OS = $"{agent.OS?.Name} {agent.OS?.Version}"; value.City = ipLocator.Locate(value.Ip); @@ -45,4 +45,4 @@ namespace Bootstrap.Admin.Controllers.Api return LogHelper.Save(value); } } -} \ No newline at end of file +} diff --git a/Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs b/Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs index 3fa52cc7..d11cea73 100644 --- a/Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs +++ b/Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs @@ -48,7 +48,7 @@ namespace Bootstrap.Admin.Controllers.Api [AllowAnonymous] public bool Put() { - var ip = (Request.HttpContext.Connection.RemoteIpAddress ?? IPAddress.IPv6Loopback).ToString(); + var ip = Request.HttpContext.Connection.RemoteIpAddress.ToIPv4String(); if (_loginUsers.TryGetValue(ip, out var user)) { user.Reset(); diff --git a/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj b/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj index dcd2a115..796ea5ae 100644 --- a/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj +++ b/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj @@ -8,7 +8,7 @@ - + diff --git a/Bootstrap.Client/Bootstrap.Client.csproj b/Bootstrap.Client/Bootstrap.Client.csproj index 82dc0a00..5dde12bf 100644 --- a/Bootstrap.Client/Bootstrap.Client.csproj +++ b/Bootstrap.Client/Bootstrap.Client.csproj @@ -9,7 +9,7 @@ - + diff --git a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj index 0fa43204..df3d3f0b 100644 --- a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj +++ b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj @@ -7,9 +7,9 @@ - + - +