修正了swgger生成的类型名,SimApiAuth 如果不加参数,则默认接受所有登录了的用户请求.

fix ci

.github/workflows/nuget-publish.yml

@@ -10,11 +10,11 @@ jobs:
     name: Publish Project to Nuget
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: "9.0.305"
+          dotnet-version: "10.x.x"
       - name: Publish
         run: |
           version=`git describe --tags`

Attributes/SimApiAuthAttribute.cs

@@ -13,13 +13,13 @@ namespace SimApi.Attributes;
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
 public class SimApiAuthAttribute : ActionFilterAttribute
 {
-    private string[] Types { get; }
+    private string[]? Types { get; }
 
 
     //默认是user登录类型
     public SimApiAuthAttribute()
     {
-        Types = new[] { "user" };
+        Types = null;
     }
 
     //只检测一种用户类型的快捷方式
@@ -34,13 +34,6 @@ public class SimApiAuthAttribute : ActionFilterAttribute
         Types = types;
     }
 
-    //只检测一种用户类型的快捷方式
-    public SimApiAuthAttribute(string type, string url)
-    {
-        Types = new[] { type };
-        new HttpPostAttribute(url);
-    }
-
     public override void OnActionExecuting(ActionExecutingContext context)
     {
         var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
@@ -49,6 +42,8 @@ public class SimApiAuthAttribute : ActionFilterAttribute
         {
             throw new SimApiException(401);
         }
+
+        if (Types == null) return;
         //检测用户类型
         if (!Types.Intersect(loginInfo.Type).Any())
         {

Communications/SimApiBaseResponse.cs

@@ -46,23 +46,15 @@ public class SimApiBaseResponse(int code = 200, string message = "成功")
 }
 
 /// <summary>
-/// 动态内容分页
+/// 分页内容返回
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public class SimApiBasePageResponse<T>() : SimApiBaseResponse
+public class PageResponse<T>
 {
     public T? List { get; set; }
     public int Page { get; set; } = 1;
     public int Count { get; set; } = 20;
     public int Total { get; set; }
-
-    public SimApiBasePageResponse(T list, int page, int count, int total) : this()
-    {
-        List = list;
-        Page = page;
-        Count = count;
-        Total = total;
-    }
 }
 
 /// <summary>

Helpers/SimApiHttpClient.cs

@@ -4,20 +4,22 @@ using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Json;
 using SimApi.Communications;
+using SimApi.Exceptions;
 
 namespace SimApi.Helpers;
 
-public class SimApiHttpClient(string? appId, string appKey)
+public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
 {
+    public string Server { get; init; } = string.Empty;
     public string SignName { get; init; } = "sign";
     public string TimestampName { get; init; } = "timestamp";
     public string NonceName { get; init; } = "nonce";
     public string? AppIdName { get; init; } = "appId";
     public string[] SignFields { get; init; } = [];
 
-
-    public T? SignQuery<T>(string url, object body, Dictionary<string, string>? queries = null)
+    public T? SignQuery<T>(string url, object? body = null, Dictionary<string, string>? queries = null)
     {
+        url = Server + url;
         var queryUrl = SignFields.Aggregate(string.Empty,
             (current, signField) => current + $"{signField}={queries?[signField]}&");
         if (!string.IsNullOrEmpty(AppIdName))
@@ -35,13 +37,12 @@ public class SimApiHttpClient(string? appId, string appKey)
                 .Aggregate(path, (current, q) => current + $"&{q.Key}={q.Value}");
         }
 
-        var http = new HttpClient();
-        var resp = http.PostAsJsonAsync(path, body).Result;
-        return resp.Content.ReadFromJsonAsync<T>().Result;
+        return Query<T>(path, body);
     }
 
     public T? AesQuery<T>(string url, object body)
     {
+        url = Server + url;
         if (!string.IsNullOrEmpty(AppIdName))
         {
             url += $"?{AppIdName}={appId}";
@@ -51,9 +52,7 @@ public class SimApiHttpClient(string? appId, string appKey)
         {
             Data = SimApiAesUtil.Encrypt(SimApiUtil.Json(body), appKey)
         };
-        var http = new HttpClient();
-        var resp = http.PostAsJsonAsync(url, req).Result;
-        return resp.Content.ReadFromJsonAsync<T>().Result;
+        return Query<T>(url, req);
     }
 
     public T? AesSignQuery<T>(string url, object body, Dictionary<string, string>? queries = null)
@@ -64,4 +63,27 @@ public class SimApiHttpClient(string? appId, string appKey)
         };
         return SignQuery<T>(url, req, queries);
     }
