From acc10fde4a3554b8abd6603e3bff996620ec2b13 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: Sat, 5 Mar 2022 16:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Extensions/DbExtension.cs | 4 ++-- ZR.Admin.WebApi/Extensions/EntityExtension.cs | 10 ---------- ZR.Admin.WebApi/Extensions/TasksExtension.cs | 2 -- ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs | 4 ++-- ZR.Admin.WebApi/Filters/VerifyAttribute.cs | 18 ++++-------------- 5 files changed, 8 insertions(+), 30 deletions(-) diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs index 392e045..27fdec2 100644 --- a/ZR.Admin.WebApi/Extensions/DbExtension.cs +++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs @@ -37,12 +37,12 @@ namespace ZR.Admin.WebApi.Extensions ConfigId = "0", ConnectionString = connStr, DbType = (IocDbType)dbType, - IsAutoCloseConnection = true//自动释放 + IsAutoCloseConnection = true }, new IocConfig() { ConfigId = "1", ConnectionString = connStrBus, DbType = (IocDbType)dbType_bus, - IsAutoCloseConnection = true//自动释放 + IsAutoCloseConnection = true } }); //每次Sql执行前事件 diff --git a/ZR.Admin.WebApi/Extensions/EntityExtension.cs b/ZR.Admin.WebApi/Extensions/EntityExtension.cs index 8308ca5..fe5c4a8 100644 --- a/ZR.Admin.WebApi/Extensions/EntityExtension.cs +++ b/ZR.Admin.WebApi/Extensions/EntityExtension.cs @@ -34,21 +34,11 @@ namespace ZR.Admin.WebApi.Extensions if (types.GetProperty("Create_by") != null && context != null) { types.GetProperty("Create_by").SetValue(source, context.GetName(), null); - - // types.GetProperty("CreateName").SetValue(source, userSession.UserName, null); } if (types.GetProperty("UserId") != null && context != null) { types.GetProperty("UserId").SetValue(source, context.GetUId(), null); } - //if (types.GetProperty("UpdateID") != null) - //{ - // types.GetProperty("UpdateID").SetValue(source, userSession.UserID, null); - - // types.GetProperty("UpdateName").SetValue(source, userSession.UserName, null); - //} - - return source; } diff --git a/ZR.Admin.WebApi/Extensions/TasksExtension.cs b/ZR.Admin.WebApi/Extensions/TasksExtension.cs index 83a878e..0d75969 100644 --- a/ZR.Admin.WebApi/Extensions/TasksExtension.cs +++ b/ZR.Admin.WebApi/Extensions/TasksExtension.cs @@ -34,8 +34,6 @@ namespace ZR.Admin.WebApi.Extensions { var _tasksQzService = (ISysTasksQzService)App.GetRequiredService(typeof(ISysTasksQzService)); - //此写法不通过有待研究 - //var _tasksQzService2 = (ISysTasksQzService)services.GetRequiredService(typeof(SysTasksQzService)); ITaskSchedulerServer _schedulerServer = App.GetRequiredService(); var tasks = _tasksQzService.GetList(m => m.IsStart); diff --git a/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs b/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs index dbe4a18..00071ee 100644 --- a/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs +++ b/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs @@ -122,8 +122,8 @@ namespace ZR.Admin.WebApi.Filters sysOperLog.jsonResult = logAttribute.IsSaveResponseData ? sysOperLog.jsonResult : ""; } - LogEventInfo ei = new(LogLevel.Info, "GlobalExceptionMiddleware", ""); - ei.Properties["status"] = 0; + LogEventInfo ei = new(LogLevel.Info, "GlobalActionMonitor", ""); + ei.Properties["jsonResult"] = !HttpMethods.IsGet(method) ? jsonResult : ""; ei.Properties["requestParam"] = sysOperLog.operParam; ei.Properties["user"] = userName; diff --git a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs index 6391046..f0ec952 100644 --- a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs +++ b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs @@ -1,8 +1,6 @@ using Infrastructure; using Infrastructure.Model; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; @@ -22,9 +20,6 @@ namespace ZR.Admin.WebApi.Filters public class VerifyAttribute : Attribute, IAuthorizationFilter { static readonly Logger logger = LogManager.GetCurrentClassLogger(); - //IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment)); - - //public VerifyAttribute() { } /// /// 只判断token是否正确，不判断权限 @@ -45,20 +40,15 @@ namespace ZR.Admin.WebApi.Filters string ip = HttpContextExtension.GetClientUserIp(context.HttpContext); string url = context.HttpContext.Request.Path; var isAuthed = context.HttpContext.User.Identity.IsAuthenticated; - var userName = context.HttpContext.User.Identity.Name; //使用jwt token校验2020-11-21 LoginUser info = JwtUtil.GetLoginUser(context.HttpContext); - if (info != null && info.UserId > 0) + if (info == null || !isAuthed) { - //logger.Info($"[{info.UserId}-{userName}-{ip}]用户登录校验成功"); - } - else - { - string msg = $"请求访问:{url}授权认证失败，无法访问系统资源"; - logger.Info($"用户{userName}{msg}"); - + string msg = $"请求访问[{url}]失败，无法访问系统资源"; + logger.Info($"{msg}"); + context.Result = new JsonResult(new ApiResult((int)ResultCode.DENY, msg)); } }