diff --git a/template/Directory.Build.targets b/template/Directory.Build.targets index fbc111f..52860dd 100644 --- a/template/Directory.Build.targets +++ b/template/Directory.Build.targets @@ -1,6 +1,6 @@ - 2.0.0 + 2.1.0 9.0.0 9.0.0 9.0.0 diff --git a/template/src/ABC.Template.Web/Extensions/SwaggerGenOptionsExtionsions.cs b/template/src/ABC.Template.Web/Extensions/SwaggerGenOptionsExtionsions.cs index beed5c5..8059bda 100644 --- a/template/src/ABC.Template.Web/Extensions/SwaggerGenOptionsExtionsions.cs +++ b/template/src/ABC.Template.Web/Extensions/SwaggerGenOptionsExtionsions.cs @@ -9,16 +9,20 @@ public static class SwaggerGenOptionsExtionsions { public static SwaggerGenOptions AddEntityIdSchemaMap(this SwaggerGenOptions swaggerGenOptions) { - // 加载domain程序集 - Assembly domainAssembly = Assembly.Load("ABC.Template.Domain"); - foreach (var type in domainAssembly.GetTypes()) + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies() + .Where(p => p.FullName != null && p.FullName.Contains("ABC.Template"))) { - if (type.IsClass && Array.Exists(type.GetInterfaces(), p => p == typeof(IEntityId))) + foreach (var type in assembly.GetTypes()) { - swaggerGenOptions.MapType(type, () => new OpenApiSchema { Type = typeof(string).Name.ToLower() }); + if (type.IsClass && Array.Exists(type.GetInterfaces(), p => p == typeof(IEntityId))) + { + swaggerGenOptions.MapType(type, + () => new OpenApiSchema { Type = typeof(string).Name.ToLower() }); + } } } + return swaggerGenOptions; } } -} +} \ No newline at end of file