From 0675e5de8c12a878e2cf46ce79436b0ef439a0ea Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 11 Dec 2021 12:01:13 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=87=8D=E6=9E=84=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BootstrapAdmin-Blazor.slnf | 4 +- BootstrapAdmin.sln | 26 +- .../Pages/Admin/_Imports.razor | 1 - .../Services/BootstrapMenuService.cs | 9 - .../Services/IBootstrapMenuService.cs | 9 - .../Admin.DataAccess.xml | 154 ++++++++++++ .../BootstrapAdmin.DataAccess.csproj} | 2 + .../BootstrapAdmin.DataAccess.xml | 154 ++++++++++++ .../Extensions/ServicesExtensions.cs | 22 ++ .../Models}/Dict.cs | 2 +- .../BootstrapAdmin.DataAccess/Models/Menu.cs | 83 +++++++ .../Services/IMenu.cs | 16 ++ .../Services/MenuService.cs | 29 +++ .../App.razor | 0 .../App.razor.cs | 4 +- .../BootstrapAdmin.Web.csproj} | 4 +- .../BootstrapAdmin.Web/BootstrapAdmin.Web.xml | 228 ++++++++++++++++++ .../BootstrapAdmin.db | Bin .../Components/BlazorTable.razor | 0 .../Components/BlazorTable.razor.cs | 2 +- .../Components/DictSearch.razor | 0 .../Controllers/AccountController.cs | 0 .../Extensions/DatabaseExtensions.cs | 2 +- .../Extensions/ServicesExtensions.cs | 5 +- .../Models/DictsSearchModel.cs | 4 +- .../Models/LoginModel.cs | 2 +- .../Pages/Admin/Dicts.razor | 2 +- .../Pages/Admin/Dicts.razor.cs | 4 +- .../Pages/Admin/Index.razor | 0 .../Pages/Admin/Users.razor | 0 .../Pages/Admin/Users.razor.cs | 2 +- .../Pages/Admin/_Imports.razor | 3 + .../Pages/Home/Index.razor | 0 .../Pages/_Host.cshtml | 2 +- .../Pages/_Layout.cshtml | 2 +- .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Services/BootstrapAppContext.cs | 2 +- .../Services/DefaultDataService.cs | 1 + .../Services/IBootstrapMenu.cs | 9 + .../Shared/MainLayout.razor | 0 .../Shared/MainLayout.razor.cs | 2 +- .../Shared/NotFoundLayout.razor | 0 .../Shared/NotFoundLayout.razor.cs | 2 +- .../Shared/NotFoundLayout.razor.css | 0 .../_Imports.razor | 9 +- .../appsettings.Development.json | 0 .../appsettings.json | 0 .../wwwroot/css/motronic.css | 0 .../wwwroot/css/site.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/favicon.png | Bin .../wwwroot/images/404.jpg | Bin .../wwwroot/images/404.png | Bin .../wwwroot/images/404_icon.png | Bin .../wwwroot/images/500.png | Bin .../wwwroot/images/Argo-C.png | Bin .../wwwroot/images/Argo.png | Bin .../wwwroot/images/aliyun-default.svg | 0 .../wwwroot/images/banner4.jpg | Bin .../wwwroot/images/bg.jpg | Bin .../wwwroot/images/bg.png | Bin .../wwwroot/images/bg2.jpg | Bin .../wwwroot/images/bg3.png | Bin .../wwwroot/images/bg4.jpg | Bin .../wwwroot/images/bg404.png | Bin .../wwwroot/images/blazor.png | Bin .../wwwroot/images/blazor.svg | 0 .../wwwroot/images/brand.png | Bin .../wwwroot/images/cover-bg.jpg | Bin .../wwwroot/images/dingding.svg | 0 .../wwwroot/images/downloadwindows_icon.svg | 0 .../wwwroot/images/enterprise.png | Bin .../wwwroot/images/error.png | Bin .../wwwroot/images/error_icon.png | Bin .../wwwroot/images/git.svg | 0 .../wwwroot/images/gitee.svg | 0 .../wwwroot/images/left-1.png | Bin .../wwwroot/images/left-2.png | Bin .../wwwroot/images/left.png | Bin .../wwwroot/images/loading-sm.gif | Bin .../wwwroot/images/lock-bg.jpg | Bin .../wwwroot/images/login-background.jpg | Bin .../wwwroot/images/logo.jpg | Bin .../wwwroot/images/logo1.jpg | Bin .../wwwroot/images/logo2.jpg | Bin .../wwwroot/images/logo3.jpg | Bin .../wwwroot/images/logo4.jpg | Bin .../wwwroot/images/logo5.jpg | Bin .../wwwroot/images/logo6.jpg | Bin .../wwwroot/images/logo7.png | Bin .../wwwroot/images/nav-expand.png | Bin .../wwwroot/images/netcore.png | Bin .../wwwroot/images/netcore2.png | Bin .../wwwroot/images/qq-2.svg | 0 .../wwwroot/images/qq-3.svg | 0 .../wwwroot/images/qq.svg | 0 .../wwwroot/images/success.png | Bin .../wwwroot/images/uploader/default.jpg | Bin .../wwwroot/images/weibo.svg | 0 .../wwwroot/images/weixin-2.svg | 0 .../wwwroot/images/weixin.svg | 0 .../wwwroot/images/zhifubao-2.svg | 0 .../wwwroot/images/zhifubao-3.svg | 0 .../wwwroot/images/zhifubao.svg | 0 .../wwwroot/lib/captcha/images/Pic0.jpg | Bin .../wwwroot/lib/captcha/images/Pic1.jpg | Bin .../wwwroot/lib/captcha/images/Pic2.jpg | Bin .../wwwroot/lib/captcha/images/Pic3.jpg | Bin .../wwwroot/lib/captcha/images/Pic4.jpg | Bin .../lib/captcha/longbow.slidercaptcha.js | 0 .../wwwroot/lib/captcha/slidercaptcha.css | 0 112 files changed, 743 insertions(+), 59 deletions(-) delete mode 100644 src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/_Imports.razor delete mode 100644 src/blazor/admin/Bootstrap.Admin.Blazor/Services/BootstrapMenuService.cs delete mode 100644 src/blazor/admin/Bootstrap.Admin.Blazor/Services/IBootstrapMenuService.cs create mode 100644 src/blazor/admin/BootstrapAdmin.DataAccess/Admin.DataAccess.xml rename src/blazor/admin/{Bootstrap.Admin.Blazor.DataAccess/Bootstrap.Admin.Blazor.DataAccess.csproj => BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.csproj} (63%) create mode 100644 src/blazor/admin/BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.xml create mode 100644 src/blazor/admin/BootstrapAdmin.DataAccess/Extensions/ServicesExtensions.cs rename src/blazor/admin/{Bootstrap.Admin.Blazor.DataAccess => BootstrapAdmin.DataAccess/Models}/Dict.cs (95%) create mode 100644 src/blazor/admin/BootstrapAdmin.DataAccess/Models/Menu.cs create mode 100644 src/blazor/admin/BootstrapAdmin.DataAccess/Services/IMenu.cs create mode 100644 src/blazor/admin/BootstrapAdmin.DataAccess/Services/MenuService.cs rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/App.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/App.razor.cs (88%) rename src/blazor/admin/{Bootstrap.Admin.Blazor/Bootstrap.Admin.Blazor.csproj => BootstrapAdmin.Web/BootstrapAdmin.Web.csproj} (69%) create mode 100644 src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.xml rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/BootstrapAdmin.db (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Components/BlazorTable.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Components/BlazorTable.razor.cs (96%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Components/DictSearch.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Controllers/AccountController.cs (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Extensions/DatabaseExtensions.cs (99%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Extensions/ServicesExtensions.cs (96%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Models/DictsSearchModel.cs (94%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Models/LoginModel.cs (94%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/Admin/Dicts.razor (98%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/Admin/Dicts.razor.cs (90%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/Admin/Index.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/Admin/Users.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/Admin/Users.razor.cs (97%) create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/_Imports.razor rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/Home/Index.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/_Host.cshtml (80%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Pages/_Layout.cshtml (97%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Program.cs (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Properties/launchSettings.json (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Services/BootstrapAppContext.cs (90%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Services/DefaultDataService.cs (98%) create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Services/IBootstrapMenu.cs rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Shared/MainLayout.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Shared/MainLayout.razor.cs (95%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Shared/NotFoundLayout.razor (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Shared/NotFoundLayout.razor.cs (84%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/Shared/NotFoundLayout.razor.css (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/_Imports.razor (67%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/appsettings.Development.json (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/appsettings.json (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/css/motronic.css (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/css/site.css (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/favicon.ico (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/favicon.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/404.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/404.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/404_icon.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/500.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/Argo-C.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/Argo.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/aliyun-default.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/banner4.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/bg.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/bg.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/bg2.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/bg3.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/bg4.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/bg404.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/blazor.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/blazor.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/brand.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/cover-bg.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/dingding.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/downloadwindows_icon.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/enterprise.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/error.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/error_icon.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/git.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/gitee.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/left-1.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/left-2.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/left.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/loading-sm.gif (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/lock-bg.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/login-background.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo1.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo2.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo3.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo4.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo5.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo6.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/logo7.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/nav-expand.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/netcore.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/netcore2.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/qq-2.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/qq-3.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/qq.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/success.png (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/uploader/default.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/weibo.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/weixin-2.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/weixin.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/zhifubao-2.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/zhifubao-3.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/images/zhifubao.svg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/lib/captcha/images/Pic0.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/lib/captcha/images/Pic1.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/lib/captcha/images/Pic2.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/lib/captcha/images/Pic3.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/lib/captcha/images/Pic4.jpg (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/lib/captcha/longbow.slidercaptcha.js (100%) rename src/blazor/admin/{Bootstrap.Admin.Blazor => BootstrapAdmin.Web}/wwwroot/lib/captcha/slidercaptcha.css (100%) diff --git a/BootstrapAdmin-Blazor.slnf b/BootstrapAdmin-Blazor.slnf index 4f220dd9..3734aa6a 100644 --- a/BootstrapAdmin-Blazor.slnf +++ b/BootstrapAdmin-Blazor.slnf @@ -2,8 +2,8 @@ "solution": { "path": "BootstrapAdmin.sln", "projects": [ - "src\\blazor\\admin\\Bootstrap.Admin.Blazor.DataAccess\\Bootstrap.Admin.Blazor.DataAccess.csproj", - "src\\blazor\\admin\\Bootstrap.Admin.Blazor\\Bootstrap.Admin.Blazor.csproj", + "src\\blazor\\admin\\BootstrapAdmin.DataAccess\\BootstrapAdmin.DataAccess.csproj", + "src\\blazor\\admin\\BootstrapAdmin.Web\\BootstrapAdmin.Web.csproj", "src\\mvc\\admin\\Bootstrap.Admin\\Bootstrap.Admin.csproj", "src\\mvc\\admin\\Bootstrap.DataAccess\\Bootstrap.DataAccess.csproj" ] diff --git a/BootstrapAdmin.sln b/BootstrapAdmin.sln index 91e3ea6d..8b5a16f2 100644 --- a/BootstrapAdmin.sln +++ b/BootstrapAdmin.sln @@ -137,15 +137,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{C07631 .github\workflows\docker.yml = .github\workflows\docker.yml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Admin.Blazor", "src\blazor\admin\Bootstrap.Admin.Blazor\Bootstrap.Admin.Blazor.csproj", "{485C1B75-7E3C-4AFC-8A91-2347FFEC1E96}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mvc", "mvc", "{C996F427-DA93-49D6-9804-4E665D195FC2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "admin", "admin", "{45ADEF9B-C8BD-4224-9E12-F6716E85A22C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{55A2459A-6BDE-4493-B2C0-5BE1673E99EE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bootstrap.Admin.Blazor.DataAccess", "src\blazor\admin\Bootstrap.Admin.Blazor.DataAccess\Bootstrap.Admin.Blazor.DataAccess.csproj", "{75730767-A53A-4CFB-BACB-B90401288FA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapAdmin.Web", "src\blazor\admin\BootstrapAdmin.Web\BootstrapAdmin.Web.csproj", "{EF5EF5A4-616A-4BA7-9E1E-1407E8EC0395}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapAdmin.DataAccess", "src\blazor\admin\BootstrapAdmin.DataAccess\BootstrapAdmin.DataAccess.csproj", "{1C04A3C2-DF68-4716-BA69-259CEC6E2311}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -189,14 +189,14 @@ Global {B306BD58-1C73-40F2-86F7-E1763344007B}.Debug|Any CPU.Build.0 = Debug|Any CPU {B306BD58-1C73-40F2-86F7-E1763344007B}.Release|Any CPU.ActiveCfg = Release|Any CPU {B306BD58-1C73-40F2-86F7-E1763344007B}.Release|Any CPU.Build.0 = Release|Any CPU - {485C1B75-7E3C-4AFC-8A91-2347FFEC1E96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {485C1B75-7E3C-4AFC-8A91-2347FFEC1E96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {485C1B75-7E3C-4AFC-8A91-2347FFEC1E96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {485C1B75-7E3C-4AFC-8A91-2347FFEC1E96}.Release|Any CPU.Build.0 = Release|Any CPU - {75730767-A53A-4CFB-BACB-B90401288FA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75730767-A53A-4CFB-BACB-B90401288FA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75730767-A53A-4CFB-BACB-B90401288FA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75730767-A53A-4CFB-BACB-B90401288FA6}.Release|Any CPU.Build.0 = Release|Any CPU + {EF5EF5A4-616A-4BA7-9E1E-1407E8EC0395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EF5EF5A4-616A-4BA7-9E1E-1407E8EC0395}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EF5EF5A4-616A-4BA7-9E1E-1407E8EC0395}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EF5EF5A4-616A-4BA7-9E1E-1407E8EC0395}.Release|Any CPU.Build.0 = Release|Any CPU + {1C04A3C2-DF68-4716-BA69-259CEC6E2311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C04A3C2-DF68-4716-BA69-259CEC6E2311}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C04A3C2-DF68-4716-BA69-259CEC6E2311}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C04A3C2-DF68-4716-BA69-259CEC6E2311}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -225,11 +225,11 @@ Global {DAE3826B-AAAB-468A-9A06-2F56EF5C0767} = {41B6D37A-5E5E-42B3-85E4-D81A81E3D757} {90BC5C25-0F93-4CDE-833C-3D8243E19D3B} = {55A2459A-6BDE-4493-B2C0-5BE1673E99EE} {B306BD58-1C73-40F2-86F7-E1763344007B} = {55A2459A-6BDE-4493-B2C0-5BE1673E99EE} - {485C1B75-7E3C-4AFC-8A91-2347FFEC1E96} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C} {C996F427-DA93-49D6-9804-4E665D195FC2} = {41B6D37A-5E5E-42B3-85E4-D81A81E3D757} {45ADEF9B-C8BD-4224-9E12-F6716E85A22C} = {DAE3826B-AAAB-468A-9A06-2F56EF5C0767} {55A2459A-6BDE-4493-B2C0-5BE1673E99EE} = {DAE3826B-AAAB-468A-9A06-2F56EF5C0767} - {75730767-A53A-4CFB-BACB-B90401288FA6} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C} + {EF5EF5A4-616A-4BA7-9E1E-1407E8EC0395} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C} + {1C04A3C2-DF68-4716-BA69-259CEC6E2311} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {221EAE38-5F75-4391-9A48-E462A9F3B8FC} diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/_Imports.razor b/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/_Imports.razor deleted file mode 100644 index 6de5d191..00000000 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/_Imports.razor +++ /dev/null @@ -1 +0,0 @@ -@attribute [Authorize] diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/BootstrapMenuService.cs b/src/blazor/admin/Bootstrap.Admin.Blazor/Services/BootstrapMenuService.cs deleted file mode 100644 index a0b36b8d..00000000 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/BootstrapMenuService.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Bootstrap.Admin.Blazor.Services -{ - /// - /// - /// - public class BootstrapMenuService : IBootstrapMenuService - { - } -} diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/IBootstrapMenuService.cs b/src/blazor/admin/Bootstrap.Admin.Blazor/Services/IBootstrapMenuService.cs deleted file mode 100644 index a63ff8df..00000000 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/IBootstrapMenuService.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Bootstrap.Admin.Blazor.Services -{ - /// - /// - /// - public interface IBootstrapMenuService - { - } -} diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess/Admin.DataAccess.xml b/src/blazor/admin/BootstrapAdmin.DataAccess/Admin.DataAccess.xml new file mode 100644 index 00000000..55e533dd --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/Admin.DataAccess.xml @@ -0,0 +1,154 @@ + + + + Admin.DataAccess + + + + + + + + + + + + + + + + + 字典配置项 + + + + + 获得/设置 字典主键 数据库自增列 + + + + + 获得/设置 字典分类 + + + + + 获得/设置 字典名称 + + + + + 获得/设置 字典字典值 + + + + + 获得/设置 字典定义值 0 表示系统使用，1 表示用户自定义 默认为 1 + + + + + Bootstrap Admin 后台管理菜单相关操作实体类 + + + + + 获得/设置 菜单主键ID + + + + + 获得/设置 父级菜单ID 默认为 0 + + + + + 获得/设置 父级菜单名称 + + + + + 获得/设置 菜单名称 + + + + + 获得/设置 菜单序号 + + + + + 获得/设置 菜单图标 + + + + + 获得/设置 菜单URL地址 + + + + + 获得/设置 菜单分类, 0 表示系统菜单 1 表示用户自定义菜单 + + + + + 获得 菜单分类名称，取字典表中的Name category="菜单" + + + + + 获得/设置 是否当前被选中 active为选中 + + + + + 获得/设置 链接目标 + + + + + 获得/设置 是否为资源文件, 0 表示菜单 1 表示资源 2 表示按钮 + + + + + 获得/设置 所属应用程序，此属性由BA后台字典表分配 + + + + + 获得/设置 当前菜单项的所有子菜单集合 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor.DataAccess/Bootstrap.Admin.Blazor.DataAccess.csproj b/src/blazor/admin/BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.csproj similarity index 63% rename from src/blazor/admin/Bootstrap.Admin.Blazor.DataAccess/Bootstrap.Admin.Blazor.DataAccess.csproj rename to src/blazor/admin/BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.csproj index 263821e9..28219b05 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor.DataAccess/Bootstrap.Admin.Blazor.DataAccess.csproj +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.csproj @@ -7,6 +7,8 @@ + + diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.xml b/src/blazor/admin/BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.xml new file mode 100644 index 00000000..afe6a698 --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/BootstrapAdmin.DataAccess.xml @@ -0,0 +1,154 @@ + + + + BootstrapAdmin.DataAccess + + + + + + + + + + + + + + + + + 字典配置项 + + + + + 获得/设置 字典主键 数据库自增列 + + + + + 获得/设置 字典分类 + + + + + 获得/设置 字典名称 + + + + + 获得/设置 字典字典值 + + + + + 获得/设置 字典定义值 0 表示系统使用，1 表示用户自定义 默认为 1 + + + + + Bootstrap Admin 后台管理菜单相关操作实体类 + + + + + 获得/设置 菜单主键ID + + + + + 获得/设置 父级菜单ID 默认为 0 + + + + + 获得/设置 父级菜单名称 + + + + + 获得/设置 菜单名称 + + + + + 获得/设置 菜单序号 + + + + + 获得/设置 菜单图标 + + + + + 获得/设置 菜单URL地址 + + + + + 获得/设置 菜单分类, 0 表示系统菜单 1 表示用户自定义菜单 + + + + + 获得 菜单分类名称，取字典表中的Name category="菜单" + + + + + 获得/设置 是否当前被选中 active为选中 + + + + + 获得/设置 链接目标 + + + + + 获得/设置 是否为资源文件, 0 表示菜单 1 表示资源 2 表示按钮 + + + + + 获得/设置 所属应用程序，此属性由BA后台字典表分配 + + + + + 获得/设置 当前菜单项的所有子菜单集合 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess/Extensions/ServicesExtensions.cs b/src/blazor/admin/BootstrapAdmin.DataAccess/Extensions/ServicesExtensions.cs new file mode 100644 index 00000000..177e9b84 --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/Extensions/ServicesExtensions.cs @@ -0,0 +1,22 @@ +using BootstrapAdmin.DataAccess.Services; +using Microsoft.Extensions.DependencyInjection.Extensions; + +namespace Microsoft.Extensions.DependencyInjection +{ + /// + /// + /// + public static class ServicesExtensions + { + /// + /// + /// + /// + /// + public static IServiceCollection AddDataAccessServices(this IServiceCollection services) + { + services.TryAddSingleton(); + return services; + } + } +} diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor.DataAccess/Dict.cs b/src/blazor/admin/BootstrapAdmin.DataAccess/Models/Dict.cs similarity index 95% rename from src/blazor/admin/Bootstrap.Admin.Blazor.DataAccess/Dict.cs rename to src/blazor/admin/BootstrapAdmin.DataAccess/Models/Dict.cs index d58b6823..515ecf14 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor.DataAccess/Dict.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/Models/Dict.cs @@ -2,7 +2,7 @@ using PetaPoco; -namespace Bootstrap.Admin.Blazor.DataAccess +namespace BootstrapAdmin.DataAccess.Models { /// /// 字典配置项 diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess/Models/Menu.cs b/src/blazor/admin/BootstrapAdmin.DataAccess/Models/Menu.cs new file mode 100644 index 00000000..bd66150a --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/Models/Menu.cs @@ -0,0 +1,83 @@ +// Copyright (c) Argo Zhang (argo@163.com). All rights reserved. + +using PetaPoco; + +namespace BootstrapAdmin.DataAccess.Models +{ + /// + /// Bootstrap Admin 后台管理菜单相关操作实体类 + /// + [TableName("Navigations")] + public class Menu + { + /// + /// 获得/设置 菜单主键ID + /// + public string? Id { set; get; } + + /// + /// 获得/设置 父级菜单ID 默认为 0 + /// + public string ParentId { set; get; } = "0"; + + /// + /// 获得/设置 父级菜单名称 + /// + public string ParentName { get; set; } = ""; + + /// + /// 获得/设置 菜单名称 + /// + public string Name { get; set; } = ""; + + /// + /// 获得/设置 菜单序号 + /// + public int Order { get; set; } + + /// + /// 获得/设置 菜单图标 + /// + public string Icon { get; set; } = ""; + + /// + /// 获得/设置 菜单URL地址 + /// + public string Url { get; set; } = ""; + + /// + /// 获得/设置 菜单分类, 0 表示系统菜单 1 表示用户自定义菜单 + /// + public string Category { get; set; } = "0"; + + /// + /// 获得 菜单分类名称，取字典表中的Name category="菜单" + /// + public string CategoryName { get; set; } = ""; + + /// + /// 获得/设置 是否当前被选中 active为选中 + /// + public string Active { get; set; } = ""; + + /// + /// 获得/设置 链接目标 + /// + public string Target { get; set; } = ""; + + /// + /// 获得/设置 是否为资源文件, 0 表示菜单 1 表示资源 2 表示按钮 + /// + public int IsResource { get; set; } + + /// + /// 获得/设置 所属应用程序，此属性由BA后台字典表分配 + /// + public string Application { get; set; } = ""; + + /// + /// 获得/设置 当前菜单项的所有子菜单集合 + /// + public IEnumerable Menus { get; set; } = new List(); + } +} diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess/Services/IMenu.cs b/src/blazor/admin/BootstrapAdmin.DataAccess/Services/IMenu.cs new file mode 100644 index 00000000..c15f9c75 --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/Services/IMenu.cs @@ -0,0 +1,16 @@ +using BootstrapAdmin.DataAccess.Models; + +namespace BootstrapAdmin.DataAccess.Services +{ + /// + /// + /// + public interface IMenu + { + /// + /// + /// + /// + IEnumerable GetMenus(); + } +} diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess/Services/MenuService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess/Services/MenuService.cs new file mode 100644 index 00000000..13f08be2 --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.DataAccess/Services/MenuService.cs @@ -0,0 +1,29 @@ +using BootstrapAdmin.DataAccess.Models; +using PetaPoco; + +namespace BootstrapAdmin.DataAccess.Services +{ + /// + /// + /// + public class MenuService : IMenu + { + private IDatabase _db; + + /// + /// + /// + /// + public MenuService(IDatabase db) => _db = db; + + /// + /// + /// + /// + /// + public IEnumerable GetMenus() + { + throw new NotImplementedException(); + } + } +} diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/App.razor b/src/blazor/admin/BootstrapAdmin.Web/App.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/App.razor rename to src/blazor/admin/BootstrapAdmin.Web/App.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/App.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/App.razor.cs similarity index 88% rename from src/blazor/admin/Bootstrap.Admin.Blazor/App.razor.cs rename to src/blazor/admin/BootstrapAdmin.Web/App.razor.cs index 97021777..5c03ed83 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/App.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/App.razor.cs @@ -1,4 +1,6 @@ -namespace Bootstrap.Admin.Blazor +using BootstrapAdmin.Web.Services; + +namespace BootstrapAdmin.Web { /// /// diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Bootstrap.Admin.Blazor.csproj b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj similarity index 69% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Bootstrap.Admin.Blazor.csproj rename to src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj index f13b995c..87ded732 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Bootstrap.Admin.Blazor.csproj +++ b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj @@ -10,12 +10,10 @@ - + - - diff --git a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.xml b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.xml new file mode 100644 index 00000000..3a2f0050 --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.xml @@ -0,0 +1,228 @@ + + + + BootstrapAdmin.Web + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 登陆页面 Model + + + + + 验证码图床地址 + + + + + 是否登录认证失败 为真时客户端弹出滑块验证码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MainLayout 布局类 + + + + + + + + + + NotFoundLayout 模板类 + + + + + + + + + + 添加示例后台任务 + + + + + + PetaPoco ORM 的 IDataService 接口实现 + + + + + 构造函数 + + + + + 删除方法 + + + + + + + 保存方法 + + + + + + + + 查询方法 + + + + + + diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/BootstrapAdmin.db b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.db similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/BootstrapAdmin.db rename to src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.db diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Components/BlazorTable.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Components/BlazorTable.razor rename to src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Components/BlazorTable.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor.cs similarity index 96% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Components/BlazorTable.razor.cs rename to src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor.cs index a537d031..938fba09 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Components/BlazorTable.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Components/BlazorTable.razor.cs @@ -1,4 +1,4 @@ -namespace Bootstrap.Admin.Blazor.Components +namespace BootstrapAdmin.Web.Components { /// /// diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Components/DictSearch.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Components/DictSearch.razor rename to src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Controllers/AccountController.cs b/src/blazor/admin/BootstrapAdmin.Web/Controllers/AccountController.cs similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Controllers/AccountController.cs rename to src/blazor/admin/BootstrapAdmin.Web/Controllers/AccountController.cs diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Extensions/DatabaseExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/DatabaseExtensions.cs similarity index 99% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Extensions/DatabaseExtensions.cs rename to src/blazor/admin/BootstrapAdmin.Web/Extensions/DatabaseExtensions.cs index 2f0bb139..b35c21f1 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Extensions/DatabaseExtensions.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/DatabaseExtensions.cs @@ -6,7 +6,7 @@ using PetaPoco; using System.Linq.Expressions; using System.Reflection; -namespace BootstrapBlazor.DataAcces.PetaPoco +namespace BootstrapAdmin.Web.Extensions { /// /// diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Extensions/ServicesExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs similarity index 96% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Extensions/ServicesExtensions.cs rename to src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs index 522b354b..55cd6315 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Extensions/ServicesExtensions.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs @@ -1,4 +1,5 @@ -using BootstrapBlazor.DataAcces.PetaPoco; +using BootstrapAdmin.Web.Services; +using BootstrapBlazor.DataAcces.PetaPoco; using System.Text; namespace Microsoft.Extensions.DependencyInjection @@ -68,7 +69,7 @@ namespace Microsoft.Extensions.DependencyInjection services.AddSingleton(); // 增加数据服务 - services.AddSingleton(); + services.AddDataAccessServices(); return services; } diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Models/DictsSearchModel.cs b/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs similarity index 94% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Models/DictsSearchModel.cs rename to src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs index a9158a5b..b31f9306 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Models/DictsSearchModel.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs @@ -1,6 +1,6 @@ -using Bootstrap.Admin.Blazor.DataAccess; +using BootstrapAdmin.DataAccess.Models; -namespace Bootstrap.Admin.Blazor.Models +namespace BootstrapAdmin.Web.Models { /// /// diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Models/LoginModel.cs b/src/blazor/admin/BootstrapAdmin.Web/Models/LoginModel.cs similarity index 94% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Models/LoginModel.cs rename to src/blazor/admin/BootstrapAdmin.Web/Models/LoginModel.cs index d9b7793a..56ffaf2d 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Models/LoginModel.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Models/LoginModel.cs @@ -1,4 +1,4 @@ -namespace Bootstrap.Admin.Blazor.Models +namespace BootstrapAdmin.Web.Models { /// /// 登陆页面 Model diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Dicts.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor similarity index 98% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Dicts.razor rename to src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor index 8f69e5a4..be19fcdf 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Dicts.razor +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor @@ -1,6 +1,6 @@ @page "/admin/dicts" - + diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Dicts.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor.cs similarity index 90% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Dicts.razor.cs rename to src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor.cs index 5f78f41f..084e4efe 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Dicts.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor.cs @@ -1,4 +1,6 @@ -namespace Bootstrap.Admin.Blazor.Pages.Admin +using BootstrapAdmin.Web.Models; + +namespace BootstrapAdmin.Web.Pages.Admin { /// /// diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Index.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Index.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Index.razor rename to src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Index.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Users.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Users.razor rename to src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Users.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor.cs similarity index 97% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Users.razor.cs rename to src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor.cs index c15f1490..10e39920 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Admin/Users.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Users.razor.cs @@ -1,6 +1,6 @@ using Task = System.Threading.Tasks.Task; -namespace Bootstrap.Admin.Blazor.Pages.Admin +namespace BootstrapAdmin.Web.Pages.Admin { /// /// diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/_Imports.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/_Imports.razor new file mode 100644 index 00000000..4a6fa2b2 --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/_Imports.razor @@ -0,0 +1,3 @@ +@attribute [Authorize] + +@using BootstrapAdmin.DataAccess.Models diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Home/Index.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Home/Index.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/Home/Index.razor rename to src/blazor/admin/BootstrapAdmin.Web/Pages/Home/Index.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/_Host.cshtml b/src/blazor/admin/BootstrapAdmin.Web/Pages/_Host.cshtml similarity index 80% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/_Host.cshtml rename to src/blazor/admin/BootstrapAdmin.Web/Pages/_Host.cshtml index 7a162f41..25a7996e 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/_Host.cshtml +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/_Host.cshtml @@ -1,5 +1,5 @@ @page "/" -@namespace Bootstrap.Admin.Blazor.Pages +@namespace BootstrapAdmin.Web.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ Layout = "_Layout"; diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/_Layout.cshtml b/src/blazor/admin/BootstrapAdmin.Web/Pages/_Layout.cshtml similarity index 97% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Pages/_Layout.cshtml rename to src/blazor/admin/BootstrapAdmin.Web/Pages/_Layout.cshtml index 3a8b8475..abeacf19 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Pages/_Layout.cshtml +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/_Layout.cshtml @@ -1,5 +1,5 @@ @using Microsoft.AspNetCore.Components.Web -@namespace Bootstrap.Admin.Blazor.Pages +@namespace BootstrapAdmin.Web.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Program.cs b/src/blazor/admin/BootstrapAdmin.Web/Program.cs similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Program.cs rename to src/blazor/admin/BootstrapAdmin.Web/Program.cs diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Properties/launchSettings.json b/src/blazor/admin/BootstrapAdmin.Web/Properties/launchSettings.json similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Properties/launchSettings.json rename to src/blazor/admin/BootstrapAdmin.Web/Properties/launchSettings.json diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/BootstrapAppContext.cs b/src/blazor/admin/BootstrapAdmin.Web/Services/BootstrapAppContext.cs similarity index 90% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Services/BootstrapAppContext.cs rename to src/blazor/admin/BootstrapAdmin.Web/Services/BootstrapAppContext.cs index 44dcfbe8..7e6d438b 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/BootstrapAppContext.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Services/BootstrapAppContext.cs @@ -1,4 +1,4 @@ -namespace Bootstrap.Admin.Blazor.Services +namespace BootstrapAdmin.Web.Services { /// /// diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/DefaultDataService.cs b/src/blazor/admin/BootstrapAdmin.Web/Services/DefaultDataService.cs similarity index 98% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Services/DefaultDataService.cs rename to src/blazor/admin/BootstrapAdmin.Web/Services/DefaultDataService.cs index f5eb551a..934028f2 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Services/DefaultDataService.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Services/DefaultDataService.cs @@ -5,6 +5,7 @@ using PetaPoco; using PetaPoco.Extensions; using PetaPoco.Providers; +using BootstrapAdmin.Web.Extensions; namespace BootstrapBlazor.DataAcces.PetaPoco { diff --git a/src/blazor/admin/BootstrapAdmin.Web/Services/IBootstrapMenu.cs b/src/blazor/admin/BootstrapAdmin.Web/Services/IBootstrapMenu.cs new file mode 100644 index 00000000..b8086673 --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.Web/Services/IBootstrapMenu.cs @@ -0,0 +1,9 @@ +namespace BootstrapAdmin.Web.Services +{ + /// + /// + /// + public interface IBootstrapMenu + { + } +} diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Shared/MainLayout.razor b/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Shared/MainLayout.razor rename to src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Shared/MainLayout.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs similarity index 95% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Shared/MainLayout.razor.cs rename to src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs index 73478338..476c6c6d 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Shared/MainLayout.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs @@ -1,4 +1,4 @@ -namespace Bootstrap.Admin.Blazor.Shared +namespace BootstrapAdmin.Web.Shared { /// /// MainLayout 布局类 diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Shared/NotFoundLayout.razor b/src/blazor/admin/BootstrapAdmin.Web/Shared/NotFoundLayout.razor similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Shared/NotFoundLayout.razor rename to src/blazor/admin/BootstrapAdmin.Web/Shared/NotFoundLayout.razor diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Shared/NotFoundLayout.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Shared/NotFoundLayout.razor.cs similarity index 84% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Shared/NotFoundLayout.razor.cs rename to src/blazor/admin/BootstrapAdmin.Web/Shared/NotFoundLayout.razor.cs index 82c5dfff..c6e7bfd5 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/Shared/NotFoundLayout.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Shared/NotFoundLayout.razor.cs @@ -1,4 +1,4 @@ -namespace Bootstrap.Admin.Blazor.Shared +namespace BootstrapAdmin.Web.Shared { /// /// NotFoundLayout 模板类 diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/Shared/NotFoundLayout.razor.css b/src/blazor/admin/BootstrapAdmin.Web/Shared/NotFoundLayout.razor.css similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/Shared/NotFoundLayout.razor.css rename to src/blazor/admin/BootstrapAdmin.Web/Shared/NotFoundLayout.razor.css diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/_Imports.razor b/src/blazor/admin/BootstrapAdmin.Web/_Imports.razor similarity index 67% rename from src/blazor/admin/Bootstrap.Admin.Blazor/_Imports.razor rename to src/blazor/admin/BootstrapAdmin.Web/_Imports.razor index 67c625c7..e94f7be8 100644 --- a/src/blazor/admin/Bootstrap.Admin.Blazor/_Imports.razor +++ b/src/blazor/admin/BootstrapAdmin.Web/_Imports.razor @@ -9,9 +9,8 @@ @using BootstrapBlazor.Components -@using Bootstrap.Admin.Blazor -@using Bootstrap.Admin.Blazor.Components -@using Bootstrap.Admin.Blazor.Models -@using Bootstrap.Admin.Blazor.Shared +@using BootstrapAdmin.DataAccess.Models -@using Bootstrap.Admin.Blazor.DataAccess \ No newline at end of file +@using BootstrapAdmin.Web.Components +@using BootstrapAdmin.Web.Models +@using BootstrapAdmin.Web.Shared \ No newline at end of file diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/appsettings.Development.json b/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/appsettings.Development.json rename to src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/appsettings.json b/src/blazor/admin/BootstrapAdmin.Web/appsettings.json similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/appsettings.json rename to src/blazor/admin/BootstrapAdmin.Web/appsettings.json diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/css/motronic.css b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/css/motronic.css similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/css/motronic.css rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/css/motronic.css diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/css/site.css b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/css/site.css similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/css/site.css rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/css/site.css diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/favicon.ico b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/favicon.ico similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/favicon.ico rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/favicon.ico diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/favicon.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/favicon.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/favicon.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/favicon.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/404.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/404.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/404.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/404.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/404.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/404.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/404.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/404.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/404_icon.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/404_icon.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/404_icon.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/404_icon.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/500.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/500.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/500.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/500.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/Argo-C.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/Argo-C.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/Argo-C.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/Argo-C.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/Argo.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/Argo.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/Argo.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/Argo.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/aliyun-default.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/aliyun-default.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/aliyun-default.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/aliyun-default.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/banner4.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/banner4.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/banner4.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/banner4.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg2.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg2.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg2.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg2.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg3.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg3.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg3.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg3.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg4.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg4.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg4.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg4.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg404.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg404.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/bg404.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/bg404.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/blazor.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/blazor.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/blazor.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/blazor.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/blazor.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/blazor.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/blazor.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/blazor.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/brand.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/brand.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/brand.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/brand.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/cover-bg.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/cover-bg.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/cover-bg.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/cover-bg.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/dingding.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/dingding.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/dingding.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/dingding.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/downloadwindows_icon.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/downloadwindows_icon.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/downloadwindows_icon.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/downloadwindows_icon.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/enterprise.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/enterprise.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/enterprise.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/enterprise.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/error.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/error.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/error.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/error.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/error_icon.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/error_icon.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/error_icon.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/error_icon.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/git.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/git.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/git.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/git.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/gitee.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/gitee.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/gitee.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/gitee.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/left-1.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/left-1.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/left-1.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/left-1.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/left-2.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/left-2.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/left-2.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/left-2.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/left.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/left.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/left.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/left.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/loading-sm.gif b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/loading-sm.gif similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/loading-sm.gif rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/loading-sm.gif diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/lock-bg.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/lock-bg.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/lock-bg.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/lock-bg.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/login-background.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/login-background.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/login-background.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/login-background.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo1.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo1.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo1.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo1.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo2.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo2.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo2.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo2.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo3.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo3.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo3.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo3.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo4.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo4.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo4.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo4.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo5.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo5.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo5.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo5.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo6.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo6.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo6.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo6.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo7.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo7.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/logo7.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/logo7.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/nav-expand.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/nav-expand.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/nav-expand.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/nav-expand.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/netcore.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/netcore.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/netcore.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/netcore.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/netcore2.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/netcore2.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/netcore2.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/netcore2.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/qq-2.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/qq-2.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/qq-2.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/qq-2.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/qq-3.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/qq-3.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/qq-3.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/qq-3.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/qq.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/qq.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/qq.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/qq.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/success.png b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/success.png similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/success.png rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/success.png diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/uploader/default.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/uploader/default.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/uploader/default.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/uploader/default.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/weibo.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/weibo.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/weibo.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/weibo.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/weixin-2.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/weixin-2.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/weixin-2.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/weixin-2.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/weixin.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/weixin.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/weixin.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/weixin.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/zhifubao-2.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/zhifubao-2.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/zhifubao-2.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/zhifubao-2.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/zhifubao-3.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/zhifubao-3.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/zhifubao-3.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/zhifubao-3.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/zhifubao.svg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/zhifubao.svg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/images/zhifubao.svg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/images/zhifubao.svg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic0.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic0.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic0.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic0.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic1.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic1.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic1.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic1.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic2.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic2.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic2.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic2.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic3.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic3.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic3.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic3.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic4.jpg b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic4.jpg similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/images/Pic4.jpg rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/images/Pic4.jpg diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/longbow.slidercaptcha.js b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/longbow.slidercaptcha.js similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/longbow.slidercaptcha.js rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/longbow.slidercaptcha.js diff --git a/src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/slidercaptcha.css b/src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/slidercaptcha.css similarity index 100% rename from src/blazor/admin/Bootstrap.Admin.Blazor/wwwroot/lib/captcha/slidercaptcha.css rename to src/blazor/admin/BootstrapAdmin.Web/wwwroot/lib/captcha/slidercaptcha.css