wei.wu
51c3fc1994
- 新增 MiGu.DB 项目，迁移所有领域实体与枚举，统一模型约定 - 实现 Entity/Repository/UoW/Provider/Exception 等接口与实现 - 支持数据修补机制，完善 Sqlite 初始迁移与数据库管理 - Server 侧移除 EF Core 相关，依赖 MiGu.DB，PlatformPersistence 适配 - 业务服务注入 UoW/Repository，状态字段统一用 enum 及辅助类 - 统一异常处理，Controller 映射 HTTP 状态码 - 配置项与文档补充数据库启动、SchemaMode、迁移说明 - 新增 GlobalUsings.Db.cs、WmsStatusAliases.cs 简化类型引用 - 新增 HttpActorContextMiddleware 支持操作者上下文一致性 - 新增 MiGuDbContextModelSnapshot 追踪数据库结构 - 优化代码结构，解耦领域与持久层，提升扩展性与安全性
225 lines
9.5 KiB
C#
225 lines
9.5 KiB
C#
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Data.Sqlite;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
|
using Microsoft.EntityFrameworkCore.Migrations;
|
|
using Microsoft.EntityFrameworkCore.Storage;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.DependencyInjection.Extensions;
|
|
using Microsoft.Extensions.Hosting;
|
|
using MiGu.DB.Abstractions.Modules;
|
|
using MiGu.DB.Abstractions.Persistence;
|
|
using MiGu.DB.Abstractions.Providers;
|
|
using MiGu.DB.Abstractions.Runtime;
|
|
using MiGu.DB.Kernel.Context;
|
|
using MiGu.DB.Kernel.Conventions;
|
|
using MiGu.DB.Kernel.Providers;
|
|
using MiGu.DB.Kernel.Repositories;
|
|
using MiGu.DB.Domains.Migrators;
|
|
|
|
namespace MiGu.DB.Kernel.Hosting;
|
|
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
public static IServiceCollection AddMiGuDb(
|
|
this IServiceCollection services,
|
|
IConfiguration configuration,
|
|
Action<MiGuDbOptions>? configure = null)
|
|
{
|
|
var options = new MiGuDbOptions
|
|
{
|
|
Provider = configuration["Database:Provider"] ?? "sqlite",
|
|
ConnectionString = configuration.GetConnectionString("Platform")
|
|
?? configuration.GetConnectionString(ConnectionKey(configuration["Database:Provider"] ?? "sqlite"))
|
|
?? "",
|
|
SchemaMode = ParseSchemaMode(configuration["Database:SchemaMode"]),
|
|
ApplyDataMigratorsOnStartup = configuration.GetValue("Database:ApplyDataMigratorsOnStartup", true)
|
|
};
|
|
configure?.Invoke(options);
|
|
services.AddSingleton(options);
|
|
|
|
services.TryAddSingleton<IActorContextAccessor, ActorContextAccessor>();
|
|
services.TryAddScoped<IActorContext>(sp => sp.GetRequiredService<IActorContextAccessor>().Current);
|
|
services.AddSingleton<AuditSaveChangesInterceptor>();
|
|
|
|
services.TryAddEnumerable(ServiceDescriptor.Singleton<IDbProviderSetup, SqliteProviderSetup>());
|
|
services.TryAddEnumerable(ServiceDescriptor.Singleton<IDbProviderSetup, MySqlProviderSetup>());
|
|
services.TryAddEnumerable(ServiceDescriptor.Singleton<IDbProviderSetup, NpgsqlProviderSetup>());
|
|
services.TryAddEnumerable(ServiceDescriptor.Singleton<IDbProviderSetup, SqlServerProviderSetup>());
|
|
|
|
services.AddDbContext<MiGuDbContext>((sp, builder) =>
|
|
{
|
|
var opt = sp.GetRequiredService<MiGuDbOptions>();
|
|
if (string.IsNullOrWhiteSpace(opt.ContentRootPath))
|
|
{
|
|
var env = sp.GetService<IHostEnvironment>();
|
|
opt.ContentRootPath = env?.ContentRootPath ?? AppContext.BaseDirectory;
|
|
}
|
|
|
|
var providerName = NormalizeProviderName(opt.Provider);
|
|
var setup = sp.GetServices<IDbProviderSetup>()
|
|
.FirstOrDefault(p => string.Equals(p.Name, providerName, StringComparison.OrdinalIgnoreCase))
|
|
?? throw new InvalidOperationException($"未知数据库 Provider: {opt.Provider}");
|
|
|
|
setup.Configure(builder, ResolveConnectionString(opt, providerName));
|
|
builder.AddInterceptors(sp.GetRequiredService<AuditSaveChangesInterceptor>());
|
|
});
|
|
|
|
services.AddScoped<IUnitOfWork, UnitOfWork>();
|
|
services.AddScoped(typeof(IRepository<,>), typeof(Repository<,>));
|
|
services.AddScoped(typeof(IEditableRepository<>), typeof(EditableRepository<>));
|
|
services.AddScoped(typeof(IHistoryRepository<>), typeof(HistoryRepository<>));
|
|
|
|
services.AddMiGuDataMigrators();
|
|
return services;
|
|
}
|
|
|
|
public static IServiceCollection AddMiGuEntityModule<TModule>(this IServiceCollection services)
|
|
where TModule : class, IEntityModule, new()
|
|
{
|
|
services.TryAddEnumerable(ServiceDescriptor.Singleton<IEntityModule, TModule>());
|
|
new TModule().RegisterServices(services);
|
|
return services;
|
|
}
|
|
|
|
private static string NormalizeProviderName(string provider) => provider.Trim().ToLowerInvariant() switch
|
|
{
|
|
"postgres" or "postgresql" => "npgsql",
|
|
"mssql" => "sqlserver",
|
|
var x => x
|
|
};
|
|
|
|
private static MiGuSchemaMode ParseSchemaMode(string? value)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(value)) return MiGuSchemaMode.Migrate;
|
|
if (Enum.TryParse<MiGuSchemaMode>(value.Trim(), ignoreCase: true, out var mode))
|
|
return mode;
|
|
// 兼容简写
|
|
return value.Trim().ToLowerInvariant() switch
|
|
{
|
|
"ensure" or "created" or "ensure-created" => MiGuSchemaMode.EnsureCreated,
|
|
"migrations" or "ef" => MiGuSchemaMode.Migrate,
|
|
_ => throw new InvalidOperationException(
|
|
$"未知 Database:SchemaMode '{value}'，允许值：Migrate、EnsureCreated")
|
|
};
|
|
}
|
|
|
|
private static string ConnectionKey(string provider) => NormalizeProviderName(provider) switch
|
|
{
|
|
"npgsql" => "PostgreSQL",
|
|
"sqlserver" => "SqlServer",
|
|
"mysql" => "MySql",
|
|
_ => "Sqlite"
|
|
};
|
|
|
|
private static string ResolveConnectionString(MiGuDbOptions options, string providerName)
|
|
{
|
|
if (!string.IsNullOrWhiteSpace(options.ConnectionString))
|
|
{
|
|
return providerName == "sqlite"
|
|
? NormalizeSqliteConnection(options.ConnectionString, options.ContentRootPath)
|
|
: options.ConnectionString;
|
|
}
|
|
|
|
var dataDir = Path.Combine(options.ContentRootPath, "data");
|
|
Directory.CreateDirectory(dataDir);
|
|
return $"Data Source={Path.Combine(dataDir, "platform.db")}";
|
|
}
|
|
|
|
private static string NormalizeSqliteConnection(string connection, string contentRoot)
|
|
{
|
|
var builder = new SqliteConnectionStringBuilder(connection);
|
|
if (string.IsNullOrWhiteSpace(builder.DataSource) || builder.DataSource is ":memory:")
|
|
return connection;
|
|
if (!Path.IsPathRooted(builder.DataSource))
|
|
builder.DataSource = Path.Combine(contentRoot, builder.DataSource);
|
|
var dir = Path.GetDirectoryName(builder.DataSource);
|
|
if (!string.IsNullOrWhiteSpace(dir)) Directory.CreateDirectory(dir);
|
|
return builder.ToString();
|
|
}
|
|
}
|
|
|
|
public static class DatabaseInitializer
|
|
{
|
|
/// <summary>
|
|
/// 启动期数据库初始化：按 SchemaMode 建库/迁移，再可选执行 DataMigrator。
|
|
/// </summary>
|
|
public static async Task MigrateMiGuDbAsync(this IServiceProvider services, CancellationToken ct = default)
|
|
{
|
|
using var scope = services.CreateScope();
|
|
var db = scope.ServiceProvider.GetRequiredService<MiGuDbContext>();
|
|
var options = scope.ServiceProvider.GetRequiredService<MiGuDbOptions>();
|
|
var logger = scope.ServiceProvider.GetService<ILoggerFactory>()?.CreateLogger("MiGu.DB.DatabaseInitializer");
|
|
|
|
if (options.SchemaMode == MiGuSchemaMode.EnsureCreated)
|
|
{
|
|
logger?.LogWarning(
|
|
"Database:SchemaMode=EnsureCreated：仅按当前模型建库，不应用 Migrations。" +
|
|
"改实体后若结构未更新，请删除平台库文件后重启。发版请改用 Migrate。");
|
|
await db.Database.EnsureCreatedAsync(ct);
|
|
}
|
|
else
|
|
{
|
|
var applied = (await db.Database.GetAppliedMigrationsAsync(ct)).ToList();
|
|
var pending = (await db.Database.GetPendingMigrationsAsync(ct)).ToList();
|
|
|
|
if (applied.Count == 0 && pending.Count == 0)
|
|
{
|
|
logger?.LogWarning("程序集内无 Migration，回退 EnsureCreated。");
|
|
await db.Database.EnsureCreatedAsync(ct);
|
|
}
|
|
else
|
|
{
|
|
// 旧库（EnsureCreated）无历史表行时写入基线，再 Migrate
|
|
await BaselineExistingDatabaseAsync(db, logger, ct);
|
|
await db.Database.MigrateAsync(ct);
|
|
}
|
|
}
|
|
|
|
if (!options.ApplyDataMigratorsOnStartup) return;
|
|
|
|
foreach (var migrator in scope.ServiceProvider.GetServices<IDataMigrator>().OrderBy(m => m.Order))
|
|
await migrator.MigrateAsync(db, ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 已有表结构但无 __EFMigrationsHistory 时：将<strong>全部</strong> pending Migration 记为已应用。
|
|
/// 前提：库由 EnsureCreated 按「当前模型 tip」建成，与最新 Snapshot 一致；否则应删库后走 Migrate，或手工对齐。
|
|
/// </summary>
|
|
private static async Task BaselineExistingDatabaseAsync(
|
|
MiGuDbContext db, ILogger? logger, CancellationToken ct)
|
|
{
|
|
var applied = await db.Database.GetAppliedMigrationsAsync(ct);
|
|
if (applied.Any()) return;
|
|
|
|
var pending = (await db.Database.GetPendingMigrationsAsync(ct)).ToList();
|
|
if (pending.Count == 0) return;
|
|
|
|
var creator = db.GetService<IRelationalDatabaseCreator>();
|
|
if (!await creator.ExistsAsync(ct) || !await creator.HasTablesAsync(ct))
|
|
return;
|
|
|
|
var history = db.GetService<IHistoryRepository>();
|
|
var productVersion = ProductInfo.GetEFCoreVersion();
|
|
logger?.LogWarning(
|
|
"检测到已有表且无迁移历史，将 {Count} 个 pending Migration 全部写入基线（假定库结构已对齐模型 tip）：{Ids}",
|
|
pending.Count, string.Join(", ", pending));
|
|
|
|
foreach (var migrationId in pending)
|
|
{
|
|
var sql = history.GetInsertScript(new HistoryRow(migrationId, productVersion));
|
|
await db.Database.ExecuteSqlRawAsync(sql, ct);
|
|
}
|
|
}
|
|
}
|
|
|
|
internal static class ProductInfo
|
|
{
|
|
public static string GetEFCoreVersion()
|
|
{
|
|
var asm = typeof(DbContext).Assembly.GetName().Version;
|
|
return asm?.ToString(3) ?? "8.0.10";
|
|
}
|
|
}
|