diff --git a/nuget-publish.bat b/nuget-publish.bat index e11f656f..d72df3fe 100644 --- a/nuget-publish.bat +++ b/nuget-publish.bat @@ -1,9 +1,9 @@ :start ::定义版本 -set EFCORE2=2.3.1.86 -set EFCORE3=3.3.1.86 -set EFCORE5=5.3.1.86 -set EFCORE6=6.3.1.86 +set EFCORE2=2.3.1.87 +set EFCORE3=3.3.1.87 +set EFCORE5=5.3.1.87 +set EFCORE6=6.3.1.87 ::删除所有bin与obj下的文件 @echo off diff --git a/samples/Sample.SqlServerShardingAll/Controllers/TestController.cs b/samples/Sample.SqlServerShardingAll/Controllers/TestController.cs index 62c31ba3..94139206 100644 --- a/samples/Sample.SqlServerShardingAll/Controllers/TestController.cs +++ b/samples/Sample.SqlServerShardingAll/Controllers/TestController.cs @@ -23,11 +23,13 @@ namespace Sample.SqlServerShardingAll.Controllers public async Task Query() { #region 动态数据源 - //var virtualDataSource = ShardingContainer.GetService>(); + var virtualDataSource = ShardingContainer.GetService>(); - //var virtualDataSourceRoute = virtualDataSource.GetRoute(typeof(Order)); - //virtualDataSourceRoute.AddDataSourceName("D"); - //DynamicDataSourceHelper.DynamicAppendDataSource("D", "连接字符串"); + var virtualDataSourceRoute1 = virtualDataSource.GetRoute(typeof(Order)); + virtualDataSourceRoute1.AddDataSourceName("D"); + var virtualDataSourceRoute2 = virtualDataSource.GetRoute(typeof(SysUser)); + virtualDataSourceRoute2.AddDataSourceName("D"); + DynamicDataSourceHelper.DynamicAppendDataSource("D", "连接字符串"); #endregion var sysUser =await _myDbContext.Set().Where(o=>o.Id=="1").FirstOrDefaultAsync(); diff --git a/src/ShardingCore/Bootstrapers/ShardingDbContextBootstrapper.cs b/src/ShardingCore/Bootstrapers/ShardingDbContextBootstrapper.cs index 85f78e6c..1067f8d7 100644 --- a/src/ShardingCore/Bootstrapers/ShardingDbContextBootstrapper.cs +++ b/src/ShardingCore/Bootstrapers/ShardingDbContextBootstrapper.cs @@ -148,7 +148,7 @@ namespace ShardingCore.Bootstrapers { var dataSourceName = dataSourceKv.Key; var connectionString = dataSourceKv.Value; - _dataSourceInitializer.InitConfigure(dataSourceName, connectionString); + _dataSourceInitializer.InitConfigure(dataSourceName, connectionString, _shardingConfigOption.EnsureCreatedWithOutShardingTable); } } } diff --git a/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs b/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs index 0075691e..9da0d374 100644 --- a/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs +++ b/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs @@ -52,10 +52,6 @@ namespace ShardingCore.DynamicDataSources _virtualDataSource = virtualDataSource; _logger = logger; } - public void InitConfigure(string dataSourceName, string connectionString) - { - InitConfigure(dataSourceName,connectionString, true); - } public void InitConfigure(string dataSourceName, string connectionString, bool createDatabase) { diff --git a/src/ShardingCore/DynamicDataSources/DynamicDataSourceHelper.cs b/src/ShardingCore/DynamicDataSources/DynamicDataSourceHelper.cs index b66bd7ee..1240e158 100644 --- a/src/ShardingCore/DynamicDataSources/DynamicDataSourceHelper.cs +++ b/src/ShardingCore/DynamicDataSources/DynamicDataSourceHelper.cs @@ -14,7 +14,7 @@ namespace ShardingCore.DynamicDataSources public static void DynamicAppendDataSource(string dataSourceName, string connectionString) where TShardingDbContext:DbContext,IShardingDbContext { var defaultDataSourceInitializer = ShardingContainer.GetService>(); - defaultDataSourceInitializer.InitConfigure(dataSourceName, connectionString); + defaultDataSourceInitializer.InitConfigure(dataSourceName, connectionString,true); } } diff --git a/src/ShardingCore/DynamicDataSources/IDataSourceInitializer`1.cs b/src/ShardingCore/DynamicDataSources/IDataSourceInitializer`1.cs index 71be2bb1..c8318c9c 100644 --- a/src/ShardingCore/DynamicDataSources/IDataSourceInitializer`1.cs +++ b/src/ShardingCore/DynamicDataSources/IDataSourceInitializer`1.cs @@ -10,8 +10,6 @@ namespace ShardingCore.DynamicDataSources { public interface IDataSourceInitializer where TShardingDbContext : DbContext, IShardingDbContext { - [Obsolete("plz use method InitConfigure(string dataSourceName, string connectionString,bool createDatabase)")] - void InitConfigure(string dataSourceName, string connectionString); void InitConfigure(string dataSourceName, string connectionString,bool createDatabase); } }