From 1d9e628a5c863525ae60bbccc2f64fd69eb3adb1 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, 13 Dec 2022 09:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4demo=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs | 2 +- ZR.Admin.WebApi/Hubs/MessageHub.cs | 7 +------ ZR.Service/System/SysOperLogService.cs | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs index 67761d3..1ea087f 100644 --- a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs +++ b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs @@ -56,7 +56,7 @@ namespace ZR.Admin.WebApi.Filters bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false); var url = context.HttpContext.Request.Path; //演示公开环境屏蔽权限 - string[] denyPerms = new string[] { "update", "add", "remove", "add", "edit", "delete", "import", "run", "start", "stop", "clear", "send", "export", "upload", "common" }; + string[] denyPerms = new string[] { "update", "add", "remove", "add", "edit", "delete", "import", "run", "start", "stop", "clear", "send", "export", "upload", "common", "gencode" }; if (isDemoMode && denyPerms.Any(f => Permission.ToLower().Contains(f))) { context.Result = new JsonResult(new { code = ResultCode.FORBIDDEN, msg = "演示模式 , 不允许操作" }); diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.Admin.WebApi/Hubs/MessageHub.cs index e06644e..3a51212 100644 --- a/ZR.Admin.WebApi/Hubs/MessageHub.cs +++ b/ZR.Admin.WebApi/Hubs/MessageHub.cs @@ -93,12 +93,7 @@ namespace ZR.Admin.WebApi.Hubs public async Task SendMessage(string connectId, string userName, string message) { Console.WriteLine($"{connectId},message={message}"); - bool isDemoMode = AppSettings.GetAppConfig("DemoMode", true); - if (isDemoMode) - { - await Clients.Caller.SendAsync("receiveChat", new { userName, message = "当前环境为演示环境,消息不会发送给对方" }); - return; - } + await Clients.Client(connectId).SendAsync("receiveChat", new { userName, message }); } } diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs index 53cff44..dc4d9ec 100644 --- a/ZR.Service/System/SysOperLogService.cs +++ b/ZR.Service/System/SysOperLogService.cs @@ -40,11 +40,6 @@ namespace ZR.Service.System sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1); sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1); - bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false); - if (isDemoMode) - { - return new PagedInfo(); - } var exp = Expressionable.Create(); exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime); exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title));