xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大版本更新

Browse Source
This commit is contained in:
橙子
2022-04-09 16:16:32 +08:00
parent 6d63c0cc59
commit ef8dc26125
34 changed files with 314 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs
View File

@@ -11,7 +11,6 @@ namespace Yi.Framework.Model.Models
{
public BaseModelEntity()
{
this.Id = Guid.NewGuid();
this.IsDeleted = false;
this.CreateTime = DateTime.Now;
}
@@ -19,17 +18,17 @@ namespace Yi.Framework.Model.Models
/// 1
///</summary>
[SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
public Guid Id { get; set; }
public long Id { get; set; }
/// <summary>
/// 创建者
/// </summary>
[SugarColumn(ColumnName = "CreateUser")]
public Guid? CreateUser { get; set; }
public long? CreateUser { get; set; }
/// <summary>
/// 修改者
///</summary>
[SugarColumn(ColumnName = "ModifyUser")]
public Guid? ModifyUser { get; set; }
public long? ModifyUser { get; set; }
/// <summary>
/// 创建时间
///</summary>

19
Yi.Framework.Net6/Yi.Framework.Model/Models/TenantEntity.cs
View File

@@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace Yi.Framework.Model.Models
{
/// <summary>
/// 租户表
///</summary>
[SugarTable("Tenant")]
public partial class TenantEntity:BaseModelEntity
{
/// <summary>
/// 租户名
///</summary>
[SugarColumn(ColumnName="TenantName" )]
public string TenantName { get; set; }
}
}

16
Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
View File

@@ -5,38 +5,38 @@ using SqlSugar;
namespace Yi.Framework.Model.Models
{
/// <summary>
/// 用户表
///
///</summary>
[SugarTable("User")]
public partial class UserEntity:BaseModelEntity
{
/// <summary>
/// 姓名
///
///</summary>
[SugarColumn(ColumnName="Name" )]
public string Name { get; set; }
/// <summary>
/// 年龄
///
///</summary>
[SugarColumn(ColumnName="Age" )]
public int? Age { get; set; }
/// <summary>
/// 租户Id
///
///</summary>
[SugarColumn(ColumnName="TenantId" )]
public Guid? TenantId { get; set; }
public long? TenantId { get; set; }
/// <summary>
/// 账户
///
///</summary>
[SugarColumn(ColumnName="UserName" )]
public string UserName { get; set; }
/// <summary>
/// 密码
///
///</summary>
[SugarColumn(ColumnName="Password" )]
public string Password { get; set; }
/// <summary>
/// 加密盐值
///
///</summary>
[SugarColumn(ColumnName="Salt" )]
public string Salt { get; set; }

44
Yi.Framework.Net6/Yi.Framework.Model/Yi - Backup (3).Framework.Model.csproj Normal file
View File

@@ -0,0 +1,44 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<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>
<ProjectReference Include="..\Yi.Framework.Common\Yi.Framework.Common.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="T4DaraContext.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>T4DaraContext.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
<ItemGroup>
<Compile Update="T4DaraContext.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>T4DaraContext.tt</DependentUpon>
</Compile>
</ItemGroup>
</Project>

22
Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
View File

@@ -1,21 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<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" />
<PackageReference Include="SqlSugarCore" Version="5.0.6.5" />
</ItemGroup>
<ItemGroup>
@@ -27,6 +18,10 @@
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>T4DaraContext.cs</LastGenOutput>
</None>
<None Update="T4DataContext.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>T4DataContext.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
@@ -39,6 +34,11 @@
<AutoGen>True</AutoGen>
<DependentUpon>T4DaraContext.tt</DependentUpon>
</Compile>
<Compile Update="T4DataContext.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>T4DataContext.tt</DependentUpon>
</Compile>
</ItemGroup>
</Project>