From 6aa970c37523aa8d6c829936e315ef2f9ea2b639 Mon Sep 17 00:00:00 2001
From: chenchun <chenchun@hymson.com>
Date: Sun, 24 Apr 2022 16:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=B1=BB=E6=A8=A1=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebFirst/database/sqlite.db                   | Bin 139264 -> 139264 bytes
 .../BaseController/BaseCrudController.cs      |   2 +-
 .../yi-sqlsugar-dev.db                        | Bin 0 -> 69632 bytes
 .../Yi.Framework.Interface/IBaseService.cs    |   2 +-
 .../Yi.Framework.Model/LogEntity.cs           |   3 +-
 .../Yi.Framework.Model/Models/LogEntity.cs    |  59 ++++++++++++++++++
 .../Yi.Framework.Model/Models/RoleEntity.cs   |   2 +-
 .../Yi.Framework.Model/Models/UserEntity.cs   |   2 +-
 .../Models/UserRoleEntity.cs                  |   2 +-
 .../Yi.Framework.Model/UserEntity.cs          |   2 +-
 .../Yi.Framework.Repository/DataContext.cs    |   2 +-
 .../Yi.Framework.Repository/IRepository.cs    |   2 +-
 .../Yi.Framework.Repository/Repository.cs     |   2 +-
 .../Yi.Framework.Service/BaseService.cs       |   2 +-
 14 files changed, 71 insertions(+), 11 deletions(-)
 create mode 100644 Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
 create mode 100644 Yi.Framework.Net6/Yi.Framework.Model/Models/LogEntity.cs

diff --git a/WebFirst/database/sqlite.db b/WebFirst/database/sqlite.db
index 0f0c339e48f5611e48a1daf523457e076c468cc5..d3374e00bcc0c64656b2b418b4721b318bfd33f7 100644
GIT binary patch
delta 628
zcmY*WPiWI%6#u?2*_y2F(mz_2GTP~|9d2pT#yKn1bZwml>nw;KEJ#_t)sD6)OR#tl
zS0vy;SWD0xr4A1cL}tLAgbt>7R0KULJM`?(gGWQ%a6Wjv_j~-_58m&s_Ndh!)$+Tm
z0D$9G?#FU_DmGLF?9|mw$rFL1-iVCB59Z@Yg|iQZ03rlnn<WG@=?W93u=o>_03f${
z3eQ7Yw?jL~)6W^5!*A(!W`Ld%CWjZHD?3+Ia88zRB~w$&>Rnxac~rkId-MfqSpU}X
zFQ~W63Y%5ZxPnzI1rx!gVnxB{oFl;lF(9Q@a8bqA%2jN!(t9m?MQ$7*-!oq<t)q4S
zGRZ`RAU_l5&cp?QJssm;*U36@0&eTJ?->NQtxN7eR1o!voe9r?DMaHu$MQmS=IpGX
z@AgkR3K#4EdcA>EEJmB`&gUHCYy#3@1EcQI4TsI~(GqEnblY+G1Ch*i&@!|HeB^8T
zAOjc~+@vVl8^~K0^O<<T=p^8S?#6j|<I^zF19>!V*j%XXK{;ZLxJ87~Z?uJ42%~XJ
zwE-iO+9f;i`zeY#7Jwj!6{T3hd!_&8VZZrGQCG^fQk3Jw!<uMx0_YGahP8R)sSkxn
zk<~65TVLQbDGFM~*n9$Gq&Tgmjoo)JOjYDs$(pB(<gdT;Ib-}i3>$SHBD2<N(hfo)
snxdRz5L}i^|D691?EgSy*1!?qcGDEicp=D2S&1*#RI&TjizXd^0Nv}YumAu6

delta 612
zcmZoTz|nAkV}i6`ECU0B5)i{c#zY-s)>sBT_Z1scg!CEhCztEXGVb3zRX@jon@@{@
ziP?mKRh`*nv!j3p^JbIe&y1Xt7#O)30y!5|ZgxyhX5@EDEKc>!Pf5*j%`3?)soc!t
z70)zzS+;k*f|6&7k`6DI0uoSiE=o--NewMdEy9oj8j_h-iB-z8*d;Y5wImhOJcxKm
zW^O9Fc`iy21F^|Loq<&fVj|cXyj+u|7fWx-`N%9`V4+}SU}a)pWoo8pVQ#{}z<7-z
zkg-j6vSYgR<cQ>(lb5EbOb$!&R|_u82`)`fEOO4tOwB7%NY2kINv$Z+RIpM=0tS=@
zlt1~wLb1tzQ)KweLB<+e08Q32FgDm!z*4}h#H2Kt{edem#IG?j#n?|i_E2TB$D^IT
z{Cp}5EIjNCyp4RTc-VO^02MTHZJ%hx_<@O~QGroldaEsC&-6T7M)v9R>==3c`NJ66
z82B?8>^V3Xg%txC82F7`tzvQ$i%U|AlJj#5N`Z7tcz#i~BQQ>4Ttg!Cf>VpiGLutd
zpmcP#f>K^0Fl4QifU?u2>>16sud-tdzsSbl&)~s)eLA}U(?p;v?3uS;7iQAr0RXG`
Br?3D3

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs
index acc74cd8..5c28c68f 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs
@@ -15,7 +15,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     /// <typeparam name="T"></typeparam>
     [ApiController]
