perf: 优化动态api启动

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs

@@ -9,18 +9,20 @@ using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Options;
 
 namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
 {
     public static class SwaggerAddExtensions
     {
-        public static IServiceCollection AddYiSwaggerGen<Program>(this IServiceCollection services, Action<SwaggerGenOptions>? action=null)
+        public static IServiceCollection AddYiSwaggerGen<Program>(this IServiceCollection services,
+            Action<SwaggerGenOptions>? action = null)
         {
+            var mvcOptions = services.GetPreConfigureActions<AbpAspNetCoreMvcOptions>().Configure();
             
-            var serviceProvider = services.BuildServiceProvider();
-            var mvcOptions = serviceProvider.GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>();
-
-            var mvcSettings = mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings.DistinctBy(x => x.RemoteServiceName);
+            var mvcSettings =
+                mvcOptions.ConventionalControllers.ConventionalControllerSettings.DistinctBy(x => x.RemoteServiceName);
 
 
             services.AddAbpSwaggerGen(
@@ -36,7 +38,8 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
                     {
                         if (!options.SwaggerGeneratorOptions.SwaggerDocs.ContainsKey(setting.RemoteServiceName))
                         {
-                        options.SwaggerDoc(setting.RemoteServiceName, new OpenApiInfo { Title = setting.RemoteServiceName, Version = "v1" });
+                            options.SwaggerDoc(setting.RemoteServiceName,
+                                new OpenApiInfo { Title = setting.RemoteServiceName, Version = "v1" });
                         }
                     }
 
@@ -45,12 +48,15 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
                     {
                         if (apiDesc.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor)
                         {
-                        var settingOrNull = mvcSettings.Where(x => x.Assembly == controllerActionDescriptor.ControllerTypeInfo.Assembly).FirstOrDefault();
+                            var settingOrNull = mvcSettings
+                                .Where(x => x.Assembly == controllerActionDescriptor.ControllerTypeInfo.Assembly)
+                                .FirstOrDefault();
                             if (settingOrNull is not null)
                             {
                                 return docName == settingOrNull.RemoteServiceName;
                             }
                         }
+
                         return false;
                     });
 
@@ -87,7 +93,6 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
             );
 
 
-
             return services;
         }
     }
@@ -103,7 +108,6 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
         /// </summary>
         /// <param name="model"></param>
         /// <param name="context"></param>
-
         public void Apply(OpenApiSchema model, SchemaFilterContext context)
         {
             if (context.Type.IsEnum)
@@ -121,9 +125,10 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
                         Enum e = (Enum)Enum.Parse(context.Type, name);
                         var descrptionOrNull = GetEnumDescription(e);
                         model.Enum.Add(new OpenApiString(name));
-                        stringBuilder.Append($"【枚举：{name}{(descrptionOrNull is null ? string.Empty : $"({descrptionOrNull})")}={Convert.ToInt64(Enum.Parse(context.Type, name))}】<br />");
+                        stringBuilder.Append(
+                            $"【枚举：{name}{(descrptionOrNull is null ? string.Empty : $"({descrptionOrNull})")}={Convert.ToInt64(Enum.Parse(context.Type, name))}】<br />");
                     });
-                model.Description= stringBuilder.ToString();
+                model.Description = stringBuilder.ToString();
             }
         }
 
@@ -133,13 +138,13 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
             var attributes = (DescriptionAttribute[])fieldInfo.GetCustomAttributes(typeof(DescriptionAttribute), false);
             return attributes.Length > 0 ? attributes[0].Description : null;
         }
-
     }
 
 
     public class AddRequiredHeaderParameter : IOperationFilter
     {
         public static string HeaderKey { get; set; } = "__tenant";
+
         public void Apply(OpenApiOperation operation, OperationFilterContext context)
         {
             if (operation.Parameters == null)
@@ -150,7 +155,7 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection
                 In = ParameterLocation.Header,
                 Required = false,
                 AllowEmptyValue = true,
-                Description="租户id或者租户名称（可空为默认租户）"
+                Description = "租户id或者租户名称（可空为默认租户）"
             });
         }
     }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs

@@ -355,13 +355,13 @@ namespace Yi.Framework.Rbac.Application.Services
             {
                 //将后端菜单转换成前端路由，组件级别需要过滤
                 output =
-                    ObjectMapper.Map<List<MenuDto>, List<MenuAggregateRoot>>(menus).Vue3RuoYiRouterBuild();
+                    ObjectMapper.Map<List<MenuDto>, List<MenuAggregateRoot>>(menus.Where(x=>x.MenuSource==MenuSourceEnum.Ruoyi).ToList()).Vue3RuoYiRouterBuild();
             }
             else if (routerType == "pure")
             {
                 //将后端菜单转换成前端路由，组件级别需要过滤
                 output =
-                    ObjectMapper.Map<List<MenuDto>, List<MenuAggregateRoot>>(menus).Vue3PureRouterBuild();
+                    ObjectMapper.Map<List<MenuDto>, List<MenuAggregateRoot>>(menus.Where(x=>x.MenuSource==MenuSourceEnum.Pure).ToList()).Vue3PureRouterBuild();
             }
 
             return output;

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Dtos/UserRoleMenuDto.cs

