From 5b6ab486d79c4e79e625bda44693741ae14829cd Mon Sep 17 00:00:00 2001
From: chenchun <chenchun@hymson.com>
Date: Fri, 8 Apr 2022 18:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E5=AE=9E=E4=BD=93=E5=9F=BA?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.Core.csproj                  |  4 --
 .../Models/BaseModel/BaseModelEntity.cs       | 59 +++++++++++++++++++
 .../Yi.Framework.Model/Models/UserEntity.cs   |  8 +--
 .../Yi.Framework.Repository/IRepository.cs    |  3 +-
 .../Yi.Framework.Repository/Repository.cs     |  3 +-
 5 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs

diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj b/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
index a5773704..c8f401f9 100644
--- a/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
@@ -41,8 +41,4 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Library\" />
-  </ItemGroup>
-
 </Project>
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs
new file mode 100644
index 00000000..f2eb7432
--- /dev/null
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs
@@ -0,0 +1,59 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Model.Models
+{
+    public abstract class BaseModelEntity
+    {
+        public BaseModelEntity()
+        {
+            this.Id = Guid.NewGuid();
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        /// <summary>
+        /// 1 
+        ///</summary>
+        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
+        public Guid Id { get; set; }
+        /// <summary>
+        /// 创建者
+        /// </summary>
+        [SugarColumn(ColumnName = "CreateUser")]
+        public Guid? CreateUser { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+        [SugarColumn(ColumnName = "ModifyUser")]
+        public Guid? ModifyUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "CreateTime")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "ModifyTime")]
+        public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 删除者 
+        ///</summary>
+        [SugarColumn(ColumnName = "DeleteUser")]
+        public Guid? DeleteUser { get; set; }
+        /// <summary>
+        /// 删除时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "DeleteTime")]
+        public DateTime? DeleteTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+        [SugarColumn(ColumnName = "IsDeleted")]
+        public bool? IsDeleted { get; set; }
+    }
+}
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
index c156f538..1bb0367e 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
@@ -8,14 +8,8 @@ namespace Yi.Framework.Model.Models
     /// 用户表
     ///</summary>
     [SugarTable("User")]
-    public partial class UserEntity
+    public partial class UserEntity:BaseModelEntity
     {
-        public UserEntity()
-        {
-            this.Id = Guid.NewGuid();
-            this.IsDeleted=false;
-            this.CreateTime = DateTime.Now;
-        }
         /// <summary>
         /// 1 
         ///</summary>
diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
index 61ea7e37..c7eeabac 100644
--- a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
@@ -6,11 +6,12 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Common.Models;
+using Yi.Framework.Model.Models;
 using Yi.Framework.Model.Query;
 
 namespace Yi.Framework.Repository
 {
-    public interface IRepository<T> : ISimpleClient<T> where T : class, new()
+    public interface IRepository<T> : ISimpleClient<T> where T : BaseModelEntity,new()
     {
         public Task<T> InsertReturnEntityAsync(T entity);
         public Task<List<S>> StoreAsync<S>(string storeName, object para);
diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
index 5237b7a4..93c4da66 100644
--- a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
@@ -2,6 +2,7 @@
 using System.Data;
 using System.Linq.Expressions;
 using Yi.Framework.Common.Models;
+using Yi.Framework.Model.Models;
 using Yi.Framework.Model.Query;
 
 /***这里面写的代码不会给覆盖,如果要重新生成请删除 Repository.cs ***/
@@ -11,7 +12,7 @@ namespace Yi.Framework.Repository
     /// 仓储模式
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class Repository<T> : DataContext<T>, IRepository<T> where T : class, new()
+    public class Repository<T> : DataContext<T>, IRepository<T> where T : BaseModelEntity,new()
     {
 
         /// <summary>