fix IReqBinder空绑定问题

vipwan · May 22, 2024 · 7fe7e48 · 7fe7e48
1 parent dd0efda
commit 7fe7e48
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/Biwen.QuickApi.DemoWeb/Apis/HelloApi.cs b/Biwen.QuickApi.DemoWeb/Apis/HelloApi.cs
@@ -140,7 +140,7 @@ public FromBodyRequest()
     /// </summary>
     public class CustomApiRequestBinder : IReqBinder<HelloApiRequest>
     {
-        public static ValueTask<HelloApiRequest?> BindAsync(HttpContext context, ParameterInfo parameter = null!)
+        public static ValueTask<HelloApiRequest> BindAsync(HttpContext context, ParameterInfo parameter = null!)
         {
             var request = new HelloApiRequest();
 

diff --git a/Biwen.QuickApi.DemoWeb/Program.cs b/Biwen.QuickApi.DemoWeb/Program.cs
@@ -226,7 +226,7 @@
 //app.MapGenQuickApis(app.Services);
 
 //测试其他地方调用QuickApi
-app.MapGet("/fromapi", async Task<Results<Ok<string>, BadRequest<IDictionary<string, string[]>>>>
+app.MapGet("/fromapi", async Task<Results<Ok<string>, ValidationProblem>>
     (JustAsService api) =>
 {
 
@@ -236,7 +236,7 @@
     var result = req.Validate();
     if (!result.IsValid)
     {
-        return TypedResults.BadRequest(result.ToDictionary());
+        return TypedResults.ValidationProblem(result.ToDictionary());
     }
 
     //执行请求
@@ -296,7 +296,7 @@ public partial class BindRequest : BaseRequest<BindRequest>, IReqBinder<BindRequ
     {
         public string? Hello { get; set; }
 
-        public static async ValueTask<BindRequest?> BindAsync(HttpContext context, ParameterInfo parameter = null!)
+        public static async ValueTask<BindRequest> BindAsync(HttpContext context, ParameterInfo parameter = null!)
         {
             //返回默认绑定
             var req = await DefaultReqBinder<BindRequest>.BindAsync(context, parameter);

diff --git a/Biwen.QuickApi/Abstractions/IReqBinder.cs b/Biwen.QuickApi/Abstractions/IReqBinder.cs
@@ -10,6 +10,6 @@ namespace Biwen.QuickApi.Abstractions
     /// <typeparam name="T"></typeparam>
     public interface IReqBinder<T> where T : class, new()
     {
-        static abstract ValueTask<T?> BindAsync(HttpContext context, ParameterInfo parameter = null!);
+        static abstract ValueTask<T> BindAsync(HttpContext context, ParameterInfo parameter = null!);
     }
 }
diff --git a/Biwen.QuickApi/Biwen.QuickApi.csproj b/Biwen.QuickApi/Biwen.QuickApi.csproj
@@ -5,7 +5,7 @@
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-		<PackageVersion>1.6.0</PackageVersion>
+		<PackageVersion>1.6.1</PackageVersion>
 		<TargetFrameworks>net8.0</TargetFrameworks>
 		<PackageProjectUrl>https://github.com/vipwan/Biwen.QuickApi</PackageProjectUrl>
 		<Authors>万雅虎</Authors>

diff --git a/Biwen.QuickApi/DefaultReqBinder.cs b/Biwen.QuickApi/DefaultReqBinder.cs
@@ -20,7 +20,7 @@ namespace Biwen.QuickApi
         /// </summary>
         /// <param name="context"></param>
         /// <returns></returns>
-        public static async ValueTask<T?> BindAsync(HttpContext context, ParameterInfo parameter = null!)
+        public static async ValueTask<T> BindAsync(HttpContext context, ParameterInfo parameter = null!)
         {
 
             IDictionary<string, object>? ReadFromJsonDic = null;
@@ -278,9 +278,9 @@ namespace Biwen.QuickApi
     /// <typeparam name="T"></typeparam>
     internal sealed class EmptyReqBinder<T> : IReqBinder<T> where T : class, new()
     {
-        public static ValueTask<T?> BindAsync(HttpContext context, ParameterInfo parameter = null!)
+        public static ValueTask<T> BindAsync(HttpContext context, ParameterInfo parameter = null!)
         {
-            return ValueTask.FromResult(default(T));
+            return ValueTask.FromResult(new T());
         }
     }
 

diff --git a/Biwen.QuickApi/ServiceRegistration.cs b/Biwen.QuickApi/ServiceRegistration.cs
@@ -401,11 +401,13 @@ async static Task<IResult> RequestHandler(IHttpContextAccessor ctx, Type apiType
                 //使用接口静态成员重写代码:
                 MethodInfo methodInfo = (((dynamic)api).ReqBinder).GetMethod("BindAsync", BindingFlags.Static | BindingFlags.Public);
                 var req = await (dynamic)methodInfo.Invoke(null, [ctx.HttpContext, null])!;
-
-                //验证DTO
-                if (req.Validate() is ValidationResult { IsValid: false } vresult)
+                if (req is not null)
                 {
-                    return TypedResults.ValidationProblem(vresult.ToDictionary());
+                    //验证DTO
+                    if (req.Validate() is ValidationResult { IsValid: false } vresult)
+                    {
+                        return TypedResults.ValidationProblem(vresult.ToDictionary());
+                    }
                 }
                 var result = await ((dynamic)api)!.ExecuteAsync(req!);
                 var rawResult = InnerResult(result);