From 5dfaf75440ea7e0aa1694ea82e890d1b46101656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Tue, 10 Dec 2024 22:04:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E9=A2=86=E5=9F=9F=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ISqlSugarDbContext.cs | 2 +- .../DefaultSqlSugarDbContext.cs | 83 ++++++++++++++++++- .../SqlSugarDbContextFactory.cs | 1 - .../Uow/SqlSugarDatabaseApi.cs | 2 +- .../Services/TestService.cs | 1 - 5 files changed, 83 insertions(+), 6 deletions(-) diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContext.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContext.cs index cd4f9dce..cb736291 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContext.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContext.cs @@ -14,7 +14,7 @@ namespace Yi.Framework.SqlSugarCore.Abstractions /// SqlSugarDb /// ISqlSugarClient SqlSugarClient { get; } - + /// /// 数据库备份 /// diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/DefaultSqlSugarDbContext.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/DefaultSqlSugarDbContext.cs index 0c13e6bf..9ba17dc3 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/DefaultSqlSugarDbContext.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/DefaultSqlSugarDbContext.cs @@ -12,6 +12,7 @@ using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities.Events; using Volo.Abp.Guids; using Volo.Abp.MultiTenancy; +using Volo.Abp.Uow; using Volo.Abp.Users; using Yi.Framework.SqlSugarCore.Abstractions; @@ -19,13 +20,13 @@ namespace Yi.Framework.SqlSugarCore; public class DefaultSqlSugarDbContext : SqlSugarDbContext { - protected DbConnOptions Options => LazyServiceProvider.LazyGetRequiredService>().Value; protected ICurrentUser CurrentUser => LazyServiceProvider.GetRequiredService(); protected IGuidGenerator GuidGenerator => LazyServiceProvider.LazyGetRequiredService(); protected ILoggerFactory Logger => LazyServiceProvider.LazyGetRequiredService(); protected ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService(); protected IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService(); + public IUnitOfWorkManager UnitOfWorkManager => LazyServiceProvider.LazyGetRequiredService(); protected virtual bool IsMultiTenantFilterEnabled => DataFilter?.IsEnabled() ?? false; protected virtual bool IsSoftDeleteFilterEnabled => DataFilter?.IsEnabled() ?? false; @@ -35,6 +36,7 @@ public class DefaultSqlSugarDbContext : SqlSugarDbContext public DefaultSqlSugarDbContext(IAbpLazyServiceProvider lazyServiceProvider) : base(lazyServiceProvider) { } + protected override void CustomDataFilter(ISqlSugarClient sqlSugarClient) { if (IsSoftDeleteFilterEnabled) @@ -123,7 +125,7 @@ public class DefaultSqlSugarDbContext : SqlSugarDbContext } - //领域事件 + //实体变更领域事件 switch (entityInfo.OperationType) { case DataFilterType.InsertByObject: @@ -166,6 +168,14 @@ public class DefaultSqlSugarDbContext : SqlSugarDbContext break; } + + + //实体领域事件-所有操作类型 + if (entityInfo.PropertyName == nameof(IEntity.Id)) + { + var eventReport = CreateEventReport(entityInfo.EntityValue); + PublishEntityEvents(eventReport); + } } public override void OnLogExecuting(string sql, SugarParameter[] pars) @@ -208,4 +218,73 @@ public class DefaultSqlSugarDbContext : SqlSugarDbContext } } + + /// + /// 创建领域事件报告 + /// + /// + /// + protected virtual EntityEventReport? CreateEventReport(object entity) + { + var eventReport = new EntityEventReport(); + + //判断是否为领域事件-聚合根 + var generatesDomainEventsEntity = entity as IGeneratesDomainEvents; + if (generatesDomainEventsEntity == null) + { + return eventReport; + } + + var localEvents = generatesDomainEventsEntity.GetLocalEvents()?.ToArray(); + if (localEvents != null && localEvents.Any()) + { + eventReport.DomainEvents.AddRange( + localEvents.Select( + eventRecord => new DomainEventEntry( + entity, + eventRecord.EventData, + eventRecord.EventOrder + ) + ) + ); + generatesDomainEventsEntity.ClearLocalEvents(); + } + + var distributedEvents = generatesDomainEventsEntity.GetDistributedEvents()?.ToArray(); + if (distributedEvents != null && distributedEvents.Any()) + { + eventReport.DistributedEvents.AddRange( + distributedEvents.Select( + eventRecord => new DomainEventEntry( + entity, + eventRecord.EventData, + eventRecord.EventOrder) + ) + ); + generatesDomainEventsEntity.ClearDistributedEvents(); + } + + return eventReport; + } + + /// + /// 发布领域事件 + /// + /// + private void PublishEntityEvents(EntityEventReport changeReport) + { + foreach (var localEvent in changeReport.DomainEvents) + { + UnitOfWorkManager.Current?.AddOrReplaceLocalEvent( + new UnitOfWorkEventRecord(localEvent.EventData.GetType(), localEvent.EventData, localEvent.EventOrder) + ); + } + + foreach (var distributedEvent in changeReport.DistributedEvents) + { + UnitOfWorkManager.Current?.AddOrReplaceDistributedEvent( + new UnitOfWorkEventRecord(distributedEvent.EventData.GetType(), distributedEvent.EventData, distributedEvent.EventOrder) + ); + } + } } \ No newline at end of file diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs index 1c7bcacf..ffcf1224 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs @@ -251,7 +251,6 @@ namespace Yi.Framework.SqlSugarCore return null; } - public virtual void BackupDataBase() { string directoryName = "database_backup"; diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarDatabaseApi.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarDatabaseApi.cs index 81d3b34d..5cd02410 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarDatabaseApi.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarDatabaseApi.cs @@ -17,4 +17,4 @@ namespace Yi.Framework.SqlSugarCore.Uow DbContext = dbContext; } } -} +} \ No newline at end of file diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs index 6c563991..f1714368 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs @@ -175,6 +175,5 @@ namespace Yi.Abp.Application.Services return result ?? string.Empty; } - } } From 8408b39fbbf835c9b1af6ea2d3c9ccb0d50a00c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Wed, 11 Dec 2024 19:48:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E6=96=87=E4=BB=B6=E6=9C=AA?= =?UTF-8?q?=E6=89=BE=E5=88=B0=EF=BC=8C=E4=B8=8D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.Rbac.Application/Services/FileService.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs index fc999707..011be87f 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs @@ -37,7 +37,7 @@ namespace Yi.Framework.Rbac.Application.Services { var path = await GetReturnPathAsync(code, isThumbnail); - if (!File.Exists(path)) + if (path is null||!File.Exists(path)) { return new NotFoundResult(); // throw new UserFriendlyException("文件不存在",code:"404"); @@ -53,12 +53,13 @@ namespace Yi.Framework.Rbac.Application.Services return new FileContentResult(steam, fileContentType ?? @"text/plain"); } - public async Task GetReturnPathAsync(Guid code, bool? isThumbnail) + public async Task GetReturnPathAsync(Guid code, bool? isThumbnail) { var file = await _repository.GetAsync(x => x.Id == code); if (file is null) { - throw new UserFriendlyException("文件编号未匹配", "404"); + return null; + // throw new UserFriendlyException("文件编号未匹配", "404"); } var path = file.FilePath; //如果为缩略图，需要修改路径