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 94e8f33c..1428dd6b 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 @@ -4,8 +4,8 @@ { public string Phone { get; set; } - public string? Uuid { get; set; } + public string Uuid { get; set; } - public string? Code { get; set; } + public string Code { get; set; } } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs index 6ebec32f..13d07949 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using Lazy.Captcha.Core.Generator; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp; using Volo.Abp.BackgroundWorkers; using Volo.Abp.BackgroundWorkers.Quartz; @@ -24,7 +25,11 @@ namespace Yi.Framework.Rbac.Application { var service = context.Services; - service.AddCaptcha(); + service.AddCaptcha(options => + { + options.CaptchaType = CaptchaType.ARITHMETIC; + + }); } public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context) diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs index 29ea0f91..2b1a2ebf 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs @@ -33,7 +33,6 @@ using Yi.Framework.Bbs.Application; using Yi.Framework.Bbs.Application.Extensions; using Yi.Framework.ChatHub.Application; using Yi.Framework.CodeGen.Application; -using Yi.Framework.DigitalCollectibles.Application; using Yi.Framework.Rbac.Application; using Yi.Framework.Rbac.Domain.Authorization; using Yi.Framework.Rbac.Domain.Shared.Consts; @@ -67,10 +66,10 @@ namespace Yi.Abp.Web //请求日志 Configure(optios => { - //开启后会有大量的审计日志 + //默认关闭,开启会有大量的审计日志 optios.IsEnabled = true; //审计日志过滤器 - optios.AlwaysLogSelectors.Add(x => Task.FromResult(true)); + optios.AlwaysLogSelectors.Add(x => Task.FromResult(!x.Url.StartsWith("/api/app/file/"))); }); //采用furion格式的规范化api,默认不开启,使用abp优雅的方式 @@ -95,8 +94,7 @@ namespace Yi.Abp.Web options => options.RemoteServiceName = "tenant-management"); options.ConventionalControllers.Create(typeof(YiFrameworkCodeGenApplicationModule).Assembly, options => options.RemoteServiceName = "code-gen"); - options.ConventionalControllers.Create(typeof(YiFrameworkDigitalCollectiblesApplicationModule).Assembly, - options => options.RemoteServiceName = "digital-collectibles"); + //统一前缀 options.ConventionalControllers.ConventionalControllerSettings.ForEach(x => x.RootPath = "api/app"); }); diff --git a/Yi.Bbs.Vue3/src/apis/accountApi.js b/Yi.Bbs.Vue3/src/apis/accountApi.js index 4dae948f..b46cf302 100644 --- a/Yi.Bbs.Vue3/src/apis/accountApi.js +++ b/Yi.Bbs.Vue3/src/apis/accountApi.js @@ -83,7 +83,7 @@ export function getCodeImg() { }); } // 获取短信验证码 -export function getCodePhone(phone) { +export function getCodePhone(phoneForm) { return request({ url: "/account/captcha-phone", headers: { @@ -91,11 +91,11 @@ export function getCodePhone(phone) { }, method: "post", timeout: 20000, - data: { phone }, + data: phoneForm, }); } // 获取短信验证码-为了重置密码 -export function getCodePhoneForRetrievePassword(phone) { +export function getCodePhoneForRetrievePassword(form) { return request({ url: "/account/captcha-phone/repassword", headers: { @@ -103,6 +103,6 @@ export function getCodePhoneForRetrievePassword(phone) { }, method: "post", timeout: 20000, - data: { phone }, + data: form, }); } diff --git a/Yi.Bbs.Vue3/src/views/login/forgotPassword.vue b/Yi.Bbs.Vue3/src/views/login/forgotPassword.vue index 29c91948..98d88b8d 100644 --- a/Yi.Bbs.Vue3/src/views/login/forgotPassword.vue +++ b/Yi.Bbs.Vue3/src/views/login/forgotPassword.vue @@ -1,15 +1,20 @@  @@ -138,7 +174,7 @@ const captcha = async () => {
- +
@@ -171,8 +207,43 @@ const captcha = async () => { + + +
+ 加载中 + +
+

*图片验证码

+ + + +
+
+ +
+ \ No newline at end of file