修复[#214] 发布6.8.0.3

xuejmnet · xuejmnet · commit 9485ae03c11a · 2022-10-31T23:19:33.000+08:00
diff --git a/nuget-publish.bat b/nuget-publish.bat
@@ -1,6 +1,6 @@
 :start
 ::定义版本
-set SHARDINGCORE=6.8.0.2
+set SHARDINGCORE=6.8.0.3
 
 ::删除所有bin与obj下的文件
 @echo off
diff --git a/samples/Sample.MySql/Controllers/WeatherForecastController.cs b/samples/Sample.MySql/Controllers/WeatherForecastController.cs
@@ -5,6 +5,7 @@
 using Sample.MySql.multi;
 using Sample.MySql.Shardings;
 using ShardingCore.Core.RuntimeContexts;
+using ShardingCore.Core.VirtualRoutes.TableRoutes;
 using ShardingCore.Core.VirtualRoutes.TableRoutes.Abstractions;
 using ShardingCore.Extensions.ShardingQueryableExtensions;
 using ShardingCore.Helpers;
@@ -85,6 +86,11 @@ public async Task<IActionResult> Get()
             // Console.WriteLine("------------");
             // using (var tran = _defaultTableDbContext.Database.BeginTransaction())
             // {
+            
+            SysUserMod? resultX123 = await _defaultTableDbContext.Set<SysUserMod>()
+                .Where(o => o.Id == "2").FirstOrDefaultAsync();
+            _defaultTableDbContext.Update(resultX123);
+            _defaultTableDbContext.SaveChanges();
             var resultX1 = await _defaultTableDbContext.Set<SysUserMod>()
                                 .Where(o => o.Id == "2" || o.Id == "3").GroupBy(o => new { o.Id,o.Name })
                                 .Select(o => new 
diff --git a/samples/Sample.MySql/DbContexts/DefaultShardingDbContext.cs b/samples/Sample.MySql/DbContexts/DefaultShardingDbContext.cs
@@ -19,6 +19,13 @@ public DefaultShardingDbContext(DbContextOptions<DefaultShardingDbContext> optio
             //ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
             //Database.SetCommandTimeout(30000);
         }
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            base.OnConfiguring(optionsBuilder);
+            optionsBuilder.UseLazyLoadingProxies();
+        }
+
         private readonly MethodInfo? _configureGlobalFiltersMethodInfo =
             typeof(DefaultShardingDbContext).GetMethod(nameof(ConfigureGlobalFilters), BindingFlags.Instance | BindingFlags.NonPublic);
 
diff --git a/samples/Sample.MySql/Sample.MySql.csproj b/samples/Sample.MySql/Sample.MySql.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Sample.MySql/Startup.cs b/samples/Sample.MySql/Startup.cs
@@ -103,6 +103,7 @@ public void ConfigureServices(IServiceCollection services)
                     o.AddShardingDataSourceRoute<SysUserModVirtualDataSourceRoute>();
                 }).UseConfig(o =>
                 {
+                    o.UseEntityFrameworkCoreProxies = true;
                     o.ThrowIfQueryRouteNotMatch = false;
                     o.AutoUseWriteConnectionStringAfterWriteDb = true;
                     o.UseShardingQuery((conStr, builder) =>
diff --git a/src/ShardingCore/Core/EntityMetadatas/EntityMetadata.cs b/src/ShardingCore/Core/EntityMetadatas/EntityMetadata.cs
@@ -16,13 +16,16 @@ namespace ShardingCore.Core.EntityMetadatas
     /// 分表或者分库对象的元数据信息记录对象在ShardingCore框架下的一些简单的信息
     /// </summary>
     public class EntityMetadata
-    {private const string QueryFilter = "QueryFilter";
+    {
+        private const string QueryFilter = "QueryFilter";
+
         public EntityMetadata(Type entityType)
         {
             EntityType = entityType;
             ShardingDataSourceProperties = new Dictionary<string, PropertyInfo>();
             ShardingTableProperties = new Dictionary<string, PropertyInfo>();
         }
+
         /// <summary>
         /// 分表类型 sharding entity type
         /// </summary>
@@ -37,10 +40,12 @@ public EntityMetadata(Type entityType)
         /// 是否分表
         /// </summary>
         public bool IsMultiTableMapping => null != ShardingTableProperty;
+
         /// <summary>
         /// 分库字段
         /// </summary>
         public PropertyInfo ShardingDataSourceProperty { get; private set; }
+
         /// <summary>
         /// 分库所有字段包括 ShardingDataSourceProperty
         /// </summary>
@@ -49,37 +54,39 @@ public EntityMetadata(Type entityType)
         /// <summary>
         /// 启动时是否建表 auto create data source when start app
         /// </summary>
-        public bool? AutoCreateDataSourceTable { get;  set; }
+        public bool? AutoCreateDataSourceTable { get; set; }
 
         /// <summary>
         /// 分表字段 sharding table property
         /// </summary>
         public PropertyInfo ShardingTableProperty { get; private set; }
+
         /// <summary>
         /// 分表所有字段包括 ShardingTableProperty
         /// </summary>
-        public IDictionary<string, PropertyInfo> ShardingTableProperties { get;}
+        public IDictionary<string, PropertyInfo> ShardingTableProperties { get; }
 
 
         /// <summary>
         /// 启动时是否建表 auto create table when start app
         /// </summary>
-        public bool? AutoCreateTable { get;  set; }
+        public bool? AutoCreateTable { get; set; }
 
         /// <summary>
         /// 分表隔离器 table sharding tail prefix
         /// </summary>
         public string TableSeparator { get; private set; } = "_";
-        
+
         /// <summary>
         /// 逻辑表名
         /// </summary>
         public string LogicTableName { get; private set; }
-        
+
         /// <summary>
         /// 主键
         /// </summary>
         public IReadOnlyList<PropertyInfo> PrimaryKeyProperties { get; private set; }
+
         /**
          * efcore query filter
          */
@@ -93,14 +100,14 @@ public EntityMetadata(Type entityType)
         public void SetEntityModel(IEntityType dbEntityType)
         {
             LogicTableName = dbEntityType.GetEntityTypeTableName();
-            QueryFilterExpression= dbEntityType.GetAnnotations().FirstOrDefault(o=>o.Name== QueryFilter)?.Value as LambdaExpression;
+            QueryFilterExpression =
+                dbEntityType.GetAnnotations().FirstOrDefault(o => o.Name == QueryFilter)?.Value as LambdaExpression;
             PrimaryKeyProperties = dbEntityType.FindPrimaryKey()?.Properties?.Select(o => o.PropertyInfo)?.ToList() ??
                                    new List<PropertyInfo>();
-            IsSingleKey=PrimaryKeyProperties.Count == 1;
+            IsSingleKey = PrimaryKeyProperties.Count == 1;
         }
-        
-        
-        
+
+
         /// <summary>
         /// 设置分库字段
         /// </summary>
@@ -109,10 +116,12 @@ public void SetShardingDataSourceProperty(PropertyInfo propertyInfo)
         {
             Check.NotNull(propertyInfo, nameof(propertyInfo));
             if (ShardingDataSourceProperties.ContainsKey(propertyInfo.Name))
-                throw new ShardingCoreConfigException($"same sharding data source property name:[{propertyInfo.Name}] don't repeat add");
+                throw new ShardingCoreConfigException(
+                    $"same sharding data source property name:[{propertyInfo.Name}] don't repeat add");
             ShardingDataSourceProperty = propertyInfo;
             ShardingDataSourceProperties.Add(propertyInfo.Name, propertyInfo);
         }
+
         /// <summary>
         /// 添加额外分表字段
         /// </summary>
@@ -121,9 +130,11 @@ public void SetShardingDataSourceProperty(PropertyInfo propertyInfo)
         public void AddExtraSharingDataSourceProperty(PropertyInfo propertyInfo)
         {
             if (ShardingDataSourceProperties.ContainsKey(propertyInfo.Name))
-                throw new ShardingCoreConfigException($"same sharding data source property name:[{propertyInfo.Name}] don't repeat add");
+                throw new ShardingCoreConfigException(
+                    $"same sharding data source property name:[{propertyInfo.Name}] don't repeat add");
             ShardingDataSourceProperties.Add(propertyInfo.Name, propertyInfo);
         }
+
         /// <summary>
         /// 设置分表字段
         /// </summary>
@@ -132,10 +143,12 @@ public void SetShardingTableProperty(PropertyInfo propertyInfo)
         {
             Check.NotNull(propertyInfo, nameof(propertyInfo));
             if (ShardingTableProperties.ContainsKey(propertyInfo.Name))
-                throw new ShardingCoreConfigException($"same sharding table property name:[{propertyInfo.Name}] don't repeat add");
+                throw new ShardingCoreConfigException(
+                    $"same sharding table property name:[{propertyInfo.Name}] don't repeat add");
             ShardingTableProperty = propertyInfo;
             ShardingTableProperties.Add(propertyInfo.Name, propertyInfo);
         }
+
         /// <summary>
         /// 添加额外分表字段
         /// </summary>
@@ -144,7 +157,8 @@ public void SetShardingTableProperty(PropertyInfo propertyInfo)
         public void AddExtraSharingTableProperty(PropertyInfo propertyInfo)
         {
             if (ShardingTableProperties.ContainsKey(propertyInfo.Name))
-                throw new ShardingCoreConfigException($"same sharding table property name:[{propertyInfo.Name}] don't repeat add");
+                throw new ShardingCoreConfigException(
+                    $"same sharding table property name:[{propertyInfo.Name}] don't repeat add");
             ShardingTableProperties.Add(propertyInfo.Name, propertyInfo);
         }
 
@@ -156,6 +170,7 @@ public void SetTableSeparator(string separator)
         {
             TableSeparator = separator;
         }
+
         /// <summary>
         /// 启动时检查分库信息是否完整
         /// </summary>
@@ -165,11 +180,13 @@ public void CheckShardingDataSourceMetadata()
             {
                 throw new ShardingCoreException($"not found  entity:{EntityType} configure");
             }
-            if(ShardingDataSourceProperty==null)
+
+            if (ShardingDataSourceProperty == null)
             {
                 throw new ShardingCoreException($"not found  entity:{EntityType} configure sharding property");
             }
         }
+
         /// <summary>
         /// 启动时检查分表信息是否完整
         /// </summary>
@@ -179,11 +196,13 @@ public void CheckShardingTableMetadata()
             {
                 throw new ShardingCoreException($"not found  entity:{EntityType} configure");
             }
+
             if (ShardingTableProperty == null)
             {
                 throw new ShardingCoreException($"not found  entity:{EntityType} configure sharding property");
             }
         }
+
         /// <summary>
         /// 启动时检查对象信息是否完整
         /// </summary>
@@ -195,6 +214,7 @@ public void CheckGenericMetadata()
                 throw new ShardingCoreException($"not found  entity:{EntityType} configure");
             }
         }
+
         protected bool Equals(EntityMetadata other)
         {
             return Equals(EntityType, other.EntityType);
@@ -213,4 +233,4 @@ public override int GetHashCode()
             return (EntityType != null ? EntityType.GetHashCode() : 0);
         }
     }
