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

Merge branch 'refs/heads/abp' into digital-collectibles

Browse Source
This commit is contained in:
橙子
2024-10-29 22:40:38 +08:00
parent 1cb396aa14 8c940126b5
commit 47ca08e432
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/AuditingStore.cs
View File

@@ -16,6 +16,7 @@ public class AuditingStore : IAuditingStore, ITransientDependency
protected IUnitOfWorkManager UnitOfWorkManager { get; } protected IUnitOfWorkManager UnitOfWorkManager { get; }
protected AbpAuditingOptions Options { get; } protected AbpAuditingOptions Options { get; }
protected IAuditLogInfoToAuditLogConverter Converter { get; } protected IAuditLogInfoToAuditLogConverter Converter { get; }
public AuditingStore( public AuditingStore(
IAuditLogRepository auditLogRepository, IAuditLogRepository auditLogRepository,
IUnitOfWorkManager unitOfWorkManager, IUnitOfWorkManager unitOfWorkManager,
@@ -52,10 +53,10 @@ public class AuditingStore : IAuditingStore, ITransientDependency
protected virtual async Task SaveLogAsync(AuditLogInfo auditInfo) protected virtual async Task SaveLogAsync(AuditLogInfo auditInfo)
{ {
Logger.LogDebug("Yi-请求追踪:" + JsonHelper.ObjToStr(auditInfo, "yyyy-MM-dd HH:mm:ss")); Logger.LogDebug("Yi-请求追踪:" + JsonHelper.ObjToStr(auditInfo, "yyyy-MM-dd HH:mm:ss"));
using (var uow = UnitOfWorkManager.Begin(true)) // using (var uow = UnitOfWorkManager.Begin(true,isTransactional:false))
{ // {
await AuditLogRepository.InsertAsync(await Converter.ConvertAsync(auditInfo)); await AuditLogRepository.InsertAsync(await Converter.ConvertAsync(auditInfo));
await uow.CompleteAsync(); // await uow.CompleteAsync();
} // }
} }
} }

4
Yi.RuoYi.Vue3/package.json
View File

@@ -30,10 +30,11 @@
"pinia": "2.1.7", "pinia": "2.1.7",
"qs": "^6.12.0", "qs": "^6.12.0",
"typeface-roboto": "^1.1.13", "typeface-roboto": "^1.1.13",
"vform3-builds": "^3.0.10",
"vue": "3.4.21", "vue": "3.4.21",
"vue-cropper": "1.0.3", "vue-cropper": "1.0.3",
"vue-router": "4.3.0", "vue-router": "4.3.0",
"vform3-builds": "^3.0.10" "yarn": "^1.22.22"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "^5.0.4", "@vitejs/plugin-vue": "^5.0.4",
@@ -48,5 +49,4 @@
"vite-plugin-vue-setup-extend": "^0.4.0" "vite-plugin-vue-setup-extend": "^0.4.0"
}, },
"type": "module" "type": "module"
} }