Просмотр исходного кода

日志增加请求跟踪Id,以便区分归类同一请求的所有日志

zuohuaijun 3 лет назад
Родитель
Сommit
74e3ffb5c2

+ 10 - 0
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -957,6 +957,11 @@
             线程Id
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.SysLogEx.TraceId">
+            <summary>
+            请求跟踪Id
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.SysLogOp">
             <summary>
             系统操作日志表
@@ -1002,6 +1007,11 @@
             线程Id
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.SysLogOp.TraceId">
+            <summary>
+            请求跟踪Id
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.SysLogVis">
             <summary>
             系统访问日志表

+ 7 - 0
Admin.NET/Admin.NET.Core/Entity/SysLogEx.cs

@@ -55,4 +55,11 @@ public class SysLogEx : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "线程Id")]
     public int ThreadId { get; set; }
+
+    /// <summary>
+    /// 请求跟踪Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求跟踪Id", Length = 128)]
+    [MaxLength(128)]
+    public string TraceId { get; set; }
 }

+ 7 - 0
Admin.NET/Admin.NET.Core/Entity/SysLogOp.cs

@@ -55,4 +55,11 @@ public class SysLogOp : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "线程Id")]
     public int ThreadId { get; set; }
+
+    /// <summary>
+    /// 请求跟踪Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "请求跟踪Id", Length = 128)]
+    [MaxLength(128)]
+    public string TraceId { get; set; }
 }

+ 2 - 0
Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs

@@ -29,6 +29,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
                 State = logMsg.State?.ToString(),
                 LogDateTime = logMsg.LogDateTime,
                 ThreadId = logMsg.ThreadId,
+                TraceId = logMsg.TraceId,
             });
         }
         else
@@ -43,6 +44,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
                 State = logMsg.State?.ToString(),
                 LogDateTime = logMsg.LogDateTime,
                 ThreadId = logMsg.ThreadId,
+                TraceId = logMsg.TraceId,
             });
         }
     }

+ 1 - 1
Web/src/utils/axios-utils.ts

@@ -125,7 +125,7 @@ axiosInstance.interceptors.response.use(
 		}
 
 		// 响应拦截及自定义处理
-		if (serve.code === 401) {
+		if (serve.code === 401 || serve.code === 400) {
 			clearAccessTokens();
 		} else if (serve.code === undefined) {
 			return Promise.resolve(res);

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

@@ -20,14 +20,15 @@
 			<el-table :data="logData" style="width: 100%" v-loading="loading" 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="日志级别" show-overflow-tooltip />
-				<el-table-column prop="eventId" label="事件Id" show-overflow-tooltip />
+				<el-table-column prop="logLevel" label="日志级别" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="eventId" label="事件Id" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="message" label="日志消息" show-overflow-tooltip />
 				<el-table-column prop="exception" label="异常对象" show-overflow-tooltip />
 				<el-table-column prop="state" label="当前状态值" show-overflow-tooltip />
-				<el-table-column prop="threadId" label="线程Id" show-overflow-tooltip />
-				<el-table-column prop="logDateTime" label="日志记录时间" align="center" show-overflow-tooltip />
-				<el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip />
+				<el-table-column prop="threadId" label="线程Id" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="traceId" label="请求跟踪Id" show-overflow-tooltip />
+				<el-table-column prop="logDateTime" label="记录时间" align="center" show-overflow-tooltip />
+				<!-- <el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip /> -->
 			</el-table>
 			<el-pagination
 				v-model:currentPage="tableParams.page"

+ 7 - 6
Web/src/views/system/log/oplog/index.vue

@@ -20,14 +20,15 @@
 			<el-table :data="logData" style="width: 100%" v-loading="loading" 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="日志级别" show-overflow-tooltip />
-				<el-table-column prop="eventId" label="事件Id" show-overflow-tooltip />
+				<el-table-column prop="logLevel" label="日志级别" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="eventId" label="事件Id" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="message" label="日志消息" show-overflow-tooltip />
-				<el-table-column prop="exception" label="异常对象" show-overflow-tooltip />
 				<el-table-column prop="state" label="当前状态值" show-overflow-tooltip />
-				<el-table-column prop="threadId" label="线程Id" show-overflow-tooltip />
-				<el-table-column prop="logDateTime" label="日志记录时间" align="center" show-overflow-tooltip />
-				<el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip />
+				<el-table-column prop="threadId" label="线程Id" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="traceId" label="请求跟踪Id" show-overflow-tooltip />
+				<el-table-column prop="logDateTime" label="记录时间" align="center" show-overflow-tooltip />
+				<!-- <el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip /> -->
+				<el-table-column prop="exception" label="异常对象" show-overflow-tooltip />
 				<el-table-column label="操作" width="80" align="center" fixed="right" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-InfoFilled" size="small" text type="primary" @click="viewDetail(scope.row)" v-auth="'sysOplog:page'">详情 </el-button>

+ 2 - 2
Web/src/views/system/timer/component/editTimer.vue

@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
 	<div class="sys-timer-container">
 		<el-dialog v-model="isShowDialog" draggable width="769px">
 			<template #header>
@@ -127,4 +127,4 @@ export default defineComponent({
 		};
 	},
 });
-</script>
+</script> -->

+ 2 - 2
Web/src/views/system/timer/index.vue

@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
 	<div class="sys-timer-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="queryParams" ref="queryForm" :inline="true">
@@ -197,4 +197,4 @@ export default defineComponent({
 		};
 	},
 });
-</script>
+</script> -->