From 636a643d2cbf44a0e8ddfd1822f4a22707cbc8a0 Mon Sep 17 00:00:00 2001
From: xuejiaming <326308290@qq.com>
Date: Tue, 12 Jul 2022 10:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83x.6.0.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nuget-publish.bat                             |  8 +++----
 .../Controllers/TestController.cs             |  2 +-
 .../Helpers/DynamicShardingHelper.cs          | 24 +++++++++++--------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/nuget-publish.bat b/nuget-publish.bat
index 2d4e8072..43a3c266 100644
--- a/nuget-publish.bat
+++ b/nuget-publish.bat
@@ -1,9 +1,9 @@
 :start
 ::定义版本
-set EFCORE2=2.6.0.7
-set EFCORE3=3.6.0.7
-set EFCORE5=5.6.0.7
-set EFCORE6=6.6.0.7
+set EFCORE2=2.6.0.8
+set EFCORE3=3.6.0.8
+set EFCORE5=5.6.0.8
+set EFCORE6=6.6.0.8
 
 ::删除所有bin与obj下的文件
 @echo off
diff --git a/samples/Sample.SqlServerShardingTable/Controllers/TestController.cs b/samples/Sample.SqlServerShardingTable/Controllers/TestController.cs
index b4399543..2127a430 100644
--- a/samples/Sample.SqlServerShardingTable/Controllers/TestController.cs
+++ b/samples/Sample.SqlServerShardingTable/Controllers/TestController.cs
@@ -149,7 +149,7 @@ namespace Sample.SqlServerShardingTable.Controllers
 
         public async Task<IActionResult> DynamicReadWrite()
         {
-            DynamicShardingHelper.DynamicAppendReadWriteConnectionString<MyDbContext>(_shardingRuntimeContext,"ds0", "Data Source=localhost;Initial Catalog=EFCoreShardingTableDB1;Integrated Security=True;");
+            DynamicShardingHelper.DynamicAppendReadWriteConnectionString(_shardingRuntimeContext,"ds0", "Data Source=localhost;Initial Catalog=EFCoreShardingTableDB1;Integrated Security=True;");
             var sysUser = await _myDbContext.Set<SysUser>().Where(o => o.Id == "1").FirstOrDefaultAsync();
 
             return Ok(sysUser);
diff --git a/src/ShardingCore/Helpers/DynamicShardingHelper.cs b/src/ShardingCore/Helpers/DynamicShardingHelper.cs
index eaf114f1..e6429877 100644
--- a/src/ShardingCore/Helpers/DynamicShardingHelper.cs
+++ b/src/ShardingCore/Helpers/DynamicShardingHelper.cs
@@ -3,14 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
 using ShardingCore.Core.RuntimeContexts;
-using ShardingCore.Core.VirtualDatabase.VirtualDataSources;
-using ShardingCore.Core.VirtualDatabase.VirtualDataSources.Abstractions;
 using ShardingCore.Core.VirtualDatabase.VirtualDataSources.PhysicDataSources;
-using ShardingCore.DynamicDataSources;
 using ShardingCore.Exceptions;
-using ShardingCore.Sharding.Abstractions;
 using ShardingCore.Sharding.ReadWriteConfigurations.Abstractions;
 
 namespace ShardingCore.Helpers
@@ -25,31 +20,40 @@ namespace ShardingCore.Helpers
         /// <summary>
         /// 动态添加数据源
         /// </summary>
-        /// <typeparam name="TShardingDbContext"></typeparam>
         /// <param name="shardingRuntimeContext"></param>
         /// <param name="dataSourceName"></param>
         /// <param name="connectionString"></param>
         /// <param name="createDatabase"></param>
         /// <param name="createTable"></param>
-        public static void DynamicAppendDataSource<TShardingDbContext>(IShardingRuntimeContext shardingRuntimeContext, string dataSourceName, string connectionString,bool createDatabase,bool createTable) where TShardingDbContext : DbContext, IShardingDbContext
+        public static void DynamicAppendDataSource(IShardingRuntimeContext shardingRuntimeContext, string dataSourceName, string connectionString,bool createDatabase,bool createTable)
         {
             var virtualDataSource = shardingRuntimeContext.GetVirtualDataSource();
             virtualDataSource.AddPhysicDataSource(new DefaultPhysicDataSource(dataSourceName, connectionString, false));
             var dataSourceInitializer = shardingRuntimeContext.GetDataSourceInitializer();
             dataSourceInitializer.InitConfigure(dataSourceName,createDatabase,createTable);
         }
+        /// <summary>
+        /// 动态添加数据源
+        /// </summary>
+        /// <param name="shardingRuntimeContext"></param>
+        /// <param name="dataSourceName"></param>
+        /// <param name="connectionString"></param>
+        public static void DynamicAppendDataSourceOnly(IShardingRuntimeContext shardingRuntimeContext, string dataSourceName, string connectionString)
+        {
+            var virtualDataSource = shardingRuntimeContext.GetVirtualDataSource();
+            virtualDataSource.AddPhysicDataSource(new DefaultPhysicDataSource(dataSourceName, connectionString, false));
+        }
 
         /// <summary>
         /// 动态添加读写分离链接字符串
         /// </summary>
-        /// <typeparam name="TShardingDbContext"></typeparam>
         /// <param name="shardingRuntimeContext"></param>
         /// <param name="dataSourceName"></param>
         /// <param name="connectionString"></param>
         /// <param name="readNodeName"></param>
         /// <exception cref="ShardingCoreInvalidOperationException"></exception>
-        public static void DynamicAppendReadWriteConnectionString<TShardingDbContext>(IShardingRuntimeContext shardingRuntimeContext, string dataSourceName,
-            string connectionString, string readNodeName=null) where TShardingDbContext : DbContext, IShardingDbContext
+        public static void DynamicAppendReadWriteConnectionString(IShardingRuntimeContext shardingRuntimeContext, string dataSourceName,
+            string connectionString, string readNodeName=null)
         {
             var virtualDataSource = shardingRuntimeContext.GetVirtualDataSource();
             if (virtualDataSource.ConnectionStringManager is IReadWriteConnectionStringManager