Skip to content

同步主分支 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 3, 2024
Merged

同步主分支 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
838adac
修改AutofacPropertityModuleReg namespace 错误
JerryBi94 Jan 9, 2024
001d203
Merge pull request #356 from RoinBi/20240109
anjoy8 Jan 9, 2024
9131d89
Update Blog.Core.Common.csproj
anjoy8 Jan 11, 2024
698e264
🐛修复表达式错误 fix #355
Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Blog.Core.Api/Filter/AutofacPropertityModuleReg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Autofac;
using Microsoft.AspNetCore.Mvc;

namespace Blog.Core.Extensions
namespace Blog.Core.Filter
{
public class AutofacPropertityModuleReg : Autofac.Module
{
Expand Down
2 changes: 1 addition & 1 deletion Blog.Core.Common/Blog.Core.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion Blog.Core.Common/Extensions/Extention.Expression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down