😁优化调整日志相关及其他

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,8 +20,8 @@
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.6.4" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.6.4" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.6.5" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.6.5" />
     <PackageReference Include="Furion.Pure" Version="4.8.6.4" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.1" />

Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs

@@ -25,13 +25,9 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
         // 不记录数据校验日志
         if (loggingMonitor.Validation != null) return;
 
-        string remoteIPv4 = loggingMonitor.remoteIPv4;
-        (string ipLocation, double? longitude, double? latitude) = GetIpAddress(remoteIPv4);
-
         // 获取当前操作者
-        var account = "";
-        var realName = "";
-        if (!string.IsNullOrWhiteSpace(loggingMonitor.authorizationClaims))
+        string account = "", realName = "";
+        if (loggingMonitor.authorizationClaims != null)
         {
             foreach (var item in loggingMonitor.authorizationClaims)
             {
@@ -42,12 +38,21 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             }
         }
 
-        if (loggingMonitor.actionName == "login")
+        string remoteIPv4 = loggingMonitor.remoteIPv4;
+        (string ipLocation, double? longitude, double? latitude) = GetIpAddress(remoteIPv4);
+
+        if (loggingMonitor.actionName == "login" || loggingMonitor.actionName == "logout")
         {
+            if (loggingMonitor.authorizationClaims == null)
+            {
+                account = logMsg.Context?.Get(ClaimConst.Account)?.ToString();
+                realName = logMsg.Context?.Get(ClaimConst.RealName)?.ToString();
+            }
+
             _sysLogVisRep.Insert(new SysLogVis
             {
                 ControllerName = loggingMonitor.controllerName,
-                ActionName = loggingMonitor.actionName,
+                ActionName = loggingMonitor.actionTypeName,
                 DisplayTitle = loggingMonitor.displayTitle,
                 Status = loggingMonitor.returnInformation.httpStatusCode,
                 RemoteIp = remoteIPv4,
@@ -67,7 +72,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             _sysLogOpRep.Insert(new SysLogOp
             {
                 ControllerName = loggingMonitor.controllerName,
-                ActionName = loggingMonitor.actionName,
+                ActionName = loggingMonitor.actionTypeName,
                 DisplayTitle = loggingMonitor.displayTitle,
                 Status = loggingMonitor.returnInformation.httpStatusCode,
                 RemoteIp = remoteIPv4,

Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -135,10 +135,6 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=1310000000522, Pid=1310000000521, Title="查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000523, Pid=1310000000521, Title="清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000524, Pid=1310000000521, Title="导出", Permission="sysOplog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=1310000000531, Pid=1310000000501, Title="异常日志", Path="/log/exlog", Name="sysExlog", Component="/system/log/exlog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
-            new SysMenu{ Id=1310000000532, Pid=1310000000531, Title="查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=1310000000533, Pid=1310000000531, Title="清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=1310000000534, Pid=1310000000531, Title="导出", Permission="sysExlog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000541, Pid=1310000000501, Title="差异日志", Path="/log/difflog", Name="sysDifflog", Component="/system/log/difflog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
             new SysMenu{ Id=1310000000542, Pid=1310000000541, Title="查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000543, Pid=1310000000541, Title="清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -1,6 +1,7 @@
 using Furion.SpecificationDocument;
 using Lazy.Captcha.Core;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
 
 namespace Admin.NET.Core.Service;
 
@@ -19,6 +20,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     private readonly SysConfigService _sysConfigService;
     private readonly IMemoryCache _cache;
     private readonly ICaptcha _captcha;
+    private readonly ILogger<SysAuthService> _logger;
 
     public SysAuthService(UserManager userManager,
         SqlSugarRepository<SysUser> sysUserRep,
@@ -28,7 +30,8 @@ public class SysAuthService : IDynamicApiController, ITransient
         SysOnlineUserService sysOnlineUserService,
         SysConfigService sysConfigService,
         IMemoryCache cache,
-        ICaptcha captcha)
+        ICaptcha captcha,
+        ILogger<SysAuthService> logger)
     {
         _userManager = userManager;
         _sysUserRep = sysUserRep;
@@ -39,6 +42,7 @@ public class SysAuthService : IDynamicApiController, ITransient
         _sysConfigService = sysConfigService;
         _cache = cache;
         _captcha = captcha;
+        _logger = logger;
     }
 
     /// <summary>
@@ -111,6 +115,10 @@ public class SysAuthService : IDynamicApiController, ITransient
         // Swagger Knife4UI-AfterScript登录脚本
         // ke.global.setAllHeader('Authorization', 'Bearer ' + ke.response.headers['access-token']);
 
+        // 设置日志额外数据
+        using var scope = _logger.ScopeContext(u => u.Set(ClaimConst.Account, user.Account).Set(ClaimConst.RealName, user.RealName));
+        // _logger.LogInformation("登录日志");
+
         return new LoginOutput
         {
             AccessToken = accessToken,
@@ -181,6 +189,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     /// </summary>
     /// <returns></returns>
     [AllowAnonymous]
+    [SuppressMonitor]
     [ApiDescriptionSettings(Name = "LoginConfig")]
     [DisplayName("获取登录配置")]
     public async Task<dynamic> GetLoginConfig()

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Output.cs.vm

@@ -26,7 +26,6 @@ if(column.EffectType == "fk")
 @foreach (var column in Model.TableField){
 if (@column.EffectType == "fk"){
     @:[SugarTable("@(@column.FkTableName)")]
-    @:[NotTable]
     @:public class @(@column.ColumnName)Fk@(@column.FkEntityName)Output: EntityBaseId
     @:{
         @:public @column.FkColumnNetType @column.FkColumnName { get; set; }
@@ -37,7 +36,6 @@ if (@column.EffectType == "fk"){
 @foreach (var column in Model.TableField){
 if (@column.EffectType == "ApiTreeSelect"){
     @:[SugarTable("@(@column.FkTableName)")]
-    @:[NotTable]
     @:public class @(@column.FkEntityName)TreeOutput: EntityBaseId
     @:{
         @:[SugarColumn(ColumnName = "@(@column.DisplayColumn)")]

Web/src/views/system/log/difflog/index.vue

@@ -22,7 +22,7 @@
 				<el-table-column prop="diffType" label="差异操作" show-overflow-tooltip />
 				<el-table-column prop="sql" label="Sql语句" show-overflow-tooltip />
 				<el-table-column prop="parameters" label="参数" show-overflow-tooltip />
-				<el-table-column prop="duration" label="耗时(ms)" show-overflow-tooltip />
+				<el-table-column prop="elapsed" label="耗时(ms)" show-overflow-tooltip />
 				<el-table-column prop="message" label="日志消息" show-overflow-tooltip />
 				<el-table-column prop="beforeData" label="操作前记录" show-overflow-tooltip />
 				<el-table-column prop="afterData" label="操作后记录" show-overflow-tooltip />

Web/src/views/system/log/exlog/index.vue

@@ -1,154 +0,0 @@
-<template>
-	<div class="sys-exlog-container" v-loading="state.loading">
-		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
-			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
-					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item label="结束时间" prop="code">
-					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysExlog:page'"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysExlog:clear'"> 清空 </el-button>
-					<el-button icon="ele-FolderOpened" @click="exportLog" v-auth="'sysExlog:export'"> 导出 </el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-
-		<el-card shadow="hover" style="margin-top: 8px">
-			<el-table :data="state.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 />
-				<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" 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="state.tableParams.page"
-				v-model:page-size="state.tableParams.pageSize"
-				:total="state.tableParams.total"
-				:page-sizes="[10, 20, 50, 100]"
-				small
-				background
-				@size-change="handleSizeChange"
-				@current-change="handleCurrentChange"
-				layout="total, sizes, prev, pager, next, jumper"
-			/>
-		</el-card>
-	</div>
-</template>
-
-<script lang="ts" setup name="sysExLog">
-import { onMounted, reactive } from 'vue';
-import { ElMessage } from 'element-plus';
-import { downloadByData, getFileName } from '/@/utils/download';
-
-import { getAPI } from '/@/utils/axios-utils';
-import { SysLogExApi } from '/@/api-services/api';
-import { SysLogEx } from '/@/api-services/models';
-
-const state = reactive({
-	loading: false,
-	queryParams: {
-		startTime: undefined,
-		endTime: undefined,
-	},
-	tableParams: {
-		page: 1,
-		pageSize: 10,
-		total: 0 as any,
-	},
-	logData: [] as Array<SysLogEx>,
-});
-
-onMounted(async () => {
-	handleQuery();
-});
-
-// 查询操作
-const handleQuery = async () => {
-	if (state.queryParams.startTime == null) state.queryParams.startTime = undefined;
-	if (state.queryParams.endTime == null) state.queryParams.endTime = undefined;
-	state.loading = true;
-	var res = await getAPI(SysLogExApi).apiSysLogExPageGet(state.queryParams.startTime, state.queryParams.endTime, state.tableParams.page, state.tableParams.pageSize);
-	state.logData = res.data.result?.items ?? [];
-	state.tableParams.total = res.data.result?.total;
-	state.loading = false;
-};
-
-// 重置操作
-const resetQuery = () => {
-	state.queryParams.startTime = undefined;
-	state.queryParams.endTime = undefined;
-	handleQuery();
-};
-
-// 清空日志
-const clearLog = async () => {
-	state.loading = true;
-	await getAPI(SysLogExApi).apiSysLogExClearDelete();
-	state.loading = false;
-
-	ElMessage.success('清空成功');
-	handleQuery();
-};
-
-// 导出日志
-const exportLog = async () => {
-	state.loading = true;
-	var res = await getAPI(SysLogExApi).apiSysLogExExportPost(state.queryParams, { responseType: 'blob' });
-	state.loading = false;
-
-	var fileName = getFileName(res.headers);
-	downloadByData(res.data as any, fileName);
-};
-
-// 改变页面容量
-const handleSizeChange = (val: number) => {
-	state.tableParams.pageSize = val;
-	handleQuery();
-};
-
-// 改变页码序号
-const handleCurrentChange = (val: number) => {
-	state.tableParams.page = val;
-	handleQuery();
-};
-
-const shortcuts = [
-	{
-		text: '今天',
-		value: new Date(),
-	},
-	{
-		text: '昨天',
-		value: () => {
-			const date = new Date();
-			date.setTime(date.getTime() - 3600 * 1000 * 24);
-			return date;
-		},
-	},
-	{
-		text: '上周',
-		value: () => {
-			const date = new Date();
-			date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-			return date;
-		},
-	},
-];
-</script>
-
-<style lang="scss" scoped>
-.el-popper {
-	max-width: 60%;
-}
-</style>

Web/src/views/system/log/oplog/index.vue

@@ -20,15 +20,32 @@
 		<el-card shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.logData" @sort-change="sortChange" style="width: 100%" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="logName" label="类别名称" sortable="custom" show-overflow-tooltip />
-				<el-table-column prop="logLevel" label="日志级别" width="110" align="center" show-overflow-tooltip />
+				<el-table-column prop="controllerName" label="模块名称" width="100" show-overflow-tooltip />
+				<el-table-column prop="displayTitle" label="显示名称" width="150" show-overflow-tooltip />
+				<el-table-column prop="actionName" label="方法名称" width="100" show-overflow-tooltip />
+				<el-table-column prop="httpMethod" label="请求方式" width="90" align="center" show-overflow-tooltip />
+				<el-table-column prop="requestUrl" label="请求地址" width="200" show-overflow-tooltip />
+				<!-- <el-table-column prop="requestParam" label="请求参数" show-overflow-tooltip />
+				<el-table-column prop="returnResult" label="返回结果" 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="state" label="当前状态值" show-overflow-tooltip />
 				<el-table-column prop="threadId" label="线程Id" sortable="custom" width="90" align="center" show-overflow-tooltip />
-				<el-table-column prop="traceId" label="请求跟踪Id" sortable="custom" show-overflow-tooltip />
-				<el-table-column prop="logDateTime" label="记录时间" sortable="custom" align="center" show-overflow-tooltip />
-				<el-table-column prop="exception" label="异常对象" show-overflow-tooltip />
+				<el-table-column prop="traceId" label="请求跟踪Id" width="150" sortable="custom" show-overflow-tooltip />
+				<el-table-column prop="account" label="账号名称" width="100" show-overflow-tooltip />
+				<el-table-column prop="realName" label="真实姓名" width="100" show-overflow-tooltip />
+				<el-table-column prop="remoteIp" label="IP地址" width="120" show-overflow-tooltip />
+				<el-table-column prop="location" label="登录地点" width="150" show-overflow-tooltip />
+				<el-table-column prop="browser" label="浏览器" show-overflow-tooltip />
+				<el-table-column prop="os" label="操作系统" width="150" show-overflow-tooltip />
+				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.status === '200'">成功</el-tag>
+						<el-tag type="danger" v-else>失败</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="elapsed" label="耗时(ms)" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="exception" label="异常对象" width="150" show-overflow-tooltip />
+				<!-- <el-table-column prop="message" label="日志消息" width="160" fixed="right" show-overflow-tooltip /> -->
+				<el-table-column prop="logDateTime" label="日志时间" width="160" align="center" fixed="right" 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>
@@ -47,7 +64,7 @@
 				layout="total, sizes, prev, pager, next, jumper"
 			/>
 		</el-card>
-		<el-dialog v-model="state.dialogVisible" draggable width="769px">
+		<el-dialog v-model="state.dialogVisible" draggable width="1000px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Document /> </el-icon>

Web/src/views/system/log/vislog/index.vue

@@ -19,25 +19,22 @@
 		<el-card shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.logData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="account" label="账号名称" show-overflow-tooltip />
-				<el-table-column prop="realName" label="真实姓名" show-overflow-tooltip />
-				<el-table-column prop="success" label="状态" width="70" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.success === 1">成功</el-tag>
-						<el-tag type="danger" v-else>失败</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column prop="ip" label="IP地址" show-overflow-tooltip />
+				<el-table-column prop="displayTitle" label="显示名称" width="150" show-overflow-tooltip />
+				<el-table-column prop="actionName" label="方法名称" width="100" show-overflow-tooltip />
+				<el-table-column prop="account" label="账号名称" width="100" show-overflow-tooltip />
+				<el-table-column prop="realName" label="真实姓名" width="100" show-overflow-tooltip />
+				<el-table-column prop="remoteIp" label="IP地址" width="120" show-overflow-tooltip />
+				<el-table-column prop="location" label="登录地点" width="150" show-overflow-tooltip />
 				<el-table-column prop="browser" label="浏览器" show-overflow-tooltip />
-				<el-table-column prop="os" label="操作系统" show-overflow-tooltip />
-				<el-table-column prop="visType" label="类型" width="70" align="center" show-overflow-tooltip>
+				<el-table-column prop="os" label="操作系统" width="150" show-overflow-tooltip />
+				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.visType === 1">登录</el-tag>
-						<el-tag type="danger" v-else>退出</el-tag>
+						<el-tag type="success" v-if="scope.row.status === '200'">成功</el-tag>
+						<el-tag type="danger" v-else>失败</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="location" label="地址" show-overflow-tooltip />
-				<el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip />
+				<el-table-column prop="elapsed" label="耗时(ms)" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="logDateTime" label="日志时间" width="160" align="center" fixed="right" show-overflow-tooltip />
 			</el-table>
 			<el-pagination
 				v-model:currentPage="state.tableParams.page"