-}
+}
diff --git a/src/ShardingCore/Core/ShardingConfigurations/ShardingConfigOptions.cs b/src/ShardingCore/Core/ShardingConfigurations/ShardingConfigOptions.cs
@@ -12,6 +12,11 @@ namespace ShardingCore.Core.ShardingConfigurations
     /// </summary>
     public class ShardingConfigOptions
     {
+        /// <summary>
+        /// 是否使用代理模式
+        /// </summary>
+        public bool UseEntityFrameworkCoreProxies { get; set; } = false;
+
         /// <summary>
         /// 写操作数据库后自动使用写库链接防止读库链接未同步无法查询到数据
         /// </summary>
diff --git a/src/ShardingCore/Core/TrackerManagers/ITrackerManager.cs b/src/ShardingCore/Core/TrackerManagers/ITrackerManager.cs
@@ -18,5 +18,6 @@ public interface ITrackerManager
         bool AddDbContextModel(Type entityType,bool hasKey);
         bool EntityUseTrack(Type entityType);
         bool IsDbContextModel(Type entityType);
+        Type TranslateEntityType(Type entityType);
     }
 }
diff --git a/src/ShardingCore/Core/TrackerManagers/TrackerManager.cs b/src/ShardingCore/Core/TrackerManagers/TrackerManager.cs
@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Text;
 using Microsoft.EntityFrameworkCore;