+
+    private T? Query<T>(string url, object? req)
+    {
+        var http = new HttpClient();
+        if (debug)
+        {
+            Console.WriteLine($"[HTTPCLIENT请求] {url}\n{SimApiUtil.Json(req)}\n");
+        }
+
+        var resp = http.PostAsJsonAsync(url, req).Result;
+        if (debug)
+        {
+            Console.WriteLine($"[HTTPCLIENT响应] {resp.Content.ReadAsStringAsync().Result}\n");
+        }
+
+        var res = resp.Content.ReadFromJsonAsync<SimApiBaseResponse<T>>().Result;
+        if (res == null)
+        {
+            throw new SimApiException(500, "请求发生错误");
+        }
+
+        return res.Code != 200 ? throw new SimApiException(res.Code, res.Message) : res.Data;
+    }
 }

SimApi.csproj

@@ -9,7 +9,7 @@
         <Description>AspNetCore一个方便的API文档,捕获异常,统一输入输出的API类库</Description>
         <PackageId>Simcu.SimApi</PackageId>
         <Nullable>enable</Nullable>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
     <ItemGroup>
@@ -17,14 +17,14 @@
         <Folder Include="Exceptions\"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.21" />
+        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.22" />
         <PackageReference Include="Hangfire.Console" Version="1.4.3"/>
         <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.12.0"/>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.10" />
-        <PackageReference Include="Minio" Version="6.0.5" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.1" />
+        <PackageReference Include="Minio" Version="7.0.0" />
         <PackageReference Include="MQTTnet" Version="5.0.1.1416"/>
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.6" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.6" />
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.0" />
     </ItemGroup>
     <ProjectExtensions>
         <MonoDevelop>

SimApiExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
@@ -9,7 +10,7 @@ using Hangfire.Redis.StackExchange;
 using SimApi.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using SimApi.Middlewares;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc;
@@ -123,11 +124,80 @@ public static class SimApiExtensions
                     });
                 }
 
-                x.CustomSchemaIds(type => type.FullName?.Replace("+", "."));
+                x.CustomSchemaIds(type =>
+                {
+                    // 递归解析类型名称（处理嵌套泛型/数组/可空 + 保证唯一性）
+                    string GetSimpleTypeName(Type t, int depth = 0)
+                    {
+                        // 防止无限递归
+                        if (depth > 5) return t.Name.Split('`')[0];
+
+                        // 处理数组类型
+                        if (t.IsArray)
+                        {
+                            var elementType = t.GetElementType();
+                            return $"{GetSimpleTypeName(elementType, depth + 1)}[]";
+                        }
+
+                        // 处理可空类型
+                        if (Nullable.GetUnderlyingType(t) != null)
+                        {
+                            var underlyingType = Nullable.GetUnderlyingType(t);
+                            return GetSimpleTypeName(underlyingType, depth + 1);
+                        }
+
+                        // 处理泛型类型（递归解析嵌套泛型）
+                        if (t.IsGenericType)
+                        {
+                            var genericBaseName = t.GetGenericTypeDefinition().Name.Split('`')[0];
+                            var genericArgs = t.GetGenericArguments()
+                                .Select(arg => GetSimpleTypeName(arg, depth + 1))
+                                .Where(arg => !string.IsNullOrEmpty(arg))
+                                .ToArray();
+                            return $"{genericBaseName}<{string.Join(",", genericArgs)}>";
+                        }
+
+                        // 处理基础类型（小写）
+                        if (t.IsPrimitive || t == typeof(string) || t == typeof(DateTime) || t == typeof(Guid))
+                        {
+                            return t.Name switch
+                            {
+                                "String" => "string",
+                                "Int32" => "int",
+                                "Int64" => "long",
+                                "Boolean" => "boolean",
+                                "DateTime" => "datetime",
+                                "Guid" => "guid",
+                                _ => t.Name.ToLower()
+                            };
+                        }
+
+                        // 核心修复：生成唯一名称（处理嵌套类/同名不同类）
+                        var typeName = t.Name;
+
+                        // 步骤1：处理嵌套类（如 ApplicationDto+ApplicationEditRequest → ApplicationDto_ApplicationEditRequest）
+                        if (t.DeclaringType != null)
+                        {
+                            typeName = $"{GetSimpleTypeName(t.DeclaringType)}.{typeName}";
+                        }
+
+                        // 步骤2：（可选）处理同命名空间下的同名类（拼接命名空间前缀，避免全局重复）
+                        // 如需更严格的唯一性，取消注释下面这行
+                        // typeName = $"{t.Namespace?.Replace(".", "_")}_{typeName}";
+
+                        return typeName;
+                    }
+
+                    // 根调用：解析当前类型
+                    var uniqueSchemaId = GetSimpleTypeName(type);
+                    // 可选：移除特殊字符（如 $、+），避免 Swagger 解析问题
+                    return uniqueSchemaId.Replace("$", "").Replace("+", "_");
+                });
                 x.OperationFilter<SimApiResponseOperationFilter>();
                 x.OperationFilter<SimApiSignOperationFilter>();
                 x.OperationFilter<AesBodyOperationFilter>();
                 x.SchemaFilter<GlobalDynamicObjectSchemaFilter>();
