innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: 更新命名空间

This commit is contained in:
Argo-Tianyi 2021-12-11 14:24:36 +08:00
parent ead25a3390
commit 27e25c9907
19 changed files with 215 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/BootstrapAdminContext.cs
View File

@ -1,10 +1,5 @@
using BootstrapAdmin.DataAccess.Models;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BootstrapAdmin.DataAccess.EFCore
{

3
src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Extensions/ServicesExtensions.cs
View File

@ -1,10 +1,9 @@
using BootstrapAdmin.DataAccess.EFCore;
using BootstrapAdmin.DataAccess.EFCore.Services;
using BootstrapAdmin.DataAccess.Interface;
using BootstrapAdmin.DataAccess.Core;
using BootstrapBlazor.Components;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection.Extensions;
namespace Microsoft.Extensions.DependencyInjection
{

2
src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Services/DictsService.cs
View File

@ -1,4 +1,4 @@
using BootstrapAdmin.DataAccess.Interface;
using BootstrapAdmin.DataAccess.Core;
namespace BootstrapAdmin.DataAccess.EFCore.Services
{

3
src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Services/NavigationsService.cs
View File

@ -1,5 +1,4 @@
using BootstrapAdmin.DataAccess.EFCore;
using BootstrapAdmin.DataAccess.Interface;
using BootstrapAdmin.DataAccess.Core;
using BootstrapAdmin.DataAccess.Models;
using Microsoft.EntityFrameworkCore;

2
src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Extensions/ServicesExtensions.cs
View File

@ -1,4 +1,4 @@
using BootstrapAdmin.DataAccess.Interface;
using BootstrapAdmin.DataAccess.Core;
using BootstrapAdmin.DataAccess.PetaPoco;
using BootstrapAdmin.DataAccess.PetaPoco.Services;
using BootstrapBlazor.Components;

2
src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictsService.cs
View File

@ -1,4 +1,4 @@
using BootstrapAdmin.DataAccess.Interface;
using BootstrapAdmin.DataAccess.Core;
namespace BootstrapAdmin.DataAccess.PetaPoco.Services
{

2
src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/NavigationsService.cs
View File

@ -1,4 +1,4 @@
using BootstrapAdmin.DataAccess.Interface;
using BootstrapAdmin.DataAccess.Core;
using BootstrapAdmin.DataAccess.Models;
using PetaPoco;

2
src/blazor/admin/BootstrapAdmin.Web.Core/BootstrapAdmin.Web.Core.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="6.1.1-beta02" />

2
src/blazor/admin/BootstrapAdmin.Web.Core/IDicts.cs
View File

@ -1,4 +1,4 @@
namespace BootstrapAdmin.DataAccess.Interface
namespace BootstrapAdmin.DataAccess.Core
{
/// <summary>
/// Dict 字典表接口

2
src/blazor/admin/BootstrapAdmin.Web.Core/INavigations.cs
View File

@ -1,6 +1,6 @@
using BootstrapAdmin.DataAccess.Models;
namespace BootstrapAdmin.DataAccess.Interface
namespace BootstrapAdmin.DataAccess.Core
{
/// <summary>
///

413
src/blazor/admin/BootstrapAdmin.Web/Controllers/AccountController.cs
View File

@ -1,11 +1,4 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.WebUtilities;
using System.Security.Claims;
namespace Bootstrap.Admin.Controllers
namespace Bootstrap.Admin.Controllers
{
///// <summary>
///// Account controller.
@ -14,225 +7,225 @@ namespace Bootstrap.Admin.Controllers
//[AutoValidateAntiforgeryToken]
//public class AccountController : Controller
//{
//private const string MobileSchema = "Mobile";
///// <summary>
///// 系统锁屏界面
///// </summary>
///// <returns></returns>
//[HttpGet]
//public async Task<ActionResult> Lock()
//{
// if (!User.Identity!.IsAuthenticated) return Login();
//private const string MobileSchema = "Mobile";
///// <summary>
///// 系统锁屏界面
///// </summary>
///// <returns></returns>
//[HttpGet]
//public async Task<ActionResult> Lock()
//{
// if (!User.Identity!.IsAuthenticated) return Login();
// var authenticationType = User.Identity.AuthenticationType;
// await HttpContext.SignOutAsync();
// var urlReferrer = Request.Headers["Referer"].FirstOrDefault();
// if (urlReferrer?.Contains("/Pages", StringComparison.OrdinalIgnoreCase) ?? false) urlReferrer = "/Pages";
// return View(new LockModel(User.Identity.Name)
// {
// AuthenticationType = authenticationType,
// ReturnUrl = WebUtility.UrlEncode(string.IsNullOrEmpty(urlReferrer) ? CookieAuthenticationDefaults.LoginPath.Value : urlReferrer)
// });
//}
// var authenticationType = User.Identity.AuthenticationType;
// await HttpContext.SignOutAsync();
// var urlReferrer = Request.Headers["Referer"].FirstOrDefault();
// if (urlReferrer?.Contains("/Pages", StringComparison.OrdinalIgnoreCase) ?? false) urlReferrer = "/Pages";
// return View(new LockModel(User.Identity.Name)
// {
// AuthenticationType = authenticationType,
// ReturnUrl = WebUtility.UrlEncode(string.IsNullOrEmpty(urlReferrer) ? CookieAuthenticationDefaults.LoginPath.Value : urlReferrer)
// });
//}
///// <summary>
///// 系统锁屏界面
///// </summary>
///// <param name="provider"></param>
///// <param name="userName"></param>
///// <param name="password"></param>
///// <param name="authType"></param>
///// <returns></returns>
//[HttpPost]
//[IgnoreAntiforgeryToken]
//public Task<IActionResult> Lock([FromServices] ISMSProvider provider, string userName, string password, string authType)
//{
// // 根据不同的登陆方式
// Task<IActionResult> ret;
// if (authType == MobileSchema) ret = Mobile(provider, userName, password);
// else ret = Login(userName, password, string.Empty);
// return ret;
//}
///// <summary>
///// 系统锁屏界面
///// </summary>
///// <param name="provider"></param>
///// <param name="userName"></param>
///// <param name="password"></param>
///// <param name="authType"></param>
///// <returns></returns>
//[HttpPost]
//[IgnoreAntiforgeryToken]
//public Task<IActionResult> Lock([FromServices] ISMSProvider provider, string userName, string password, string authType)
//{
// // 根据不同的登陆方式
// Task<IActionResult> ret;
// if (authType == MobileSchema) ret = Mobile(provider, userName, password);
// else ret = Login(userName, password, string.Empty);
// return ret;
//}
///// <summary>
///// 系统登录方法
///// </summary>
///// <param name="appId"></param>
///// <param name="view"></param>
///// <returns></returns>
//[HttpGet]
//public ActionResult Login([FromQuery] string? appId = null, [FromQuery] string view = "")
//{
// if (DictHelper.RetrieveSystemModel())
// {
// ViewBag.UserName = "Admin";
// ViewBag.Password = "123789";
// }
// return User.Identity!.IsAuthenticated ? (ActionResult)Redirect("~/Home/Index") : LoginView(view, new LoginModel(appId));
//}
///// <summary>
///// 系统登录方法
///// </summary>
///// <param name="appId"></param>
///// <param name="view"></param>
///// <returns></returns>
//[HttpGet]
//public ActionResult Login([FromQuery] string? appId = null, [FromQuery] string view = "")
//{
// if (DictHelper.RetrieveSystemModel())
// {
// ViewBag.UserName = "Admin";
// ViewBag.Password = "123789";
// }
// return User.Identity!.IsAuthenticated ? (ActionResult)Redirect("~/Home/Index") : LoginView(view, new LoginModel(appId));
//}
//private ViewResult LoginView(string view, LoginModel model)
//{
// if (string.IsNullOrEmpty(view))
// {
// // retrieve login view from db
// view = DictHelper.RetrieveLoginView();
// }
// return View(view, model);
//}
//private ViewResult LoginView(string view, LoginModel model)
//{
// if (string.IsNullOrEmpty(view))
// {
// // retrieve login view from db
// view = DictHelper.RetrieveLoginView();
// }
// return View(view, model);
//}
///// <summary>
///// 短信验证登陆方法
///// </summary>
///// <param name="provider"></param>
///// <param name="phone"></param>
///// <param name="code"></param>
///// <returns></returns>
//[HttpPost()]
//public async Task<IActionResult> Mobile([FromServices] ISMSProvider provider, string phone, string code)
//{
// if (string.IsNullOrEmpty(phone) || string.IsNullOrEmpty(code)) return RedirectLogin();
///// <summary>
///// 短信验证登陆方法
///// </summary>
///// <param name="provider"></param>
///// <param name="phone"></param>
///// <param name="code"></param>
///// <returns></returns>
//[HttpPost()]
//public async Task<IActionResult> Mobile([FromServices] ISMSProvider provider, string phone, string code)
//{
// if (string.IsNullOrEmpty(phone) || string.IsNullOrEmpty(code)) return RedirectLogin();
// var auth = provider.Validate(phone, code);
// await HttpContext.Log(phone, auth);
// if (auth)
// {
// var user = UserHelper.Retrieves().FirstOrDefault(u => u.UserName == phone);
// if (user == null)
// {
// user = new User()
// {
// ApprovedBy = "Mobile",
// ApprovedTime = DateTime.Now,
// DisplayName = "手机用户",
// UserName = phone,
// Password = code,
// Icon = "default.jpg",
// Description = "手机用户",
// App = provider.Options.App
// };
// if (UserHelper.Save(user) && !string.IsNullOrEmpty(user.Id))
// {
// // 根据配置文件设置默认角色
// var roles = RoleHelper.Retrieves().Where(r => provider.Options.Roles.Any(rl => rl.Equals(r.RoleName, StringComparison.OrdinalIgnoreCase))).Select(r => r.Id!);
// RoleHelper.SaveByUserId(user.Id, roles);
// }
// }
// }
// return auth ? await SignInAsync(phone, true, MobileSchema) : RedirectLogin();
//}
// var auth = provider.Validate(phone, code);
// await HttpContext.Log(phone, auth);
// if (auth)
// {
// var user = UserHelper.Retrieves().FirstOrDefault(u => u.UserName == phone);
// if (user == null)
// {
// user = new User()
// {
// ApprovedBy = "Mobile",
// ApprovedTime = DateTime.Now,
// DisplayName = "手机用户",
// UserName = phone,
// Password = code,
// Icon = "default.jpg",
// Description = "手机用户",
// App = provider.Options.App
// };
// if (UserHelper.Save(user) && !string.IsNullOrEmpty(user.Id))
// {
// // 根据配置文件设置默认角色
// var roles = RoleHelper.Retrieves().Where(r => provider.Options.Roles.Any(rl => rl.Equals(r.RoleName, StringComparison.OrdinalIgnoreCase))).Select(r => r.Id!);
// RoleHelper.SaveByUserId(user.Id, roles);
// }
// }
// }
// return auth ? await SignInAsync(phone, true, MobileSchema) : RedirectLogin();
//}
//private IActionResult RedirectLogin()
//{
// var query = Request.Query.Aggregate(new Dictionary<string, string?>(), (d, v) =>
// {
// d.Add(v.Key, v.Value.ToString());
// return d;
// });
// return Redirect(QueryHelpers.AddQueryString(Request.PathBase + CookieAuthenticationDefaults.LoginPath, query));
//}
//private IActionResult RedirectLogin()
//{
// var query = Request.Query.Aggregate(new Dictionary<string, string?>(), (d, v) =>
// {
// d.Add(v.Key, v.Value.ToString());
// return d;
// });
// return Redirect(QueryHelpers.AddQueryString(Request.PathBase + CookieAuthenticationDefaults.LoginPath, query));
//}
///// <summary>
///// Login the specified userName, password and remember.
///// </summary>
///// <returns>The login.</returns>
///// <param name="userName">User name.</param>
///// <param name="password">Password.</param>
///// <param name="remember">Remember.</param>
//[HttpPost]
//public async Task<IActionResult> Login(string userName, string password, string remember)
//{
// if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(password)) return RedirectLogin();
///// <summary>
///// Login the specified userName, password and remember.
///// </summary>
///// <returns>The login.</returns>
///// <param name="userName">User name.</param>
///// <param name="password">Password.</param>
///// <param name="remember">Remember.</param>
//[HttpPost]
//public async Task<IActionResult> Login(string userName, string password, string remember)
//{
// if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(password)) return RedirectLogin();
// var auth = UserHelper.Authenticate(userName, password);
// await HttpContext.Log(userName, auth);
// return auth ? await SignInAsync(userName, remember == "true") : LoginView("", new LoginModel() { AuthFailed = true });
//}
// var auth = UserHelper.Authenticate(userName, password);
// await HttpContext.Log(userName, auth);
// return auth ? await SignInAsync(userName, remember == "true") : LoginView("", new LoginModel() { AuthFailed = true });
//}
//private async Task<IActionResult> SignInAsync(string userName, bool persistent, string authenticationScheme = CookieAuthenticationDefaults.AuthenticationScheme)
//{
// var identity = new ClaimsIdentity(authenticationScheme);
// identity.AddClaim(new Claim(ClaimTypes.Name, userName));
// await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, new ClaimsPrincipal(identity), new AuthenticationProperties { ExpiresUtc = DateTimeOffset.Now.AddDays(DictHelper.RetrieveCookieExpiresPeriod()), IsPersistent = persistent });
//private async Task<IActionResult> SignInAsync(string userName, bool persistent, string authenticationScheme = CookieAuthenticationDefaults.AuthenticationScheme)
//{
// var identity = new ClaimsIdentity(authenticationScheme);
// identity.AddClaim(new Claim(ClaimTypes.Name, userName));
// await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, new ClaimsPrincipal(identity), new AuthenticationProperties { ExpiresUtc = DateTimeOffset.Now.AddDays(DictHelper.RetrieveCookieExpiresPeriod()), IsPersistent = persistent });
// // redirect origin url
// var originUrl = Request.Query[CookieAuthenticationDefaults.ReturnUrlParameter].FirstOrDefault() ?? "~/Home/Index";
// return Redirect(originUrl);
//}
// // redirect origin url
// var originUrl = Request.Query[CookieAuthenticationDefaults.ReturnUrlParameter].FirstOrDefault() ?? "~/Home/Index";
// return Redirect(originUrl);
//}
///// <summary>
///// Logout this instance.
///// </summary>
///// <param name="appId"></param>
///// <returns>The logout.</returns>
//[HttpGet]
//public async Task<IActionResult> Logout([FromQuery] string appId)
//{
// await HttpContext.SignOutAsync();
// return Redirect(QueryHelpers.AddQueryString(Request.PathBase + CookieAuthenticationDefaults.LoginPath, "AppId", appId ?? BootstrapAppContext.AppId));
//}
///// <summary>
///// Logout this instance.
///// </summary>
///// <param name="appId"></param>
///// <returns>The logout.</returns>
//[HttpGet]
//public async Task<IActionResult> Logout([FromQuery] string appId)
//{
// await HttpContext.SignOutAsync();
// return Redirect(QueryHelpers.AddQueryString(Request.PathBase + CookieAuthenticationDefaults.LoginPath, "AppId", appId ?? BootstrapAppContext.AppId));
//}
///// <summary>
///// Accesses the denied.
///// </summary>
///// <returns>The denied.</returns>
//[ResponseCache(Duration = 600)]
//[HttpGet]
//public ActionResult AccessDenied() => View("Error", ErrorModel.CreateById(403));
///// <summary>
///// Accesses the denied.
///// </summary>
///// <returns>The denied.</returns>
//[ResponseCache(Duration = 600)]
//[HttpGet]
//public ActionResult AccessDenied() => View("Error", ErrorModel.CreateById(403));
///// <summary>
///// Gitee 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult Gitee([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(GiteeOptions)}:Enabled", false);
// return Challenge(enabled ? GiteeDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// Gitee 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult Gitee([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(GiteeOptions)}:Enabled", false);
// return Challenge(enabled ? GiteeDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// GitHub 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult GitHub([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(GitHubOptions)}:Enabled", false);
// return Challenge(enabled ? GitHubDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// GitHub 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult GitHub([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(GitHubOptions)}:Enabled", false);
// return Challenge(enabled ? GitHubDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// Tencent 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult Tencent([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(TencentOptions)}:Enabled", false);
// return Challenge(enabled ? TencentDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// Tencent 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult Tencent([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(TencentOptions)}:Enabled", false);
// return Challenge(enabled ? TencentDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// Alipay 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult Alipay([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(AlipayOptions)}:Enabled", false);
// return Challenge(enabled ? AlipayDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// Alipay 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult Alipay([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(AlipayOptions)}:Enabled", false);
// return Challenge(enabled ? AlipayDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// WeChat 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult WeChat([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(WeChatOptions)}:Enabled", false);
// return Challenge(enabled ? WeChatDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
///// <summary>
///// WeChat 认证
///// </summary>
///// <returns></returns>
//[HttpGet]
//public IActionResult WeChat([FromServices] IConfiguration config)
//{
// var enabled = config.GetValue($"{nameof(WeChatOptions)}:Enabled", false);
// return Challenge(enabled ? WeChatDefaults.AuthenticationScheme : CookieAuthenticationDefaults.AuthenticationScheme);
//}
//}
}

1
src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
View File

@ -1,5 +1,4 @@
using BootstrapAdmin.Web.Services;
using BootstrapBlazor.DataAcces.PetaPoco;
using System.Text;
namespace Microsoft.Extensions.DependencyInjection

2
src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs
View File

@ -1,4 +1,4 @@
using BootstrapAdmin.DataAccess.Interface;
using BootstrapAdmin.DataAccess.Core;
using BootstrapAdmin.Web.Extensions;
namespace BootstrapAdmin.Web.Shared

1
src/mvc/admin/Bootstrap.Admin/Controllers/HomeController.cs
View File

@ -3,7 +3,6 @@ using Bootstrap.DataAccess;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
namespace Bootstrap.Admin.Controllers
{

3
src/mvc/admin/Bootstrap.Admin/Pages/Components/EditPageBase.cs
View File

@ -1,5 +1,4 @@
using Bootstrap.Admin.Pages.Shared;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components;
using System;
using System.Collections.Generic;

3
src/mvc/admin/Bootstrap.Admin/Pages/Components/HeaderBase.cs
View File

@ -1,5 +1,4 @@
using Bootstrap.Admin.Pages.Extensions;
using Bootstrap.Admin.Pages.Shared;
using Bootstrap.Admin.Pages.Shared;
using Bootstrap.DataAccess;
using Microsoft.AspNetCore.Components;

2
src/mvc/admin/Bootstrap.Admin/Pages/Components/LgbInputText.cs
View File

@ -1,5 +1,3 @@
using Bootstrap.Admin.Pages.Shared;
namespace Bootstrap.Admin.Pages.Components
{
/// <summary>

1
src/mvc/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
View File

@ -1,5 +1,4 @@
using Bootstrap.Admin.Pages.Extensions;
using Bootstrap.Admin.Pages.Shared;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.JSInterop;

1
src/mvc/admin/Bootstrap.Admin/Pages/Views/Admin/RolesBase.cs
View File

@ -1,5 +1,4 @@
using Bootstrap.Admin.Pages.Components;
using Bootstrap.Admin.Pages.Shared;
using Bootstrap.DataAccess;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;