diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index 6a9ff24..fdd3dfd 100644 --- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -15,11 +15,11 @@ - + - + diff --git a/ZR.CodeGenerator/ZR.CodeGenerator.csproj b/ZR.CodeGenerator/ZR.CodeGenerator.csproj index 620ceae..8c6d6f2 100644 --- a/ZR.CodeGenerator/ZR.CodeGenerator.csproj +++ b/ZR.CodeGenerator/ZR.CodeGenerator.csproj @@ -12,6 +12,6 @@ - + diff --git a/ZR.Common/ZR.Common.csproj b/ZR.Common/ZR.Common.csproj index 9a9f2a7..65b6fa3 100644 --- a/ZR.Common/ZR.Common.csproj +++ b/ZR.Common/ZR.Common.csproj @@ -6,7 +6,7 @@ - + diff --git a/ZR.Model/ZR.Model.csproj b/ZR.Model/ZR.Model.csproj index 22b5ee1..c675f96 100644 --- a/ZR.Model/ZR.Model.csproj +++ b/ZR.Model/ZR.Model.csproj @@ -9,7 +9,7 @@ - + diff --git a/ZR.Repository/ZR.Repository.csproj b/ZR.Repository/ZR.Repository.csproj index d5e0de2..0c1fd6d 100644 --- a/ZR.Repository/ZR.Repository.csproj +++ b/ZR.Repository/ZR.Repository.csproj @@ -10,9 +10,9 @@ - + - + diff --git a/ZR.ServiceCore/Services/SysOperLogService.cs b/ZR.ServiceCore/Services/SysOperLogService.cs index dcfa2aa..6fb14ec 100644 --- a/ZR.ServiceCore/Services/SysOperLogService.cs +++ b/ZR.ServiceCore/Services/SysOperLogService.cs @@ -37,9 +37,6 @@ namespace ZR.Service.System /// 操作日志集合 public PagedInfo SelectOperLogList(SysOperLogQueryDto sysOper) { - sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1); - sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1); - var exp = Expressionable.Create(); exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime); exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title)); @@ -51,7 +48,6 @@ namespace ZR.Service.System return Queryable().Where(exp.ToExpression()) .OrderBy(x => x.OperId, OrderByType.Desc) .ToPage(sysOper); - //return GetList(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc); } /// diff --git a/ZR.ServiceCore/Signalr/MessageHub.cs b/ZR.ServiceCore/Signalr/MessageHub.cs index 2fa1258..28e32bd 100644 --- a/ZR.ServiceCore/Signalr/MessageHub.cs +++ b/ZR.ServiceCore/Signalr/MessageHub.cs @@ -46,7 +46,6 @@ namespace ZR.ServiceCore.Signalr var context = App.HttpContext; var name = HttpContextExtension.GetName(context); var ip = HttpContextExtension.GetClientUserIp(context); - var ip_info = IpTool.Search(ip); ClientInfo clientInfo = HttpContextExtension.GetClientInfo(context); string device = clientInfo.ToString(); string qs = HttpContextExtension.GetQueryString(context); @@ -62,9 +61,10 @@ namespace ZR.ServiceCore.Signalr //判断用户是否存在,否则添加集合!user2 && !user && if (!user2 && !user && Context.User.Identity.IsAuthenticated) { + var ip_info = IpTool.Search(ip); OnlineUsers onlineUser = new(Context.ConnectionId, name, userid, ip, device) { - Location = ip_info.City, + Location = ip_info?.City, Uuid = uuid, Platform = from, ClientId = clientId ?? Context.ConnectionId