wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⬆️升级包

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
View File

@ -15,11 +15,11 @@
<ProjectReference Include="..\ZR.Tasks\ZR.Tasks.csproj" /> <ProjectReference Include="..\ZR.Tasks\ZR.Tasks.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" /> <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" /> <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" /> <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
<PackageReference Include="Mapster" Version="7.3.0" /> <PackageReference Include="Mapster" Version="7.4.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.5" /> <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.5" />
</ItemGroup> </ItemGroup>

2
ZR.CodeGenerator/ZR.CodeGenerator.csproj
View File

@ -12,6 +12,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="JinianNet.JNTemplate" Version="2.3.3" /> <PackageReference Include="JinianNet.JNTemplate" Version="2.3.3" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.105" /> <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.110" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
ZR.Common/ZR.Common.csproj
View File

@ -6,7 +6,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" /> <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
<PackageReference Include="MailKit" Version="4.1.0" /> <PackageReference Include="MailKit" Version="4.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
ZR.Model/ZR.Model.csproj
View File

@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="MiniExcel" Version="1.31.2" /> <PackageReference Include="MiniExcel" Version="1.31.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.105" /> <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.110" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
ZR.Repository/ZR.Repository.csproj
View File

@ -10,9 +10,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Mapster" Version="7.3.0" /> <PackageReference Include="Mapster" Version="7.4.0" />
<PackageReference Include="MySqlConnector" Version="2.2.6" /> <PackageReference Include="MySqlConnector" Version="2.2.6" />
<PackageReference Include="SqlSugar.IOC" Version="2.0.0" /> <PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.105" /> <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.110" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
ZR.ServiceCore/Services/SysOperLogService.cs
View File

@ -37,9 +37,6 @@ namespace ZR.Service.System
/// <returns>操作日志集合</returns> /// <returns>操作日志集合</returns>
public PagedInfo<SysOperLog> SelectOperLogList(SysOperLogQueryDto sysOper) 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>(); var exp = Expressionable.Create<SysOperLog>();
exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime); exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime);
exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title)); exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title));
@ -51,7 +48,6 @@ namespace ZR.Service.System
return Queryable().Where(exp.ToExpression()) return Queryable().Where(exp.ToExpression())
.OrderBy(x => x.OperId, OrderByType.Desc) .OrderBy(x => x.OperId, OrderByType.Desc)
.ToPage(sysOper); .ToPage(sysOper);
//return GetList(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc);
} }
/// <summary> /// <summary>

4
ZR.ServiceCore/Signalr/MessageHub.cs
View File

@ -46,7 +46,6 @@ namespace ZR.ServiceCore.Signalr
var context = App.HttpContext; var context = App.HttpContext;
var name = HttpContextExtension.GetName(context); var name = HttpContextExtension.GetName(context);
var ip = HttpContextExtension.GetClientUserIp(context); var ip = HttpContextExtension.GetClientUserIp(context);
var ip_info = IpTool.Search(ip);
ClientInfo clientInfo = HttpContextExtension.GetClientInfo(context); ClientInfo clientInfo = HttpContextExtension.GetClientInfo(context);
string device = clientInfo.ToString(); string device = clientInfo.ToString();
string qs = HttpContextExtension.GetQueryString(context); string qs = HttpContextExtension.GetQueryString(context);
@ -62,9 +61,10 @@ namespace ZR.ServiceCore.Signalr
//判断用户是否存在，否则添加集合!user2 && !user && //判断用户是否存在，否则添加集合!user2 && !user &&
if (!user2 && !user && Context.User.Identity.IsAuthenticated) if (!user2 && !user && Context.User.Identity.IsAuthenticated)
{ {
var ip_info = IpTool.Search(ip);
OnlineUsers onlineUser = new(Context.ConnectionId, name, userid, ip, device) OnlineUsers onlineUser = new(Context.ConnectionId, name, userid, ip, device)
{ {
Location = ip_info.City, Location = ip_info?.City,
Uuid = uuid, Uuid = uuid,
Platform = from, Platform = from,
ClientId = clientId ?? Context.ConnectionId ClientId = clientId ?? Context.ConnectionId