更新FreeSql Nuget包，修正解密判断

zhontai · zhontai · commit 50acaa2e3d62 · 2020-04-10T21:54:57.000+08:00
diff --git a/Admin.Core.Common/Admin.Core.Common.csproj b/Admin.Core.Common/Admin.Core.Common.csproj
@@ -5,13 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSRedisCore" Version="3.5.5" />
-    <PackageReference Include="FreeSql" Version="1.4.0-preview20200401" />
-    <PackageReference Include="FreeSql.Provider.MySql" Version="1.4.0-preview20200401" />
-    <PackageReference Include="FreeSql.Provider.Oracle" Version="1.4.0-preview20200401" />
-    <PackageReference Include="FreeSql.Provider.Sqlite" Version="1.4.0-preview20200401" />
-    <PackageReference Include="FreeSql.Provider.SqlServer" Version="1.4.0-preview20200401" />
-    <PackageReference Include="FreeSql.Repository" Version="1.4.0-preview20200401" />
+    <PackageReference Include="CSRedisCore" Version="3.6.1" />
+    <PackageReference Include="FreeSql" Version="1.4.0-preview20200410" />
+    <PackageReference Include="FreeSql.Provider.MySql" Version="1.4.0-preview20200410" />
+    <PackageReference Include="FreeSql.Provider.Oracle" Version="1.4.0-preview20200410" />
+    <PackageReference Include="FreeSql.Provider.Sqlite" Version="1.4.0-preview20200410" />
+    <PackageReference Include="FreeSql.Provider.SqlServer" Version="1.4.0-preview20200410" />
+    <PackageReference Include="FreeSql.Repository" Version="1.4.0-preview20200410" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
diff --git a/Admin.Core.Services/Admin/Auth/AuthService.cs b/Admin.Core.Services/Admin/Auth/AuthService.cs
@@ -77,7 +77,7 @@ public async Task<IResponseOutput> LoginAsync(AuthLoginInput input)
                 if (existsPasswordKey)
                 {
                     var secretKey = await _cache.GetAsync(passwordEncryptKey);
-                    if (passwordEncryptKey.IsNull())
+                    if (secretKey.IsNull())
                     {
                         return ResponseOutput.NotOk("解密失败！", 1);
                     }
diff --git a/Admin.Core/Admin.Core.csproj b/Admin.Core/Admin.Core.csproj
@@ -34,9 +34,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.2.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.3.1" />
 
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.1" />
     <PackageReference Include="NLog" Version="4.7.0" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public async Task<IResponseOutput> LoginAsync(AuthLoginInput input)`
`77`	`77`	`if (existsPasswordKey)`
`78`	`78`	`{`
`79`	`79`	`var secretKey = await _cache.GetAsync(passwordEncryptKey);`
`80`		`- if (passwordEncryptKey.IsNull())`
	`80`	`+ if (secretKey.IsNull())`
`81`	`81`	`{`
`82`	`82`	`return ResponseOutput.NotOk("解密失败！", 1);`
`83`	`83`	`}`