feat(efcore): 调整IServiceCollection.AddOsharpDbContext<TDbContext>()的执行位置 #225

Author: gmf520

src/OSharp.EntityFrameworkCore/EntityFrameworkCorePackBase.cs

@@ -53,7 +53,6 @@ public abstract class EntityFrameworkCorePackBase : OsharpPack
         /// <returns></returns>
         public override IServiceCollection AddServices(IServiceCollection services)
         {
-            services.AddOsharpDbContext<DefaultDbContext>();
             services.TryAddScoped<IAuditEntityProvider, AuditEntityProvider>();
             services.TryAddScoped(typeof(IRepository<,>), typeof(Repository<,>));
             services.TryAddScoped<IUnitOfWork, UnitOfWork>();

src/OSharp.EntityFrameworkCore/MigrationPackBase.cs

@@ -39,6 +39,17 @@ public abstract class MigrationPackBase<TDbContext> : OsharpPack
         /// </summary>
         protected abstract DatabaseType DatabaseType { get; }
 
+        /// <summary>
+        /// 将模块服务添加到依赖注入服务容器中
+        /// </summary>
+        /// <param name="services">依赖注入服务容器</param>
+        /// <returns></returns>
+        public override IServiceCollection AddServices(IServiceCollection services)
+        {
+            services.AddOsharpDbContext<TDbContext>();
+            return services;
+        }
+
         /// <summary>
         /// 应用模块服务
         /// </summary>

src/OSharp.EntityFrameworkCore/ServiceExtensions.cs

@@ -39,7 +39,7 @@ public static class ServiceExtensions
         /// <param name="services">依赖注入服务集合</param>
         /// <param name="optionsAction">数据库选项创建配置，将在内置配置后运行</param>
         /// <returns>依赖注入服务集合</returns>
-        public static IServiceCollection AddOsharpDbContext<TDbContext>(this IServiceCollection services, Action<IServiceProvider, DbContextOptionsBuilder> optionsAction = null) where TDbContext : DbContextBase
+        public static IServiceCollection AddOsharpDbContext<TDbContext>(this IServiceCollection services, Action<IServiceProvider, DbContextOptionsBuilder> optionsAction = null) where TDbContext : DbContext
         {
             services = services.AddDbContext<TDbContext>((provider, builder) =>
             {