+                x.DocumentFilter<RemoveEmptyTagsFilter>();
                 if (simApiOptions.EnableSimApiAuth)
                 {
                     x.OperationFilter<SimApiAuthOperationFilter>();
@@ -157,11 +227,12 @@ public static class SimApiExtensions
                     switch (auth)
                     {
                         case "SimApiAuth":
-                            x.AddSecurityDefinition("HeaderToken",
+                            x.AddSecurityDefinition("SimApiAuth",
                                 new OpenApiSecurityScheme
                                 {
                                     Name = "Token",
-                                    In = ParameterLocation.Header
+                                    In = ParameterLocation.Header,
+                                    Type = SecuritySchemeType.ApiKey
                                 });
                             break;
                         case "ClientCredentials":
@@ -392,7 +463,6 @@ public static class SimApiExtensions
                         x.SwaggerEndpoint($"/swagger/{group.Id}.json", name: group.Name);
                     }
 
-                    x.EnableValidator();
                     x.SupportedSubmitMethods(docOptions.SupportedMethod);
                     x.DisplayRequestDuration();
                 });

SwaggerFilters/AesBodyOperationFilter.cs

@@ -1,10 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.OpenApi;
 using SimApi.Attributes;
 
 namespace SimApi.SwaggerFilters;
 
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System.Reflection;
 

SwaggerFilters/GlobalDynamicObjectSchemaFilter.cs

@@ -1,27 +1,26 @@
 using System;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System.Collections;
 using System.Collections.Generic;
-using System.Reflection;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 
 namespace SimApi.SwaggerFilters;
 
 public class GlobalDynamicObjectSchemaFilter : ISchemaFilter
 {
-    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+    public void Apply(IOpenApiSchema schema, SchemaFilterContext context)
     {
         if (!IsDynamicObjectType(context.Type)) return;
-        schema.AdditionalPropertiesAllowed = true;
-        schema.AdditionalProperties = new OpenApiSchema
+        var oaSchema = schema as OpenApiSchema;
+        oaSchema.AdditionalPropertiesAllowed = true;
+        oaSchema.AdditionalProperties = new OpenApiSchema
         {
-            Type = "object", // 表示 value 可以是任意类型（兼容所有类型）
-            Nullable = true
+            Type = JsonSchemaType.Object, // 表示 value 可以是任意类型（兼容所有类型）
         };
 
         // 2. 覆盖默认示例，使用包含多种类型的示例
-        schema.Example = CreateMultiTypeExample();
+        oaSchema.Example = CreateMultiTypeExample();
     }
 
     // 判断是否为需要处理的“动态对象”类型
@@ -33,30 +32,39 @@ public class GlobalDynamicObjectSchemaFilter : ISchemaFilter
         {
             return true;
         }
+
         if (type == typeof(object))
         {
             return true;
         }
+
         return type.Name.Contains("AnonymousType") && type.Namespace == null;
     }
 
     // 创建包含多种类型的示例（覆盖默认的 string 示例）
-    private OpenApiObject CreateMultiTypeExample()
+    private JsonNode CreateMultiTypeExample()
     {
-        return new OpenApiObject
+        return new JsonObject
         {
-            ["stringProp"] = new OpenApiString("example string"), // 字符串
-            ["numberProp"] = new OpenApiInteger(123), // 数字
-            ["boolProp"] = new OpenApiBoolean(true), // 布尔值
-            ["objectProp"] = new OpenApiObject // 嵌套对象
+            // 字符串类型：JsonValue.Create 包装字符串
+            ["stringProp"] = JsonValue.Create("example string"),
+            // 数字类型：支持 int/long/double 等，JsonValue 自动适配
+            ["numberProp"] = JsonValue.Create(123),
+            // 布尔类型
+            ["boolProp"] = JsonValue.Create(true),
+            // 嵌套对象：JsonObject 对应 OpenApiObject
+            ["objectProp"] = new JsonObject
             {
-                ["nestedKey"] = new OpenApiString("nested value")
+                ["nestedKey"] = JsonValue.Create("nested value")
             },
-            ["arrayProp"] = new OpenApiArray // 数组
+            // 数组类型：JsonArray 对应 OpenApiArray
+            ["arrayProp"] = new JsonArray
             {
-                new OpenApiInteger(1),
-                new OpenApiString("two")
-            }
+                JsonValue.Create(1), // 数组内数字
+                JsonValue.Create("two") // 数组内字符串
+            },
+            // 可选：添加 null 值示例（若需要）
+            ["nullProp"] = null
         };
     }
 }

