diff --git a/Yi.Framework.Net6/Yi.Framework.Common/Helper/HttpHelper.cs b/Yi.Framework.Net6/Yi.Framework.Common/Helper/HttpHelper.cs index cd668621..28d367ae 100644 --- a/Yi.Framework.Net6/Yi.Framework.Common/Helper/HttpHelper.cs +++ b/Yi.Framework.Net6/Yi.Framework.Common/Helper/HttpHelper.cs @@ -61,6 +61,7 @@ namespace Yi.Framework.Common.Helper request.ContentType = "application/x-www-form-urlencoded"; request.ContentLength = Encoding.UTF8.GetByteCount(postDataStr); request.CookieContainer = cookie; + Stream myRequestStream = request.GetRequestStream(); StreamWriter myStreamWriter = new StreamWriter(myRequestStream, Encoding.GetEncoding("gb2312")); myStreamWriter.Write(postDataStr); diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs deleted file mode 100644 index d02df0a0..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs +++ /dev/null @@ -1,48 +0,0 @@ -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.IsDeleted = false; - this.CreateTime = DateTime.Now; - } - /// - /// 1 - /// - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] - public long Id { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName = "CreateUser")] - public long? CreateUser { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName = "ModifyUser")] - public long? ModifyUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "CreateTime")] - public DateTime? CreateTime { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName = "ModifyTime")] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName = "IsDeleted")] - public bool? IsDeleted { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/IBaseModelEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/IBaseModelEntity.cs new file mode 100644 index 00000000..eaf25431 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/IBaseModelEntity.cs @@ -0,0 +1,23 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Model.Models +{ + public interface IBaseModelEntity + { + public long Id { get; set; } + + public long? CreateUser { get; set; } + + public long? ModifyUser { get; set; } + + public DateTime? CreateTime { get; set; } + + public DateTime? ModifyTime { get; set; } + public bool? IsDeleted { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/RoleEntity.cs new file mode 100644 index 00000000..ccf630b6 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/RoleEntity.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Yi.Framework.Model.Models +{ + /// + /// + /// + [SugarTable("Role")] + public partial class RoleEntity:IBaseModelEntity + { + public BaseModelEntity() + { + this.IsDeleted = false; + this.CreateTime = DateTime.Now; + } + /// + /// 1 + /// + [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="RoleName" )] + public string RoleName { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName="CreateUser" )] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CreateTime" )] + public DateTime? CreateTime { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName="ModifyTime" )] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName="IsDeleted" )] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName="TenantId" )] + public long? TenantId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName="ModifyUser" )] + public long? ModifyUser { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs new file mode 100644 index 00000000..df8da635 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Yi.Framework.Model.Models +{ + /// + /// + /// + [SugarTable("User")] + public partial class UserEntity:IBaseModelEntity + { + public BaseModelEntity() + { + this.IsDeleted = false; + this.CreateTime = DateTime.Now; + } + /// + /// + /// + [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="Name" )] + public string Name { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="Age" )] + public int? Age { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="CreateUser" )] + public long? CreateUser { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="CreateTime" )] + public DateTime? CreateTime { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="ModifyUser" )] + public long? ModifyUser { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="ModifyTime" )] + public DateTime? ModifyTime { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="IsDeleted" )] + public bool? IsDeleted { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="TenantId" )] + public long? TenantId { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="UserName" )] + public string UserName { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="Password" )] + public string Password { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="Salt" )] + public string Salt { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserRoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserRoleEntity.cs new file mode 100644 index 00000000..60afb037 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserRoleEntity.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Yi.Framework.Model.Models +{ + /// + /// + /// + [SugarTable("UserRole")] + public partial class UserRoleEntity:IBaseModelEntity + { + public BaseModelEntity() + { + this.IsDeleted = false; + this.CreateTime = DateTime.Now; + } + /// + /// 1 + /// + [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="RoleId" )] + public long? RoleId { get; set; } + /// + /// + /// + [SugarColumn(ColumnName="UserId" )] + public long? UserId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName="CreateUser" )] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CreateTime" )] + public DateTime? CreateTime { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName="ModifyTime" )] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName="IsDeleted" )] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName="TenantId" )] + public long? TenantId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName="ModifyUser" )] + public long? ModifyUser { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs b/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs index f4ad2611..fdfec61e 100644 --- a/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs +++ b/Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs @@ -1,9 +1,10 @@ using SqlSugar; using Yi.Framework.Common.Models; +using Yi.Framework.Model.Models; namespace Yi.Framework.Repository { - public class DataContext : SimpleClient where T : class, new() + public class DataContext : SimpleClient where T : class, BaseModelEntity, new() { public DataContext(ISqlSugarClient context) : base(context) {