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; } 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 a0bc3dfe..1f08f654 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(); //校验 @@ -209,13 +209,16 @@ namespace Yi.Framework.Rbac.Application.Services } /// - /// 手机验证码 + /// 手机验证码-需通过图形验证码 /// /// [RemoteService(isEnabled:false)] public async Task PostCaptchaPhoneAsync(ValidationPhoneTypeEnum validationPhoneType, PhoneCaptchaImageDto input) { + //验证uuid 和 验证码 + ValidationImageCaptcha(input.Uuid,input.Code); + await ValidationPhone(input.Phone); //注册的手机号验证,是不能已经注册过的