xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

非常优雅的完成了数据模块

Browse Source
This commit is contained in:
橙子
2023-01-20 20:03:25 +08:00
parent 98375f8629
commit fceefac0ee
26 changed files with 185 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarDataFiterExtensions.cs Normal file
View File

@@ -0,0 +1,37 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Yi.Framework.Core.Sqlsugar.Extensions
{
public static class SqlsugarDataFilterExtensions
{
public static IApplicationBuilder UseSqlsugarDataFiterServer(this IApplicationBuilder builder)
{
return builder.UseMiddleware<SqlsugarDataFilterMiddleware>();
}
}
public class SqlsugarDataFilterMiddleware
{
private readonly RequestDelegate _next;
private readonly ILogger<SqlsugarDataFilterMiddleware> _logger;
public SqlsugarDataFilterMiddleware(RequestDelegate next, ILoggerFactory loggerFactory)
{
this._next = next;
this._logger = loggerFactory.CreateLogger<SqlsugarDataFilterMiddleware>();
}
public async Task InvokeAsync(HttpContext context)
{
await _next(context);
}
}
}

1
Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Extensions/SqlsugarExtensions.cs
View File

@@ -81,7 +81,6 @@ namespace Yi.Framework.Core.Sqlsugar.Extensions
{
action(db);
}
db.Aop.DataExecuting = (oldValue, entityInfo) =>
{

17
Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Filters/SqlsugarDataFiter.cs → Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Filters/SqlsugarDataFilter.cs
View File

@@ -9,10 +9,10 @@ using Yi.Framework.Data.Filters;
namespace Yi.Framework.Core.Sqlsugar.Filters
{
public class SqlsugarDataFiter : IDataFilter
public class SqlsugarDataFilter : IDataFilter
{
private ISqlSugarClient _Db { get; set; }
public SqlsugarDataFiter(ISqlSugarClient sqlSugarClient)
public SqlsugarDataFilter(ISqlSugarClient sqlSugarClient)
{
_Db = sqlSugarClient;
}
@@ -24,24 +24,27 @@ namespace Yi.Framework.Core.Sqlsugar.Filters
public IDisposable Disable<TFilter>() where TFilter : class
{
_Db.QueryFilter.ClearAndBackup<TFilter>();
throw new NotImplementedException();
return this;
}
public IDisposable Enable<TFilter>() where TFilter : class
{
_Db.QueryFilter.Restore();
throw new NotImplementedException();
throw new NotImplementedException("暂时没有单独还原过滤器的方式");
}
public bool IsEnabled<TFilter>() where TFilter : class
{
throw new NotImplementedException();
throw new NotImplementedException("暂时没有判断过滤器的方式");
}
public void RemoveFilter<TFilter>() where TFilter : class
{
_Db.QueryFilter.Clear<TFilter>();
throw new NotImplementedException();
}
public void Dispose()
{
_Db.QueryFilter.Restore();
}
}
}

2
Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SqlSugarCore" Version="5.1.3.46-preview10" />
<PackageReference Include="SqlSugarCore" Version="5.1.3.46-preview11" />
</ItemGroup>
<ItemGroup>

4
Yi.Framework.Net6/src/framework/Yi.Framework.Core.Sqlsugar/YiFrameworkCoreSqlsugarModule.cs
View File

@@ -3,9 +3,11 @@ using Microsoft.Extensions.DependencyInjection;
using StartupModules;
using Yi.Framework.Core.Configuration;
using Yi.Framework.Core.Sqlsugar.Extensions;
using Yi.Framework.Core.Sqlsugar.Filters;
using Yi.Framework.Core.Sqlsugar.Options;
using Yi.Framework.Core.Sqlsugar.Repositories;
using Yi.Framework.Core.Sqlsugar.Uow;
using Yi.Framework.Data.Filters;
using Yi.Framework.Ddd;
using Yi.Framework.Ddd.Repositories;
using Yi.Framework.Uow;
@@ -26,7 +28,7 @@ namespace Yi.Framework.Core.Sqlsugar
services.AddSingleton<IUnitOfWorkManager, UnitOfWorkManager>();
//这里替换过滤器实现
services.AddScoped<IDataFilter, SqlsugarDataFilter>();
services.Configure<DbConnOptions>(Appsettings.appConfiguration("DbConnOptions"));
services.AddSqlsugarServer();

2
Yi.Framework.Net6/src/framework/Yi.Framework.Core/Yi.Framework.Core.csproj
View File

@@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.46-preview10" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.46-preview11" />
<PackageReference Include="StartupModules" Version="4.0.0" />
</ItemGroup>

41
Yi.Framework.Net6/src/framework/Yi.Framework.Data/Extensions/DataFiterExtensions.cs Normal file
View File

@@ -0,0 +1,41 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Data.Entities;
using Yi.Framework.Data.Filters;
namespace Yi.Framework.Data.Extensions
{
public static class DataFilterExtensions
{
public static IApplicationBuilder UseDataFiterServer(this IApplicationBuilder builder)
{
return builder.UseMiddleware<DataFilterMiddleware>();
}
}
public class DataFilterMiddleware
{
private readonly RequestDelegate _next;
private readonly ILogger<DataFilterMiddleware> _logger;
public DataFilterMiddleware(RequestDelegate next, ILoggerFactory loggerFactory)
{
this._next = next;
this._logger = loggerFactory.CreateLogger<DataFilterMiddleware>();
}
public async Task InvokeAsync(HttpContext context, IDataFilter dataFilter)
{
//添加默认的过滤器
dataFilter.AddFilter<ISoftDelete>(u => u.IsDeleted == false);
//dataFilter.AddFilter<IMultiTenant>(u => u.TenantId == Guid.Empty);
await _next(context);
}
}
}

9
Yi.Framework.Net6/src/framework/Yi.Framework.Data/Filters/DefaultDataFilter.cs
View File

@@ -21,12 +21,12 @@ namespace Yi.Framework.Data.Filters
public IDisposable Disable<TFilter>() where TFilter : class
{
return null;
return this;
}
public IDisposable Enable<TFilter>() where TFilter : class
{
return null;
return this;
}
public bool IsEnabled<TFilter>() where TFilter : class
@@ -44,5 +44,10 @@ namespace Yi.Framework.Data.Filters
public void AddFilter<TFilter>(Expression<Func<TFilter, bool>> expression) where TFilter : class
{
}
public void Dispose()
{
}
}
}

2
Yi.Framework.Net6/src/framework/Yi.Framework.Data/Filters/IDataFilter.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace Yi.Framework.Data.Filters
{
public interface IDataFilter
public interface IDataFilter:IDisposable
{
IDisposable Enable<TFilter>() where TFilter :class;

9
Yi.Framework.Net6/src/framework/Yi.Framework.Data/YiFrameworkDataModule.cs
View File

@@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Core.Attributes;
using Yi.Framework.Data.Entities;
using Yi.Framework.Data.Extensions;
using Yi.Framework.Data.Filters;
using Yi.Framework.Ddd;
@@ -19,12 +20,8 @@ namespace Yi.Framework.Data
{
public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context)
{
var dataFilter = app.ApplicationServices.GetRequiredService<IDataFilter>();
//内置多租户与软删除过滤
dataFilter.AddFilter<ISoftDelete>(u => u.IsDeleted == false);
//租户id从租户管理中获取
dataFilter.AddFilter<IMultiTenant>(u => u.TenantId == Guid.Empty);
//使用了过滤器
app.UseDataFiterServer();
}
public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)