+using ShardingCore.Core.ShardingConfigurations;
+using ShardingCore.Exceptions;
 using ShardingCore.Sharding.Abstractions;
 
 namespace ShardingCore.Core.TrackerManagers
@@ -15,9 +17,15 @@ namespace ShardingCore.Core.TrackerManagers
     * @Ver: 1.0
     * @Email: 326308290@qq.com
     */
-    public class TrackerManager: ITrackerManager
+    public class TrackerManager : ITrackerManager
     {
-        private readonly ConcurrentDictionary<Type,bool> _dbContextModels = new ();
+        private readonly ShardingConfigOptions _shardingConfigOptions;
+        private readonly ConcurrentDictionary<Type, bool> _dbContextModels = new();
+
+        public TrackerManager(ShardingConfigOptions shardingConfigOptions)
+        {
+            _shardingConfigOptions = shardingConfigOptions;
+        }
 
         public bool AddDbContextModel(Type entityType, bool hasKey)
         {
@@ -26,16 +34,66 @@ public bool AddDbContextModel(Type entityType, bool hasKey)
 
         public bool EntityUseTrack(Type entityType)
         {
-            if (!_dbContextModels.TryGetValue(entityType, out var hasKey))
+            if (_dbContextModels.TryGetValue(entityType, out var hasKey))
+            {
+                return hasKey;
+            }
+
+            if (_shardingConfigOptions.UseEntityFrameworkCoreProxies && entityType.BaseType != null)
             {
-                return false;
+                if (_dbContextModels.TryGetValue(entityType.BaseType, out hasKey))
+                {
+                    return hasKey;
+                }
             }
-            return hasKey;
+
+            return false;
         }
 
         public bool IsDbContextModel(Type entityType)
         {
-            return _dbContextModels.ContainsKey(entityType);
+            if (_dbContextModels.ContainsKey(entityType))
+            {
+                return true;
+            }
+
+            if (_shardingConfigOptions.UseEntityFrameworkCoreProxies && entityType.BaseType != null)
+            {
+                return _dbContextModels.ContainsKey(entityType.BaseType);
+            }
+
+            return false;
+        }
+
+        public Type TranslateEntityType(Type entityType)
+        {
+            if (!_dbContextModels.ContainsKey(entityType))
+            {
+                if (_shardingConfigOptions.UseEntityFrameworkCoreProxies && entityType.BaseType != null)
+                {
+                    if (_dbContextModels.ContainsKey(entityType.BaseType))
+                    {
+                        return entityType.BaseType;
+                    }
+                }
+            }
+
+            return entityType;
         }
+
+        //
+        // public Type GetEntityType(Type entityType)
+        // {
+        //     if (_dbContextModels.ContainsKey(entityType))
+        //     {
+        //         return entityType;
+        //     }
+        //
+        //     if (entityType.BaseType != null&&_dbContextModels.ContainsKey(entityType.BaseType))
+        //     {
+        //         return entityType.BaseType;
+        //     }
+        //     throw new ShardingCoreInvalidOperationException($"entity type:{entityType.FullName} not found");
+        // }
     }
-}
+}
diff --git a/src/ShardingCore/Core/VirtualRoutes/DataSourceRoutes/DataSourceRouteManager.cs b/src/ShardingCore/Core/VirtualRoutes/DataSourceRoutes/DataSourceRouteManager.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using ShardingCore.Core.EntityMetadatas;
 using ShardingCore.Core.ShardingEnumerableQueries;
