From 5dd8210653731fa0429f59591a9d2ddc13036cde Mon Sep 17 00:00:00 2001
From: AlexLEWIS <liuyis@live.com>
Date: Fri, 6 Aug 2021 16:55:44 +0800
Subject: [PATCH 1/4] Code cleanup.

---
 .../BaseEntity.cs                             |  95 +++++++++-------
 .../BaseEntityAsync.cs                        | 103 ++++++++++--------
 .../BaseEntityReadOnly.cs                     |  84 ++++++++------
 .../FreeSql.Extensions.BaseEntity.csproj      |   5 +-
 4 files changed, 164 insertions(+), 123 deletions(-)

diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs
index 40382f84..76d2d2a5 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs
+++ b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs
@@ -1,12 +1,15 @@
-using FreeSql;
+#if NET40
+using FreeSql.DataAnnotations;
+using System;
+
+#else
 using FreeSql.DataAnnotations;
 using System;
-using System.Data;
-using System.Diagnostics;
-using System.Linq.Expressions;
-using System.Threading;
 using System.Threading.Tasks;
 
+#endif
+
+// ReSharper disable once CheckNamespace
 namespace FreeSql
 {
     /// <summary>
@@ -21,9 +24,9 @@ namespace FreeSql
     {
         static BaseEntity()
         {
-            var tkeyType = typeof(TKey)?.NullableTypeOrThis();
-            if (tkeyType == typeof(int) || tkeyType == typeof(long))
-                BaseEntity.ConfigEntity(typeof(TEntity), t => t.Property("Id").IsIdentity(true));
+            var keyType = typeof(TKey).NullableTypeOrThis();
+            if (keyType == typeof(int) || keyType == typeof(long))
+                ConfigEntity(typeof(TEntity), t => t.Property("Id").IsIdentity(true));
         }
 
         /// <summary>
@@ -32,14 +35,13 @@ namespace FreeSql
         [Column(Position = 1)]
         public virtual TKey Id { get; set; }
 
-#if net40
-#else
+#if !NET40
         /// <summary>
         /// 根据主键值获取数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        async public static Task<TEntity> FindAsync(TKey id)
+        public static async Task<TEntity> FindAsync(TKey id)
         {
             var item = await Select.WhereDynamic(id).FirstAsync();
             (item as BaseEntity<TEntity>)?.Attach();
@@ -69,15 +71,18 @@ namespace FreeSql
     {
         bool UpdateIsDeleted(bool value)
         {
-            if (this.Repository == null)
+            if (Repository is null)
+            {
                 return Orm.Update<TEntity>(this as TEntity)
-                    .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
-                    .Set(a => (a as BaseEntity).IsDeleted, this.IsDeleted = value).ExecuteAffrows() == 1;
+                          .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
+                          .Set(a => (a as BaseEntity).IsDeleted, IsDeleted = value).ExecuteAffrows() == 1;
+            }
 
-            this.IsDeleted = value;
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.Update(this as TEntity) == 1;
+            IsDeleted = value;
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.Update(this as TEntity) == 1;
         }
+
         /// <summary>
         /// 删除数据
         /// </summary>
@@ -85,18 +90,21 @@ namespace FreeSql
         /// <returns></returns>
         public virtual bool Delete(bool physicalDelete = false)
         {
-            if (physicalDelete == false) return this.UpdateIsDeleted(true);
-            if (this.Repository == null) 
+            if (physicalDelete == false)
+                return UpdateIsDeleted(true);
+
+            if (Repository is null)
                 return Orm.Delete<TEntity>(this as TEntity).ExecuteAffrows() == 1;
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.Delete(this as TEntity) == 1;
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.Delete(this as TEntity) == 1;
         }
+
         /// <summary>
         /// 恢复删除的数据
         /// </summary>
         /// <returns></returns>
-        public virtual bool Restore() => this.UpdateIsDeleted(false);
+        public virtual bool Restore() => UpdateIsDeleted(false);
 
         /// <summary>
         /// 更新数据
@@ -104,26 +112,29 @@ namespace FreeSql
         /// <returns></returns>
         public virtual bool Update()
         {
-            this.UpdateTime = DateTime.Now;
-            if (this.Repository == null)
+            UpdateTime = DateTime.Now;
+            if (Repository is null)
+            {
                 return Orm.Update<TEntity>()
-                    .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
-                    .SetSource(this as TEntity).ExecuteAffrows() == 1;
+                          .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
+                          .SetSource(this as TEntity).ExecuteAffrows() == 1;
+            }
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.Update(this as TEntity) == 1;
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.Update(this as TEntity) == 1;
         }
+
         /// <summary>
         /// 插入数据
         /// </summary>
         public virtual TEntity Insert()
         {
-            this.CreateTime = DateTime.Now;
-            if (this.Repository == null)
-                this.Repository = Orm.GetRepository<TEntity>();
+            CreateTime = DateTime.Now;
+            if (Repository is null)
+                Repository = Orm.GetRepository<TEntity>();
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.Insert(this as TEntity);
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.Insert(this as TEntity);
         }
 
         /// <summary>
@@ -132,12 +143,12 @@ namespace FreeSql
         /// <returns></returns>
         public virtual TEntity Save()
         {
-            this.UpdateTime = DateTime.Now;
-            if (this.Repository == null)
-                this.Repository = Orm.GetRepository<TEntity>();
+            UpdateTime = DateTime.Now;
+            if (Repository is null)
+                Repository = Orm.GetRepository<TEntity>();
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.InsertOrUpdate(this as TEntity);
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.InsertOrUpdate(this as TEntity);
         }
 
         /// <summary>
@@ -146,11 +157,11 @@ namespace FreeSql
         /// <param name="navigatePropertyName">导航属性名</param>
         public virtual void SaveMany(string navigatePropertyName)
         {
-            if (this.Repository == null)
-                this.Repository = Orm.GetRepository<TEntity>();
+            if (Repository is null)
+                Repository = Orm.GetRepository<TEntity>();
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            this.Repository.SaveMany(this as TEntity, navigatePropertyName);
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            Repository.SaveMany(this as TEntity, navigatePropertyName);
         }
     }
 }
\ No newline at end of file
diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs
index ca589470..3821a812 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs
+++ b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs
@@ -1,9 +1,14 @@
-
-using FreeSql;
+#if NET40
+using FreeSql.DataAnnotations;
+
+#else
 using FreeSql.DataAnnotations;
 using System;
 using System.Threading.Tasks;
 
+#endif
+
+// ReSharper disable once CheckNamespace
 namespace FreeSql
 {
     /// <summary>
@@ -18,32 +23,30 @@ namespace FreeSql
     {
         static BaseEntityAsync()
         {
-            var tkeyType = typeof(TKey)?.NullableTypeOrThis();
-            if (tkeyType == typeof(int) || tkeyType == typeof(long))
-                BaseEntity.ConfigEntity(typeof(TEntity), t => t.Property("Id").IsIdentity(true));
+            var keyType = typeof(TKey).NullableTypeOrThis();
+            if (keyType == typeof(int) || keyType == typeof(long))
+                ConfigEntity(typeof(TEntity), t => t.Property("Id").IsIdentity(true));
         }
 
         /// <summary>
         /// 主键
         /// </summary>
-        [Column(Position = 1)] 
+        [Column(Position = 1)]
         public virtual TKey Id { get; set; }
 
-#if net40
-#else
+#if !NET40
         /// <summary>
         /// 根据主键值获取数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        async public static Task<TEntity> FindAsync(TKey id)
+        public static async Task<TEntity> FindAsync(TKey id)
         {
             var item = await Select.WhereDynamic(id).FirstAsync();
             (item as BaseEntity<TEntity>)?.Attach();
             return item;
         }
 #endif
-
     }
 
     /// <summary>
@@ -53,65 +56,73 @@ namespace FreeSql
     [Table(DisableSyncStructure = true)]
     public abstract class BaseEntityAsync<TEntity> : BaseEntityReadOnly<TEntity> where TEntity : class
     {
-#if net40
-#else
+#if !NET40
         async Task<bool> UpdateIsDeletedAsync(bool value)
         {
-            if (this.Repository == null)
+            if (Repository is null)
+            {
                 return await Orm.Update<TEntity>(this as TEntity)
-                    .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
-                    .Set(a => (a as BaseEntity).IsDeleted, this.IsDeleted = value).ExecuteAffrowsAsync() == 1;
+                                .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
+                                .Set(a => (a as BaseEntity).IsDeleted, IsDeleted = value).ExecuteAffrowsAsync() == 1;
+            }
 
-            this.IsDeleted = value;
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return await this.Repository.UpdateAsync(this as TEntity) == 1;
+            IsDeleted = value;
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return await Repository.UpdateAsync(this as TEntity) == 1;
         }
+
         /// <summary>
         /// 删除数据
         /// </summary>
         /// <param name="physicalDelete">是否物理删除</param>
         /// <returns></returns>
-        async public virtual Task<bool> DeleteAsync(bool physicalDelete = false)
+        public virtual async Task<bool> DeleteAsync(bool physicalDelete = false)
         {
-            if (physicalDelete == false) return await this.UpdateIsDeletedAsync(true);
-            if (this.Repository == null)
+            if (physicalDelete == false)
+                return await UpdateIsDeletedAsync(true);
+
+            if (Repository is null)
                 return await Orm.Delete<TEntity>(this as TEntity).ExecuteAffrowsAsync() == 1;
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return await this.Repository.DeleteAsync(this as TEntity) == 1;
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return await Repository.DeleteAsync(this as TEntity) == 1;
         }
+
         /// <summary>
         /// 恢复删除的数据
         /// </summary>
         /// <returns></returns>
-        public virtual Task<bool> RestoreAsync() => this.UpdateIsDeletedAsync(false);
+        public virtual Task<bool> RestoreAsync() => UpdateIsDeletedAsync(false);
 
         /// <summary>
         /// 更新数据
         /// </summary>
         /// <returns></returns>
-        async public virtual Task<bool> UpdateAsync()
+        public virtual async Task<bool> UpdateAsync()
         {
-            this.UpdateTime = DateTime.Now;
-            if (this.Repository == null)
+            UpdateTime = DateTime.Now;
+            if (Repository is null)
+            {
                 return await Orm.Update<TEntity>()
-                    .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
-                    .SetSource(this as TEntity).ExecuteAffrowsAsync() == 1;
+                                .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction())
+                                .SetSource(this as TEntity).ExecuteAffrowsAsync() == 1;
+            }
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return await this.Repository.UpdateAsync(this as TEntity) == 1;
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return await Repository.UpdateAsync(this as TEntity) == 1;
         }
+
         /// <summary>
         /// 插入数据
         /// </summary>
         public virtual Task<TEntity> InsertAsync()
         {
-            this.CreateTime = DateTime.Now;
-            if (this.Repository == null)
-                this.Repository = Orm.GetRepository<TEntity>();
+            CreateTime = DateTime.Now;
+            if (Repository is null)
+                Repository = Orm.GetRepository<TEntity>();
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.InsertAsync(this as TEntity);
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.InsertAsync(this as TEntity);
         }
 
         /// <summary>
@@ -120,12 +131,12 @@ namespace FreeSql
         /// <returns></returns>
         public virtual Task<TEntity> SaveAsync()
         {
-            this.UpdateTime = DateTime.Now;
-            if (this.Repository == null)
-                this.Repository = Orm.GetRepository<TEntity>();
+            UpdateTime = DateTime.Now;
+            if (Repository is null)
+                Repository = Orm.GetRepository<TEntity>();
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.InsertOrUpdateAsync(this as TEntity);
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.InsertOrUpdateAsync(this as TEntity);
         }
 
         /// <summary>
@@ -134,12 +145,12 @@ namespace FreeSql
         /// <param name="navigatePropertyName">导航属性名</param>
         public virtual Task SaveManyAsync(string navigatePropertyName)
         {
-            if (this.Repository == null)
-                this.Repository = Orm.GetRepository<TEntity>();
+            if (Repository is null)
+                Repository = Orm.GetRepository<TEntity>();
 
-            this.Repository.UnitOfWork = _resolveUow?.Invoke();
-            return this.Repository.SaveManyAsync(this as TEntity, navigatePropertyName);
+            Repository.UnitOfWork = _resolveUow?.Invoke();
+            return Repository.SaveManyAsync(this as TEntity, navigatePropertyName);
         }
 #endif
     }
-}
+}
\ No newline at end of file
diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
index b3dd1c8a..13c44e92 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
+++ b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
@@ -1,15 +1,14 @@
-
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Data.Common;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
 
