diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs index f7e5eb17..0a9a0c43 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs @@ -10,7 +10,12 @@ namespace Yi.Framework.SqlSugarCore.Uow public SqlSugarTransactionApi(ISqlSugarDbContext sqlsugarDbContext) { _sqlsugarDbContext = sqlsugarDbContext; + } + public ISqlSugarDbContext GetDbContext() + { + + return _sqlsugarDbContext; } public async Task CommitAsync(CancellationToken cancellationToken = default) diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs index 4910c1a0..3cd8c58c 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs @@ -82,17 +82,17 @@ namespace Yi.Framework.SqlSugarCore.Uow protected virtual async Task CreateDbContextAsync(IUnitOfWork unitOfWork) { - return unitOfWork.Options.IsTransactional - ? await CreateDbContextWithTransactionAsync(unitOfWork) - : unitOfWork.ServiceProvider.GetRequiredService(); + return unitOfWork.ServiceProvider.GetRequiredService(); + //return unitOfWork.Options.IsTransactional + // ? await CreateDbContextWithTransactionAsync(unitOfWork) + // : unitOfWork.ServiceProvider.GetRequiredService(); } protected virtual async Task CreateDbContextWithTransactionAsync(IUnitOfWork unitOfWork) { - var transactionApiKey = $"Sqlsugar_Default".ToString(); - - var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as SqlSugarDatabaseApi; - if (activeTransaction == null) - { + var transactionApiKey = $"Sqlsugar_Default"+Guid.NewGuid().ToString(); + var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as SqlSugarTransactionApi; + //if (activeTransaction==null|| activeTransaction.Equals(default(SqlSugarTransactionApi))) + //{ var dbContext = unitOfWork.ServiceProvider.GetRequiredService(); var transaction = new SqlSugarTransactionApi( @@ -105,14 +105,15 @@ namespace Yi.Framework.SqlSugarCore.Uow // Console.WriteLine(dbContext.SqlSugarClient.ContextID); await dbContext.SqlSugarClient.Ado.BeginTranAsync(); return dbContext; - } - else - { - // await Console.Out.WriteLineAsync("继续老的事务"); - // Console.WriteLine(activeTransaction.DbContext.SqlSugarClient); - await activeTransaction.DbContext.SqlSugarClient.Ado.BeginTranAsync(); - return (TDbContext)activeTransaction.DbContext; - } + //} + //else + //{ + // var db= activeTransaction.GetDbContext().SqlSugarClient; + // // await Console.Out.WriteLineAsync("继续老的事务"); + // // Console.WriteLine(activeTransaction.DbContext.SqlSugarClient); + // await activeTransaction.GetDbContext().SqlSugarClient.Ado.BeginTranAsync(); + // return (TDbContext)activeTransaction.GetDbContext(); + //} } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs index c0c3009a..14298787 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs @@ -19,7 +19,10 @@ namespace Yi.Framework.Bbs.Application.Services return Task.FromResult("你好世界"); } - + /// + /// 获取头像文件 + /// + /// public List GetIcon() { diff --git a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiDbContext.cs b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiDbContext.cs index 15e1b0b2..35913b5e 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiDbContext.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiDbContext.cs @@ -16,6 +16,7 @@ namespace Yi.Abp.SqlSugarCore base.CustomDataFilter(); } + protected override void DataExecuted(object oldValue, DataAfterModel entityInfo) { base.DataExecuted(oldValue, entityInfo);