-    public class BaseCrudController<T> : ControllerBase where T : BaseModelEntity,new()
+    public class BaseCrudController<T> : ControllerBase where T : class, IBaseModelEntity,new()
     {
         private readonly ILogger<T> _logger;
         private IBaseService<T> _baseService;
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
new file mode 100644
index 0000000000000000000000000000000000000000..906d48707b349476aa402db41416b93284a1eb7e
GIT binary patch
literal 69632
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

literal 0
HcmV?d00001

diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs
index 3f26d296..93411ba5 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs
@@ -8,7 +8,7 @@ using Yi.Framework.Repository;
 
 namespace Yi.Framework.Interface
 {
-    public interface IBaseService<T> where T:BaseModelEntity,new()
+    public interface IBaseService<T> where T: class, IBaseModelEntity,new()
     {
         public IRepository<T> _repository { get; set; }
     }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs
index 11a4db0d..18aba3fb 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs
@@ -9,9 +9,10 @@ namespace Yi.Framework.Model.Models
     ///</summary>
     [SplitTable(SplitType.Year)]
     [SugarTable("SplitLog_{year}{month}{day}")]
-    public partial class LogEntity
+    public  partial class LogEntity
     {
         [SplitField] //分表字段 在插入的时候会根据这个字段插入哪个表，在更新删除的时候用这个字段找出相关表
         public DateTime? LogCreateTime { get; set; }
+
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/LogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/LogEntity.cs
new file mode 100644
index 00000000..db54343a
--- /dev/null
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/LogEntity.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 日志表
+    ///</summary>
+    public partial class LogEntity:IBaseModelEntity
+    {
+        public LogEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        /// <summary>
+        /// 1 
+        ///</summary>
+         [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? 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 long? TenantId { get; set; }
+        /// <summary>
+        /// 消息 
+        ///</summary>
+         [SugarColumn(ColumnName="Message"    )]
+         public string Message { get; set; }
+    }
+}
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/RoleEntity.cs
index ccf630b6..e1b490db 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Models/RoleEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/RoleEntity.cs
@@ -10,7 +10,7 @@ namespace Yi.Framework.Model.Models
     [SugarTable("Role")]
     public partial class RoleEntity:IBaseModelEntity
     {
-        public BaseModelEntity()
+        public RoleEntity()
         {
             this.IsDeleted = false;
             this.CreateTime = DateTime.Now;
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
index df8da635..2936acb4 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
@@ -10,7 +10,7 @@ namespace Yi.Framework.Model.Models
     [SugarTable("User")]
     public partial class UserEntity:IBaseModelEntity
     {
-        public BaseModelEntity()
+        public UserEntity()
         {
             this.IsDeleted = false;
             this.CreateTime = DateTime.Now;
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserRoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserRoleEntity.cs
index 60afb037..e686a840 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserRoleEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserRoleEntity.cs
@@ -10,7 +10,7 @@ namespace Yi.Framework.Model.Models
     [SugarTable("UserRole")]
     public partial class UserRoleEntity:IBaseModelEntity
     {
-        public BaseModelEntity()
+        public UserRoleEntity()
         {
             this.IsDeleted = false;
             this.CreateTime = DateTime.Now;
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
index b2d8eb37..0a80c087 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using SqlSugar;
 namespace Yi.Framework.Model.Models
 {
-    public partial class UserEntity:BaseModelEntity
+    public partial class UserEntity
     {
         /// <summary>
         ///  看好啦！ORM精髓，导航属性
diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs b/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs
index fdfec61e..d738ad77 100644
--- a/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs
@@ -4,7 +4,7 @@ using Yi.Framework.Model.Models;
 
 namespace Yi.Framework.Repository
 {
-    public class DataContext<T> : SimpleClient<T> where T : class, BaseModelEntity, new()
+    public class DataContext<T> : SimpleClient<T> where T : class, IBaseModelEntity, new()
     {
         public DataContext(ISqlSugarClient context) : base(context)
         {
diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
index 0883bb9c..6b281189 100644
--- a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
@@ -11,7 +11,7 @@ using Yi.Framework.Model.Query;
 
 namespace Yi.Framework.Repository
 {
-    public interface IRepository<T> : ISimpleClient<T> where T : BaseModelEntity,new()
+    public interface IRepository<T> : ISimpleClient<T> where T : class, IBaseModelEntity, new()
     {
         public ISqlSugarClient _Db { get; set; }
         public Task<bool> UseTranAsync(Func<Task> func);
diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
index 4b21db78..3017074f 100644
--- a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
@@ -12,7 +12,7 @@ namespace Yi.Framework.Repository
     /// 仓储模式
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class Repository<T> : DataContext<T>, IRepository<T> where T : BaseModelEntity,new()
+    public class Repository<T> : DataContext<T>, IRepository<T> where T : class, IBaseModelEntity, new()
     {
         public ISqlSugarClient _Db { get; set; }
         /// <summary>
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs b/Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs
index 43fff21c..603bab64 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs
@@ -9,7 +9,7 @@ using Yi.Framework.Repository;
 
 namespace Yi.Framework.Service
 {
-    public class BaseService<T>:IBaseService<T> where T:BaseModelEntity,new()
+    public class BaseService<T>:IBaseService<T> where T:class, IBaseModelEntity,new()
     {
         public IRepository<T> _repository { get; set; }
         public BaseService(IRepository<T> iRepository)