diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs index bfc2e3c..8c47e07 100644 --- a/ZR.Admin.WebApi/Controllers/CommonController.cs +++ b/ZR.Admin.WebApi/Controllers/CommonController.cs @@ -49,6 +49,22 @@ namespace ZR.Admin.WebApi.Controllers "如果觉得项目有用,打赏作者喝杯咖啡作为奖励\n☛☛http://www.izhaorui.cn/doc/support.html\n"); } + /// + /// 企业消息测试 + /// + /// 要发送的消息 + /// 要发送的人@all所有,xxx单独发送对个人 + /// + [Route("/sendMsg")] + [HttpGet] + [Log(Title = "企业消息测试")] + public IActionResult SendMsg(string msg, string toUser = "") + { + throw new Exception("ddddd"); + WxNoticeHelper.SendMsg("消息测试", msg, toUser, WxNoticeHelper.MsgType.markdown); + return SUCCESS(msg); + } + /// /// 发送邮件 /// diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index e1f6c61..ec6384c 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -67,7 +67,6 @@ namespace ZR.Admin.WebApi.Controllers List list = _CodeGeneraterService.GetAllTables(dbName, tableName, pager); var page = new PagedInfo { - TotalPage = pager.TotalPage, TotalNum = pager.TotalNum, PageSize = pager.PageSize, PageIndex = pager.PageNum, diff --git a/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs b/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs index f6efad4..cc97354 100644 --- a/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs +++ b/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs @@ -23,7 +23,7 @@ namespace ZR.Admin.WebApi.Middleware private readonly RequestDelegate next; private readonly ISysOperLogService SysOperLogService; - static readonly Logger Logger = LogManager.GetCurrentClassLogger();//声明NLog变量 + static readonly Logger Logger = LogManager.GetCurrentClassLogger(); public GlobalExceptionMiddleware(RequestDelegate next, ISysOperLogService sysOperLog) { @@ -88,7 +88,7 @@ namespace ZR.Admin.WebApi.Middleware RequestMethod = context.Request.Method, JsonResult = responseResult, ErrorMsg = string.IsNullOrEmpty(error) ? msg : error, - OperName = context.User.Identity.Name, + OperName = HttpContextExtension.GetName(context), OperLocation = ip_info.Province + " " + ip_info.City, OperTime = DateTime.Now }; @@ -113,23 +113,18 @@ namespace ZR.Admin.WebApi.Middleware ei.Properties["status"] = 1;//走正常返回都是通过走GlobalExceptionFilter不通过 ei.Properties["jsonResult"] = responseResult; ei.Properties["requestParam"] = sysOperLog.OperParam; - ei.Properties["user"] = HttpContextExtension.GetName(context); + ei.Properties["user"] = sysOperLog.OperName; Logger.Log(ei); context.Response.ContentType = "text/json;charset=utf-8"; await context.Response.WriteAsync(responseResult, System.Text.Encoding.UTF8); - - // 获取异常堆栈 - var traceFrame = new StackTrace(true)?.GetFrame(0); - // 获取出错的文件名 - var exceptionFileName = traceFrame?.GetFileName(); - // 获取出错的行号 - var exceptionFileLineNumber = traceFrame?.GetFileLineNumber(); - string errorMsg = $"用户名:{sysOperLog.OperName}\n" + - $"错误信息:{sysOperLog.ErrorMsg}\n"+ - $"错误行号:{exceptionFileLineNumber}\n" + - $"{traceFrame}#{exceptionFileName}"; - WxNoticeHelper.SendMsg("系统出错", errorMsg); + + string errorMsg = $"> 操作人:{sysOperLog.OperName} {sysOperLog.OperLocation}" + + $"\n> 操作模块:{sysOperLog.Title}" + + $"\n> 操作地址:{sysOperLog.OperUrl}" + + $"\n> 错误信息:{msg}\n\n> {error}"; + + WxNoticeHelper.SendMsg("系统出错", errorMsg, "", WxNoticeHelper.MsgType.markdown); SysOperLogService.InsertOperlog(sysOperLog); } diff --git a/ZR.Model/PagerInfo.cs b/ZR.Model/PagerInfo.cs index 5d69e2e..fe94b18 100644 --- a/ZR.Model/PagerInfo.cs +++ b/ZR.Model/PagerInfo.cs @@ -14,20 +14,6 @@ /// 总记录数 /// public int TotalNum { get; set; } - /// - /// 总页码 - /// - /// - /// 总页数 - /// - public int TotalPage - { - get - { - return TotalNum > 0 ? TotalNum % PageSize == 0 ? TotalNum / PageSize : TotalNum / PageSize + 1 : 0; - } - } - /// /// 排序字段 ///