From e1c79b124bc5ea04b8dd63f3a8c3863b9c3fefd0 Mon Sep 17 00:00:00 2001 From: wayne Date: Sat, 18 Mar 2023 16:40:01 +0800 Subject: [PATCH] Update Packages --- Database/MySql/Dump.sql | 8 ++++---- Database/SQLite/ZKEACMS.sqlite.sql | 8 ++++---- Database/script.sql | 8 ++++---- src/EasyFrameWork/EasyFrameWork.csproj | 8 ++++---- .../Controllers/ActionBodyController.cs | 8 ++++---- .../Controllers/EventActionController.cs | 10 +++++----- .../Controllers/PendingTaskController.cs | 8 ++++---- src/ZKEACMS.EventAction/EventActionPlug.cs | 16 ++++++++-------- src/ZKEACMS.EventAction/PermissionKeys.cs | 8 ++++---- .../Views/ActionBody/Create.cshtml | 2 +- .../Views/ActionBody/Edit.cshtml | 2 +- .../Views/ActionBody/Index.cshtml | 4 ++-- .../Views/EventAction/Create.cshtml | 2 +- .../Views/EventAction/Edit.cshtml | 2 +- .../Views/EventAction/Index.cshtml | 4 ++-- .../Views/PendingTask/Create.cshtml | 2 +- .../Views/PendingTask/Edit.cshtml | 2 +- src/ZKEACMS.WebHost/Locale/zh-CN.yml | 9 ++++----- src/ZKEACMS.WebHost/Locale/zh-TW.yml | 9 ++++----- src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj | 2 +- src/ZKEACMS/ZKEACMS.csproj | 10 +++++----- .../EasyFrameWork.Test/EasyFrameWork.Test.csproj | 2 +- test/ZKEACMS.Test/ZKEACMS.Test.csproj | 4 ++-- tools/LanguageScriptGen/LanguageScriptGen.csproj | 2 +- 24 files changed, 69 insertions(+), 71 deletions(-) diff --git a/Database/MySql/Dump.sql b/Database/MySql/Dump.sql index 6dfa6c6b..82a6ea8c 100644 --- a/Database/MySql/Dump.sql +++ b/Database/MySql/Dump.sql @@ -1897,8 +1897,8 @@ CREATE TABLE `Permission` ( /*!40000 ALTER TABLE `Permission` DISABLE KEYS */; INSERT INTO `Permission` VALUES -('ActionBody_Manage',1,'Manage Action Body',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'), -('ActionBody_View',1,'View Action Body',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'), +('NotificationContent_Manage',1,'Manage Notification Content',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'), +('NotificationContent_View',1,'View Notification Content',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'), ('ApplicationSetting_Manage',1,'管理系统设置',NULL,'用户/安全',NULL,'admin','ZKEASOFT','2016-08-01 14:12:07.567','admin','ZKEASOFT','2023-03-14 21:04:42.750'), ('ApplicationSetting_View',1,'查看系统设置',NULL,'用户/安全',NULL,'admin','ZKEASOFT','2016-08-01 13:37:46.647','admin','ZKEASOFT','2023-03-14 21:04:42.757'), ('Article_Manage',1,'管理文章',NULL,'文章',NULL,'admin','ZKEASOFT','2016-08-01 13:18:40.493','admin','ZKEASOFT','2023-03-14 21:04:42.757'), @@ -1911,8 +1911,8 @@ INSERT INTO `Permission` VALUES ('Comments_Manage',1,'管理回复',NULL,'留言评论',NULL,'admin','ZKEASOFT','2017-12-03 17:09:48.053','admin','ZKEASOFT','2023-03-14 21:04:42.757'), ('Comments_View',1,'查看回复',NULL,'留言评论',NULL,'admin','ZKEASOFT','2017-12-03 17:09:48.050','admin','ZKEASOFT','2023-03-14 21:04:42.757'), ('Config_Currency',1,'Currency',NULL,'Setting',NULL,'admin','ZKEASOFT','2021-03-06 22:16:30.727','admin','ZKEASOFT','2023-03-14 21:04:42.757'), -('EventAction_Manage',1,'Manage EventAction',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.767','admin','ZKEASOFT','2023-03-14 21:04:42.767'), -('EventAction_View',1,'View EventAction',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.760','admin','ZKEASOFT','2023-03-14 21:04:42.760'), +('EventNotification_Manage',1,'Manage Event Notification',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.767','admin','ZKEASOFT','2023-03-14 21:04:42.767'), +('EventNotification_View',1,'View Event Notification',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.760','admin','ZKEASOFT','2023-03-14 21:04:42.760'), ('EventViewer_Manage',1,'查看错误日志',NULL,'设置',NULL,'admin','ZKEASOFT','2017-07-11 15:43:52.147','admin','ZKEASOFT','2023-03-14 21:04:42.757'), ('Form_Manage',1,'管理表单',NULL,'自定义表单',NULL,'admin','ZKEASOFT','2017-10-12 15:11:51.843','admin','ZKEASOFT','2023-03-14 21:04:42.757'), ('Form_View',1,'查看表单',NULL,'自定义表单',NULL,'admin','ZKEASOFT','2017-10-12 15:11:51.830','admin','ZKEASOFT','2023-03-14 21:04:42.757'), diff --git a/Database/SQLite/ZKEACMS.sqlite.sql b/Database/SQLite/ZKEACMS.sqlite.sql index 6e576fc4..e46a54e0 100644 --- a/Database/SQLite/ZKEACMS.sqlite.sql +++ b/Database/SQLite/ZKEACMS.sqlite.sql @@ -1251,8 +1251,8 @@ INSERT INTO [Product] ([ID],[Title],[ImageUrl],[ImageThumbUrl],[BrandCD],[Produc

节省存储空间并减少可能的线缆损坏。

HyperX 红色背光按键，实现动态的灯光效果

让璀璨的背光彰显您的风格

','实心钢架,CHERRY® MX 机械按键开关,带有可拆卸的线缆',1,'2017-11-17 00:00:00.000',1,NULL,NULL,NULL,NULL,NULL,'Alloy-FPS',NULL,NULL,'HX-KB4RD1-US/R1','admin','ZKEASOFT','2017-11-17 15:30:22.000','admin','ZKEASOFT','2019-04-24 21:52:25.420'); -INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('ActionBody_Manage',1,'Manage Action Body',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'); -INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('ActionBody_View',1,'View Action Body',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'); +INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('NotificationContent_Manage',1,'Manage Notification Content',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'); +INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('NotificationContent_View',1,'View Notification Content',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.770','admin','ZKEASOFT','2023-03-14 21:04:42.770'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('ApplicationSetting_Manage',1,'管理系统设置',NULL,'用户/安全',NULL,'admin','ZKEASOFT','2016-08-01 14:12:07.567','admin','ZKEASOFT','2023-03-14 21:04:42.750'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('ApplicationSetting_View',1,'查看系统设置',NULL,'用户/安全',NULL,'admin','ZKEASOFT','2016-08-01 13:37:46.647','admin','ZKEASOFT','2023-03-14 21:04:42.757'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('Article_Manage',1,'管理文章',NULL,'文章',NULL,'admin','ZKEASOFT','2016-08-01 13:18:40.493','admin','ZKEASOFT','2023-03-14 21:04:42.757'); @@ -1265,8 +1265,8 @@ INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('Comments_Manage',1,'管理回复',NULL,'留言评论',NULL,'admin','ZKEASOFT','2017-12-03 17:09:48.053','admin','ZKEASOFT','2023-03-14 21:04:42.757'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('Comments_View',1,'查看回复',NULL,'留言评论',NULL,'admin','ZKEASOFT','2017-12-03 17:09:48.050','admin','ZKEASOFT','2023-03-14 21:04:42.757'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('Config_Currency',1,'Currency',NULL,'Setting',NULL,'admin','ZKEASOFT','2021-03-06 22:16:30.727','admin','ZKEASOFT','2023-03-14 21:04:42.757'); -INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('EventAction_Manage',1,'Manage EventAction',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.767','admin','ZKEASOFT','2023-03-14 21:04:42.767'); -INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('EventAction_View',1,'View EventAction',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.760','admin','ZKEASOFT','2023-03-14 21:04:42.760'); +INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('EventNotification_Manage',1,'Manage Event Notification',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.767','admin','ZKEASOFT','2023-03-14 21:04:42.767'); +INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('EventNotification_View',1,'View Event Notification',NULL,'EventAction',NULL,'admin','ZKEASOFT','2023-03-14 21:04:42.760','admin','ZKEASOFT','2023-03-14 21:04:42.760'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('EventViewer_Manage',1,'查看错误日志',NULL,'设置',NULL,'admin','ZKEASOFT','2017-07-11 15:43:52.147','admin','ZKEASOFT','2023-03-14 21:04:42.757'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('Form_Manage',1,'管理表单',NULL,'自定义表单',NULL,'admin','ZKEASOFT','2017-10-12 15:11:51.843','admin','ZKEASOFT','2023-03-14 21:04:42.757'); INSERT INTO [Permission] ([PermissionKey],[RoleId],[Title],[Description],[Module],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('Form_View',1,'查看表单',NULL,'自定义表单',NULL,'admin','ZKEASOFT','2017-10-12 15:11:51.830','admin','ZKEASOFT','2023-03-14 21:04:42.757'); diff --git a/Database/script.sql b/Database/script.sql index 41d11c41..65300ce6 100644 --- a/Database/script.sql +++ b/Database/script.sql @@ -2594,8 +2594,8 @@ INSERT [dbo].[Navigation] ([ID], [ParentId], [Url], [Title], [IsMobile], [Html], INSERT [dbo].[Navigation] ([ID], [ParentId], [Url], [Title], [IsMobile], [Html], [Description], [Status], [DisplayOrder], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'd122a50356bf46c8a8c8349612145e24', N'#', N'~/questionnaire', N'问卷调查', 0, NULL, NULL, 1, 4, N'admin', N'ZKEASOFT', CAST(N'2017-10-15T18:05:25.947' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2017-10-15T18:05:28.837' AS DateTime)) INSERT [dbo].[Navigation] ([ID], [ParentId], [Url], [Title], [IsMobile], [Html], [Description], [Status], [DisplayOrder], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'e4658e8af8434a05b773b666c6c67cd5', N'#', N'~/article', N'新闻', 1, NULL, NULL, 1, 2, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T23:32:53.000' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2017-10-15T18:05:28.827' AS DateTime)) INSERT [dbo].[NavigationWidget] ([ID], [CustomerClass], [Title], [Logo], [AlignClass], [IsTopFix], [RootID], [ShowBasket]) VALUES (N'6ee67036e78b4b498d932ab2d76757fb', N'container', NULL, N'~/images/logo_zkea.png', N'navbar-left', NULL, N'#', 0) -INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'ActionBody_Manage', 1, N'Manage Action Body', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime)) -INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'ActionBody_View', 1, N'View Action Body', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime)) +INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'NotificationContent_Manage', 1, N'Manage Notification Content', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime)) +INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'NotificationContent_View', 1, N'View Notification Content', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.770' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'ApplicationSetting_Manage', 1, N'管理系统设置', NULL, N'用户/安全', NULL, N'admin', N'ZKEASOFT', CAST(N'2016-08-01T14:12:07.567' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.750' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'ApplicationSetting_View', 1, N'查看系统设置', NULL, N'用户/安全', NULL, N'admin', N'ZKEASOFT', CAST(N'2016-08-01T13:37:46.647' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'Article_Manage', 1, N'管理文章', NULL, N'文章', NULL, N'admin', N'ZKEASOFT', CAST(N'2016-08-01T13:18:40.493' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) @@ -2608,8 +2608,8 @@ INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [M INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'Comments_Manage', 1, N'管理回复', NULL, N'留言评论', NULL, N'admin', N'ZKEASOFT', CAST(N'2017-12-03T17:09:48.053' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'Comments_View', 1, N'查看回复', NULL, N'留言评论', NULL, N'admin', N'ZKEASOFT', CAST(N'2017-12-03T17:09:48.050' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'Config_Currency', 1, N'Currency', NULL, N'Setting', NULL, N'admin', N'ZKEASOFT', CAST(N'2021-03-06T22:16:30.727' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) -INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'EventAction_Manage', 1, N'Manage EventAction', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.767' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.767' AS DateTime)) -INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'EventAction_View', 1, N'View EventAction', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.760' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.760' AS DateTime)) +INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'EventNotification_Manage', 1, N'Manage Event Notification', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.767' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.767' AS DateTime)) +INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'EventNotification_View', 1, N'View Event Notification', NULL, N'EventAction', NULL, N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.760' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.760' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'EventViewer_Manage', 1, N'查看错误日志', NULL, N'设置', NULL, N'admin', N'ZKEASOFT', CAST(N'2017-07-11T15:43:52.147' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'Form_Manage', 1, N'管理表单', NULL, N'自定义表单', NULL, N'admin', N'ZKEASOFT', CAST(N'2017-10-12T15:11:51.843' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) INSERT [dbo].[Permission] ([PermissionKey], [RoleId], [Title], [Description], [Module], [Status], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (N'Form_View', 1, N'查看表单', NULL, N'自定义表单', NULL, N'admin', N'ZKEASOFT', CAST(N'2017-10-12T15:11:51.830' AS DateTime), N'admin', N'ZKEASOFT', CAST(N'2023-03-14T21:04:42.757' AS DateTime)) diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj index 0a647764..83cd786e 100644 --- a/src/EasyFrameWork/EasyFrameWork.csproj +++ b/src/EasyFrameWork/EasyFrameWork.csproj @@ -20,15 +20,15 @@ - - - + + + - + diff --git a/src/ZKEACMS.EventAction/Controllers/ActionBodyController.cs b/src/ZKEACMS.EventAction/Controllers/ActionBodyController.cs index d2a4ce22..c1394172 100644 --- a/src/ZKEACMS.EventAction/Controllers/ActionBodyController.cs +++ b/src/ZKEACMS.EventAction/Controllers/ActionBodyController.cs @@ -14,26 +14,26 @@ namespace ZKEACMS.EventAction.Controllers { - [DefaultAuthorize(Policy = PermissionKeys.ViewActionBody)] + [DefaultAuthorize(Policy = PermissionKeys.ViewNotificationContent)] public class ActionBodyController : BasicController { public ActionBodyController(IActionBodyService service) : base(service) { } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageActionBody)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageNotificationContent)] public override IActionResult Edit(Models.ActionBody entity) { return base.Edit(entity); } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageActionBody)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageNotificationContent)] public override IActionResult Create(Models.ActionBody entity) { return base.Create(entity); } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageActionBody)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageNotificationContent)] public override IActionResult Delete(int id) { return base.Delete(id); diff --git a/src/ZKEACMS.EventAction/Controllers/EventActionController.cs b/src/ZKEACMS.EventAction/Controllers/EventActionController.cs index 7facfa15..904aeca3 100644 --- a/src/ZKEACMS.EventAction/Controllers/EventActionController.cs +++ b/src/ZKEACMS.EventAction/Controllers/EventActionController.cs @@ -16,20 +16,20 @@ namespace ZKEACMS.EventAction.Controllers { - [DefaultAuthorize(Policy = PermissionKeys.ViewEventAction)] + [DefaultAuthorize(Policy = PermissionKeys.ViewEventNotification)] public class EventActionController : BasicController { public EventActionController(IEventActionService service) : base(service) { } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventAction)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventNotification)] public override IActionResult Edit(Models.EventAction entity) { return base.Edit(entity); } - [DefaultAuthorize(Policy = PermissionKeys.ManageEventAction)] + [DefaultAuthorize(Policy = PermissionKeys.ManageEventNotification)] public override IActionResult Create() { return View(new Models.EventAction @@ -38,13 +38,13 @@ public override IActionResult Create() }); } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventAction)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventNotification)] public override IActionResult Create(Models.EventAction entity) { return base.Create(entity); } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventAction)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventNotification)] public override IActionResult Delete(int id) { return base.Delete(id); diff --git a/src/ZKEACMS.EventAction/Controllers/PendingTaskController.cs b/src/ZKEACMS.EventAction/Controllers/PendingTaskController.cs index 03967d6e..d6ecf4fa 100644 --- a/src/ZKEACMS.EventAction/Controllers/PendingTaskController.cs +++ b/src/ZKEACMS.EventAction/Controllers/PendingTaskController.cs @@ -15,14 +15,14 @@ namespace ZKEACMS.EventAction.Controllers { - [DefaultAuthorize(Policy = PermissionKeys.ViewEventAction)] + [DefaultAuthorize(Policy = PermissionKeys.ViewEventNotification)] public class PendingTaskController : BasicController { public PendingTaskController(IPendingTaskManagerService service) : base(service) { } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventAction)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventNotification)] public override IActionResult Edit(Models.PendingTaskEntity entity) { entity.RetryCount = 0; @@ -31,13 +31,13 @@ public override IActionResult Edit(Models.PendingTaskEntity entity) return base.Edit(entity); } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventAction)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventNotification)] public override IActionResult Create(Models.PendingTaskEntity entity) { return base.Create(entity); } - [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventAction)] + [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageEventNotification)] public override IActionResult Delete(int id) { return base.Delete(id); diff --git a/src/ZKEACMS.EventAction/EventActionPlug.cs b/src/ZKEACMS.EventAction/EventActionPlug.cs index b82f27b3..4bc9ee65 100644 --- a/src/ZKEACMS.EventAction/EventActionPlug.cs +++ b/src/ZKEACMS.EventAction/EventActionPlug.cs @@ -41,7 +41,7 @@ public override IEnumerable AdminMenu() Icon = "glyphicon-indent-left", Url = "~/admin/eventaction", Order = 0, - PermissionKey = PermissionKeys.ViewEventAction + PermissionKey = PermissionKeys.ViewEventNotification }, new AdminMenu { @@ -49,7 +49,7 @@ public override IEnumerable AdminMenu() Icon = "glyphicon-log-in", Url = "~/admin/actionbody", Order = 1, - PermissionKey = PermissionKeys.ViewActionBody + PermissionKey = PermissionKeys.ViewNotificationContent }, new AdminMenu { @@ -74,12 +74,12 @@ protected override void InitStyle(Func style) public override IEnumerable RegistPermission() { - yield return new PermissionDescriptor(PermissionKeys.ViewEventAction, "EventAction", "View EventAction", ""); - yield return new PermissionDescriptor(PermissionKeys.ManageEventAction, "EventAction", "Manage EventAction", ""); - yield return new PermissionDescriptor(PermissionKeys.ViewActionBody, "EventAction", "View Action Body", ""); - yield return new PermissionDescriptor(PermissionKeys.ManageActionBody, "EventAction", "Manage Action Body", ""); - yield return new PermissionDescriptor(PermissionKeys.ViewPendingTask, "EventAction", "View Pending Task", ""); - yield return new PermissionDescriptor(PermissionKeys.ManagePendingTask, "EventAction", "Manage Pending Task", ""); + yield return new PermissionDescriptor(PermissionKeys.ViewEventNotification, "Event/Notification", "View Notification", ""); + yield return new PermissionDescriptor(PermissionKeys.ManageEventNotification, "Event/Notification", "Manage Notification", ""); + yield return new PermissionDescriptor(PermissionKeys.ViewNotificationContent, "Event/Notification", "View Notification Content", ""); + yield return new PermissionDescriptor(PermissionKeys.ManageNotificationContent, "Event/Notification", "Manage Notification Content", ""); + yield return new PermissionDescriptor(PermissionKeys.ViewPendingTask, "Event/Notification", "View Pending Task", ""); + yield return new PermissionDescriptor(PermissionKeys.ManagePendingTask, "Event/Notification", "Manage Pending Task", ""); } public override IEnumerable WidgetServiceTypes() diff --git a/src/ZKEACMS.EventAction/PermissionKeys.cs b/src/ZKEACMS.EventAction/PermissionKeys.cs index 1da407ff..eb018c0e 100644 --- a/src/ZKEACMS.EventAction/PermissionKeys.cs +++ b/src/ZKEACMS.EventAction/PermissionKeys.cs @@ -11,10 +11,10 @@ namespace ZKEACMS.EventAction { public class PermissionKeys { - public const string ViewEventAction = "EventAction_View"; - public const string ManageEventAction = "EventAction_Manage"; - public const string ViewActionBody = "ActionBody_View"; - public const string ManageActionBody = "ActionBody_Manage"; + public const string ViewEventNotification = "EventNotification_View"; + public const string ManageEventNotification = "EventNotification_Manage"; + public const string ViewNotificationContent = "NotificationContent_View"; + public const string ManageNotificationContent = "NotificationContent_Manage"; public const string ViewPendingTask = "PendingTask_View"; public const string ManagePendingTask = "PendingTask_Manage"; diff --git a/src/ZKEACMS.EventAction/Views/ActionBody/Create.cshtml b/src/ZKEACMS.EventAction/Views/ActionBody/Create.cshtml index 6e9f77af..49245584 100644 --- a/src/ZKEACMS.EventAction/Views/ActionBody/Create.cshtml +++ b/src/ZKEACMS.EventAction/Views/ActionBody/Create.cshtml @@ -13,7 +13,7 @@ { @Html.EditorForModel()
- @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventAction)) + @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventNotification)) { } diff --git a/src/ZKEACMS.EventAction/Views/ActionBody/Edit.cshtml b/src/ZKEACMS.EventAction/Views/ActionBody/Edit.cshtml index f18ac4f7..351a77bf 100644 --- a/src/ZKEACMS.EventAction/Views/ActionBody/Edit.cshtml +++ b/src/ZKEACMS.EventAction/Views/ActionBody/Edit.cshtml @@ -13,7 +13,7 @@ { @Html.EditorForModel()
- @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventAction)) + @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventNotification)) { } diff --git a/src/ZKEACMS.EventAction/Views/ActionBody/Index.cshtml b/src/ZKEACMS.EventAction/Views/ActionBody/Index.cshtml index 69d00ce7..33c38163 100644 --- a/src/ZKEACMS.EventAction/Views/ActionBody/Index.cshtml +++ b/src/ZKEACMS.EventAction/Views/ActionBody/Index.cshtml @@ -10,10 +10,10 @@ }
- @Html.SearchTerms(Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageActionBody)) + @Html.SearchTerms(Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageNotificationContent))
- +
\ No newline at end of file diff --git a/src/ZKEACMS.EventAction/Views/EventAction/Create.cshtml b/src/ZKEACMS.EventAction/Views/EventAction/Create.cshtml index 23f3cd3f..5f03103e 100644 --- a/src/ZKEACMS.EventAction/Views/EventAction/Create.cshtml +++ b/src/ZKEACMS.EventAction/Views/EventAction/Create.cshtml @@ -13,7 +13,7 @@ { @Html.EditorForModel()
- @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventAction)) + @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventNotification)) { } diff --git a/src/ZKEACMS.EventAction/Views/EventAction/Edit.cshtml b/src/ZKEACMS.EventAction/Views/EventAction/Edit.cshtml index 0b4ff296..91bfbca8 100644 --- a/src/ZKEACMS.EventAction/Views/EventAction/Edit.cshtml +++ b/src/ZKEACMS.EventAction/Views/EventAction/Edit.cshtml @@ -13,7 +13,7 @@ { @Html.EditorForModel()
- @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventAction)) + @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventNotification)) { } diff --git a/src/ZKEACMS.EventAction/Views/EventAction/Index.cshtml b/src/ZKEACMS.EventAction/Views/EventAction/Index.cshtml index 43964140..87ae3eec 100644 --- a/src/ZKEACMS.EventAction/Views/EventAction/Index.cshtml +++ b/src/ZKEACMS.EventAction/Views/EventAction/Index.cshtml @@ -10,10 +10,10 @@ }
- @Html.SearchTerms(Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventAction)) + @Html.SearchTerms(Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventNotification))
- +
\ No newline at end of file diff --git a/src/ZKEACMS.EventAction/Views/PendingTask/Create.cshtml b/src/ZKEACMS.EventAction/Views/PendingTask/Create.cshtml index 6664a4c0..ba4e0c2a 100644 --- a/src/ZKEACMS.EventAction/Views/PendingTask/Create.cshtml +++ b/src/ZKEACMS.EventAction/Views/PendingTask/Create.cshtml @@ -13,7 +13,7 @@ { @Html.EditorForModel()
- @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventAction)) + @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventNotification)) { } diff --git a/src/ZKEACMS.EventAction/Views/PendingTask/Edit.cshtml b/src/ZKEACMS.EventAction/Views/PendingTask/Edit.cshtml index de256cb4..6f5945bb 100644 --- a/src/ZKEACMS.EventAction/Views/PendingTask/Edit.cshtml +++ b/src/ZKEACMS.EventAction/Views/PendingTask/Edit.cshtml @@ -13,7 +13,7 @@ { @Html.EditorForModel()
- @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventAction)) + @if (Authorizer.Authorize(ZKEACMS.EventAction.PermissionKeys.ManageEventNotification)) { } diff --git a/src/ZKEACMS.WebHost/Locale/zh-CN.yml b/src/ZKEACMS.WebHost/Locale/zh-CN.yml index bfa2bd1a..b3cc24d6 100644 --- a/src/ZKEACMS.WebHost/Locale/zh-CN.yml +++ b/src/ZKEACMS.WebHost/Locale/zh-CN.yml @@ -1908,10 +1908,9 @@ PendingTaskEntity@HandlerName: 处理程序 PendingTaskEntity@RetryCount: 尝试次数 PendingTaskEntity@Data: 相关数据 PendingTaskEntity@LogMessage: 日志 -EventAction: 事件动作 -View EventAction: 查看事件动作 -Manage EventAction: 管理事件动作 -View Action Body: 查看事件内容 -Manage Action Body: 管理事件内容 +View Notification: 查看事件通知 +Manage Notification: 管理事件通知 +View Notification Content: 查看通知内容 +Manage Notification Content: 管理通知内容 View Pending Task: 查看待处理事件 Manage Pending Task: 管理待处理事件 diff --git a/src/ZKEACMS.WebHost/Locale/zh-TW.yml b/src/ZKEACMS.WebHost/Locale/zh-TW.yml index d6a8dfa1..c86c33ee 100644 --- a/src/ZKEACMS.WebHost/Locale/zh-TW.yml +++ b/src/ZKEACMS.WebHost/Locale/zh-TW.yml @@ -1908,10 +1908,9 @@ PendingTaskEntity@HandlerName: 處理程式 PendingTaskEntity@RetryCount: 嘗試次數 PendingTaskEntity@Data: 相關資料 PendingTaskEntity@LogMessage: 日誌 -EventAction: 事件動作 -View EventAction: 查看事件動作 -Manage EventAction: 管理事件動作 -View Action Body: 查看事件內容 -Manage Action Body: 管理事件內容 +View Notification: 查看事件通知 +Manage Notification: 管理事件通知 +View Notification Content: 查看通知內容 +Manage Notification Content: 管理通知內容 View Pending Task: 查看待處理事件 Manage Pending Task: 管理待處理事件 diff --git a/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj b/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj index 9215c154..486d9c47 100644 --- a/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj +++ b/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj @@ -20,7 +20,7 @@ true - + diff --git a/src/ZKEACMS/ZKEACMS.csproj b/src/ZKEACMS/ZKEACMS.csproj index d05bed52..2dd362a9 100644 --- a/src/ZKEACMS/ZKEACMS.csproj +++ b/src/ZKEACMS/ZKEACMS.csproj @@ -31,11 +31,11 @@ - - - - - + + + + + diff --git a/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj b/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj index 52ccb7a5..8df58b72 100644 --- a/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj +++ b/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/ZKEACMS.Test/ZKEACMS.Test.csproj b/test/ZKEACMS.Test/ZKEACMS.Test.csproj index beab89e5..d2c1cc3b 100644 --- a/test/ZKEACMS.Test/ZKEACMS.Test.csproj +++ b/test/ZKEACMS.Test/ZKEACMS.Test.csproj @@ -7,11 +7,11 @@ - + - + diff --git a/tools/LanguageScriptGen/LanguageScriptGen.csproj b/tools/LanguageScriptGen/LanguageScriptGen.csproj index 6c6a520f..2ac95c56 100644 --- a/tools/LanguageScriptGen/LanguageScriptGen.csproj +++ b/tools/LanguageScriptGen/LanguageScriptGen.csproj @@ -6,7 +6,7 @@ - +