+// ReSharper disable once CheckNamespace
 namespace FreeSql
 {
     /// <summary>
@@ -19,6 +18,7 @@ namespace FreeSql
     public abstract class BaseEntity
     {
         internal static IFreeSql _ormPriv;
+
         /// <summary>
         /// 全局 IFreeSql orm 对象
         /// </summary>
@@ -26,6 +26,7 @@ namespace FreeSql
 .UseAutoSyncStructure(true)
 .UseConnectionString(DataType.Sqlite, ""data source=test.db;max pool size=5"")
 .Build());");
+
         internal static Func<IUnitOfWork> _resolveUow;
 
         /// <summary>
@@ -52,21 +53,24 @@ namespace FreeSql
                         _ormPriv.CodeFirst.ConfigEntity(cei.EntityType, cei.Fluent);
                 }
             }
+
             _resolveUow = resolveUow;
         }
-        
+
         class ConfigEntityInfo
         {
             public Type EntityType;
             public Action<TableFluent> Fluent;
         }
-        static ConcurrentQueue<ConfigEntityInfo> _configEntityQueues = new ConcurrentQueue<ConfigEntityInfo>();
-        static object _configEntityLock = new object();
+
+        static ConcurrentQueue<ConfigEntityInfo> _configEntityQueues = new();
+        static object _configEntityLock = new();
+
         internal static void ConfigEntity(Type entityType, Action<TableFluent> fluent)
         {
             lock (_configEntityLock)
             {
-                if (_ormPriv == null)
+                if (_ormPriv is null)
                     _configEntityQueues.Enqueue(new ConfigEntityInfo { EntityType = entityType, Fluent = fluent });
                 else
                     _ormPriv.CodeFirst.ConfigEntity(entityType, fluent);
@@ -78,16 +82,19 @@ namespace FreeSql
         /// </summary>
         [Column(Position = -4)]
         public virtual DateTime CreateTime { get; set; } = DateTime.Now;
+
         /// <summary>
         /// 更新时间
         /// </summary>
         [Column(Position = -3)]
         public virtual DateTime UpdateTime { get; set; }
+
         /// <summary>
         /// 逻辑删除
         /// </summary>
         [Column(Position = -2)]
         public virtual bool IsDeleted { get; set; }
+
         /// <summary>
         /// 排序
         /// </summary>
@@ -107,25 +114,29 @@ namespace FreeSql
             get
             {
                 var select = Orm.Select<TEntity>()
-                    .TrackToList(TrackToList) //自动为每个元素 Attach
-                    .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction(false));
+                                .TrackToList(TrackToList) //自动为每个元素 Attach
+                                .WithTransaction(_resolveUow?.Invoke()?.GetOrBeginTransaction(false));
                 return select.WhereCascade(a => (a as BaseEntity).IsDeleted == false);
             }
         }
 
         static void TrackToList(object list)
         {
-            if (list == null) return;
-            var ls = list as IList<TEntity>;
-            if (ls == null)
+            if (list is null)
+                return;
+
+            if (list is not IList<TEntity> ls)
             {
-                var ie = list as IEnumerable;
-                if (ie == null) return;
+                if (list is not IEnumerable ie)
+                    return;
+
                 var isFirst = true;
+
                 IBaseRepository<TEntity> berepo = null;
+
                 foreach (var item in ie)
                 {
-                    if (item == null) return;
+                    if (item is null) return;
                     if (isFirst)
                     {
                         isFirst = false;
@@ -135,28 +146,36 @@ namespace FreeSql
                         if (Orm.CodeFirst.GetTableByEntity(itemType)?.Primarys.Any() != true) return;
                         if (item is BaseEntity<TEntity> == false) return;
                     }
-                    var beitem = item as BaseEntity<TEntity>;
-                    if (beitem != null)
+
+                    if (item is BaseEntity<TEntity> entity)
                     {
-                        if (berepo == null) berepo = Orm.GetRepository<TEntity>();
-                        beitem.Repository = berepo;
-                        beitem.Attach();
+                        berepo ??= Orm.GetRepository<TEntity>();
+                        entity.Repository = berepo;
+                        entity.Attach();
                     }
                 }
+
                 return;
             }
-            if (ls.Any() == false) return;
-            if (ls.FirstOrDefault() is BaseEntity<TEntity> == false) return;
-            if (Orm.CodeFirst.GetTableByEntity(typeof(TEntity))?.Primarys.Any() != true) return;
+
+            if (ls.Any() == false)
+                return;
+
+            if (ls.FirstOrDefault() is not BaseEntity<TEntity>)
+                return;
+
+            if (Orm.CodeFirst.GetTableByEntity(typeof(TEntity))?.Primarys.Any() != true)
+                return;
+
             IBaseRepository<TEntity> repo = null;
+
             foreach (var item in ls)
             {
-                var beitem = item as BaseEntity<TEntity>;
-                if (beitem != null)
+                if (item is BaseEntity<TEntity> entity)
                 {
-                    if (repo == null) repo = Orm.GetRepository<TEntity>();
-                    beitem.Repository = repo;
-                    beitem.Attach();
+                    repo ??= Orm.GetRepository<TEntity>();
+                    entity.Repository = repo;
+                    entity.Attach();
                 }
             }
         }
