😊 修复动态 WebAPI 不支持贴有 [NonController] 特性的控制器

MonkSoul · Dec 10, 2024 · d3fdd24 · d3fdd24
1 parent 187a178
commit d3fdd24
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/framework/Furion.Pure/DynamicApiController/Internal/Penetrates.cs b/framework/Furion.Pure/DynamicApiController/Internal/Penetrates.cs
@@ -106,6 +106,9 @@ static bool Function(Type type)
             // 不能是非公开、基元类型、值类型、抽象类、接口、泛型类
             if (!type.IsPublic || type.IsPrimitive || type.IsValueType || type.IsAbstract || type.IsInterface || type.IsGenericType) return false;
 
+            // 如果控制器贴有 [NonController] 特性则忽略
+            if (type.IsDefined(typeof(NonControllerAttribute), false)) return false;
+
             // 继承 ControllerBase 或 实现 IDynamicApiController 的类型 或 贴了 [DynamicApiController] 特性
             if ((!typeof(Controller).IsAssignableFrom(type) && typeof(ControllerBase).IsAssignableFrom(type))
                 || typeof(IDynamicApiController).IsAssignableFrom(type)

diff --git a/framework/Furion/DynamicApiController/Internal/Penetrates.cs b/framework/Furion/DynamicApiController/Internal/Penetrates.cs
@@ -106,6 +106,9 @@ static bool Function(Type type)
             // 不能是非公开、基元类型、值类型、抽象类、接口、泛型类
             if (!type.IsPublic || type.IsPrimitive || type.IsValueType || type.IsAbstract || type.IsInterface || type.IsGenericType) return false;
 
+            // 如果控制器贴有 [NonController] 特性则忽略
+            if (type.IsDefined(typeof(NonControllerAttribute), false)) return false;
+
             // 继承 ControllerBase 或 实现 IDynamicApiController 的类型 或 贴了 [DynamicApiController] 特性
             if ((!typeof(Controller).IsAssignableFrom(type) && typeof(ControllerBase).IsAssignableFrom(type))
                 || typeof(IDynamicApiController).IsAssignableFrom(type)

diff --git a/samples/Furion.Web.Entry/Controllers/TestApiController.cs b/samples/Furion.Web.Entry/Controllers/TestApiController.cs
@@ -8,6 +8,7 @@ namespace Furion.Web.Entry.Controllers;
 /// </summary>
 [Route("api/[controller]")]
 [ApiController]
+//[NonController]
 public class TestApiController : ControllerBase
 {
     [HttpGet, NonUnify]