😎代码整理

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

@@ -27,7 +27,7 @@
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.1" />
     <PackageReference Include="Magicodes.IE.Word" Version="2.7.5.1" />
     <PackageReference Include="MailKit" Version="4.7.1.1" />
-    <PackageReference Include="NewLife.Redis" Version="5.7.2024.709" />
+    <PackageReference Include="NewLife.Redis" Version="5.7.2024.801" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />

Admin.NET/Admin.NET.Core/Service/Logging/Dto/LogInput.cs

@@ -6,7 +6,7 @@
 
 namespace Admin.NET.Core.Service;
 
-public class PageExLogInput : PageOpLogInput
+public class PageOpLogInput : PageVisLogInput
 {
     /// <summary>
     /// 模块名称
@@ -14,13 +14,10 @@ public class PageExLogInput : PageOpLogInput
     public string? ControllerName { get; set; }
 }
 
-public class PageOpLogInput : PageVisLogInput
+public class PageExLogInput : PageOpLogInput
 {
-    /// <summary>
-    /// 模块名称
-    /// </summary>
-    public string? ControllerName { get; set; }
 }
+
 public class PageVisLogInput : PageLogInput
 {
     /// <summary>
@@ -28,6 +25,7 @@ public class PageVisLogInput : PageLogInput
     ///</summary>
     public string? ActionName { get; set; }
 }
