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

This commit is contained in:
2025-12-23 08:18:11 +08:00
parent d50d32f032
commit 81e166ad45
2 changed files with 51 additions and 23 deletions
+4 -9
View File
@@ -13,13 +13,13 @@ namespace SimApi.Attributes;
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
public class SimApiAuthAttribute : ActionFilterAttribute public class SimApiAuthAttribute : ActionFilterAttribute
{ {
private string[] Types { get; } private string[]? Types { get; }
//默认是user登录类型 //默认是user登录类型
public SimApiAuthAttribute() public SimApiAuthAttribute()
{ {
Types = new[] { "user" }; Types = null;
} }
//只检测一种用户类型的快捷方式 //只检测一种用户类型的快捷方式
@@ -34,13 +34,6 @@ public class SimApiAuthAttribute : ActionFilterAttribute
Types = types; Types = types;
} }
//只检测一种用户类型的快捷方式
public SimApiAuthAttribute(string type, string url)
{
Types = new[] { type };
new HttpPostAttribute(url);
}
public override void OnActionExecuting(ActionExecutingContext context) public override void OnActionExecuting(ActionExecutingContext context)
{ {
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!; var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
@@ -49,6 +42,8 @@ public class SimApiAuthAttribute : ActionFilterAttribute
{ {
throw new SimApiException(401); throw new SimApiException(401);
} }
if (Types == null) return;
//检测用户类型 //检测用户类型
if (!Types.Intersect(loginInfo.Type).Any()) if (!Types.Intersect(loginInfo.Type).Any())
{ {
+47 -14
View File
@@ -126,14 +126,38 @@ public static class SimApiExtensions
x.CustomSchemaIds(type => x.CustomSchemaIds(type =>
{ {
string GetSimpleTypeName(Type t) // 递归解析类型名称(处理嵌套泛型/数组/可空 + 保证唯一性)
string GetSimpleTypeName(Type t, int depth = 0)
{ {
// 防止无限递归
if (depth > 5) return t.Name.Split('`')[0];
// 处理数组类型
if (t.IsArray) if (t.IsArray)
{ {
var elementType = t.GetElementType(); var elementType = t.GetElementType();
return $"{GetSimpleTypeName(elementType)}[]"; 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)) if (t.IsPrimitive || t == typeof(string) || t == typeof(DateTime) || t == typeof(Guid))
{ {
return t.Name switch return t.Name switch
@@ -142,23 +166,32 @@ public static class SimApiExtensions
"Int32" => "int", "Int32" => "int",
"Int64" => "long", "Int64" => "long",
"Boolean" => "boolean", "Boolean" => "boolean",
"DateTime" => "DateTime", "DateTime" => "datetime",
"Guid" => "Guid", "Guid" => "guid",
_ => t.Name _ => t.Name.ToLower()
}; };
} }
return t.Name; // 核心修复:生成唯一名称(处理嵌套类/同名不同类)
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;
} }
if (!type.IsGenericType) return GetSimpleTypeName(type); // 根调用:解析当前类型
var baseName = type.GetGenericTypeDefinition().Name.Split('`')[0]; var uniqueSchemaId = GetSimpleTypeName(type);
var genericArgs = type.GetGenericArguments() // 可选:移除特殊字符(如 $、+),避免 Swagger 解析问题
.Select(GetSimpleTypeName) return uniqueSchemaId.Replace("$", "").Replace("+", "_");
.ToArray();
return genericArgs.Length > 0
? $"{baseName}<{string.Join(",", genericArgs)}>"
: baseName;
}); });
x.OperationFilter<SimApiResponseOperationFilter>(); x.OperationFilter<SimApiResponseOperationFilter>();
x.OperationFilter<SimApiSignOperationFilter>(); x.OperationFilter<SimApiSignOperationFilter>();