Merge pull request #15 from anjoy8/master

hudingwen · web-flow · commit 91c17a53f764 · 2024-02-03T21:07:43.000+08:00
同步主分支
diff --git a/Blog.Core.Api/Filter/AutofacPropertityModuleReg.cs b/Blog.Core.Api/Filter/AutofacPropertityModuleReg.cs
@@ -1,7 +1,7 @@
 ﻿using Autofac;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Blog.Core.Extensions
+namespace Blog.Core.Filter
 {
     public class AutofacPropertityModuleReg : Autofac.Module
     {
diff --git a/Blog.Core.Common/Blog.Core.Common.csproj b/Blog.Core.Common/Blog.Core.Common.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.7.4" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771" />
 
     <PackageReference Include="Serilog" Version="3.1.1" />
diff --git a/Blog.Core.Common/Extensions/Extention.Expression.cs b/Blog.Core.Common/Extensions/Extention.Expression.cs
@@ -204,7 +204,7 @@ public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> on
             var parameterReplacer = new ParameterReplaceVisitor(newParameter);
             var left = parameterReplacer.Visit(one.Body);
             var right = parameterReplacer.Visit(another.Body);
-            var body = Expression.And(left, right);
+            var body = Expression.AndAlso(left, right);
 
             return Expression.Lambda<Func<T, bool>>(body, newParameter);
         }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Autofac;`
`2`	`2`	`using Microsoft.AspNetCore.Mvc;`
`3`	`3`
`4`		`-namespace Blog.Core.Extensions`
	`4`	`+namespace Blog.Core.Filter`
`5`	`5`	`{`
`6`	`6`	`public class AutofacPropertityModuleReg : Autofac.Module`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> on`
`204`	`204`	`var parameterReplacer = new ParameterReplaceVisitor(newParameter);`
`205`	`205`	`var left = parameterReplacer.Visit(one.Body);`
`206`	`206`	`var right = parameterReplacer.Visit(another.Body);`
`207`		`- var body = Expression.And(left, right);`
	`207`	`+ var body = Expression.AndAlso(left, right);`
`208`	`208`
`209`	`209`	`return Expression.Lambda<Func<T, bool>>(body, newParameter);`
`210`	`210`	`}`