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

feat:完成codefirst与种子数据，发现非空类型问题，等待紧急修复

Browse Source
This commit is contained in:
橙子
2023-04-20 22:36:32 +08:00
parent ae5db16d67
commit b55a45baa2
13 changed files with 131 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Yi.Furion.Net6/Yi.Furion.Core/Rbac/DataSeeds/MenuDataSeed.cs
View File

@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System.Linq;
using System.Threading.Tasks;
using Yi.Framework.Infrastructure.Data.DataSeeds;
using Yi.Framework.Infrastructure.Ddd.Repositories;
using Yi.Framework.Infrastructure.Helper;
@@ -89,7 +90,7 @@ namespace Yi.Furion.Core.Rbac.DataSeeds
ParentId = monitoring.Id,
IsDeleted = false
};
entities.Add(online);
entities.Add(cache);
//服务监控
MenuEntity server = new MenuEntity()
@@ -108,7 +109,7 @@ namespace Yi.Furion.Core.Rbac.DataSeeds
ParentId = monitoring.Id,
IsDeleted = false
};
entities.Add(online);
entities.Add(server);
//系统工具
@@ -1104,6 +1105,16 @@ namespace Yi.Furion.Core.Rbac.DataSeeds
m.IsDeleted = false;
m.State = true;
});
var p = entities.GroupBy(x => x.Id);
foreach (var k in p)
{
if (k.ToList().Count > 1)
{
Console.WriteLine("菜单id重复");
}
}
return entities;
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/DeptEntity.cs
View File

@@ -69,7 +69,7 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 负责人
///</summary>
[SugarColumn(ColumnName = "Leader")]
public string Leader { get; set; }
public string? Leader { get; set; }
/// <summary>
/// 父级id
///</summary>
@@ -80,6 +80,6 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 描述
///</summary>
[SugarColumn(ColumnName = "Remark")]
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

12
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/MenuEntity.cs
View File

@@ -71,7 +71,7 @@ namespace Yi.Furion.Core.Rbac.Entities
///
///</summary>
[SugarColumn(ColumnName = "PermissionCode")]
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
/// <summary>
///
///</summary>
@@ -82,12 +82,12 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 菜单图标
///</summary>
[SugarColumn(ColumnName = "MenuIcon")]
public string MenuIcon { get; set; }
public string? MenuIcon { get; set; }
/// <summary>
/// 菜单组件路由
///</summary>
[SugarColumn(ColumnName = "Router")]
public string Router { get; set; }
public string? Router { get; set; }
/// <summary>
/// 是否为外部链接
///</summary>
@@ -108,17 +108,17 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 描述
///</summary>
[SugarColumn(ColumnName = "Remark")]
public string Remark { get; set; }
public string? Remark { get; set; }
/// <summary>
/// 组件路径
///</summary>
[SugarColumn(ColumnName = "Component")]
public string Component { get; set; }
public string? Component { get; set; }
/// <summary>
/// 路由参数
///</summary>
[SugarColumn(ColumnName = "Query")]
public string Query { get; set; }
public string? Query { get; set; }
[SugarColumn(IsIgnore = true)]
public List<MenuEntity> Children { get; set; }

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/PostEntity.cs
View File

@@ -69,6 +69,6 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 描述
///</summary>
[SugarColumn(ColumnName = "Remark")]
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

14
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/UserEntity.cs
View File

@@ -68,28 +68,28 @@ namespace Yi.Furion.Core.Rbac.Entities
/// <summary>
/// 头像
/// </summary>
public string Icon { get; set; }
public string? Icon { get; set; }
/// <summary>
/// 昵称
/// </summary>
public string Nick { get; set; }
public string? Nick { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string Email { get; set; }
public string? Email { get; set; }
/// <summary>
/// Ip
/// </summary>
public string Ip { get; set; }
public string? Ip { get; set; }
/// <summary>
/// 地址
/// </summary>
public string Address { get; set; }
public string? Address { get; set; }
/// <summary>
/// 电话
@@ -99,12 +99,12 @@ namespace Yi.Furion.Core.Rbac.Entities
/// <summary>
/// 简介
/// </summary>
public string Introduction { get; set; }
public string? Introduction { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
public string? Remark { get; set; }
/// <summary>
/// 性别

1
Yi.Furion.Net6/Yi.Furion.Core/Yi.Furion.Core.csproj
View File

@@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>Yi.Furion.Core.xml</DocumentationFile>
<Nullable>enable</Nullable>
</PropertyGroup>