SwaggerFilters/RemoveEmptyTagsFilter.cs

@@ -0,0 +1,25 @@
+using Microsoft.OpenApi;
+using Swashbuckle.AspNetCore.SwaggerGen;
+using System.Linq;
+
+namespace SimApi.SwaggerFilters;
+
+public class RemoveEmptyTagsFilter : IDocumentFilter
+{
+    public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
+    {
+        // 步骤1：收集所有有接口的 Tag 名称
+        var tagsWithOperations = swaggerDoc.Paths.Values
+            .SelectMany(path => path.Operations.Values)
+            .SelectMany(op => op.Tags.Select(t => t.Name))
+            .Distinct()
+            .ToList();
+
+        // 步骤2：移除无接口的空 Tag
+        var emptyTags = swaggerDoc.Tags.Where(t => !tagsWithOperations.Contains(t.Name)).ToList();
+        foreach (var tag in emptyTags)
+        {
+            swaggerDoc.Tags.Remove(tag);
+        }
+    }
+}

SwaggerFilters/SimApiAuthOperationFilter.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using SimApi.Attributes;
 
@@ -18,28 +18,12 @@ namespace SimApi.SwaggerFilters
                 ||
                 // 控制器上有 [SimApiAuth]（继承到所有方法）
                 context.MethodInfo.DeclaringType?.GetCustomAttributes<SimApiAuthAttribute>(true).Any() == true;
-            if (requiresAuth)
+            if (!requiresAuth) return;
+            operation.Security ??= new List<OpenApiSecurityRequirement>();
+            operation.Security.Add(new OpenApiSecurityRequirement()
             {
-                // 添加授权要求：关联步骤 2 中定义的 "SimApiAuth" 安全方案
-                operation.Security = new List<OpenApiSecurityRequirement>
-                {
-                    new OpenApiSecurityRequirement
-                    {
-                        {
-                            new OpenApiSecurityScheme
-                            {
-                                Reference = new OpenApiReference
-                                {
-                                    Type = ReferenceType.SecurityScheme,
-                                    Id = "SimApiAuth" // 必须与 AddSecurityDefinition 的第一个参数一致
-                                }
-                            },
-                            [] // 无需指定作用域（scope）时留空
-                        }
-                    }
-                };
-            }
-            // 未标记 [SimApiAuth] 的接口：不添加安全要求，Swagger 不显示锁图标
+                { new OpenApiSecuritySchemeReference("SimApiAuth", context.Document), [] }
+            });
         }
     }
 }

SwaggerFilters/SimApiResponseOperationFilter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System.Reflection;
 using System.Threading.Tasks;

SwaggerFilters/SimApiSignOperationFilter.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using SimApi.Attributes;
 using SimApi.ModelBinders;
 using Swashbuckle.AspNetCore.SwaggerGen;
@@ -67,20 +67,24 @@ public class SimApiSignOperationFilter(IServiceProvider serviceProvider) : IOper
         signParameters.AddRange(keyProvider.SignFields.Where(x => x != keyProvider.AppIdName)
             .Select(f => (f, string.Empty, true)));
 
+        operation.Parameters ??= new List<IOpenApiParameter>();
+
         foreach (var (name, description, required) in signParameters)
         {
             if (operation.Parameters?.Any(p => p.Name == name) == true)
             {
                 var tmp = operation.Parameters?.FirstOrDefault(p => p.Name == name);
-                if (tmp != null)
+                if (tmp is OpenApiParameter concreteParam)
                 {
-                    tmp.Required = required;
-                    tmp.Description = description;
+                    // 重新赋值只读属性（通过实例化新对象覆盖，或直接修改具体类的可写属性）
+                    concreteParam.Required = required; // OpenApiParameter 的 Required 有 setter
+                    concreteParam.Description = description;
                 }
+
                 continue;
             }
 
-            operation.Parameters ??= new List<OpenApiParameter>();
+            operation.Parameters ??= new List<IOpenApiParameter>();
             operation.Parameters.Add(new OpenApiParameter
             {
                 Name = name,
@@ -89,7 +93,7 @@ public class SimApiSignOperationFilter(IServiceProvider serviceProvider) : IOper
                 Required = required,
                 Schema = new OpenApiSchema
                 {
-                    Type = "string" // 签名相关参数通常为字符串类型
+                    Type = JsonSchemaType.String // 签名相关参数通常为字符串类型
                 }
             });
         }