diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs index a6df96a..c521110 100644 --- a/ZR.Admin.WebApi/Controllers/BaseController.cs +++ b/ZR.Admin.WebApi/Controllers/BaseController.cs @@ -12,8 +12,7 @@ namespace ZR.Admin.WebApi.Controllers public class BaseController : ControllerBase { public static string TIME_FORMAT_FULL = "yyyy-MM-dd HH:mm:ss"; - public static string TIME_FORMAT_FULL_2 = "MM-dd HH:mm:ss"; - + /// /// 返回成功封装 /// diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index 189a1f5..0b6e61d 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -38,7 +38,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor { var list = sysLoginService.GetLoginLog(sysLogininfoDto, pagerInfo); - return SUCCESS(list, TIME_FORMAT_FULL_2); + return SUCCESS(list); } /// diff --git a/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs b/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs index 661d0c9..35e3018 100644 --- a/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs +++ b/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs @@ -2,13 +2,10 @@ using Infrastructure.Attribute; using Infrastructure.Model; using IPTools.Core; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using NLog; -using System; using System.Text.Encodings.Web; using System.Text.Json; -using System.Threading.Tasks; using ZR.Admin.WebApi.Extensions; using ZR.Common; using ZR.Model.System; @@ -101,7 +98,7 @@ namespace ZR.Admin.WebApi.Middleware var logAttribute = endpoint.Metadata.GetMetadata(); if (logAttribute != null) { - sysOperLog.BusinessType = (int)logAttribute?.BusinessType; + sysOperLog.BusinessType = (int)logAttribute.BusinessType; sysOperLog.Title = logAttribute?.Title; sysOperLog.OperParam = logAttribute.IsSaveRequestData ? sysOperLog.OperParam : ""; sysOperLog.JsonResult = logAttribute.IsSaveResponseData ? sysOperLog.JsonResult : ""; diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index c24ae9c..8e28a95 100644 --- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -6,7 +6,7 @@ True - 1701;1702;1591 + 1701;1702;1591,8603,8602,8604,8600