소스 검색

调整导出日志功能示例

zuohuaijun 3 년 전
부모
커밋
7ff4084da3

+ 11 - 11
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -7041,52 +7041,52 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="T:Admin.NET.Core.ExportLogOpDto">
+        <member name="T:Admin.NET.Core.ExportLogDto">
             <summary>
-            导出操作日志表
+            导出日志数据
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.LogName">
+        <member name="P:Admin.NET.Core.ExportLogDto.LogName">
             <summary>
             记录器类别名称
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.LogLevel">
+        <member name="P:Admin.NET.Core.ExportLogDto.LogLevel">
             <summary>
             日志级别
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.EventId">
+        <member name="P:Admin.NET.Core.ExportLogDto.EventId">
             <summary>
             事件Id
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.Message">
+        <member name="P:Admin.NET.Core.ExportLogDto.Message">
             <summary>
             日志消息
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.Exception">
+        <member name="P:Admin.NET.Core.ExportLogDto.Exception">
             <summary>
             异常对象
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.State">
+        <member name="P:Admin.NET.Core.ExportLogDto.State">
             <summary>
             当前状态值
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.LogDateTime">
+        <member name="P:Admin.NET.Core.ExportLogDto.LogDateTime">
             <summary>
             日志记录时间
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.ThreadId">
+        <member name="P:Admin.NET.Core.ExportLogDto.ThreadId">
             <summary>
             线程Id
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.ExportLogOpDto.TraceId">
+        <member name="P:Admin.NET.Core.ExportLogDto.TraceId">
             <summary>
             请求跟踪Id
             </summary>

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/Logging/Dto/ExportLogOpDto.cs → Admin.NET/Admin.NET.Core/Service/Logging/Dto/ExportLogDto.cs

@@ -4,10 +4,10 @@ using Magicodes.ExporterAndImporter.Excel;
 namespace Admin.NET.Core;
 
 /// <summary>
-/// 导出操作日志表
+/// 导出日志数据
 /// </summary>
-[ExcelExporter(Name = "操作日志", TableStyle = OfficeOpenXml.Table.TableStyles.None, AutoFitAllColumn = true)]
-public class ExportLogOpDto
+[ExcelExporter(Name = "日志数据", TableStyle = OfficeOpenXml.Table.TableStyles.None, AutoFitAllColumn = true)]
+public class ExportLogDto
 {
     /// <summary>
     /// 记录器类别名称

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Logging/SysLogExService.cs

@@ -51,11 +51,11 @@ public class SysLogExService : IDynamicApiController, ITransient
             .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
                     u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
             .OrderBy(u => u.CreateTime, OrderByType.Desc)
-            .Select<ExportLogOpDto>().ToListAsync();
+            .Select<ExportLogDto>().ToListAsync();
 
         IExcelExporter excelExporter = new ExcelExporter();
         var res = await excelExporter.ExportAsByteArray(lopOpList);
 
-        return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "操作日志.xlsx" };
+        return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "异常日志.xlsx" };
     }
 }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Logging/SysLogOpService.cs

@@ -51,7 +51,7 @@ public class SysLogOpService : IDynamicApiController, ITransient
             .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
                     u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
             .OrderBy(u => u.CreateTime, OrderByType.Desc)
-            .Select<ExportLogOpDto>().ToListAsync();
+            .Select<ExportLogDto>().ToListAsync();
 
         IExcelExporter excelExporter = new ExcelExporter();
         var res = await excelExporter.ExportAsByteArray(lopOpList);

+ 2 - 2
Web/src/views/system/log/exlog/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="sys-exlog-container">
+	<div class="sys-exlog-container" v-loading="loading">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="queryParams" ref="queryForm" :inline="true">
 				<el-form-item label="开始时间" prop="name">
@@ -18,7 +18,7 @@
 		</el-card>
 
 		<el-card shadow="hover" style="margin-top: 8px">
-			<el-table :data="logData" style="width: 100%" v-loading="loading" border>
+			<el-table :data="logData" style="width: 100%" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="logName" label="类别名称" show-overflow-tooltip />
 				<el-table-column prop="logLevel" label="日志级别" width="100" align="center" show-overflow-tooltip />