wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除demo模式判断代码

Browse Source
This commit is contained in:
不做码农 2022-12-13 09:57:10 +08:00
parent 6fc10455a4
commit 1d9e628a5c
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
View File

@ -56,7 +56,7 @@ namespace ZR.Admin.WebApi.Filters
bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false); bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false);
var url = context.HttpContext.Request.Path; 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))) if (isDemoMode && denyPerms.Any(f => Permission.ToLower().Contains(f)))
{ {
context.Result = new JsonResult(new { code = ResultCode.FORBIDDEN, msg = "演示模式 , 不允许操作" }); context.Result = new JsonResult(new { code = ResultCode.FORBIDDEN, msg = "演示模式 , 不允许操作" });

7
ZR.Admin.WebApi/Hubs/MessageHub.cs
View File

@ -93,12 +93,7 @@ namespace ZR.Admin.WebApi.Hubs
public async Task SendMessage(string connectId, string userName, string message) public async Task SendMessage(string connectId, string userName, string message)
{ {
Console.WriteLine($"{connectId},message={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 }); await Clients.Client(connectId).SendAsync("receiveChat", new { userName, message });
} }
} }

5
ZR.Service/System/SysOperLogService.cs
View File

@ -40,11 +40,6 @@ namespace ZR.Service.System
sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1); sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1);
sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1); sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1);
bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false);
if (isDemoMode)
{
return new PagedInfo<SysOperLog>();
}
var exp = Expressionable.Create<SysOperLog>(); var exp = Expressionable.Create<SysOperLog>();
exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime); exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime);
exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title)); exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title));