框架重构

清除多余的业务

Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 用户表
+    ///</summary>
+    [SugarTable("User")]
+    public partial class UserEntity
+    {
+        public UserEntity()
+        {
+            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="Name"    )]
+         public string Name { get; set; }
+        /// <summary>
+        /// 年龄 
+        ///</summary>
+         [SugarColumn(ColumnName="Age"    )]
+         public int? Age { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public Guid? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public Guid? ModifyUser { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public Guid? TenantId { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/Models/user.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Model.Models
-{
-   public class User
-    {
-        public int Id { get; set; }
-        public string Username { get; set; }
-        public string Password { get; set; }
-        public string Icon { get; set; }
-        public string Nick { get; set; }
-        public string Email { get; set; }
-        public string Ip { get; set; }
-        public int? Age { get; set; }
-        public string Introduction { get; set; }
-        public string Address { get; set; }
-        public string Phone { get; set; }
-
-    }
-}

Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj

@@ -4,8 +4,18 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="BaseModels\**" />
+    <Compile Remove="ModelFactory\**" />
+    <EmbeddedResource Remove="BaseModels\**" />
+    <EmbeddedResource Remove="ModelFactory\**" />
+    <None Remove="BaseModels\**" />
+    <None Remove="ModelFactory\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="NEST" Version="7.16.0" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.6.4" />
   </ItemGroup>
 
   <ItemGroup>
@@ -31,9 +41,4 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="BaseModels\" />
-    <Folder Include="ModelFactory\" />
-  </ItemGroup>
-
 </Project>