+
 public class PageLogInput : BasePageInput
 {
     /// <summary>

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

@@ -8,26 +8,26 @@
 				<el-form-item label="结束时间">
 					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="模块名称" >
+				<el-form-item label="模块名称">
 					<el-input v-model="state.queryParams.controllerName" placeholder="方法名称" clearable />
 				</el-form-item>
-				<el-form-item label="方法名称" >
+				<el-form-item label="方法名称">
 					<el-input v-model="state.queryParams.actionName" placeholder="方法名称" clearable />
 				</el-form-item>
-				<el-form-item label="账号名称" >
-					<el-input v-model="state.queryParams.account" placeholder="账号名称" clearable  />
+				<el-form-item label="账号名称">
+					<el-input v-model="state.queryParams.account" placeholder="账号名称" clearable />
 				</el-form-item>
-				<el-form-item label="状态" >
-					<el-select v-model="state.queryParams.status" placeholder="状态"  clearable >
+				<el-form-item label="状态">
+					<el-select v-model="state.queryParams.status" placeholder="状态" clearable>
 						<el-option label="成功" :value="200" />
 						<el-option label="失败" :value="400" />
 					</el-select>
 				</el-form-item>
-				<el-form-item label="耗时" >
-					<el-input v-model="state.queryParams.elapsed" placeholder="耗时>?MS"  clearable  />
+				<el-form-item label="耗时">
+					<el-input v-model="state.queryParams.elapsed" placeholder="耗时>?MS" clearable />
 				</el-form-item>
-				<el-form-item label="IP地址" >
-					<el-input v-model="state.queryParams.remoteIp" placeholder="IP地址"  clearable  />
+				<el-form-item label="IP地址">
+					<el-input v-model="state.queryParams.remoteIp" placeholder="IP地址" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -126,12 +126,12 @@ const state = reactive({
 	queryParams: {
 		startTime: undefined,
 		endTime: undefined,
-		status:undefined,
-		controllerName:undefined,
-		actionName:undefined,
-		account:undefined,
-		elapsed:undefined,
-		remoteIp:undefined,
+		status: undefined,
+		controllerName: undefined,
+		actionName: undefined,
+		account: undefined,
+		elapsed: undefined,
+		remoteIp: undefined,
 	},
 	tableParams: {
 		page: 1,

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

@@ -2,26 +2,26 @@
 	<div class="sys-oplog-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="开始时间" >
+				<el-form-item label="开始时间">
 					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="结束时间" >
+				<el-form-item label="结束时间">
 					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="模块名称" >
+				<el-form-item label="模块名称">
 					<el-input v-model="state.queryParams.controllerName" placeholder="方法名称" clearable />
 				</el-form-item>
-				<el-form-item label="方法名称" >
+				<el-form-item label="方法名称">
 					<el-input v-model="state.queryParams.actionName" placeholder="方法名称" clearable />
 				</el-form-item>
-				<el-form-item label="账号名称" >
-					<el-input v-model="state.queryParams.account" placeholder="账号名称" clearable  />
+				<el-form-item label="账号名称">
+					<el-input v-model="state.queryParams.account" placeholder="账号名称" clearable />
 				</el-form-item>
-				<el-form-item label="耗时" >
-					<el-input v-model="state.queryParams.elapsed" placeholder="耗时>?MS"  clearable  />
+				<el-form-item label="耗时">
+					<el-input v-model="state.queryParams.elapsed" placeholder="耗时>?MS" clearable />
 				</el-form-item>
-				<el-form-item label="IP地址" >
-					<el-input v-model="state.queryParams.remoteIp" placeholder="IP地址"  clearable  />
+				<el-form-item label="IP地址">
+					<el-input v-model="state.queryParams.remoteIp" placeholder="IP地址" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -120,11 +120,11 @@ const state = reactive({
 	queryParams: {
 		startTime: undefined,
 		endTime: undefined,
-		controllerName:undefined,
-		actionName:undefined,
-		account:undefined,
-		elapsed:undefined,
-		remoteIp:undefined,
+		controllerName: undefined,
+		actionName: undefined,
+		account: undefined,
+		elapsed: undefined,
+		remoteIp: undefined,
 	},
 	tableParams: {
 		page: 1,
@@ -152,7 +152,7 @@ const handleQuery = async () => {
 	if (state.queryParams.account == null) state.queryParams.account = undefined;
 	if (state.queryParams.elapsed == null) state.queryParams.elapsed = undefined;
 	if (state.queryParams.remoteIp == null) state.queryParams.remoteIp = undefined;
-	
+
 	state.loading = true;
 	let params = Object.assign(state.queryParams, state.tableParams);
 	var res = await getAPI(SysLogOpApi).apiSysLogOpPagePost(params);

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

@@ -2,29 +2,29 @@
 	<div class="sys-vislog-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" >
+				<el-form-item label="开始时间">
 					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="结束时间" prop="code" >
+				<el-form-item label="结束时间" prop="code">
 					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="方法名称" >
+				<el-form-item label="方法名称">
 					<el-input v-model="state.queryParams.actionName" placeholder="方法名称" clearable />
 				</el-form-item>
-				<el-form-item label="账号名称" >
-					<el-input v-model="state.queryParams.account" placeholder="账号名称" clearable  />
+				<el-form-item label="账号名称">
+					<el-input v-model="state.queryParams.account" placeholder="账号名称" clearable />
 				</el-form-item>
-				<el-form-item label="状态" >
-					<el-select v-model="state.queryParams.status" placeholder="状态"  clearable >
+				<el-form-item label="状态">
+					<el-select v-model="state.queryParams.status" placeholder="状态" clearable>
 						<el-option label="成功" :value="200" />
 						<el-option label="失败" :value="400" />
 					</el-select>
 				</el-form-item>
-				<el-form-item label="耗时" >
-					<el-input v-model="state.queryParams.elapsed" placeholder="耗时>?MS"  clearable  />
+				<el-form-item label="耗时">
+					<el-input v-model="state.queryParams.elapsed" placeholder="耗时>?MS" clearable />
 				</el-form-item>
-				<el-form-item label="IP地址" >
-					<el-input v-model="state.queryParams.remoteIp" placeholder="IP地址"  clearable  />
+				<el-form-item label="IP地址">
+					<el-input v-model="state.queryParams.remoteIp" placeholder="IP地址" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -89,10 +89,10 @@ const state = reactive({
 		startTime: undefined,
 		endTime: undefined,
 		status: undefined,
-		actionName:undefined,
-		account:undefined,
-		elapsed:undefined,
-		remoteIp:undefined,
+		actionName: undefined,
+		account: undefined,
+		elapsed: undefined,
+		remoteIp: undefined,
 	},
 	tableParams: {
 		page: 1,
@@ -115,7 +115,7 @@ const handleQuery = async () => {
 	if (state.queryParams.account == null) state.queryParams.account = undefined;
 	if (state.queryParams.elapsed == null) state.queryParams.elapsed = undefined;
 	if (state.queryParams.remoteIp == null) state.queryParams.remoteIp = undefined;
-	
+
 	state.loading = true;
 	let params = Object.assign(state.queryParams, state.tableParams);
 	var res = await getAPI(SysLogVisApi).apiSysLogVisPagePost(params);

Web/src/views/system/user/index.vue

@@ -12,10 +12,10 @@
 							<el-input v-model="state.queryParams.account" placeholder="账号" clearable />
 						</el-form-item>
 						<el-form-item label="姓名">
-							<el-input v-model="state.queryParams.realName" placeholder="姓名" clearable  />
+							<el-input v-model="state.queryParams.realName" placeholder="姓名" clearable />
 						</el-form-item>
 						<el-form-item label="职位名称">
-							<el-input v-model="state.queryParams.posName" placeholder="职位名称" clearable  />
+							<el-input v-model="state.queryParams.posName" placeholder="职位名称" clearable />
 						</el-form-item>
 						<el-form-item label="手机号码">
 							<el-input v-model="state.queryParams.phone" placeholder="手机号码" clearable />
@@ -137,7 +137,7 @@ const state = reactive({
 		account: undefined,
 		realName: undefined,
 		phone: undefined,
-		posName:undefined,
+		posName: undefined,
 	},
 	tableParams: {
 		page: 1,
@@ -176,7 +176,7 @@ const resetQuery = async () => {
 	state.queryParams.account = undefined;
 	state.queryParams.realName = undefined;
 	state.queryParams.phone = undefined;
-	state.queryParams.posName=undefined;
+	state.queryParams.posName = undefined;
 	await handleQuery();
 };