:arrow_up:升级包

This commit is contained in:
不做码农
2023-10-21 10:21:35 +08:00
parent 2071219c34
commit bc4e92bcad
7 changed files with 9 additions and 13 deletions
@@ -37,9 +37,6 @@ namespace ZR.Service.System
/// <returns>操作日志集合</returns>
public PagedInfo<SysOperLog> SelectOperLogList(SysOperLogQueryDto sysOper)
{
sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1);
sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1);
var exp = Expressionable.Create<SysOperLog>();
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);
}
/// <summary>
+2 -2
View File
@@ -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