@@ -167,6 +186,7 @@ namespace FreeSql
         /// <param name="exp">lambda表达式</param>
         /// <returns></returns>
         public static ISelect<TEntity> Where(Expression<Func<TEntity, bool>> exp) => Select.Where(exp);
+
         /// <summary>
         /// 查询条件，Where(true, a => a.Id > 10)，支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com")
         /// </summary>
@@ -185,12 +205,10 @@ namespace FreeSql
         /// </summary>
         public TEntity Attach()
         {
-            if (this.Repository == null)
-                this.Repository = Orm.GetRepository<TEntity>();
-
+            Repository ??= Orm.GetRepository<TEntity>();
             var item = this as TEntity;
-            this.Repository.Attach(item);
+            Repository.Attach(item);
             return item;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
index bfd13274..8a9e2002 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
+++ b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
@@ -6,8 +6,8 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用.</Description>
-    <PackageProjectUrl>https://github.com/2881099/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/2881099/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/dotnetcore/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>FreeSql;ORM;BaseEntity</PackageTags>
@@ -19,6 +19,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 73d2bfc680da517b626e11b9c4fc75429aa44dd9 Mon Sep 17 00:00:00 2001
From: AlexLEWIS <liuyis@live.com>
Date: Fri, 6 Aug 2021 17:07:36 +0800
Subject: [PATCH 2/4] Code cleanup.

---
 .../BaseEntityReadOnly.cs                     | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
index 13c44e92..da2475d1 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
+++ b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
@@ -8,7 +8,9 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
 
-// ReSharper disable once CheckNamespace
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+// ReSharper disable InconsistentlySynchronizedField
 namespace FreeSql
 {
     /// <summary>
@@ -19,13 +21,16 @@ namespace FreeSql
     {
         internal static IFreeSql _ormPriv;
 
+        private const string ErrorMessageTemplate = @"使用前请初始化：
+BaseEntity.Initialization(new FreeSqlBuilder()
+        .UseAutoSyncStructure(true)
+        .UseConnectionString(DataType.Sqlite, ""data source=test.db;max pool size=5"")
+        .Build());";
+
         /// <summary>
         /// 全局 IFreeSql orm 对象
         /// </summary>
-        public static IFreeSql Orm => _ormPriv ?? throw new Exception(@"使用前请初始化 BaseEntity.Initialization(new FreeSqlBuilder()
-.UseAutoSyncStructure(true)
-.UseConnectionString(DataType.Sqlite, ""data source=test.db;max pool size=5"")
-.Build());");
+        public static IFreeSql Orm => _ormPriv ?? throw new Exception(ErrorMessageTemplate);
 
         internal static Func<IUnitOfWork> _resolveUow;
 
@@ -63,8 +68,8 @@ namespace FreeSql
             public Action<TableFluent> Fluent;
         }
 
-        static ConcurrentQueue<ConfigEntityInfo> _configEntityQueues = new();
-        static object _configEntityLock = new();
+        static readonly ConcurrentQueue<ConfigEntityInfo> _configEntityQueues = new();
+        static readonly object _configEntityLock = new();
 
         internal static void ConfigEntity(Type entityType, Action<TableFluent> fluent)
         {
@@ -131,26 +136,29 @@ namespace FreeSql
                     return;
 
                 var isFirst = true;
-
-                IBaseRepository<TEntity> berepo = null;
+                IBaseRepository<TEntity> baseRepo = null;
 
                 foreach (var item in ie)
                 {
-                    if (item is null) return;
+                    if (item is null)
+                    {
+                        return;
+                    }
+
                     if (isFirst)
                     {
                         isFirst = false;
                         var itemType = item.GetType();
                         if (itemType == typeof(object)) return;
-                        if (itemType.FullName.Contains("FreeSqlLazyEntity__")) itemType = itemType.BaseType;
+                        if (itemType.FullName!.Contains("FreeSqlLazyEntity__")) itemType = itemType.BaseType;
                         if (Orm.CodeFirst.GetTableByEntity(itemType)?.Primarys.Any() != true) return;
-                        if (item is BaseEntity<TEntity> == false) return;
+                        if (item is not BaseEntity<TEntity>) return;
                     }
 
                     if (item is BaseEntity<TEntity> entity)
                     {
-                        berepo ??= Orm.GetRepository<TEntity>();
-                        entity.Repository = berepo;
+                        baseRepo ??= Orm.GetRepository<TEntity>();
+                        entity.Repository = baseRepo;
                         entity.Attach();
                     }
                 }

From 6789c3f3ee69d200e73b245c49c83f2f7608a54a Mon Sep 17 00:00:00 2001
From: AlexLEWIS <liuyis@live.com>
Date: Fri, 6 Aug 2021 17:23:52 +0800
Subject: [PATCH 3/4] Add English comments.

---
 .../BaseEntity.cs                             | 31 ++++++++++++-------
 .../BaseEntityAsync.cs                        | 30 +++++++++++-------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs
index 76d2d2a5..8986e5b5 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs
+++ b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs
@@ -13,8 +13,12 @@ using System.Threading.Tasks;
 namespace FreeSql
 {
     /// <summary>
+    /// Entity base class, including CreateTime/UpdateTime/IsDeleted, the CRUD methods, and ID primary key definition.
+    /// <para></para>
     /// 包括 CreateTime/UpdateTime/IsDeleted、CRUD 方法、以及 ID 主键定义 的实体基类
     /// <para></para>
+    /// When TKey is int/long, the Id is set to be an auto-incremented primary key
+    /// <para></para>
     /// 当 TKey 为 int/long 时，Id 主键被设为自增值主键
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
@@ -30,6 +34,7 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// Primary key <br />
         /// 主键
         /// </summary>
         [Column(Position = 1)]
@@ -37,6 +42,7 @@ namespace FreeSql
 
 #if !NET40
         /// <summary>
+        /// Get data based on the value of the primary key <br />
         /// 根据主键值获取数据
         /// </summary>
         /// <param name="id"></param>
@@ -50,6 +56,7 @@ namespace FreeSql
 #endif
 
         /// <summary>
+        /// Get data based on the value of the primary key <br />
         /// 根据主键值获取数据
         /// </summary>
         /// <param name="id"></param>
@@ -63,6 +70,8 @@ namespace FreeSql
     }
 
     /// <summary>
+    /// Entity base class, including CreateTime/UpdateTime/IsDeleted, and sync/async CRUD methods.
+    /// <para></para>
     /// 包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步和同步方法的实体基类
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
@@ -84,9 +93,10 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// To delete data <br />
         /// 删除数据
         /// </summary>
-        /// <param name="physicalDelete">是否物理删除</param>
+        /// <param name="physicalDelete">To flag whether to delete the physical level of the data</param>
         /// <returns></returns>
         public virtual bool Delete(bool physicalDelete = false)
         {
@@ -101,12 +111,14 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// To recover deleted data <br />
         /// 恢复删除的数据
         /// </summary>
         /// <returns></returns>
         public virtual bool Restore() => UpdateIsDeleted(false);
 
         /// <summary>
+        /// To update data <br />
         /// 更新数据
         /// </summary>
         /// <returns></returns>
@@ -125,41 +137,38 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// To insert data <br />
         /// 插入数据
         /// </summary>
         public virtual TEntity Insert()
         {
             CreateTime = DateTime.Now;
-            if (Repository is null)
-                Repository = Orm.GetRepository<TEntity>();
-
+            Repository ??= Orm.GetRepository<TEntity>();
             Repository.UnitOfWork = _resolveUow?.Invoke();
             return Repository.Insert(this as TEntity);
         }
 
         /// <summary>
+        /// To insert or update data <br />
         /// 更新或插入
         /// </summary>
         /// <returns></returns>
         public virtual TEntity Save()
         {
             UpdateTime = DateTime.Now;
-            if (Repository is null)
-                Repository = Orm.GetRepository<TEntity>();
-
+            Repository ??= Orm.GetRepository<TEntity>();
             Repository.UnitOfWork = _resolveUow?.Invoke();
             return Repository.InsertOrUpdate(this as TEntity);
         }
 
         /// <summary>
+        /// To completely save the navigation properties of the entity in the form of sub-tables. <br />
         /// 【完整】保存导航属性，子表
         /// </summary>
-        /// <param name="navigatePropertyName">导航属性名</param>
+        /// <param name="navigatePropertyName">Navigation property name</param>
         public virtual void SaveMany(string navigatePropertyName)
         {
-            if (Repository is null)
-                Repository = Orm.GetRepository<TEntity>();
-
+            Repository ??= Orm.GetRepository<TEntity>();
             Repository.UnitOfWork = _resolveUow?.Invoke();
             Repository.SaveMany(this as TEntity, navigatePropertyName);
         }
diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs
index 3821a812..58f1300e 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs
+++ b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs
@@ -12,8 +12,12 @@ using System.Threading.Tasks;
 namespace FreeSql
 {
     /// <summary>
+    /// Entity base class, including CreateTime/UpdateTime/IsDeleted, the async CRUD methods, and ID primary key definition.
+    /// <para></para>
     /// 包括 CreateTime/UpdateTime/IsDeleted、CRUD 异步方法、以及 ID 主键定义 的实体基类
     /// <para></para>
+    /// When TKey is int/long, the Id is set to be an auto-incremented primary key
+    /// <para></para>
     /// 当 TKey 为 int/long 时，Id 主键被设为自增值主键
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
@@ -29,6 +33,7 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// Primary key <br />
         /// 主键
         /// </summary>
         [Column(Position = 1)]
@@ -36,6 +41,7 @@ namespace FreeSql
 
 #if !NET40
         /// <summary>
+        /// Get data based on the value of the primary key <br />
         /// 根据主键值获取数据
         /// </summary>
         /// <param name="id"></param>
@@ -50,6 +56,8 @@ namespace FreeSql
     }
 
     /// <summary>
+    /// Entity base class, including CreateTime/UpdateTime/IsDeleted, and async CRUD methods.
+    /// <para></para>
     /// 包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步方法的实体基类
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
@@ -72,9 +80,10 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// To delete data <br />
         /// 删除数据
         /// </summary>
-        /// <param name="physicalDelete">是否物理删除</param>
+        /// <param name="physicalDelete">To flag whether to delete the physical level of the data</param>
         /// <returns></returns>
         public virtual async Task<bool> DeleteAsync(bool physicalDelete = false)
         {
@@ -89,12 +98,14 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// To recover deleted data <br />
         /// 恢复删除的数据
         /// </summary>
         /// <returns></returns>
         public virtual Task<bool> RestoreAsync() => UpdateIsDeletedAsync(false);
 
         /// <summary>
+        /// To update data <br />
         /// 更新数据
         /// </summary>
         /// <returns></returns>
@@ -113,41 +124,38 @@ namespace FreeSql
         }
 
         /// <summary>
+        /// To insert data <br />
         /// 插入数据
         /// </summary>
         public virtual Task<TEntity> InsertAsync()
         {
             CreateTime = DateTime.Now;
-            if (Repository is null)
-                Repository = Orm.GetRepository<TEntity>();
-
+            Repository ??= Orm.GetRepository<TEntity>();
             Repository.UnitOfWork = _resolveUow?.Invoke();
             return Repository.InsertAsync(this as TEntity);
         }
 
         /// <summary>
+        /// To insert or update data <br />
         /// 更新或插入
         /// </summary>
         /// <returns></returns>
         public virtual Task<TEntity> SaveAsync()
         {
             UpdateTime = DateTime.Now;
-            if (Repository is null)
-                Repository = Orm.GetRepository<TEntity>();
-
+            Repository ??= Orm.GetRepository<TEntity>();
             Repository.UnitOfWork = _resolveUow?.Invoke();
             return Repository.InsertOrUpdateAsync(this as TEntity);
         }
 
         /// <summary>
+        /// To completely save the navigation properties of the entity in the form of sub-tables. <br />
         /// 【完整】保存导航属性，子表
         /// </summary>
-        /// <param name="navigatePropertyName">导航属性名</param>
+        /// <param name="navigatePropertyName">Navigation property name</param>
         public virtual Task SaveManyAsync(string navigatePropertyName)
         {
-            if (Repository is null)
-                Repository = Orm.GetRepository<TEntity>();
-
+            Repository ??= Orm.GetRepository<TEntity>();
             Repository.UnitOfWork = _resolveUow?.Invoke();
             return Repository.SaveManyAsync(this as TEntity, navigatePropertyName);
         }

From 902f1e45f13b8cf810d89ee19b10e2fbb5a68210 Mon Sep 17 00:00:00 2001
From: AlexLEWIS <liuyis@live.com>
Date: Sun, 8 Aug 2021 22:26:10 +0800
Subject: [PATCH 4/4] Add English comments.

---
 .../BaseEntityReadOnly.cs                     | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
index da2475d1..8b10be63 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
+++ b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
@@ -14,6 +14,8 @@ using System.Threading;
 namespace FreeSql
 {
     /// <summary>
+    /// Entity base class, including CreateTime/UpdateTime/IsDeleted.
+    /// <para></para>
     /// 包括 CreateTime/UpdateTime/IsDeleted 的实体基类
     /// </summary>
     [Table(DisableSyncStructure = true)]
@@ -28,23 +30,24 @@ BaseEntity.Initialization(new FreeSqlBuilder()
         .Build());";
 
         /// <summary>
-        /// 全局 IFreeSql orm 对象
+        /// Global IFreeSql ORM Object <br />
+        /// 全局 IFreeSql ORM 对象
         /// </summary>
         public static IFreeSql Orm => _ormPriv ?? throw new Exception(ErrorMessageTemplate);
 
         internal static Func<IUnitOfWork> _resolveUow;
 
         /// <summary>
-        /// 初始化BaseEntity
-        /// BaseEntity.Initialization(new FreeSqlBuilder()
+        /// To initialize the BaseEntity <br />
+        /// 初始化 BaseEntity
         /// <para></para>
-        /// .UseAutoSyncStructure(true)
-        /// <para></para>
-        /// .UseConnectionString(DataType.Sqlite, "data source=test.db;max pool size=5")
-        /// <para></para>
-        /// .Build());
+        /// BaseEntity.Initialization( <br />
+        ///   new FreeSqlBuilder() <br />
+        ///     .UseAutoSyncStructure(true) <br />
+        ///     .UseConnectionString(DataType.Sqlite, "data source=test.db;max pool size=5") <br />
+        ///     .Build());
         /// </summary>
-        /// <param name="fsql">IFreeSql orm 对象</param>
+        /// <param name="fsql">IFreeSql ORM Object</param>
         /// <param name="resolveUow">工作单元(事务)委托，如果不使用事务请传 null<para></para>解释：由于AsyncLocal平台兼容不好，所以交给外部管理</param>
         public static void Initialization(IFreeSql fsql, Func<IUnitOfWork> resolveUow)
         {
@@ -83,34 +86,45 @@ BaseEntity.Initialization(new FreeSqlBuilder()
         }
 
         /// <summary>
+        /// Created time <br />
         /// 创建时间
         /// </summary>
         [Column(Position = -4)]
         public virtual DateTime CreateTime { get; set; } = DateTime.Now;
 
         /// <summary>
+        /// Updated time <br />
         /// 更新时间
         /// </summary>
         [Column(Position = -3)]
         public virtual DateTime UpdateTime { get; set; }
 
         /// <summary>
+        /// Logical Delete <br />
         /// 逻辑删除
         /// </summary>
         [Column(Position = -2)]
         public virtual bool IsDeleted { get; set; }
 
         /// <summary>
+        /// Sort <br />
         /// 排序
         /// </summary>
         [Column(Position = -1)]
         public virtual int Sort { get; set; }
     }
 
+    /// <summary>
+    /// A readonly entity base class, including CreateTime/UpdateTime/IsDeleted.
+    /// <para></para>
+    /// 包括 CreateTime/UpdateTime/IsDeleted 的只读实体基类
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
     [Table(DisableSyncStructure = true)]
     public abstract class BaseEntityReadOnly<TEntity> : BaseEntity where TEntity : class
     {
         /// <summary>
+        /// To query data <br />
         /// 查询数据
         /// </summary>
         /// <returns></returns>
@@ -189,14 +203,22 @@ BaseEntity.Initialization(new FreeSqlBuilder()
         }
 
         /// <summary>
-        /// 查询条件，Where(a => a.Id > 10)，支持导航对象查询，Where(a => a.Author.Email == "2881099@qq.com")
+        /// Query conditions <br />
+        /// 查询条件，Where(a => a.Id> 10)
+        /// <para></para>
+        /// Support navigation object query <br />
+        /// 支持导航对象查询，Where(a => a.Author.Email == "2881099@qq.com")
         /// </summary>
         /// <param name="exp">lambda表达式</param>
         /// <returns></returns>
         public static ISelect<TEntity> Where(Expression<Func<TEntity, bool>> exp) => Select.Where(exp);
 
         /// <summary>
-        /// 查询条件，Where(true, a => a.Id > 10)，支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com")
+        /// Query conditions <br />
+        /// 查询条件，Where(true, a => a.Id > 10)
+        /// <para></para>
+        /// Support navigation object query <br />
+        /// 支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com")
         /// </summary>
         /// <param name="condition">true 时生效</param>
         /// <param name="exp">lambda表达式</param>
@@ -204,12 +226,14 @@ BaseEntity.Initialization(new FreeSqlBuilder()
         public static ISelect<TEntity> WhereIf(bool condition, Expression<Func<TEntity, bool>> exp) => Select.WhereIf(condition, exp);
 
         /// <summary>
+        /// Repository object. <br />
         /// 仓储对象
         /// </summary>
         protected IBaseRepository<TEntity> Repository { get; set; }
 
         /// <summary>
-        /// 附加实体，在更新数据时，只更新变化的部分
+        /// To Attach entities. When updating data, only the changed part is updated. <br />
+        /// 附加实体。在更新数据时，只更新变化的部分
         /// </summary>
         public TEntity Attach()
         {