@@ -9,8 +9,8 @@ namespace Yi.Framework.Rbac.Domain.Shared.Dtos
         public HashSet<RoleDto> Roles { get; set; } = new();
         public HashSet<MenuDto> Menus { get; set; } = new();
 
-        public List<string> RoleCodes { get; set; } = new();
-        public List<string> PermissionCodes { get; set; } = new();
+        public HashSet<string> RoleCodes { get; set; } = new();
+        public HashSet<string> PermissionCodes { get; set; } = new();
     }
 
     public class UserDto

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs

@@ -217,8 +217,8 @@ namespace Yi.Framework.Rbac.Domain.Managers
             }
             else
             {
-                dto.PermissionCodes?.ForEach(per => AddToClaim(claims, TokenTypeConst.Permission, per));
-                dto.RoleCodes?.ForEach(role => AddToClaim(claims, AbpClaimTypes.Role, role));
+                dto.PermissionCodes?.ToList()?.ForEach(per => AddToClaim(claims, TokenTypeConst.Permission, per));
+                dto.RoleCodes?.ToList()?.ForEach(role => AddToClaim(claims, AbpClaimTypes.Role, role));
             }
 
             return claims;

Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs

@@ -66,6 +66,30 @@ namespace Yi.Abp.Web
     {
         private const string DefaultCorsPolicyName = "Default";
 
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            //动态Api-改进在pre中配置，启动更快
+            PreConfigure<AbpAspNetCoreMvcOptions>(options =>
+            {
+                options.ConventionalControllers.Create(typeof(YiAbpApplicationModule).Assembly,
+                    options => options.RemoteServiceName = "default");
+                options.ConventionalControllers.Create(typeof(YiFrameworkRbacApplicationModule).Assembly,
+                    options => options.RemoteServiceName = "rbac");
+                options.ConventionalControllers.Create(typeof(YiFrameworkBbsApplicationModule).Assembly,
+                    options => options.RemoteServiceName = "bbs");
+                options.ConventionalControllers.Create(typeof(YiFrameworkChatHubApplicationModule).Assembly,
+                    options => options.RemoteServiceName = "chat-hub");
+                options.ConventionalControllers.Create(
+                    typeof(YiFrameworkTenantManagementApplicationModule).Assembly,
+                    options => options.RemoteServiceName = "tenant-management");
+                options.ConventionalControllers.Create(typeof(YiFrameworkCodeGenApplicationModule).Assembly,
+                    options => options.RemoteServiceName = "code-gen");
+
+                //统一前缀
+                options.ConventionalControllers.ConventionalControllerSettings.ForEach(x => x.RootPath = "api/app");
+            });
+        }
+
         public override Task ConfigureServicesAsync(ServiceConfigurationContext context)
         {
             var configuration = context.Services.GetConfiguration();
@@ -92,27 +116,6 @@ namespace Yi.Abp.Web
             //配置错误处理显示详情
             Configure<AbpExceptionHandlingOptions>(options => { options.SendExceptionsDetailsToClients = true; });
             
-            //动态Api
-            Configure<AbpAspNetCoreMvcOptions>(options =>
-            {
-                options.ConventionalControllers.Create(typeof(YiAbpApplicationModule).Assembly,
-                    options => options.RemoteServiceName = "default");
-                options.ConventionalControllers.Create(typeof(YiFrameworkRbacApplicationModule).Assembly,
-                    options => options.RemoteServiceName = "rbac");
-                options.ConventionalControllers.Create(typeof(YiFrameworkBbsApplicationModule).Assembly,
-                    options => options.RemoteServiceName = "bbs");
-                options.ConventionalControllers.Create(typeof(YiFrameworkChatHubApplicationModule).Assembly,
-                    options => options.RemoteServiceName = "chat-hub");
-                options.ConventionalControllers.Create(
-                    typeof(YiFrameworkTenantManagementApplicationModule).Assembly,
-                    options => options.RemoteServiceName = "tenant-management");
-                options.ConventionalControllers.Create(typeof(YiFrameworkCodeGenApplicationModule).Assembly,
-                    options => options.RemoteServiceName = "code-gen");
-
-                //统一前缀
-                options.ConventionalControllers.ConventionalControllerSettings.ForEach(x => x.RootPath = "api/app");
-            });
-
             //【NewtonsoftJson严重问题！！！！！逆天】设置api格式，留给后人铭记
             // service.AddControllers().AddNewtonsoftJson(options =>
             // {