diff --git a/Bootstrap.Admin/BootstrapAdmin.db b/Bootstrap.Admin/BootstrapAdmin.db index 48c551c2..f357c060 100644 Binary files a/Bootstrap.Admin/BootstrapAdmin.db and b/Bootstrap.Admin/BootstrapAdmin.db differ diff --git a/Bootstrap.Client.DataAccess/DictHelper.cs b/Bootstrap.Client.DataAccess/DictHelper.cs index 49d2104d..9e654e7a 100644 --- a/Bootstrap.Client.DataAccess/DictHelper.cs +++ b/Bootstrap.Client.DataAccess/DictHelper.cs @@ -36,6 +36,15 @@ namespace Bootstrap.Client.DataAccess return RetrieveAppName("系统设置地址"); } + /// + /// + /// + /// + public static string RetrieveNotisUrl() + { + return RetrieveAppName("系统通知地址"); + } + /// /// /// diff --git a/Bootstrap.Client/Models/HeaderBarModel.cs b/Bootstrap.Client/Models/HeaderBarModel.cs index 12a149c1..cfe2636d 100644 --- a/Bootstrap.Client/Models/HeaderBarModel.cs +++ b/Bootstrap.Client/Models/HeaderBarModel.cs @@ -23,34 +23,46 @@ namespace Bootstrap.Client.Models UserName = user.UserName; SettingsUrl = DictHelper.RetrieveSettingsUrl(); ProfilesUrl = DictHelper.RetrieveProfilesUrl(); + NotisUrl = DictHelper.RetrieveNotisUrl(); var uriBuilder = new UriBuilder(ConfigurationManager.AppSettings["AuthHost"]); uriBuilder.Path = uriBuilder.Path == "/" ? CookieAuthenticationDefaults.LogoutPath.Value : uriBuilder.Path + CookieAuthenticationDefaults.LogoutPath; LogoutUrl = uriBuilder.ToString(); if (!string.IsNullOrEmpty(user.Css)) Theme = user.Css; } + /// /// /// public string UserName { get; } + /// /// /// public string DisplayName { get; } + /// /// 获得/设置 用户头像地址 /// public string Icon { get; } + /// /// 获得/设置 设置网址 /// public string SettingsUrl { get; } + /// /// 获得/设置 个人中心网址 /// public string ProfilesUrl { get; } + /// /// 获得 退出登录地址 /// public string LogoutUrl { get; } + + /// + /// + /// + public string NotisUrl { get; } } } \ No newline at end of file diff --git a/Bootstrap.Client/Views/Shared/Header.cshtml b/Bootstrap.Client/Views/Shared/Header.cshtml index b768d3a6..45c4f376 100644 --- a/Bootstrap.Client/Views/Shared/Header.cshtml +++ b/Bootstrap.Client/Views/Shared/Header.cshtml @@ -31,7 +31,7 @@
个人中心 设置 - 通知 + 通知
注销 diff --git a/DatabaseScripts/InitData.sql b/DatabaseScripts/InitData.sql index 68add162..bcc2e478 100644 --- a/DatabaseScripts/InitData.sql +++ b/DatabaseScripts/InitData.sql @@ -144,6 +144,7 @@ Insert Dicts (Category, Name, Code, Define) values (@AppName, N'网站标题', N Insert Dicts (Category, Name, Code, Define) values (@AppName, N'网站页脚', N'通用后台管理测试平台', 1); Insert Dicts (Category, Name, Code, Define) values (@AppName, N'个人中心地址', N'http://localhost:50852/Admin/Profiles', 1); Insert Dicts (Category, Name, Code, Define) values (@AppName, N'系统设置地址', N'http://localhost:50852/Admin/Index', 1); +Insert Dicts (Category, Name, Code, Define) values (@AppName, N'系统通知地址', N'http://localhost:50852/Admin/Notifications', 1); -- 菜单 DELETE FROM Navigations Where [Application] = @AppId diff --git a/DatabaseScripts/MongoDB/BootstrapAdmin.Dicts.json b/DatabaseScripts/MongoDB/BootstrapAdmin.Dicts.json index 3d631562..f06950af 100644 --- a/DatabaseScripts/MongoDB/BootstrapAdmin.Dicts.json +++ b/DatabaseScripts/MongoDB/BootstrapAdmin.Dicts.json @@ -258,6 +258,13 @@ "Code": "http://localhost:50852/Admin/Index", "Define": NumberInt(1) }, + { + "_id": ObjectId("5bd6c73d5fa31256f77e4a12"), + "Category": "测试平台", + "Name": "系统通知地址", + "Code": "http://localhost:50852/Admin/Notifications", + "Define": NumberInt(1) + }, { "_id": ObjectId("5bd6c73d5fa31256f77e4a37"), "Category": "设备驱动", diff --git a/DatabaseScripts/MySQL/initData.sql b/DatabaseScripts/MySQL/initData.sql index 612a3e40..b9d9c1bd 100644 --- a/DatabaseScripts/MySQL/initData.sql +++ b/DatabaseScripts/MySQL/initData.sql @@ -134,6 +134,7 @@ Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '网站 Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '网站页脚', '通用后台管理测试平台', 1); Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '个人中心地址', 'http://localhost:50852/Admin/Profiles', 1); Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '系统设置地址', 'http://localhost:50852/Admin/Index', 1); +Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '系统通知地址', 'http://localhost:50852/Admin/Notifications', 1); Delete from Navigations where Application = 2; INSERT into Navigations (ParentId, Name, `Order`, Icon, Url, Category, Application) VALUES (0, '首页', 10, 'fa fa-fa', '~/Home/Index', '1', 2); diff --git a/DatabaseScripts/Postgresql/initData.sql b/DatabaseScripts/Postgresql/initData.sql index ae4bc142..8e2ee0d7 100644 --- a/DatabaseScripts/Postgresql/initData.sql +++ b/DatabaseScripts/Postgresql/initData.sql @@ -134,6 +134,7 @@ Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '网站 Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '网站页脚', '通用后台管理测试平台', 1); Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '个人中心地址', 'http://localhost:50852/Admin/Profiles', 1); Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '系统设置地址', 'http://localhost:50852/Admin/Index', 1); +Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '系统通知地址', 'http://localhost:50852/Admin/Notifications', 1); Delete from Navigations where Application = '2'; INSERT into Navigations (ParentId, Name, "order", Icon, Url, Category, Application) VALUES (0, '首页', 10, 'fa fa-fa', '~/Home/Index', '1', 2); diff --git a/DatabaseScripts/SQLite/InitData.sql b/DatabaseScripts/SQLite/InitData.sql index a0d59c77..a6d1d96d 100644 --- a/DatabaseScripts/SQLite/InitData.sql +++ b/DatabaseScripts/SQLite/InitData.sql @@ -135,6 +135,7 @@ Insert into Dicts (Category, [Name], Code, Define) values ('测试平台', '网 Insert into Dicts (Category, [Name], Code, Define) values ('测试平台', '网站页脚', '通用后台管理测试平台', 1); Insert into Dicts (Category, [Name], Code, Define) values ('测试平台', '个人中心地址', 'http://localhost:50852/Admin/Profiles', 1); Insert into Dicts (Category, [Name], Code, Define) values ('测试平台', '系统设置地址', 'http://localhost:50852/Admin/Index', 1); +Insert into Dicts (Category, [Name], Code, Define) values ('测试平台', '系统通知地址', 'http://localhost:50852/Admin/Notifications', 1); Delete from [Navigations] where Application = 2; INSERT into [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], [Application]) VALUES (0, '首页', 10, 'fa fa-fa', '~/Home/Index', '1', 2); diff --git a/UnitTest/DB/UnitTest.db b/UnitTest/DB/UnitTest.db index ee960054..7d374d09 100644 Binary files a/UnitTest/DB/UnitTest.db and b/UnitTest/DB/UnitTest.db differ