From f87a066257a36f7276db5d1c89e734f20f2c7008 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 6 Oct 2019 21:51:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(#I12VKZ):=20=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=94=B9=E4=B8=BA=20favicon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #Comment comment #I12VKZ 更改字典表网站图标为 favicon #Issue link #I12VKZ --- db/MongoDB/Dicts.js | 2 +- db/MySQL/initData.sql | 2 +- db/Postgresql/initData.sql | 2 +- db/SQLite/InitData.sql | 2 +- db/SqlServer/InitData.sql | 2 +- src/admin/Bootstrap.Admin/BootstrapAdmin.db | Bin 110592 -> 110592 bytes .../Bootstrap.Admin/Models/HeaderBarModel.cs | 2 +- src/admin/Bootstrap.Admin/Models/ModelBase.cs | 4 ++-- .../Views/Shared/_Layout.cshtml | 4 ++-- .../Bootstrap.DataAccess/Helper/DictHelper.cs | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/db/MongoDB/Dicts.js b/db/MongoDB/Dicts.js index 25c1f12e..5d0cdd24 100644 --- a/db/MongoDB/Dicts.js +++ b/db/MongoDB/Dicts.js @@ -284,7 +284,7 @@ }, { "Category": "测试平台", - "Name": "网站图标", + "Name": "favicon", "Code": "http://localhost:49185/favicon.ico", "Define": NumberInt(1) } diff --git a/db/MySQL/initData.sql b/db/MySQL/initData.sql index b425cbed..0153d8c0 100644 --- a/db/MySQL/initData.sql +++ b/db/MySQL/initData.sql @@ -157,7 +157,7 @@ Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '网站 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); -INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('测试平台', '网站图标', 'http://localhost:49185/favicon.ico', 1); +INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('测试平台', 'favicon', 'http://localhost:49185/favicon.ico', 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/db/Postgresql/initData.sql b/db/Postgresql/initData.sql index 017796ad..d5570707 100644 --- a/db/Postgresql/initData.sql +++ b/db/Postgresql/initData.sql @@ -158,7 +158,7 @@ Insert into Dicts (Category, Name, Code, Define) values ('测试平台', '网站 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); -INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('测试平台', '网站图标', 'http://localhost:49185/favicon.ico', 1); +INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('测试平台', 'favicon', 'http://localhost:49185/favicon.ico', 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/db/SQLite/InitData.sql b/db/SQLite/InitData.sql index 14bbe97e..b3471a44 100644 --- a/db/SQLite/InitData.sql +++ b/db/SQLite/InitData.sql @@ -163,7 +163,7 @@ Insert into Dicts (Category, [Name], Code, Define) values ('测试平台', '网 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); -INSERT INTO Dicts (Category, [Name], Code, Define) VALUES ('测试平台', '网站图标', 'http://localhost:49185/favicon.ico', 1); +INSERT INTO Dicts (Category, [Name], Code, Define) VALUES ('测试平台', 'favicon', 'http://localhost:49185/favicon.ico', 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/db/SqlServer/InitData.sql b/db/SqlServer/InitData.sql index 2ad45ddc..2a5d3a95 100644 --- a/db/SqlServer/InitData.sql +++ b/db/SqlServer/InitData.sql @@ -170,7 +170,7 @@ Insert Dicts (Category, Name, Code, Define) values (@AppName, N'网站页脚', N 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); -INSERT Dicts (Category, Name, Code, Define) VALUES (@AppName, N'网站图标', N'http://localhost:49185/favicon.ico', 1); +INSERT Dicts (Category, Name, Code, Define) VALUES (@AppName, N'favicon', N'http://localhost:49185/favicon.ico', 1); -- 菜单 DELETE FROM Navigations Where [Application] = @AppId diff --git a/src/admin/Bootstrap.Admin/BootstrapAdmin.db b/src/admin/Bootstrap.Admin/BootstrapAdmin.db index 92bac051f67f5ae6909b6d418da3573f7ad806ac..d7cbf58345d41d359c93839f608e4596f6233da1 100644 GIT binary patch delta 70 zcmV-M0J;Bw;0A!;29O&89FZJD0UWVlrq2PHlLydX0hzNA5G)5E3cvtDB|9(%03{ny c3Fftn=&zOKxwGYuux4R)X=870v$WSt*nw3Xm;e9( delta 70 zcmV-M0J;Bw;0A!;29O&88<8AC0UNPkrq2PClLydX0hF^55G)5EKrjXXB_&Y_=CzCH cua)Jwv*nMl=e?2VtC{7SzUH8Zv$WSt*wdXMF8}}l diff --git a/src/admin/Bootstrap.Admin/Models/HeaderBarModel.cs b/src/admin/Bootstrap.Admin/Models/HeaderBarModel.cs index 57e3a41b..d0306b4f 100644 --- a/src/admin/Bootstrap.Admin/Models/HeaderBarModel.cs +++ b/src/admin/Bootstrap.Admin/Models/HeaderBarModel.cs @@ -31,7 +31,7 @@ namespace Bootstrap.Admin.Models // feat: https://gitee.com/LongbowEnterprise/dashboard/issues?id=I12VKZ // 后台系统网站图标跟随个人中心设置的默认应用站点的展示 - WebSiteLogo = DictHelper.RetrieveWebLogo(AppId); + WebSiteIcon = DictHelper.RetrieveWebIcon(AppId); } } diff --git a/src/admin/Bootstrap.Admin/Models/ModelBase.cs b/src/admin/Bootstrap.Admin/Models/ModelBase.cs index 11aaf5da..3e679bec 100644 --- a/src/admin/Bootstrap.Admin/Models/ModelBase.cs +++ b/src/admin/Bootstrap.Admin/Models/ModelBase.cs @@ -1,13 +1,13 @@ namespace Bootstrap.Admin.Models { /// - /// + /// Model 基类 /// public class ModelBase { /// /// 获取 网站 logo 小图标 /// - public string WebSiteLogo { get; protected set; } = "~/favicon.ico"; + public string WebSiteIcon { get; protected set; } = "~/favicon.ico"; } } diff --git a/src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml index 6351f08a..b2a9a4c5 100644 --- a/src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml +++ b/src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml @@ -5,8 +5,8 @@ - - + + @ViewBag.Title @RenderSection("css", false) diff --git a/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs index 055e855c..e9aa7594 100644 --- a/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs +++ b/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs @@ -32,16 +32,16 @@ namespace Bootstrap.DataAccess private static IEnumerable RetrieveProtectedDicts() => RetrieveDicts().Where(d => d.Define == 0 || d.Category == "测试平台"); /// - /// 获取网站 logo 小图标 + /// 获取网站 favicon 图标 /// /// /// - public static string RetrieveWebLogo(string appId) + public static string RetrieveWebIcon(string appId) { // 获取应用程序 logo var ditcs = RetrieveDicts(); var platName = ditcs.FirstOrDefault(d => d.Category == "应用程序" && d.Code == appId)?.Name; - return ditcs.FirstOrDefault(d => d.Category == platName && d.Name == "网站图标")?.Code ?? $"~/favicon.ico"; + return ditcs.FirstOrDefault(d => d.Category == platName && d.Name == "favicon")?.Code ?? $"~/favicon.ico"; } ///