From f9fd2a3343a0b14c2e1610be8896a99817e1be48 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Fri, 13 Nov 2020 15:31:39 +0800 Subject: [PATCH] add missing module to All.sln --- aspnet-core/LINGYUN.MicroService.All.sln | 7 +++++++ .../account/LINGYUN.Abp.Account.Web/README.md | 2 ++ .../Pages/Account/SendCode.cshtml | 2 +- .../Pages/Account/SendCode.cshtml.cs | 16 ++++++++-------- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/aspnet-core/LINGYUN.MicroService.All.sln b/aspnet-core/LINGYUN.MicroService.All.sln index ea419eead..722ce79af 100644 --- a/aspnet-core/LINGYUN.MicroService.All.sln +++ b/aspnet-core/LINGYUN.MicroService.All.sln @@ -261,6 +261,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wechat", "wechat", "{DD9BE9 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WeChat", "modules\wechat\LINGYUN.Abp.WeChat\LINGYUN.Abp.WeChat.csproj", "{BAE74ABC-1096-495F-A624-BEBFBC1896F2}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Identity.Domain.Shared", "modules\identity\LINGYUN.Abp.Identity.Domain.Shared\LINGYUN.Abp.Identity.Domain.Shared.csproj", "{E92A1CAA-5758-41EF-B67E-C0D394E85417}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -691,6 +693,10 @@ Global {BAE74ABC-1096-495F-A624-BEBFBC1896F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAE74ABC-1096-495F-A624-BEBFBC1896F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {BAE74ABC-1096-495F-A624-BEBFBC1896F2}.Release|Any CPU.Build.0 = Release|Any CPU + {E92A1CAA-5758-41EF-B67E-C0D394E85417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E92A1CAA-5758-41EF-B67E-C0D394E85417}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E92A1CAA-5758-41EF-B67E-C0D394E85417}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E92A1CAA-5758-41EF-B67E-C0D394E85417}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -822,6 +828,7 @@ Global {43083268-74DE-4C68-824A-FB0CEC77358D} = {8AC72641-30D3-4ACF-89FA-808FADC55C2E} {DD9BE9E7-F6BF-4869-BCD2-82F5072BDA21} = {C5CAD011-DF84-4914-939C-0C029DCEF26F} {BAE74ABC-1096-495F-A624-BEBFBC1896F2} = {DD9BE9E7-F6BF-4869-BCD2-82F5072BDA21} + {E92A1CAA-5758-41EF-B67E-C0D394E85417} = {52B5D4F7-237B-4E0A-A167-68442164F70A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/README.md b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/README.md index 8d57fea0f..00062094f 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/README.md +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/README.md @@ -2,6 +2,8 @@ 重写用户账户相关页面 +暂时不启用 + ## 配置使用 diff --git a/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml b/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml index e5d879118..95b00081b 100644 --- a/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml +++ b/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml @@ -12,7 +12,7 @@
- +
@L["SendVerifyCode"] diff --git a/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml.cs b/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml.cs index b4aee15df..4d878ee94 100644 --- a/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml.cs +++ b/aspnet-core/services/account/AuthServer.Host/Pages/Account/SendCode.cshtml.cs @@ -14,7 +14,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account public class SendCodeModel : AccountPageModel { [BindProperty] - public SendCodeInputModel SendCodeInput { get; set; } + public SendCodeInputModel Input { get; set; } [HiddenInput] [BindProperty(SupportsGet = true)] @@ -46,7 +46,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account public virtual async Task OnGetAsync() { - SendCodeInput = new SendCodeInputModel(); + Input = new SendCodeInputModel(); var user = await SignInManager.GetTwoFactorAuthenticationUserAsync(); if (user == null) @@ -70,7 +70,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account return Page(); } - if (SendCodeInput.SelectedProvider == "Authenticator") + if (Input.SelectedProvider == "Authenticator") { // ûͨʼ/ӽȨҳ return RedirectToPage("VerifyAuthenticatorCode", new @@ -81,23 +81,23 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account }); } // ֤ - var code = await UserManager.GenerateTwoFactorTokenAsync(user, SendCodeInput.SelectedProvider); + var code = await UserManager.GenerateTwoFactorTokenAsync(user, Input.SelectedProvider); if (string.IsNullOrWhiteSpace(code)) { Alerts.Warning(L["InvaidGenerateTwoFactorToken"]); return Page(); } - if (SendCodeInput.SelectedProvider == "Email") + if (Input.SelectedProvider == "Email") { var appName = "MVC"; // TODO: Abpܵ˼䶯 await AccountEmailVerifySender .SendMailLoginVerifyLinkAsync( user, code, appName, - SendCodeInput.SelectedProvider, + Input.SelectedProvider, RememberMe, ReturnUrl, ReturnUrlHash); } - else if (SendCodeInput.SelectedProvider == "Phone") + else if (Input.SelectedProvider == "Phone") { var phoneNumber = await UserManager.GetPhoneNumberAsync(user); var templateCode = await SettingProvider.GetOrNullAsync(AccountSettingNames.SmsSigninTemplateCode); @@ -113,7 +113,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account return RedirectToPage("VerifyCode", new { - provider = SendCodeInput.SelectedProvider, + provider = Input.SelectedProvider, returnUrl = ReturnUrl, returnUrlHash = ReturnUrlHash, rememberMe = RememberMe