From b5afc773090bf5db61476e134750ad831cbe7f5b Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 19 Sep 2023 16:19:35 +0800
Subject: [PATCH] Expose the `validator` service itself.

Resolve #17596
---
 .../AbpFluentValidationConventionalRegistrar.cs       |  1 +
 .../ApplicationService_FluentValidation_Tests.cs      | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/AbpFluentValidationConventionalRegistrar.cs b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/AbpFluentValidationConventionalRegistrar.cs
index 5923949b0e..a7d2c4f9d3 100644
--- a/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/AbpFluentValidationConventionalRegistrar.cs
+++ b/framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/AbpFluentValidationConventionalRegistrar.cs
@@ -24,6 +24,7 @@ public class AbpFluentValidationConventionalRegistrar : DefaultConventionalRegis
     {
         return new List<Type>()
             {
+                type,
                 typeof(IValidator<>).MakeGenericType(GetFirstGenericArgumentOrNull(type, 1)!)
             };
     }
diff --git a/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs b/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs
index 37e6b07b8f..46e16bc292 100644
--- a/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs
+++ b/framework/test/Volo.Abp.FluentValidation.Tests/Volo/Abp/FluentValidation/ApplicationService_FluentValidation_Tests.cs
@@ -103,6 +103,17 @@ public class ApplicationService_FluentValidation_Tests : AbpIntegratedTest<Appli
         output.ShouldBe("444");
     }
 
+
+    [Fact]
+    public void Should_Add_Validators_To_DI()
+    {
+        var validator = ServiceProvider.GetService<IValidator<MyMethodInput>>();
+        validator.GetType().ShouldBe(typeof(MyMethodInputValidator));
+
+        validator = ServiceProvider.GetService<MyMethodInputValidator>();
+        validator.GetType().ShouldBe(typeof(MyMethodInputValidator));
+    }
+
     [DependsOn(typeof(AbpAutofacModule))]
     [DependsOn(typeof(AbpFluentValidationModule))]
     public class TestModule : AbpModule