Skip to content

Commit

Permalink
v3.2.2024.1202
Browse files Browse the repository at this point in the history
  • Loading branch information
nnhy committed Dec 2, 2024
1 parent facca46 commit 10e3aed
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
<AnalysisLevel>latest</AnalysisLevel>
<WarningsAsErrors>CA2007</WarningsAsErrors>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion NewLife.Remoting/Clients/Upgrade.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Diagnostics;
using System.Net.Http;
using System.Reflection;
using System.Security.Cryptography;
using NewLife.Log;
using NewLife.Remoting.Models;

Expand Down
3 changes: 2 additions & 1 deletion NewLife.Remoting/NewLife.Remoting.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
<AnalysisLevel>latest</AnalysisLevel>
<WarningsAsErrors>CA2007</WarningsAsErrors>
</PropertyGroup>

Expand Down Expand Up @@ -53,7 +54,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.0.2024.1130-beta0449" />
<PackageReference Include="NewLife.Core" Version="11.0.2024.1201" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/IoTZero/Services/MyDeviceService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public MyDeviceService(IPasswordProvider passwordProvider, ICacheProvider cacheP

//if (dv != null && !dv.Enable) throw new ApiException(99, "禁止登录");

if (dv == null) throw new ApiException(ApiCode.Unauthorized, "节点鉴权失败");
if (dv == null) throw new ApiException(ApiCode.Unauthorized, "登录失败");

dv.Login(inf, ip);

Expand All @@ -99,7 +99,7 @@ public MyDeviceService(IPasswordProvider passwordProvider, ICacheProvider cacheP
//SetChildOnline(dv, ip);

// 登录历史
WriteHistory(dv, source + "登录", true, $"[{dv.Name}/{dv.Code}]鉴权成功 " + inf.ToJson(false, false, false), ip);
WriteHistory(dv, source + "登录", true, $"[{dv.Name}/{dv.Code}]登录成功 " + inf.ToJson(false, false, false), ip);

var rs = new LoginResponse
{
Expand Down
4 changes: 2 additions & 2 deletions Samples/ZeroServer/Services/NodeService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public NodeService(IPasswordProvider passwordProvider, ICacheProvider cacheProvi
}
}

if (node == null) throw new ApiException(ApiCode.Unauthorized, "节点鉴权失败");
if (node == null) throw new ApiException(ApiCode.Unauthorized, "登录失败");

node.Login(inf, ip);

Expand All @@ -93,7 +93,7 @@ public NodeService(IPasswordProvider passwordProvider, ICacheProvider cacheProvi
olt.Save(inf, null, null, ip);

// 登录历史
WriteHistory(node, source + "节点鉴权", true, $"[{node.Name}/{node.Code}]鉴权成功 " + inf.ToJson(false, false, false), ip);
WriteHistory(node, source + "登录", true, $"[{node.Name}/{node.Code}]登录成功 " + inf.ToJson(false, false, false), ip);

var rs = new LoginResponse
{
Expand Down
2 changes: 1 addition & 1 deletion Test/Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.0.2024.1130-beta0449" />
<PackageReference Include="NewLife.Core" Version="11.0.2024.1201" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion XUnitTest/XUnitTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NewLife.Core" Version="11.0.2024.1130-beta0449" />
<PackageReference Include="NewLife.Core" Version="11.0.2024.1201" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2024.1102-beta0202" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
Expand Down

0 comments on commit 10e3aed

Please sign in to comment.