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

style；完善注释

Browse Source
This commit is contained in:
陈淳
2023-12-29 13:49:06 +08:00
parent 469ec71074
commit 8f6d84f3ad
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/SqlSugarTransactionApi.cs
View File

@@ -10,7 +10,12 @@ namespace Yi.Framework.SqlSugarCore.Uow
public SqlSugarTransactionApi(ISqlSugarDbContext sqlsugarDbContext) public SqlSugarTransactionApi(ISqlSugarDbContext sqlsugarDbContext)
{ {
_sqlsugarDbContext = sqlsugarDbContext; _sqlsugarDbContext = sqlsugarDbContext;
}
public ISqlSugarDbContext GetDbContext()
{
return _sqlsugarDbContext;
} }
public async Task CommitAsync(CancellationToken cancellationToken = default) public async Task CommitAsync(CancellationToken cancellationToken = default)

33
Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs
View File

@@ -82,17 +82,17 @@ namespace Yi.Framework.SqlSugarCore.Uow
protected virtual async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork) protected virtual async Task<TDbContext> CreateDbContextAsync(IUnitOfWork unitOfWork)
{ {
return unitOfWork.Options.IsTransactional return unitOfWork.ServiceProvider.GetRequiredService<TDbContext>();
? await CreateDbContextWithTransactionAsync(unitOfWork) //return unitOfWork.Options.IsTransactional
: unitOfWork.ServiceProvider.GetRequiredService<TDbContext>(); // ? await CreateDbContextWithTransactionAsync(unitOfWork)
// : unitOfWork.ServiceProvider.GetRequiredService<TDbContext>();
} }
protected virtual async Task<TDbContext> CreateDbContextWithTransactionAsync(IUnitOfWork unitOfWork) protected virtual async Task<TDbContext> CreateDbContextWithTransactionAsync(IUnitOfWork unitOfWork)
{ {
var transactionApiKey = $"Sqlsugar_Default".ToString(); var transactionApiKey = $"Sqlsugar_Default"+Guid.NewGuid().ToString();
var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as SqlSugarTransactionApi;
var activeTransaction = unitOfWork.FindTransactionApi(transactionApiKey) as SqlSugarDatabaseApi; //if (activeTransaction==null|| activeTransaction.Equals(default(SqlSugarTransactionApi)))
if (activeTransaction == null) //{
{
var dbContext = unitOfWork.ServiceProvider.GetRequiredService<TDbContext>(); var dbContext = unitOfWork.ServiceProvider.GetRequiredService<TDbContext>();
var transaction = new SqlSugarTransactionApi( var transaction = new SqlSugarTransactionApi(
@@ -105,14 +105,15 @@ namespace Yi.Framework.SqlSugarCore.Uow
// Console.WriteLine(dbContext.SqlSugarClient.ContextID); // Console.WriteLine(dbContext.SqlSugarClient.ContextID);
await dbContext.SqlSugarClient.Ado.BeginTranAsync(); await dbContext.SqlSugarClient.Ado.BeginTranAsync();
return dbContext; return dbContext;
} //}
else //else
{ //{
// await Console.Out.WriteLineAsync("继续老的事务"); // var db= activeTransaction.GetDbContext().SqlSugarClient;
// Console.WriteLine(activeTransaction.DbContext.SqlSugarClient); // // await Console.Out.WriteLineAsync("继续老的事务");
await activeTransaction.DbContext.SqlSugarClient.Ado.BeginTranAsync(); // // Console.WriteLine(activeTransaction.DbContext.SqlSugarClient);
return (TDbContext)activeTransaction.DbContext; // await activeTransaction.GetDbContext().SqlSugarClient.Ado.BeginTranAsync();
} // return (TDbContext)activeTransaction.GetDbContext();
//}
} }

5
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs
View File

@@ -19,7 +19,10 @@ namespace Yi.Framework.Bbs.Application.Services
return Task.FromResult("你好世界"); return Task.FromResult("你好世界");
} }
/// <summary>
/// 获取头像文件
/// </summary>
/// <returns></returns>
public List<string> GetIcon() public List<string> GetIcon()
{ {

1
Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiDbContext.cs
View File

@@ -16,6 +16,7 @@ namespace Yi.Abp.SqlSugarCore
base.CustomDataFilter(); base.CustomDataFilter();
} }
protected override void DataExecuted(object oldValue, DataAfterModel entityInfo) protected override void DataExecuted(object oldValue, DataAfterModel entityInfo)
{ {
base.DataExecuted(oldValue, entityInfo); base.DataExecuted(oldValue, entityInfo);