From 572b3b102b9b75f3048dbe3d783a1c8d6d61a3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Mon, 21 Mar 2022 21:26:50 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix=20=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=B9=8B=E5=90=8E=E6=96=87=E4=BB=B6id=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=87=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Controllers/CommonController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs index 7295ea0..e4120fd 100644 --- a/ZR.Admin.WebApi/Controllers/CommonController.cs +++ b/ZR.Admin.WebApi/Controllers/CommonController.cs @@ -146,7 +146,7 @@ namespace ZR.Admin.WebApi.Controllers { url = uploadType == 1 ? finalFilePath : accessPath, fileName, - fileId + fileId = fileId.ToString() }); } From 971c22ce470e6fa2611b491044ece5b194f0af53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Tue, 22 Mar 2022 11:34:23 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E8=B4=A6=E5=8F=B7=E4=B8=80=E4=BA=9B=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../System/monitor/SysLogininforController.cs | 12 ++++++++++-- .../System/monitor/SysOperlogController.cs | 18 +++++++++++------- .../Extensions/HttpContextExtension.cs | 6 ++++++ 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index 0df0ade..b56b80e 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -1,14 +1,14 @@ using Infrastructure; using Infrastructure.Attribute; using Infrastructure.Enums; +using Infrastructure.Model; using Microsoft.AspNetCore.Mvc; using SqlSugar; -using System.Linq.Expressions; +using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Common; using ZR.Model; using ZR.Model.System; -using ZR.Model.Vo; using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Controllers.monitor @@ -52,6 +52,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor [HttpDelete("clean")] public IActionResult CleanLoginInfo() { + if (!HttpContextExtension.IsAdmin(HttpContext)) + { + return ToResponse(ApiResult.Error("操作失败")); + } sysLoginService.TruncateLogininfo(); return SUCCESS(1); } @@ -66,6 +70,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor [ActionPermissionFilter(Permission = "monitor:logininfor:remove")] public IActionResult Remove(string infoIds) { + if (!HttpContextExtension.IsAdmin(HttpContext)) + { + return ToResponse(ApiResult.Error("操作失败")); + } long[] infoIdss = Tools.SpitLongArrary(infoIds); return SUCCESS(sysLoginService.DeleteLogininforByIds(infoIdss)); } diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index c71ef7d..3bf7224 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -1,19 +1,14 @@ using Infrastructure.Attribute; using Infrastructure.Enums; using Infrastructure.Model; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; +using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Common; using ZR.Model; using ZR.Model.System.Dto; -using ZR.Model.System; -using ZR.Model.Vo; using ZR.Service.System.IService; -using System; -using System.IO; -using OfficeOpenXml; -using Microsoft.AspNetCore.Hosting; -using System.Collections.Generic; namespace ZR.Admin.WebApi.Controllers.monitor { @@ -40,6 +35,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor { PagerInfo pagerInfo = new(sysOperLog.pageNum, sysOperLog.PageSize); + sysOperLog.operName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.operName; var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo); return SUCCESS(list, "MM/dd HH:mm"); @@ -55,6 +51,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor [HttpDelete("{operIds}")] public IActionResult Remove(string operIds) { + if (!HttpContextExtension.IsAdmin(HttpContext)) + { + return ToResponse(ApiResult.Error("操作失败")); + } long[] operIdss = Tools.SpitLongArrary(operIds); return SUCCESS(sysOperLogService.DeleteOperLogByIds(operIdss)); } @@ -68,6 +68,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor [HttpDelete("clean")] public ApiResult ClearOperLog() { + if (!HttpContextExtension.IsAdmin(HttpContext)) + { + return ApiResult.Error("操作失败"); + } sysOperLogService.CleanOperLog(); return ToJson(1); diff --git a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs index 535d9d8..2df4734 100644 --- a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs +++ b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs @@ -79,6 +79,12 @@ namespace ZR.Admin.WebApi.Extensions return uid; } + public static bool IsAdmin(this HttpContext context) + { + long id = GetUId(context); + return id == 1; + } + /// /// ClaimsIdentity /// From 04acf820f711c18bd710841ebc05f32d7e8d67f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Tue, 22 Mar 2022 17:24:51 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Vue/src/views/tool/file/index.vue | 50 ++++++++++++++++------------ 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/ZR.Vue/src/views/tool/file/index.vue b/ZR.Vue/src/views/tool/file/index.vue index 0cc75e0..49c2a54 100644 --- a/ZR.Vue/src/views/tool/file/index.vue +++ b/ZR.Vue/src/views/tool/file/index.vue @@ -2,14 +2,14 @@
- + - + - + @@ -34,13 +34,10 @@ - - + + @@ -56,7 +53,7 @@ - +