From 453d95a460860ef161919500e4b8ce6f3d558102 Mon Sep 17 00:00:00 2001 From: chenchun Date: Mon, 21 Oct 2024 10:39:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/Account/PhoneCaptchaImageDto.cs | 4 ++++ .../Services/AccountService.cs | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/PhoneCaptchaImageDto.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/PhoneCaptchaImageDto.cs index 331dcec3..94e8f33c 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/PhoneCaptchaImageDto.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/PhoneCaptchaImageDto.cs @@ -3,5 +3,9 @@ public class PhoneCaptchaImageDto { public string Phone { get; set; } + + public string? Uuid { get; set; } + + public string? Code { get; set; } } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs index 2830a9fe..388cf078 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs @@ -82,12 +82,12 @@ namespace Yi.Framework.Rbac.Application.Services /// 校验图片登录验证码,无需和账号绑定 /// [AllowAnonymous] - private void ValidationImageCaptcha(LoginInputVo input) + private void ValidationImageCaptcha(string? uuid,string? code ) { if (_rbacOptions.EnableCaptcha) { //登录不想要验证码 ，可不校验 - if (!_captcha.Validate(input.Uuid, input.Code)) + if (!_captcha.Validate(uuid, code)) { throw new UserFriendlyException("验证码错误"); } @@ -109,7 +109,7 @@ namespace Yi.Framework.Rbac.Application.Services } //校验验证码 - ValidationImageCaptcha(input); + ValidationImageCaptcha(input.Uuid,input.Code); UserAggregateRoot user = new(); //校验 @@ -199,12 +199,15 @@ namespace Yi.Framework.Rbac.Application.Services } /// - /// 手机验证码 + /// 手机验证码-需通过图形验证码 /// /// private async Task PostCaptchaPhoneAsync(ValidationPhoneTypeEnum validationPhoneType, PhoneCaptchaImageDto input) { + //验证uuid 和 验证码 + ValidationImageCaptcha(input.Uuid,input.Code); + await ValidationPhone(input.Phone); //注册的手机号验证，是不能已经注册过的 From 998d97b6696cd5bafb712857b055ef6c399dde03 Mon Sep 17 00:00:00 2001 From: chenchun Date: Mon, 21 Oct 2024 16:58:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E8=AE=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/AuditLogAggregateRoot.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Entities/AuditLogAggregateRoot.cs b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Entities/AuditLogAggregateRoot.cs index e0188184..9f4ddc49 100644 --- a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Entities/AuditLogAggregateRoot.cs +++ b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Entities/AuditLogAggregateRoot.cs @@ -109,6 +109,7 @@ namespace Yi.Framework.AuditLogging.Domain.Entities public virtual string? Url { get; protected set; } + [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)] public virtual string? Exceptions { get; protected set; } public virtual string? Comments { get; protected set; }