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

feat: 移除对 Longbow.Web 依赖

This commit is contained in:
Argo-Tianyi 2022-01-15 11:51:22 +08:00
parent d0860e57a5
commit b8078fd505
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
View File

@ -7,7 +7,6 @@
<ItemGroup>
<PackageReference Include="Longbow.Logging" Version="6.0.2" />
<PackageReference Include="Longbow.Tasks" Version="5.2.1" />
<PackageReference Include="Longbow.Web" Version="5.2.1" />
</ItemGroup>
<ItemGroup>

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

@ -1,13 +1,11 @@
using BootstrapAdmin.Web.Core;
using BootstrapAdmin.Web.Services;
using BootstrapAdmin.Web.Services.SMS;
using Longbow.Web;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.WebUtilities;
using System.Net;
using System.Security.Claims;
namespace BootstrapAdmin.Web.Controllers
@ -32,12 +30,10 @@ namespace BootstrapAdmin.Web.Controllers
/// <param name="appId"></param>
/// <param name="userService"></param>
/// <param name="dictService"></param>
/// <param name="loginService"></param>
[HttpPost]
public async Task<IActionResult> Login(string userName, string password, [FromQuery] string? remember, [FromQuery] string? returnUrl, [FromQuery] string? appId,
[FromServices] IUser userService,
[FromServices] IDict dictService,
[FromServices] ILogin loginService)
[FromServices] IDict dictService)
{
if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(password))
{
@ -52,13 +48,6 @@ namespace BootstrapAdmin.Web.Controllers
// Cookie 持久化
period = dictService.GetCookieExpiresPeriod();
}
var ipLocator = HttpContext.RequestServices.GetRequiredService<BootstrapBlazor.Components.IIPLocatorProvider>();
var ip = HttpContext.Connection.RemoteIpAddress?.ToIPv4String() ?? "";
var userAgent = HttpContext.Request.Headers["User-Agent"];
var agent = new UserAgent(userAgent);
var address = await ipLocator.Locate(ip);
await loginService.Log(userName, DateTime.Now, ip, address, $"{agent.Browser.Name} {agent.Browser.Version}", userAgent, $"{agent.OS.Name} {agent.OS.Version}", auth);
return auth ? await SignInAsync(userName, returnUrl ?? GetAppHomeUrl(dictService, appId), persistent, period) : RedirectLogin(returnUrl);
}
@ -133,7 +122,6 @@ namespace BootstrapAdmin.Web.Controllers
public async Task<IActionResult> Mobile(string phone, string code, [FromQuery] string? remember, [FromQuery] string? returnUrl,
[FromQuery] string? appId,
[FromServices] ISMSProvider provider,
[FromServices] ILogin loginService,
[FromServices] IUser userService,
[FromServices] IDict dictService,
[FromServices] BootstrapAppContext context)
@ -151,12 +139,6 @@ namespace BootstrapAdmin.Web.Controllers
// Cookie 持久化
period = dictService.GetCookieExpiresPeriod();
}
var ipLocator = HttpContext.RequestServices.GetRequiredService<BootstrapBlazor.Components.IIPLocatorProvider>();
var ip = HttpContext.Connection.RemoteIpAddress?.ToIPv4String() ?? "";
var userAgent = HttpContext.Request.Headers["User-Agent"];
var agent = new UserAgent(userAgent);
var address = await ipLocator.Locate(ip);
await loginService.Log(phone, DateTime.Now, ip, address, $"{agent.Browser.Name} {agent.Browser.Version}", userAgent, $"{agent.OS.Name} {agent.OS.Version}", auth);
if (auth)
{
userService.TryCreateUserByPhone(phone, code, context.AppId, provider.Options.Roles);