diff --git a/Admin.NET/Admin.NET.Core/Entity/SysTenantCarousel.cs b/Admin.NET/Admin.NET.Core/Entity/SysTenantCarousel.cs deleted file mode 100644 index 5d6f25ee..00000000 --- a/Admin.NET/Admin.NET.Core/Entity/SysTenantCarousel.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 -// -// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 -// -// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! - -//namespace Admin.NET.Core; - -///// -///// 系统租户轮播图表 -///// -//[SugarTable(null, "系统租户轮播图表")] -//[SysTable] -//public partial class SysTenantCarousel : EntityBaseId -//{ -// /// -// /// 租户Id -// /// -// [SugarColumn(ColumnDescription = "租户Id")] -// public long TenantId { get; set; } - -// ///// -// ///// 文件Id -// ///// -// //[SugarColumn(ColumnDescription = "文件Id")] -// //public long? FileId { get; set; } - -// /// -// /// 文件名称 -// /// -// [SugarColumn(ColumnDescription = "文件名称", Length = 64), MaxLength(64)] -// public string? FileName { get; set; } - -// /// -// /// 文件路径 -// /// -// [SugarColumn(ColumnDescription = "文件路径", Length = 256), MaxLength(256)] -// public string? FilePath { get; set; } - -// /// -// /// 排序 -// /// -// [SugarColumn(ColumnDescription = "排序", DefaultValue = "100")] -// public int OrderNo { get; set; } = 100; -//} \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs b/Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs index 6dfc933d..52cac66e 100644 --- a/Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs +++ b/Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs @@ -170,11 +170,14 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter, IDisposable // 记录访问日志-登录退出 if (loggingMonitor.actionName == "login" || loggingMonitor.actionName == "loginPhone" || loggingMonitor.actionName == "logout") { - dynamic para = Clay.Parse((loggingMonitor.parameters == null || loggingMonitor.parameters.Count == 0) ? null : JSON.Serialize(loggingMonitor.parameters[0].value)); - if (loggingMonitor.actionName == "login") - account = para.account; - else if (loggingMonitor.actionName == "loginPhone") - account = para.phone; + if (loggingMonitor.actionName != "logout") + { + dynamic para = Clay.Parse((loggingMonitor.parameters == null) ? null : JSON.Serialize(loggingMonitor.parameters[0].value)); + if (loggingMonitor.actionName == "login") + account = para.account; + else if (loggingMonitor.actionName == "loginPhone") + account = para.phone; + } await _db.Insertable(new SysLogVis {