使用接口类型作为Action入参，模型绑定器测试通过

NewLifeX · Jun 18, 2024 · 6565a67 · 6565a67
1 parent 80f7011
commit 6565a67
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 43 deletions.
diff --git a/NewLife.Remoting.Extensions/ModelBinders/InterfaceModelBinder.cs b/NewLife.Remoting.Extensions/ModelBinders/InterfaceModelBinder.cs
@@ -1,51 +1,51 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace NewLife.Remoting.Extensions.ModelBinders
+namespace NewLife.Remoting.Extensions.ModelBinders;
+
+/// <summary>接口模型绑定器</summary>
+public class InterfaceModelBinder : IModelBinder
 {
-    /// <summary>接口模型绑定器</summary>
-    public class InterfaceModelBinder : IModelBinder
+    /// <summary>对于Json请求，从body中读取参数</summary>
+    /// <param name="bindingContext"></param>
+    /// <returns></returns>
+    public async Task BindModelAsync(ModelBindingContext bindingContext)
     {
-        /// <summary>对于Json请求，从body中读取参数</summary>
-        /// <param name="bindingContext"></param>
-        /// <returns></returns>
-        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        var provider = bindingContext.HttpContext.RequestServices;
+        var modelType = bindingContext.ModelType;
+
+        // 从容器中获取接口类型对应实例
+        var model = provider.GetRequiredService(modelType);
+
+        try
         {
             var req = bindingContext.HttpContext.Request;
-            var provider = bindingContext.HttpContext.RequestServices;
-            var modelType = bindingContext.ModelType;
-            // 从容器中获取接口类型对应实例
-            var model = provider.GetService(modelType);
-
-            try
-            {
-                var entityBody = await req.ReadFromJsonAsync(model.GetType());
-
-                bindingContext.Result = ModelBindingResult.Success(entityBody);
-            }
-            catch (Exception ex)
-            {
-                bindingContext.ModelState.AddModelError(bindingContext.ModelName, ex.Message);
-            }
+            var entityBody = await req.ReadFromJsonAsync(model!.GetType());
 
+            bindingContext.Result = ModelBindingResult.Success(entityBody);
+        }
+        catch (Exception ex)
+        {
+            bindingContext.ModelState.AddModelError(bindingContext.ModelName, ex.Message);
         }
     }
+}
 
-    /// <summary>模型绑定器提供者</summary>
-    public class InterfaceModelBinderProvider : IModelBinderProvider
+/// <summary>模型绑定器提供者</summary>
+public class InterfaceModelBinderProvider : IModelBinderProvider
+{
+    /// <summary>获取绑定器</summary>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    public IModelBinder? GetBinder(ModelBinderProviderContext context)
     {
-        /// <summary>获取绑定器</summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public IModelBinder? GetBinder(ModelBinderProviderContext context)
-        {
-            var modelType = context.Metadata.ModelType;
-
-            if (modelType.IsInterface)
-            {
-                return new InterfaceModelBinder();
-            }
+        if (!context.Metadata.IsComplexType) return null;
 
-            return null;
+        var type = context.Metadata.ModelType;
+        if (type.IsInterface && context.Services?.GetService(type) != null)
+        {
+            return new InterfaceModelBinder();
         }
+
+        return null;
     }
 }
diff --git a/NewLife.Remoting.Extensions/NewLife.Remoting.Extensions.csproj b/NewLife.Remoting.Extensions/NewLife.Remoting.Extensions.csproj
@@ -55,6 +55,10 @@
     <_WebToolingArtifacts Remove="Properties\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="Services\ServicModelMetadataProvider.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="..\Doc\leaf.png" Link="leaf.png" PackagePath="\" />
   </ItemGroup>

diff --git a/Samples/IoTZero/Controllers/DeviceController.cs b/Samples/IoTZero/Controllers/DeviceController.cs
@@ -20,7 +20,6 @@ public class DeviceController : BaseDeviceController
     /// <summary>当前设备</summary>
     public Device Device { get; set; }
 
-    private readonly QueueService _queue;
     private readonly ThingService _thingService;
     private readonly ITracer _tracer;
 
@@ -31,9 +30,8 @@ public class DeviceController : BaseDeviceController
     /// <param name="deviceService"></param>
     /// <param name="thingService"></param>
     /// <param name="tracer"></param>
-    public DeviceController(IServiceProvider serviceProvider, QueueService queue, ThingService thingService, ITracer tracer) : base(serviceProvider)
+    public DeviceController(IServiceProvider serviceProvider, ThingService thingService, ITracer tracer) : base(serviceProvider)
     {
-        _queue = queue;
         _thingService = thingService;
         _tracer = tracer;
     }

diff --git a/Samples/IoTZero/IoTZero.csproj b/Samples/IoTZero/IoTZero.csproj
@@ -19,6 +19,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="Common\InterfaceModelBinderProvider.cs" />
+    <Compile Remove="Common\LoginRequestModelBinder.cs" />
+    <Compile Remove="Common\PingRequestModelBinder.cs" />
     <Compile Remove="Models\LoginResponse.cs" />
     <Compile Remove="Models\LogoutResponse.cs" />
     <Compile Remove="Models\PingResponse.cs" />

diff --git a/Samples/IoTZero/Program.cs b/Samples/IoTZero/Program.cs
@@ -46,10 +46,7 @@
 // 启用接口响应压缩
 services.AddResponseCompression();
 
-services.AddControllersWithViews(options =>
-{
-    options.ModelBinderProviders.Insert(0, new InterfaceModelBinderProvider());
-});
+services.AddControllersWithViews();
 
 // 引入魔方
 services.AddCube();