+using ShardingCore.Core.TrackerManagers;
 using ShardingCore.Core.VirtualDatabase.VirtualDataSources;
 using ShardingCore.Core.VirtualRoutes.Abstractions;
 using ShardingCore.Exceptions;
diff --git a/src/ShardingCore/EFCores/ShardingInternalDbSet.cs b/src/ShardingCore/EFCores/ShardingInternalDbSet.cs
diff --git a/src/ShardingCore/Extensions/DataSourceRouteManagerExtension.cs b/src/ShardingCore/Extensions/DataSourceRouteManagerExtension.cs
diff --git a/src/ShardingCore/Extensions/VirtualDataBaseExtension.cs b/src/ShardingCore/Extensions/VirtualDataBaseExtension.cs
diff --git a/src/ShardingCore/Sharding/ShardingDbContextExecutors/ShardingDbContextExecutor.cs b/src/ShardingCore/Sharding/ShardingDbContextExecutors/ShardingDbContextExecutor.cs

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ public void ConfigureServices(IServiceCollection services)`
`103`	`103`	`o.AddShardingDataSourceRoute<SysUserModVirtualDataSourceRoute>();`
`104`	`104`	`}).UseConfig(o =>`
`105`	`105`	`{`
	`106`	`+ o.UseEntityFrameworkCoreProxies = true;`
`106`	`107`	`o.ThrowIfQueryRouteNotMatch = false;`
`107`	`108`	`o.AutoUseWriteConnectionStringAfterWriteDb = true;`
`108`	`109`	`o.UseShardingQuery((conStr, builder) =>`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@ public interface ITrackerManager`
`18`	`18`	`bool AddDbContextModel(Type entityType,bool hasKey);`
`19`	`19`	`bool EntityUseTrack(Type entityType);`
`20`	`20`	`bool IsDbContextModel(Type entityType);`
	`21`	`+ Type TranslateEntityType(Type entityType);`
`21`	`22`	`}`
`22`	`23`	`}`