From c49796586be0cdc7ac80155ca95cc3d09174d56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Thu, 22 May 2025 23:59:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=95=92=20perf(=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96):=20=E4=B8=BA=E8=A1=A8=E7=BB=93=E6=9E=84=E3=80=81?= =?UTF-8?q?=E7=A7=8D=E5=AD=90=E6=95=B0=E6=8D=AE=E5=92=8C=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=80=97?= =?UTF-8?q?=E6=97=B6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Core/SqlSugar/SqlSugarSetup.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs index 24d44bf9..d40accf2 100644 --- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs +++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs @@ -380,6 +380,7 @@ public static class SqlSugarSetup // 初始化表结构 if (config.TableSettings.EnableInitTable || isFirstRun) { + var totalWatch = Stopwatch.StartNew(); // 开始总计时 Log.Information($"初始化表结构 {config.DbType} - {config.ConfigId}"); var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false)) .Where(u => !u.GetCustomAttributes().Any()) @@ -405,6 +406,10 @@ public static class SqlSugarSetup Console.WriteLine($"初始化表 {entityType,-64} ({config.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}) 耗时：{stopWatch.ElapsedMilliseconds} ms"); })); Task.WaitAll(taskList.ToArray()); + + totalWatch.Stop(); // 停止总计时 + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化表结构 {config.DbType} - {config.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds} ms"); } // 初始化视图 @@ -512,6 +517,7 @@ public static class SqlSugarSetup /// private static void InitSeedData(SqlSugarScopeProvider dbProvider, bool enableIncreSeed) { + var totalWatch = Stopwatch.StartNew(); // 开始总计时 Log.Information($"初始化种子数据 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId}"); var seedDataTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>)))) .Where(u => !u.IsDefined(typeof(TenantSeedAttribute), false)) @@ -533,6 +539,10 @@ public static class SqlSugarSetup Console.ForegroundColor = ConsoleColor.Green; Console.WriteLine($"初始化种子数据 {seedType.FullName,-58} ({dbProvider.CurrentConnectionConfig.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}，数据量：{tuple.Value.Item1:D003}，新增 {tuple.Value.Item2:D003} 条记录，更新 {tuple.Value.Item3:D003} 条记录，耗时：{stopWatch.ElapsedMilliseconds:N0} ms)"); } + + totalWatch.Stop(); // 停止总计时 + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化种子数据 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds:N0} ms"); } /// @@ -541,6 +551,7 @@ public static class SqlSugarSetup /// private static void InitView(SqlSugarScopeProvider dbProvider) { + var totalWatch = Stopwatch.StartNew(); // 开始总计时 Log.Information($"初始化视图 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId}"); var viewTypeList = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarView)))).ToList(); @@ -570,6 +581,10 @@ public static class SqlSugarSetup Console.WriteLine($"初始化视图 {viewType.FullName,-58} ({dbProvider.CurrentConnectionConfig.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}，耗时：{stopWatch.ElapsedMilliseconds:N0} ms)"); })); Task.WaitAll(taskList.ToArray()); + + totalWatch.Stop(); // 停止总计时 + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化视图 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds:N0} ms"); } /// From a3b11ae089be6f11f926bc1e5acfee24fceda526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Sat, 24 May 2025 13:59:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=98=8Eperf(=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96):=20=E4=BC=98=E5=8C=96=E9=A6=96=E6=AC=A1=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Core/SqlSugar/SqlSugarSetup.cs | 1397 +++++++++-------- 1 file changed, 702 insertions(+), 695 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs index d40accf2..2ed67845 100644 --- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs +++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs @@ -1,696 +1,703 @@ -// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 -// -// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 -// -// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ - -namespace Admin.NET.Core; - -public static class SqlSugarSetup -{ - // 多租户实例 - public static ITenant ITenant { get; set; } - - /// - /// SqlSugar 上下文初始化 - /// - /// - public static void AddSqlSugar(this IServiceCollection services) - { - // 注册雪花Id - var snowIdOpt = App.GetConfig("SnowId", true); - services.AddYitIdHelper(snowIdOpt); - - // 自定义雪花Id算法 - StaticConfig.CustomSnowFlakeFunc = YitIdHelper.NextId; - // 配置字符串表达式 - StaticConfig.DynamicExpressionParserType = typeof(DynamicExpressionParser); - StaticConfig.DynamicExpressionParsingConfig = new ParsingConfig - { - CustomTypeProvider = new SqlSugarTypeProvider() - }; - - // 初始化所有库连接 - var dbOptions = App.GetConfig("DbConnection", true); - dbOptions.ConnectionConfigs.ForEach(SetDbConfig); - - // 初始化SqlSugar - SqlSugarScope sqlSugar = new(dbOptions.ConnectionConfigs.Adapt>(), db => - { - dbOptions.ConnectionConfigs.ForEach(config => - { - var dbProvider = db.GetConnectionScope(config.ConfigId); - SetDbAop(dbProvider, dbOptions.EnableConsoleSql); - SetDbDiffLog(dbProvider, config); - }); - }); - ITenant = sqlSugar; - - services.AddSingleton(sqlSugar); // 单例注册 - services.AddScoped(typeof(SqlSugarRepository<>)); // 仓储注册 - services.AddUnitOfWork(); // 事务与工作单元注册 - - // 初始化数据库表结构及种子数据 - dbOptions.ConnectionConfigs.ForEach(config => - { - InitDatabase(sqlSugar, config); - }); - } - - /// - /// 配置连接属性 - /// - /// - public static void SetDbConfig(DbConnectionConfig config) - { - // 解密数据库连接串 - if (config.DbSettings.EnableConnEncrypt) - config.ConnectionString = CryptogramUtil.Decrypt(config.ConnectionString); - - // SqlFunc 扩展函数 - var sqlFuncServices = new List - { - // 密码解密 - new SqlFuncExternal() - { - UniqueMethodName = "SqlFuncDecrypt", - MethodValue = (expInfo, dbType, expContext) => - { - return CryptogramUtil.Decrypt(expInfo.Args[0].MemberName.ToString()); - } - } - }; - - var configureExternalServices = new ConfigureExternalServices - { - EntityNameService = (type, entity) => // 处理表 - { - entity.IsDisabledDelete = true; // 禁止删除非 sqlsugar 创建的列 - // 只处理贴了特性[SugarTable]表 - if (!type.GetCustomAttributes().Any()) - return; - if (config.DbSettings.EnableUnderLine && !entity.DbTableName.Contains('_')) - entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName); // 驼峰转下划线 - }, - EntityService = (type, column) => // 处理列 - { - // 只处理贴了特性[SugarColumn]列 - if (!type.GetCustomAttributes().Any()) - return; - if (new NullabilityInfoContext().Create(type).WriteState is NullabilityState.Nullable) - column.IsNullable = true; - if (config.DbSettings.EnableUnderLine && !column.IsIgnore && !column.DbColumnName.Contains('_')) - column.DbColumnName = UtilMethods.ToUnderLine(column.DbColumnName); // 驼峰转下划线 - }, - DataInfoCacheService = new SqlSugarCache(), - SqlFuncServices = sqlFuncServices - }; - config.ConfigureExternalServices = configureExternalServices; - config.InitKeyType = InitKeyType.Attribute; - config.IsAutoCloseConnection = true; - config.MoreSettings = new ConnMoreSettings - { - IsAutoRemoveDataCache = true, // 启用自动删除缓存，所有增删改会自动调用.RemoveDataCache() - IsAutoDeleteQueryFilter = true, // 启用删除查询过滤器 - IsAutoUpdateQueryFilter = true, // 启用更新查询过滤器 - SqlServerCodeFirstNvarchar = true // 采用Nvarchar - }; - - // 若库类型是人大金仓则默认设置PG模式 - if (config.DbType == SqlSugar.DbType.Kdbndp) - config.MoreSettings.DatabaseModel = SqlSugar.DbType.PostgreSQL; // 配置PG模式主要是兼容系统表差异 - - // 若库类型是Oracle则默认主键名字和参数名字最大长度 - if (config.DbType == SqlSugar.DbType.Oracle) - config.MoreSettings.MaxParameterNameLength = 30; - } - - /// - /// SqlFunc 扩展函数定义（密码解密） - /// - /// - /// - /// - /// - public static string SqlFuncDecrypt(T password) - { - throw new NotSupportedException("Can only be used in expressions"); - } - - /// - /// 配置Aop - /// - /// - /// - public static void SetDbAop(SqlSugarScopeProvider dbProvider, bool enableConsoleSql) - { - // 设置超时时间 - dbProvider.Ado.CommandTimeOut = 30; - - // 打印SQL语句 - dbProvider.Aop.OnError = ex => - { - if (ex.Parametres == null) return; - var log = $"【{DateTime.Now}——错误SQL】\r\n{UtilMethods.GetNativeSql(ex.Sql, (SugarParameter[])ex.Parametres)}\r\n"; - Log.Error(log, ex); - App.PrintToMiniProfiler("SqlSugar", "Error", log); - }; - if (enableConsoleSql) - { - dbProvider.Aop.OnLogExecuting = (sql, pars) => - { - //// 若参数值超过100个字符则进行截取 - //foreach (var par in pars) - //{ - // if (par.DbType != System.Data.DbType.String || par.Value == null) continue; - // if (par.Value.ToString().Length > 100) - // par.Value = string.Concat(par.Value.ToString()[..100], "......"); - //} - - var log = $"【{DateTime.Now}——执行SQL】\r\n{UtilMethods.GetNativeSql(sql, pars)}\r\n"; - var originColor = Console.ForegroundColor; - if (sql.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase)) - Console.ForegroundColor = ConsoleColor.Green; - if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase)) - Console.ForegroundColor = ConsoleColor.Yellow; - if (sql.StartsWith("DELETE", StringComparison.OrdinalIgnoreCase)) - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine(log); - Console.ForegroundColor = originColor; - App.PrintToMiniProfiler("SqlSugar", "Info", log); - }; - } - dbProvider.Aop.OnLogExecuted = (sql, pars) => - { - //// 若参数值超过100个字符则进行截取 - //foreach (var par in pars) - //{ - // if (par.DbType != System.Data.DbType.String || par.Value == null) continue; - // if (par.Value.ToString().Length > 100) - // par.Value = string.Concat(par.Value.ToString()[..100], "......"); - //} - - // 执行时间超过5秒时 - if (dbProvider.Ado.SqlExecutionTime.TotalSeconds <= 5) return; - - var fileName = dbProvider.Ado.SqlStackTrace.FirstFileName; // 文件名 - var fileLine = dbProvider.Ado.SqlStackTrace.FirstLine; // 行号 - var firstMethodName = dbProvider.Ado.SqlStackTrace.FirstMethodName; // 方法名 - var log = $"【{DateTime.Now}——超时SQL】\r\n【所在文件名】：{fileName}\r\n【代码行数】：{fileLine}\r\n【方法名】：{firstMethodName}\r\n" + $"【SQL语句】：{UtilMethods.GetNativeSql(sql, pars)}"; - Log.Warning(log); - App.PrintToMiniProfiler("SqlSugar", "Slow", log); - }; - - // 数据审计 - dbProvider.Aop.DataExecuting = (oldValue, entityInfo) => - { - // 新增/插入 操作 - if (entityInfo.OperationType == DataFilterType.InsertByObject) - { - // 若是主键且非自增类型 - if (entityInfo.EntityColumnInfo.IsPrimarykey && !entityInfo.EntityColumnInfo.IsIdentity) - { - // 雪花Id类型（长整型且空则赋值） - if (entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(long)) - { - var id = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue); - if (id == null || (long)id == 0) - entityInfo.SetValue(YitIdHelper.NextId()); - } - // Guid类型（空则赋值） - else if (entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(Guid)) - { - var id = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue); - if (id == null) - entityInfo.SetValue(Guid.NewGuid()); - } - } - // 若创建时间为空则赋值当前时间 - else if (entityInfo.PropertyName == nameof(EntityBase.CreateTime)) - { - var createTime = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue)!; - if (createTime == null || createTime.Equals(DateTime.MinValue)) - entityInfo.SetValue(DateTime.Now); - } - // 若当前用户非空（web线程时） - if (App.User == null) return; - - dynamic entityValue = entityInfo.EntityValue; - if (entityInfo.PropertyName == nameof(EntityTenantId.TenantId)) - { - if (entityValue.TenantId == null || entityValue.TenantId == 0) - entityInfo.SetValue(App.User.FindFirst(ClaimConst.TenantId)?.Value ?? SqlSugarConst.DefaultTenantId.ToString()); - } - else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserId)) - { - if (entityValue.CreateUserId == null || entityValue.CreateUserId == 0) - entityInfo.SetValue(App.User.FindFirst(ClaimConst.UserId)?.Value); - } - else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserName)) - { - if (string.IsNullOrWhiteSpace(entityValue.CreateUserName)) - entityInfo.SetValue(App.User.FindFirst(ClaimConst.RealName)?.Value); - } - else if (entityInfo.PropertyName == nameof(EntityBaseData.CreateOrgId)) - { - if (entityValue.CreateOrgId == null || entityValue.CreateOrgId == 0) - entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgId)?.Value); - } - else if (entityInfo.PropertyName == nameof(EntityBaseData.CreateOrgName)) - { - if (string.IsNullOrWhiteSpace(entityValue.CreateOrgName)) - entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgName)?.Value); - } - } - // 编辑/更新 操作 - else if (entityInfo.OperationType == DataFilterType.UpdateByObject) - { - if (entityInfo.PropertyName == nameof(EntityBase.UpdateTime)) - entityInfo.SetValue(DateTime.Now); - else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserId)) - entityInfo.SetValue(App.User?.FindFirst(ClaimConst.UserId)?.Value); - else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserName)) - entityInfo.SetValue(App.User?.FindFirst(ClaimConst.RealName)?.Value); - } - - //// 自定义数据审计 - //SqlSugarDataExecuting.Execute(oldValue, entityInfo); - }; - - // 超管不受任何过滤器限制 - if (App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString()) - return; - - // 配置假删除过滤器 - dbProvider.QueryFilter.AddTableFilter(u => u.IsDelete == false); - - // 配置租户过滤器 - var tenantId = App.User?.FindFirst(ClaimConst.TenantId)?.Value; - if (!string.IsNullOrWhiteSpace(tenantId)) - dbProvider.QueryFilter.AddTableFilter(u => u.TenantId == long.Parse(tenantId)); - - // 配置用户机构（数据范围）过滤器 - SqlSugarFilter.SetOrgEntityFilter(dbProvider); - - // 配置自定义过滤器 - SqlSugarFilter.SetCustomEntityFilter(dbProvider); - } - - /// - /// 开启库表差异化日志 - /// - /// - /// - private static void SetDbDiffLog(SqlSugarScopeProvider dbProvider, DbConnectionConfig config) - { - if (!config.DbSettings.EnableDiffLog) return; - - dbProvider.Aop.OnDiffLogEvent = async u => - { - // 记录差异数据 - var diffData = new List(); - for (int i = 0; i < u.AfterData.Count; i++) - { - var diffColumns = new List(); - var afterColumns = u.AfterData[i].Columns; - var beforeColumns = u.BeforeData[i].Columns; - for (int j = 0; j < afterColumns.Count; j++) - { - if (afterColumns[j].Value.Equals(beforeColumns[j].Value)) continue; - diffColumns.Add(new - { - afterColumns[j].IsPrimaryKey, - afterColumns[j].ColumnName, - afterColumns[j].ColumnDescription, - BeforeValue = beforeColumns[j].Value, - AfterValue = afterColumns[j].Value, - }); - } - diffData.Add(new - { - u.AfterData[i].TableName, - u.AfterData[i].TableDescription, - Columns = diffColumns - }); - } - - var logDiff = new SysLogDiff - { - // 差异数据（字段描述、列名、值、表名、表描述） - DiffData = JSON.Serialize(diffData), - // 传进来的对象（如果对象为空，则使用首个数据的表名作为业务对象） - BusinessData = u.BusinessData == null ? u.AfterData.FirstOrDefault()?.TableName : JSON.Serialize(u.BusinessData), - // 枚举（insert、update、delete） - DiffType = u.DiffType.ToString(), - Sql = u.Sql, - Parameters = JSON.Serialize(u.Parameters.Select(e => new { e.ParameterName, e.Value, TypeName = e.DbType.ToString() })), - Elapsed = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds - }; - var logDb = ITenant.IsAnyConnection(SqlSugarConst.LogConfigId) ? ITenant.GetConnectionScope(SqlSugarConst.LogConfigId) : ITenant.GetConnectionScope(SqlSugarConst.MainConfigId); - await logDb.CopyNew().Insertable(logDiff).ExecuteCommandAsync(); - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine(DateTime.Now + $"\r\n*****开始差异日志*****\r\n{Environment.NewLine}{JSON.Serialize(logDiff)}{Environment.NewLine}*****结束差异日志*****\r\n"); - }; - } - - /// - /// 初始化数据库 - /// - /// - /// - private static void InitDatabase(SqlSugarScope db, DbConnectionConfig config) - { - var dbProvider = db.GetConnectionScope(config.ConfigId); - - // 若第一次启动系统则强制初始化数据库表和种子数据 - bool isFirstRun = false; - try { isFirstRun = dbProvider.CurrentConnectionConfig.ConfigId.ToString() == SqlSugarConst.MainConfigId && !dbProvider.DbMaintenance.IsAnyTable(dbProvider.EntityMaintenance.GetTableName(typeof(SysConfig))); } - catch { isFirstRun = true; } - - // 初始化/创建数据库 - if (config.DbSettings.EnableInitDb || isFirstRun) - { - Log.Information($"初始化数据库 {config.DbType} - {config.ConfigId} - {config.ConnectionString}"); - if (config.DbType != SqlSugar.DbType.Oracle) dbProvider.DbMaintenance.CreateDatabase(); - } - - // 初始化表结构之前——系统版本号 - var (startups, oldVerion, currentVersion) = BeforeInitTable(dbProvider); - - // 初始化表结构 - if (config.TableSettings.EnableInitTable || isFirstRun) - { - var totalWatch = Stopwatch.StartNew(); // 开始总计时 - Log.Information($"初始化表结构 {config.DbType} - {config.ConfigId}"); - var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false)) - .Where(u => !u.GetCustomAttributes().Any()) - .WhereIF(config.TableSettings.EnableIncreTable, u => u.IsDefined(typeof(IncreTableAttribute), false)).ToList(); - - if (config.ConfigId.ToString() == SqlSugarConst.MainConfigId) // 默认库（有系统表特性、没有日志表和租户表特性） - entityTypes = entityTypes.Where(u => u.GetCustomAttributes().Any() || (!u.GetCustomAttributes().Any() && !u.GetCustomAttributes().Any())).ToList(); - else if (config.ConfigId.ToString() == SqlSugarConst.LogConfigId) // 日志库 - entityTypes = entityTypes.Where(u => u.GetCustomAttributes().Any()).ToList(); - else - entityTypes = entityTypes.Where(u => u.GetCustomAttribute()?.configId.ToString() == config.ConfigId.ToString()).ToList(); // 自定义的库 - - int taskIndex = 0, size = entityTypes.Count; - var taskList = entityTypes.Select(entityType => Task.Run(() => - { - var stopWatch = Stopwatch.StartNew(); // 开始计时 - - dbProvider.InitTable(entityType); // 初始化表结构 - - stopWatch.Stop(); // 停止计时 - - Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine($"初始化表 {entityType,-64} ({config.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}) 耗时：{stopWatch.ElapsedMilliseconds} ms"); - })); - Task.WaitAll(taskList.ToArray()); - - totalWatch.Stop(); // 停止总计时 - Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine($"初始化表结构 {config.DbType} - {config.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds} ms"); - } - - // 初始化视图 - if (config.DbSettings.EnableInitView || isFirstRun) InitView(dbProvider); - - // 初始化种子数据 - if (config.SeedSettings.EnableInitSeed || isFirstRun) InitSeedData(dbProvider, config.SeedSettings.EnableIncreSeed); - - // 初始化种子数据之后——系统版本号 - AfterInitSeed(dbProvider, startups, oldVerion, currentVersion); - } - - /// - /// 初始化表结构之前（版本号） - /// - /// - /// - private static (IOrderedEnumerable startups, long oldVerion, long currentVersion) BeforeInitTable(SqlSugarScopeProvider dbProvider) - { - // 扫描所有继承 AppStartup 的类（排序执行顺序） - var startups = App.EffectiveTypes - .Where(u => typeof(AppStartup).IsAssignableFrom(u) && u.IsClass && !u.IsAbstract && !u.IsGenericType && (u.GetMethod("BeforeInitTable") != null || u.GetMethod("AfterInitSeed") != null)) - .OrderByDescending(u => !u.IsDefined(typeof(AppStartupAttribute), true) ? 0 : u.GetCustomAttribute(true).Order); - if (startups == null || !startups.Any()) return (startups, 0, 0); - - long oldVerion = 0, currentVersion = 0; - try - { - // 获取系统版本号 - if (dbProvider.CurrentConnectionConfig.ConfigId.ToString() == SqlSugarConst.MainConfigId && dbProvider.DbMaintenance.IsAnyTable(dbProvider.EntityMaintenance.GetTableName(typeof(SysConfig)))) - { - var versionCfg = dbProvider.Queryable().Where(u => u.Code == ConfigConst.SysVersion).First(); - oldVerion = versionCfg != null ? CommonUtil.ConvertVersionToLong(versionCfg.Value) : 0; - } - else - { - oldVerion = -1; - } - currentVersion = CommonUtil.ConvertVersionToLong(ConfigConst.SysCurrentVersion); - - foreach (var type in startups) - { - var startup = Activator.CreateInstance(type) as AppStartup; - var initDataMethod = type.GetMethod("BeforeInitTable"); - initDataMethod?.Invoke(startup, [dbProvider, oldVerion, currentVersion]); - } - } - catch (Exception ex) - { - Log.Information($"数据库初始化表结构之前有错 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} : {ex.Message}"); - } - - return (startups, oldVerion, currentVersion); - } - - /// - /// 初始化种子数据之后（版本号） - /// - /// - /// - /// - /// - private static void AfterInitSeed(SqlSugarScopeProvider dbProvider, IOrderedEnumerable startups, long oldVerion, long currentVersion) - { - if (startups == null || !startups.Any()) return; - - try - { - foreach (var type in startups) - { - var startup = Activator.CreateInstance(type) as AppStartup; - if (startup == null) continue; - var initDataMethod = type.GetMethod("AfterInitSeed"); - if (initDataMethod == null) continue; - initDataMethod?.Invoke(startup, [dbProvider, oldVerion, currentVersion]); - } - } - catch (Exception ex) - { - string errr = $"数据库初始化种子数据之后有错 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} : {ex.Message}"; - Log.Information(errr); - Console.WriteLine(errr); - Console.WriteLine(ex.StackTrace); - } - finally - { - // 更新系统版本号 - if (dbProvider.CurrentConnectionConfig.ConfigId.ToString() == SqlSugarConst.MainConfigId) - { - IEnumerable cfgs = - [ - new SysConfig{ Id=1300000000999, Name="系统版本号", Code=ConfigConst.SysVersion, Value=ConfigConst.SysCurrentVersion, SysFlag=YesNoEnum.Y, Remark= "系统版本号，用于自动升级，请勿手动填写", OrderNo=1000, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2025-04-10 00:00:00") } - ]; - var storage = dbProvider.StorageableByObject(cfgs.ToList()).ToStorage(); - storage.AsInsertable.ExecuteCommand(); - storage.AsUpdateable.ExecuteCommand(); - } - } - } - - /// - /// 初始化种子数据 - /// - /// - /// - private static void InitSeedData(SqlSugarScopeProvider dbProvider, bool enableIncreSeed) - { - var totalWatch = Stopwatch.StartNew(); // 开始总计时 - Log.Information($"初始化种子数据 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId}"); - var seedDataTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>)))) - .Where(u => !u.IsDefined(typeof(TenantSeedAttribute), false)) - .WhereIF(enableIncreSeed, u => u.IsDefined(typeof(IncreSeedAttribute), false)) - .OrderBy(u => u.GetCustomAttributes(typeof(SeedDataAttribute), false).Length > 0 ? ((SeedDataAttribute)u.GetCustomAttributes(typeof(SeedDataAttribute), false)[0]).Order : 0).ToList(); - - // 由于种子数据在应用层存在重写，必须保证应用层种子最后执行（多线程顺序会乱） - int taskIndex = 0, size = seedDataTypes.Count; - foreach (var seedType in seedDataTypes) - { - var stopWatch = Stopwatch.StartNew(); // 开始计时 - - // 初始化种子数据 - var tuple = dbProvider.InitTableSeedData(seedType); - if (tuple == null) return; - - stopWatch.Stop(); // 停止计时 - - Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine($"初始化种子数据 {seedType.FullName,-58} ({dbProvider.CurrentConnectionConfig.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}，数据量：{tuple.Value.Item1:D003}，新增 {tuple.Value.Item2:D003} 条记录，更新 {tuple.Value.Item3:D003} 条记录，耗时：{stopWatch.ElapsedMilliseconds:N0} ms)"); - } - - totalWatch.Stop(); // 停止总计时 - Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine($"初始化种子数据 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds:N0} ms"); - } - - /// - /// 初始化视图 - /// - /// - private static void InitView(SqlSugarScopeProvider dbProvider) - { - var totalWatch = Stopwatch.StartNew(); // 开始总计时 - Log.Information($"初始化视图 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId}"); - var viewTypeList = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarView)))).ToList(); - - int taskIndex = 0, size = viewTypeList.Count; - var taskList = viewTypeList.Select(viewType => Task.Run(() => - { - // 开始计时 - var stopWatch = Stopwatch.StartNew(); - - // 获取视图实体和配置信息 - var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(viewType) ?? throw new Exception("获取视图实体配置有误"); - - // 如果视图存在，则删除视图 - if (dbProvider.DbMaintenance.GetViewInfoList().Any(it => it.Name.EqualIgnoreCase(entityInfo.DbTableName))) - dbProvider.DbMaintenance.DropView(entityInfo.DbTableName); - - // 获取初始化视图查询SQL - var sql = viewType.GetMethod(nameof(ISqlSugarView.GetQueryableSqlString))?.Invoke(Activator.CreateInstance(viewType), [dbProvider]) as string; - if (string.IsNullOrWhiteSpace(sql)) throw new Exception("视图初始化Sql语句不能为空"); - - // 创建视图 - dbProvider.Ado.ExecuteCommand($"CREATE VIEW {entityInfo.DbTableName} AS " + Environment.NewLine + " " + sql); - - // 停止计时 - stopWatch.Stop(); - Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine($"初始化视图 {viewType.FullName,-58} ({dbProvider.CurrentConnectionConfig.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}，耗时：{stopWatch.ElapsedMilliseconds:N0} ms)"); - })); - Task.WaitAll(taskList.ToArray()); - - totalWatch.Stop(); // 停止总计时 - Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine($"初始化视图 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds:N0} ms"); - } - - /// - /// 初始化租户业务数据库 - /// - /// - public static void InitTenantDatabase(DbConnectionConfig config) - { - SetDbConfig(config); - - var iTenant = App.GetRequiredService().AsTenant(); - if (!iTenant.IsAnyConnection(config.ConfigId.ToString())) - iTenant.AddConnection(config); - var db = iTenant.GetConnectionScope(config.ConfigId.ToString()); - db.DbMaintenance.CreateDatabase(); - - // 初始化租户库表结构-获取所有业务应用表（排除系统表、日志表、特定库表） - var entityTypes = App.EffectiveTypes - .Where(u => !u.GetCustomAttributes().Any()) - .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false) && - !u.IsDefined(typeof(SysTableAttribute), false) && !u.IsDefined(typeof(LogTableAttribute), false) && !u.IsDefined(typeof(TenantAttribute), false)).ToList(); - if (entityTypes.Count == 0) return; - - foreach (var entityType in entityTypes) - { - var splitTable = entityType.GetCustomAttribute(); - if (splitTable == null) - db.CodeFirst.InitTables(entityType); - else - db.CodeFirst.SplitTables().InitTables(entityType); - } - - // 初始化租户业务数据 - InitTenantData(iTenant, config.ConfigId.ToLong(), config.ConfigId.ToLong()); - } - - /// - /// 初始化租户业务数据 - /// - /// - /// 库标识 - /// 租户Id - public static void InitTenantData(ITenant iTenant, long dbConfigId, long tenantId) - { - var seedDataTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>)))) - .Where(u => u.IsDefined(typeof(TenantSeedAttribute), false)) - .OrderBy(u => u.GetCustomAttributes(typeof(SeedDataAttribute), false).Length > 0 ? ((SeedDataAttribute)u.GetCustomAttributes(typeof(SeedDataAttribute), false)[0]).Order : 0).ToList(); - if (seedDataTypes.Count < 1) return; - - var db = iTenant.GetConnectionScope(dbConfigId); - foreach (var seedType in seedDataTypes) - { - var instance = Activator.CreateInstance(seedType); - var hasDataMethod = seedType.GetMethod("HasData"); - var seedData = ((IEnumerable)hasDataMethod?.Invoke(instance, null))?.Cast().ToList() ?? []; - if (seedData.Count == 0) continue; - - var entityType = seedType.GetInterfaces().First().GetGenericArguments().First(); - var entityInfo = db.EntityMaintenance.GetEntityInfo(entityType); - // var dbConfigId = config.ConfigId.ToLong(); - // 若实体包含租户Id字段，则设置为当前租户Id - if (entityInfo.Columns.Any(u => u.PropertyName == nameof(EntityTenantId.TenantId))) - { - foreach (var sd in seedData) - { - sd.GetType().GetProperty(nameof(EntityTenantId.TenantId))!.SetValue(sd, tenantId); - } - } - // 若实体包含Pid字段，则设置为当前租户Id - if (entityInfo.Columns.Any(u => u.PropertyName == nameof(SysOrg.Pid))) - { - foreach (var sd in seedData) - { - sd.GetType().GetProperty(nameof(SysOrg.Pid))!.SetValue(sd, tenantId); - } - } - // 若实体包含Id字段，则设置为当前租户Id递增1 - if (entityInfo.Columns.Any(u => u.PropertyName == nameof(EntityBaseId.Id))) - { - var seedId = tenantId; - foreach (var sd in seedData) - { - var id = sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.GetValue(sd, null); - if (id != null && (id.ToString() == "0" || string.IsNullOrWhiteSpace(id.ToString()))) - sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.SetValue(sd, ++seedId); - } - } - - // 若实体是系统内置，则切换至默认库 - if (entityType.GetCustomAttribute() != null) - db = iTenant.GetConnectionScope(SqlSugarConst.MainConfigId); - - if (entityInfo.Columns.Any(u => u.IsPrimarykey)) - { - // 按主键进行批量增加和更新 - var storage = db.StorageableByObject(seedData).ToStorage(); - storage.AsInsertable.ExecuteCommand(); - if (seedType.GetCustomAttribute() == null) // 有忽略更新种子特性时则不更新 - storage.AsUpdateable.IgnoreColumns(entityInfo.Columns.Where(c => c.PropertyInfo.GetCustomAttribute() != null).Select(c => c.PropertyName).ToArray()).ExecuteCommand(); - } - else - { - // 无主键则只进行插入 - if (!db.Queryable(entityInfo.DbTableName, entityInfo.DbTableName).Any()) - db.InsertableByObject(seedData).ExecuteCommand(); - } - } - } +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +namespace Admin.NET.Core; + +public static class SqlSugarSetup +{ + // 多租户实例 + public static ITenant ITenant { get; set; } + + /// + /// SqlSugar 上下文初始化 + /// + /// + public static void AddSqlSugar(this IServiceCollection services) + { + // 注册雪花Id + var snowIdOpt = App.GetConfig("SnowId", true); + services.AddYitIdHelper(snowIdOpt); + + // 自定义雪花Id算法 + StaticConfig.CustomSnowFlakeFunc = YitIdHelper.NextId; + // 配置字符串表达式 + StaticConfig.DynamicExpressionParserType = typeof(DynamicExpressionParser); + StaticConfig.DynamicExpressionParsingConfig = new ParsingConfig + { + CustomTypeProvider = new SqlSugarTypeProvider() + }; + + // 初始化所有库连接 + var dbOptions = App.GetConfig("DbConnection", true); + dbOptions.ConnectionConfigs.ForEach(SetDbConfig); + + // 初始化SqlSugar + SqlSugarScope sqlSugar = new(dbOptions.ConnectionConfigs.Adapt>(), db => + { + dbOptions.ConnectionConfigs.ForEach(config => + { + var dbProvider = db.GetConnectionScope(config.ConfigId); + SetDbAop(dbProvider, dbOptions.EnableConsoleSql); + SetDbDiffLog(dbProvider, config); + }); + }); + ITenant = sqlSugar; + + services.AddSingleton(sqlSugar); // 单例注册 + services.AddScoped(typeof(SqlSugarRepository<>)); // 仓储注册 + services.AddUnitOfWork(); // 事务与工作单元注册 + + // 初始化数据库表结构及种子数据 + dbOptions.ConnectionConfigs.ForEach(config => + { + InitDatabase(sqlSugar, config); + }); + } + + /// + /// 配置连接属性 + /// + /// + public static void SetDbConfig(DbConnectionConfig config) + { + // 解密数据库连接串 + if (config.DbSettings.EnableConnEncrypt) + config.ConnectionString = CryptogramUtil.Decrypt(config.ConnectionString); + + // SqlFunc 扩展函数 + var sqlFuncServices = new List + { + // 密码解密 + new SqlFuncExternal() + { + UniqueMethodName = "SqlFuncDecrypt", + MethodValue = (expInfo, dbType, expContext) => + { + return CryptogramUtil.Decrypt(expInfo.Args[0].MemberName.ToString()); + } + } + }; + + var configureExternalServices = new ConfigureExternalServices + { + EntityNameService = (type, entity) => // 处理表 + { + entity.IsDisabledDelete = true; // 禁止删除非 sqlsugar 创建的列 + // 只处理贴了特性[SugarTable]表 + if (!type.GetCustomAttributes().Any()) + return; + if (config.DbSettings.EnableUnderLine && !entity.DbTableName.Contains('_')) + entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName); // 驼峰转下划线 + }, + EntityService = (type, column) => // 处理列 + { + // 只处理贴了特性[SugarColumn]列 + if (!type.GetCustomAttributes().Any()) + return; + if (new NullabilityInfoContext().Create(type).WriteState is NullabilityState.Nullable) + column.IsNullable = true; + if (config.DbSettings.EnableUnderLine && !column.IsIgnore && !column.DbColumnName.Contains('_')) + column.DbColumnName = UtilMethods.ToUnderLine(column.DbColumnName); // 驼峰转下划线 + }, + DataInfoCacheService = new SqlSugarCache(), + SqlFuncServices = sqlFuncServices + }; + config.ConfigureExternalServices = configureExternalServices; + config.InitKeyType = InitKeyType.Attribute; + config.IsAutoCloseConnection = true; + config.MoreSettings = new ConnMoreSettings + { + IsAutoRemoveDataCache = true, // 启用自动删除缓存，所有增删改会自动调用.RemoveDataCache() + IsAutoDeleteQueryFilter = true, // 启用删除查询过滤器 + IsAutoUpdateQueryFilter = true, // 启用更新查询过滤器 + SqlServerCodeFirstNvarchar = true // 采用Nvarchar + }; + + // 若库类型是人大金仓则默认设置PG模式 + if (config.DbType == SqlSugar.DbType.Kdbndp) + config.MoreSettings.DatabaseModel = SqlSugar.DbType.PostgreSQL; // 配置PG模式主要是兼容系统表差异 + + // 若库类型是Oracle则默认主键名字和参数名字最大长度 + if (config.DbType == SqlSugar.DbType.Oracle) + config.MoreSettings.MaxParameterNameLength = 30; + } + + /// + /// SqlFunc 扩展函数定义（密码解密） + /// + /// + /// + /// + /// + public static string SqlFuncDecrypt(T password) + { + throw new NotSupportedException("Can only be used in expressions"); + } + + /// + /// 配置Aop + /// + /// + /// + public static void SetDbAop(SqlSugarScopeProvider dbProvider, bool enableConsoleSql) + { + // 设置超时时间 + dbProvider.Ado.CommandTimeOut = 30; + + // 打印SQL语句 + dbProvider.Aop.OnError = ex => + { + if (ex.Parametres == null) return; + var log = $"【{DateTime.Now}——错误SQL】\r\n{UtilMethods.GetNativeSql(ex.Sql, (SugarParameter[])ex.Parametres)}\r\n"; + Log.Error(log, ex); + App.PrintToMiniProfiler("SqlSugar", "Error", log); + }; + if (enableConsoleSql) + { + dbProvider.Aop.OnLogExecuting = (sql, pars) => + { + //// 若参数值超过100个字符则进行截取 + //foreach (var par in pars) + //{ + // if (par.DbType != System.Data.DbType.String || par.Value == null) continue; + // if (par.Value.ToString().Length > 100) + // par.Value = string.Concat(par.Value.ToString()[..100], "......"); + //} + + var log = $"【{DateTime.Now}——执行SQL】\r\n{UtilMethods.GetNativeSql(sql, pars)}\r\n"; + var originColor = Console.ForegroundColor; + if (sql.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase)) + Console.ForegroundColor = ConsoleColor.Green; + if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase)) + Console.ForegroundColor = ConsoleColor.Yellow; + if (sql.StartsWith("DELETE", StringComparison.OrdinalIgnoreCase)) + Console.ForegroundColor = ConsoleColor.Red; + Console.WriteLine(log); + Console.ForegroundColor = originColor; + App.PrintToMiniProfiler("SqlSugar", "Info", log); + }; + } + dbProvider.Aop.OnLogExecuted = (sql, pars) => + { + //// 若参数值超过100个字符则进行截取 + //foreach (var par in pars) + //{ + // if (par.DbType != System.Data.DbType.String || par.Value == null) continue; + // if (par.Value.ToString().Length > 100) + // par.Value = string.Concat(par.Value.ToString()[..100], "......"); + //} + + // 执行时间超过5秒时 + if (dbProvider.Ado.SqlExecutionTime.TotalSeconds <= 5) return; + + var fileName = dbProvider.Ado.SqlStackTrace.FirstFileName; // 文件名 + var fileLine = dbProvider.Ado.SqlStackTrace.FirstLine; // 行号 + var firstMethodName = dbProvider.Ado.SqlStackTrace.FirstMethodName; // 方法名 + var log = $"【{DateTime.Now}——超时SQL】\r\n【所在文件名】：{fileName}\r\n【代码行数】：{fileLine}\r\n【方法名】：{firstMethodName}\r\n" + $"【SQL语句】：{UtilMethods.GetNativeSql(sql, pars)}"; + Log.Warning(log); + App.PrintToMiniProfiler("SqlSugar", "Slow", log); + }; + + // 数据审计 + dbProvider.Aop.DataExecuting = (oldValue, entityInfo) => + { + // 新增/插入 操作 + if (entityInfo.OperationType == DataFilterType.InsertByObject) + { + // 若是主键且非自增类型 + if (entityInfo.EntityColumnInfo.IsPrimarykey && !entityInfo.EntityColumnInfo.IsIdentity) + { + // 雪花Id类型（长整型且空则赋值） + if (entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(long)) + { + var id = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue); + if (id == null || (long)id == 0) + entityInfo.SetValue(YitIdHelper.NextId()); + } + // Guid类型（空则赋值） + else if (entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(Guid)) + { + var id = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue); + if (id == null) + entityInfo.SetValue(Guid.NewGuid()); + } + } + // 若创建时间为空则赋值当前时间 + else if (entityInfo.PropertyName == nameof(EntityBase.CreateTime)) + { + var createTime = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue)!; + if (createTime == null || createTime.Equals(DateTime.MinValue)) + entityInfo.SetValue(DateTime.Now); + } + // 若当前用户非空（web线程时） + if (App.User == null) return; + + dynamic entityValue = entityInfo.EntityValue; + if (entityInfo.PropertyName == nameof(EntityTenantId.TenantId)) + { + if (entityValue.TenantId == null || entityValue.TenantId == 0) + entityInfo.SetValue(App.User.FindFirst(ClaimConst.TenantId)?.Value ?? SqlSugarConst.DefaultTenantId.ToString()); + } + else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserId)) + { + if (entityValue.CreateUserId == null || entityValue.CreateUserId == 0) + entityInfo.SetValue(App.User.FindFirst(ClaimConst.UserId)?.Value); + } + else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserName)) + { + if (string.IsNullOrWhiteSpace(entityValue.CreateUserName)) + entityInfo.SetValue(App.User.FindFirst(ClaimConst.RealName)?.Value); + } + else if (entityInfo.PropertyName == nameof(EntityBaseData.CreateOrgId)) + { + if (entityValue.CreateOrgId == null || entityValue.CreateOrgId == 0) + entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgId)?.Value); + } + else if (entityInfo.PropertyName == nameof(EntityBaseData.CreateOrgName)) + { + if (string.IsNullOrWhiteSpace(entityValue.CreateOrgName)) + entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgName)?.Value); + } + } + // 编辑/更新 操作 + else if (entityInfo.OperationType == DataFilterType.UpdateByObject) + { + if (entityInfo.PropertyName == nameof(EntityBase.UpdateTime)) + entityInfo.SetValue(DateTime.Now); + else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserId)) + entityInfo.SetValue(App.User?.FindFirst(ClaimConst.UserId)?.Value); + else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserName)) + entityInfo.SetValue(App.User?.FindFirst(ClaimConst.RealName)?.Value); + } + + //// 自定义数据审计 + //SqlSugarDataExecuting.Execute(oldValue, entityInfo); + }; + + // 超管不受任何过滤器限制 + if (App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString()) + return; + + // 配置假删除过滤器 + dbProvider.QueryFilter.AddTableFilter(u => u.IsDelete == false); + + // 配置租户过滤器 + var tenantId = App.User?.FindFirst(ClaimConst.TenantId)?.Value; + if (!string.IsNullOrWhiteSpace(tenantId)) + dbProvider.QueryFilter.AddTableFilter(u => u.TenantId == long.Parse(tenantId)); + + // 配置用户机构（数据范围）过滤器 + SqlSugarFilter.SetOrgEntityFilter(dbProvider); + + // 配置自定义过滤器 + SqlSugarFilter.SetCustomEntityFilter(dbProvider); + } + + /// + /// 开启库表差异化日志 + /// + /// + /// + private static void SetDbDiffLog(SqlSugarScopeProvider dbProvider, DbConnectionConfig config) + { + if (!config.DbSettings.EnableDiffLog) return; + + dbProvider.Aop.OnDiffLogEvent = async u => + { + // 记录差异数据 + var diffData = new List(); + for (int i = 0; i < u.AfterData.Count; i++) + { + var diffColumns = new List(); + var afterColumns = u.AfterData[i].Columns; + var beforeColumns = u.BeforeData[i].Columns; + for (int j = 0; j < afterColumns.Count; j++) + { + if (afterColumns[j].Value.Equals(beforeColumns[j].Value)) continue; + diffColumns.Add(new + { + afterColumns[j].IsPrimaryKey, + afterColumns[j].ColumnName, + afterColumns[j].ColumnDescription, + BeforeValue = beforeColumns[j].Value, + AfterValue = afterColumns[j].Value, + }); + } + diffData.Add(new + { + u.AfterData[i].TableName, + u.AfterData[i].TableDescription, + Columns = diffColumns + }); + } + + var logDiff = new SysLogDiff + { + // 差异数据（字段描述、列名、值、表名、表描述） + DiffData = JSON.Serialize(diffData), + // 传进来的对象（如果对象为空，则使用首个数据的表名作为业务对象） + BusinessData = u.BusinessData == null ? u.AfterData.FirstOrDefault()?.TableName : JSON.Serialize(u.BusinessData), + // 枚举（insert、update、delete） + DiffType = u.DiffType.ToString(), + Sql = u.Sql, + Parameters = JSON.Serialize(u.Parameters.Select(e => new { e.ParameterName, e.Value, TypeName = e.DbType.ToString() })), + Elapsed = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds + }; + var logDb = ITenant.IsAnyConnection(SqlSugarConst.LogConfigId) ? ITenant.GetConnectionScope(SqlSugarConst.LogConfigId) : ITenant.GetConnectionScope(SqlSugarConst.MainConfigId); + await logDb.CopyNew().Insertable(logDiff).ExecuteCommandAsync(); + Console.ForegroundColor = ConsoleColor.Red; + Console.WriteLine(DateTime.Now + $"\r\n*****开始差异日志*****\r\n{Environment.NewLine}{JSON.Serialize(logDiff)}{Environment.NewLine}*****结束差异日志*****\r\n"); + }; + } + + /// + /// 初始化数据库 + /// + /// + /// + private static void InitDatabase(SqlSugarScope db, DbConnectionConfig config) + { + var dbProvider = db.GetConnectionScope(config.ConfigId); + + // 判断是否第一次启动 + bool isFirstRun = true; + try + { + dbProvider.DbMaintenance.IsAnySystemTablePermissions(); + isFirstRun = false; + } + catch + { + // ignored + } + + // 初始化/创建数据库 + if (config.DbSettings.EnableInitDb || isFirstRun) + { + Log.Information($"初始化数据库 {config.DbType} - {config.ConfigId} - {config.ConnectionString}"); + if (config.DbType != SqlSugar.DbType.Oracle) dbProvider.DbMaintenance.CreateDatabase(); + } + + // 初始化表结构之前——系统版本号 + var (startups, oldVerion, currentVersion) = BeforeInitTable(dbProvider); + + // 初始化表结构 + if (config.TableSettings.EnableInitTable || isFirstRun) + { + var totalWatch = Stopwatch.StartNew(); // 开始总计时 + Log.Information($"初始化表结构 {config.DbType} - {config.ConfigId}"); + var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false)) + .Where(u => !u.GetCustomAttributes().Any()) + .WhereIF(config.TableSettings.EnableIncreTable, u => u.IsDefined(typeof(IncreTableAttribute), false)).ToList(); + + if (config.ConfigId.ToString() == SqlSugarConst.MainConfigId) // 默认库（有系统表特性、没有日志表和租户表特性） + entityTypes = entityTypes.Where(u => u.GetCustomAttributes().Any() || (!u.GetCustomAttributes().Any() && !u.GetCustomAttributes().Any())).ToList(); + else if (config.ConfigId.ToString() == SqlSugarConst.LogConfigId) // 日志库 + entityTypes = entityTypes.Where(u => u.GetCustomAttributes().Any()).ToList(); + else + entityTypes = entityTypes.Where(u => u.GetCustomAttribute()?.configId.ToString() == config.ConfigId.ToString()).ToList(); // 自定义的库 + + int taskIndex = 0, size = entityTypes.Count; + var taskList = entityTypes.Select(entityType => Task.Run(() => + { + var stopWatch = Stopwatch.StartNew(); // 开始计时 + + dbProvider.InitTable(entityType); // 初始化表结构 + + stopWatch.Stop(); // 停止计时 + + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化表 {entityType,-64} ({config.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}) 耗时：{stopWatch.ElapsedMilliseconds} ms"); + })); + Task.WaitAll(taskList.ToArray()); + + totalWatch.Stop(); // 停止总计时 + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化表结构 {config.DbType} - {config.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds} ms"); + } + + // 初始化视图 + if (config.DbSettings.EnableInitView || isFirstRun) InitView(dbProvider); + + // 初始化种子数据 + if (config.SeedSettings.EnableInitSeed || isFirstRun) InitSeedData(dbProvider, config.SeedSettings.EnableIncreSeed); + + // 初始化种子数据之后——系统版本号 + AfterInitSeed(dbProvider, startups, oldVerion, currentVersion); + } + + /// + /// 初始化表结构之前（版本号） + /// + /// + /// + private static (IOrderedEnumerable startups, long oldVerion, long currentVersion) BeforeInitTable(SqlSugarScopeProvider dbProvider) + { + // 扫描所有继承 AppStartup 的类（排序执行顺序） + var startups = App.EffectiveTypes + .Where(u => typeof(AppStartup).IsAssignableFrom(u) && u.IsClass && !u.IsAbstract && !u.IsGenericType && (u.GetMethod("BeforeInitTable") != null || u.GetMethod("AfterInitSeed") != null)) + .OrderByDescending(u => !u.IsDefined(typeof(AppStartupAttribute), true) ? 0 : u.GetCustomAttribute(true).Order); + if (startups == null || !startups.Any()) return (startups, 0, 0); + + long oldVerion = 0, currentVersion = 0; + try + { + // 获取系统版本号 + if (dbProvider.CurrentConnectionConfig.ConfigId.ToString() == SqlSugarConst.MainConfigId && dbProvider.DbMaintenance.IsAnyTable(dbProvider.EntityMaintenance.GetTableName(typeof(SysConfig)))) + { + var versionCfg = dbProvider.Queryable().Where(u => u.Code == ConfigConst.SysVersion).First(); + oldVerion = versionCfg != null ? CommonUtil.ConvertVersionToLong(versionCfg.Value) : 0; + } + else + { + oldVerion = -1; + } + currentVersion = CommonUtil.ConvertVersionToLong(ConfigConst.SysCurrentVersion); + + foreach (var type in startups) + { + var startup = Activator.CreateInstance(type) as AppStartup; + var initDataMethod = type.GetMethod("BeforeInitTable"); + initDataMethod?.Invoke(startup, [dbProvider, oldVerion, currentVersion]); + } + } + catch (Exception ex) + { + Log.Information($"数据库初始化表结构之前有错 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} : {ex.Message}"); + } + + return (startups, oldVerion, currentVersion); + } + + /// + /// 初始化种子数据之后（版本号） + /// + /// + /// + /// + /// + private static void AfterInitSeed(SqlSugarScopeProvider dbProvider, IOrderedEnumerable startups, long oldVerion, long currentVersion) + { + if (startups == null || !startups.Any()) return; + + try + { + foreach (var type in startups) + { + var startup = Activator.CreateInstance(type) as AppStartup; + if (startup == null) continue; + var initDataMethod = type.GetMethod("AfterInitSeed"); + if (initDataMethod == null) continue; + initDataMethod?.Invoke(startup, [dbProvider, oldVerion, currentVersion]); + } + } + catch (Exception ex) + { + string errr = $"数据库初始化种子数据之后有错 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} : {ex.Message}"; + Log.Information(errr); + Console.WriteLine(errr); + Console.WriteLine(ex.StackTrace); + } + finally + { + // 更新系统版本号 + if (dbProvider.CurrentConnectionConfig.ConfigId.ToString() == SqlSugarConst.MainConfigId) + { + IEnumerable cfgs = + [ + new SysConfig{ Id=1300000000999, Name="系统版本号", Code=ConfigConst.SysVersion, Value=ConfigConst.SysCurrentVersion, SysFlag=YesNoEnum.Y, Remark= "系统版本号，用于自动升级，请勿手动填写", OrderNo=1000, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2025-04-10 00:00:00") } + ]; + var storage = dbProvider.StorageableByObject(cfgs.ToList()).ToStorage(); + storage.AsInsertable.ExecuteCommand(); + storage.AsUpdateable.ExecuteCommand(); + } + } + } + + /// + /// 初始化种子数据 + /// + /// + /// + private static void InitSeedData(SqlSugarScopeProvider dbProvider, bool enableIncreSeed) + { + var totalWatch = Stopwatch.StartNew(); // 开始总计时 + Log.Information($"初始化种子数据 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId}"); + var seedDataTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>)))) + .Where(u => !u.IsDefined(typeof(TenantSeedAttribute), false)) + .WhereIF(enableIncreSeed, u => u.IsDefined(typeof(IncreSeedAttribute), false)) + .OrderBy(u => u.GetCustomAttributes(typeof(SeedDataAttribute), false).Length > 0 ? ((SeedDataAttribute)u.GetCustomAttributes(typeof(SeedDataAttribute), false)[0]).Order : 0).ToList(); + + // 由于种子数据在应用层存在重写，必须保证应用层种子最后执行（多线程顺序会乱） + int taskIndex = 0, size = seedDataTypes.Count; + foreach (var seedType in seedDataTypes) + { + var stopWatch = Stopwatch.StartNew(); // 开始计时 + + // 初始化种子数据 + var tuple = dbProvider.InitTableSeedData(seedType); + if (tuple == null) return; + + stopWatch.Stop(); // 停止计时 + + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化种子数据 {seedType.FullName,-58} ({dbProvider.CurrentConnectionConfig.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}，数据量：{tuple.Value.Item1:D003}，新增 {tuple.Value.Item2:D003} 条记录，更新 {tuple.Value.Item3:D003} 条记录，耗时：{stopWatch.ElapsedMilliseconds:N0} ms)"); + } + + totalWatch.Stop(); // 停止总计时 + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化种子数据 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds:N0} ms"); + } + + /// + /// 初始化视图 + /// + /// + private static void InitView(SqlSugarScopeProvider dbProvider) + { + var totalWatch = Stopwatch.StartNew(); // 开始总计时 + Log.Information($"初始化视图 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId}"); + var viewTypeList = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarView)))).ToList(); + + int taskIndex = 0, size = viewTypeList.Count; + var taskList = viewTypeList.Select(viewType => Task.Run(() => + { + // 开始计时 + var stopWatch = Stopwatch.StartNew(); + + // 获取视图实体和配置信息 + var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(viewType) ?? throw new Exception("获取视图实体配置有误"); + + // 如果视图存在，则删除视图 + if (dbProvider.DbMaintenance.GetViewInfoList().Any(it => it.Name.EqualIgnoreCase(entityInfo.DbTableName))) + dbProvider.DbMaintenance.DropView(entityInfo.DbTableName); + + // 获取初始化视图查询SQL + var sql = viewType.GetMethod(nameof(ISqlSugarView.GetQueryableSqlString))?.Invoke(Activator.CreateInstance(viewType), [dbProvider]) as string; + if (string.IsNullOrWhiteSpace(sql)) throw new Exception("视图初始化Sql语句不能为空"); + + // 创建视图 + dbProvider.Ado.ExecuteCommand($"CREATE VIEW {entityInfo.DbTableName} AS " + Environment.NewLine + " " + sql); + + // 停止计时 + stopWatch.Stop(); + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化视图 {viewType.FullName,-58} ({dbProvider.CurrentConnectionConfig.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}，耗时：{stopWatch.ElapsedMilliseconds:N0} ms)"); + })); + Task.WaitAll(taskList.ToArray()); + + totalWatch.Stop(); // 停止总计时 + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine($"初始化视图 {dbProvider.CurrentConnectionConfig.DbType} - {dbProvider.CurrentConnectionConfig.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds:N0} ms"); + } + + /// + /// 初始化租户业务数据库 + /// + /// + public static void InitTenantDatabase(DbConnectionConfig config) + { + SetDbConfig(config); + + var iTenant = App.GetRequiredService().AsTenant(); + if (!iTenant.IsAnyConnection(config.ConfigId.ToString())) + iTenant.AddConnection(config); + var db = iTenant.GetConnectionScope(config.ConfigId.ToString()); + db.DbMaintenance.CreateDatabase(); + + // 初始化租户库表结构-获取所有业务应用表（排除系统表、日志表、特定库表） + var entityTypes = App.EffectiveTypes + .Where(u => !u.GetCustomAttributes().Any()) + .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false) && + !u.IsDefined(typeof(SysTableAttribute), false) && !u.IsDefined(typeof(LogTableAttribute), false) && !u.IsDefined(typeof(TenantAttribute), false)).ToList(); + if (entityTypes.Count == 0) return; + + foreach (var entityType in entityTypes) + { + var splitTable = entityType.GetCustomAttribute(); + if (splitTable == null) + db.CodeFirst.InitTables(entityType); + else + db.CodeFirst.SplitTables().InitTables(entityType); + } + + // 初始化租户业务数据 + InitTenantData(iTenant, config.ConfigId.ToLong(), config.ConfigId.ToLong()); + } + + /// + /// 初始化租户业务数据 + /// + /// + /// 库标识 + /// 租户Id + public static void InitTenantData(ITenant iTenant, long dbConfigId, long tenantId) + { + var seedDataTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>)))) + .Where(u => u.IsDefined(typeof(TenantSeedAttribute), false)) + .OrderBy(u => u.GetCustomAttributes(typeof(SeedDataAttribute), false).Length > 0 ? ((SeedDataAttribute)u.GetCustomAttributes(typeof(SeedDataAttribute), false)[0]).Order : 0).ToList(); + if (seedDataTypes.Count < 1) return; + + var db = iTenant.GetConnectionScope(dbConfigId); + foreach (var seedType in seedDataTypes) + { + var instance = Activator.CreateInstance(seedType); + var hasDataMethod = seedType.GetMethod("HasData"); + var seedData = ((IEnumerable)hasDataMethod?.Invoke(instance, null))?.Cast().ToList() ?? []; + if (seedData.Count == 0) continue; + + var entityType = seedType.GetInterfaces().First().GetGenericArguments().First(); + var entityInfo = db.EntityMaintenance.GetEntityInfo(entityType); + // var dbConfigId = config.ConfigId.ToLong(); + // 若实体包含租户Id字段，则设置为当前租户Id + if (entityInfo.Columns.Any(u => u.PropertyName == nameof(EntityTenantId.TenantId))) + { + foreach (var sd in seedData) + { + sd.GetType().GetProperty(nameof(EntityTenantId.TenantId))!.SetValue(sd, tenantId); + } + } + // 若实体包含Pid字段，则设置为当前租户Id + if (entityInfo.Columns.Any(u => u.PropertyName == nameof(SysOrg.Pid))) + { + foreach (var sd in seedData) + { + sd.GetType().GetProperty(nameof(SysOrg.Pid))!.SetValue(sd, tenantId); + } + } + // 若实体包含Id字段，则设置为当前租户Id递增1 + if (entityInfo.Columns.Any(u => u.PropertyName == nameof(EntityBaseId.Id))) + { + var seedId = tenantId; + foreach (var sd in seedData) + { + var id = sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.GetValue(sd, null); + if (id != null && (id.ToString() == "0" || string.IsNullOrWhiteSpace(id.ToString()))) + sd.GetType().GetProperty(nameof(EntityBaseId.Id))!.SetValue(sd, ++seedId); + } + } + + // 若实体是系统内置，则切换至默认库 + if (entityType.GetCustomAttribute() != null) + db = iTenant.GetConnectionScope(SqlSugarConst.MainConfigId); + + if (entityInfo.Columns.Any(u => u.IsPrimarykey)) + { + // 按主键进行批量增加和更新 + var storage = db.StorageableByObject(seedData).ToStorage(); + storage.AsInsertable.ExecuteCommand(); + if (seedType.GetCustomAttribute() == null) // 有忽略更新种子特性时则不更新 + storage.AsUpdateable.IgnoreColumns(entityInfo.Columns.Where(c => c.PropertyInfo.GetCustomAttribute() != null).Select(c => c.PropertyName).ToArray()).ExecuteCommand(); + } + else + { + // 无主键则只进行插入 + if (!db.Queryable(entityInfo.DbTableName, entityInfo.DbTableName).Any()) + db.InsertableByObject(seedData).ExecuteCommand(); + } + } + } } \ No newline at end of file From 7d51d1c5216624ff4ab48f6df2b75801856c5d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Sat, 24 May 2025 14:01:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=98=8Efix(=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?):=20=E5=9C=A8=E8=A1=A8=E7=BB=93=E6=9E=84=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=89=8D=E5=85=88=E5=88=A0=E9=99=A4=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=A7=86=E5=9B=BE=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs index 2ed67845..21d6e908 100644 --- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs +++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs @@ -400,6 +400,15 @@ public static class SqlSugarSetup else entityTypes = entityTypes.Where(u => u.GetCustomAttribute()?.configId.ToString() == config.ConfigId.ToString()).ToList(); // 自定义的库 + // 删除视图再初始化表结构，防止因为视图导致无法同步表结构 + var viewTypeList = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarView)))).ToList(); + foreach (var viewType in viewTypeList) + { + var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(viewType) ?? throw new Exception("获取视图实体配置有误"); + if (dbProvider.DbMaintenance.GetViewInfoList(false).Any(it => it.Name.EqualIgnoreCase(entityInfo.DbTableName))) + dbProvider.DbMaintenance.DropView(entityInfo.DbTableName); + } + int taskIndex = 0, size = entityTypes.Count; var taskList = entityTypes.Select(entityType => Task.Run(() => { @@ -413,7 +422,7 @@ public static class SqlSugarSetup Console.WriteLine($"初始化表 {entityType,-64} ({config.ConfigId} - {Interlocked.Increment(ref taskIndex):D003}/{size:D003}) 耗时：{stopWatch.ElapsedMilliseconds} ms"); })); Task.WaitAll(taskList.ToArray()); - + totalWatch.Stop(); // 停止总计时 Console.ForegroundColor = ConsoleColor.Green; Console.WriteLine($"初始化表结构 {config.DbType} - {config.ConfigId} 总耗时：{totalWatch.ElapsedMilliseconds} ms"); @@ -572,7 +581,7 @@ public static class SqlSugarSetup var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(viewType) ?? throw new Exception("获取视图实体配置有误"); // 如果视图存在，则删除视图 - if (dbProvider.DbMaintenance.GetViewInfoList().Any(it => it.Name.EqualIgnoreCase(entityInfo.DbTableName))) + if (dbProvider.DbMaintenance.GetViewInfoList(false).Any(it => it.Name.EqualIgnoreCase(entityInfo.DbTableName))) dbProvider.DbMaintenance.DropView(entityInfo.DbTableName); // 获取初始化视图查询SQL