Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2023-05-24 11:52:57 +08:00

View File

@@ -36,12 +36,12 @@ public static class ConfigureSqlSugarExtensions
services.AddSqlSugar(connectConfigList, client => services.AddSqlSugar(connectConfigList, client =>
{ {
//connectConfigList.ForEach(config => connectConfigList.ForEach(config =>
//{ {
// var db = ((SqlSugarScope)client).GetConnectionScope((string)config.ConfigId); var db = ((SqlSugarScope)client).GetConnectionScope((string)config.ConfigId);
// // 设置超时时间 // 设置超时时间
// db.Ado.CommandTimeOut = 30; db.Ado.CommandTimeOut = 30;
//db.Aop.OnLogExecuted = (sql, pars) => //db.Aop.OnLogExecuted = (sql, pars) =>
//{ //{
// var oldColor = Console.ForegroundColor; // var oldColor = Console.ForegroundColor;
@@ -60,7 +60,7 @@ public static class ConfigureSqlSugarExtensions
//{ //{
// Log.Error(UtilMethods.GetSqlString(db.CurrentConnectionConfig.DbType, ex.Sql, (SugarParameter[])ex.Parametres)); // Log.Error(UtilMethods.GetSqlString(db.CurrentConnectionConfig.DbType, ex.Sql, (SugarParameter[])ex.Parametres));
//}; //};
//}); });
}); });
services.AddConfigurableOptions<ConnectionStringsOptions>(); services.AddConfigurableOptions<ConnectionStringsOptions>();
services.AddConfigurableOptions<TenantOptions>(); services.AddConfigurableOptions<TenantOptions>();