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

fix:完成非空问题修复

Browse Source
This commit is contained in:
橙子
2023-04-20 23:08:21 +08:00
parent b55a45baa2
commit c943c1fc74
68 changed files with 206 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerCreateInputVo.cs
View File

@@ -12,7 +12,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner
public class BannerCreateInputVo
{
public string Name { get; set; }
public string Logo { get; set; }
public string Color { get; set; }
public string? Logo { get; set; }
public string? Color { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetListOutputDto.cs
View File

@@ -7,8 +7,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Color { get; set; }
public string? Logo { get; set; }
public string? Color { get; set; }
public DateTime CreationTime { get; set; }
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerGetOutputDto.cs
View File

@@ -7,8 +7,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Color { get; set; }
public string? Logo { get; set; }
public string? Color { get; set; }
public DateTime CreationTime { get; set; }
}

6
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Banner/BannerUpdateInputVo.cs
View File

@@ -2,8 +2,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.Banner
{
public class BannerUpdateInputVo
{
public string Name { get; set; }
public string Logo { get; set; }
public string Color { get; set; }
public string? Name { get; set; }
public string? Logo { get; set; }
public string? Color { get; set; }
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Comment/CommentGetListInputVo.cs
View File

@@ -5,7 +5,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Comment
public class CommentGetListInputVo
{
public DateTime? creationTime { get; set; }
public string Content { get; set; }
public string? Content { get; set; }
//Ӧ<><D3A6>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ī<EFBFBD><C4AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ
public long? DiscussId { get; set; }

8
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussCreateInputVo.cs
View File

@@ -13,11 +13,11 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
public class DiscussCreateInputVo
{
public string Title { get; set; }
public string Types { get; set; }
public string Introduction { get; set; }
public string? Types { get; set; }
public string? Introduction { get; set; }
public DateTime? CreateTime { get; set; } = DateTime.Now;
public string Content { get; set; }
public string Color { get; set; }
public string? Color { get; set; }
public long PlateId { get; set; }
@@ -28,6 +28,6 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
/// <summary>
/// 封面
/// </summary>
public string Cover { get; set; }
public string? Cover { get; set; }
}
}

16
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs
View File

@@ -16,14 +16,14 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
public long Id { get; set; }
public string Title { get; set; }
public string Types { get; set; }
public string Introduction { get; set; }
public string? Introduction { get; set; }
public int AgreeNum { get; set; }
public int SeeNum { get; set; }
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD><DDA3><EFBFBD><EFBFBD>ܿ<EFBFBD><DCBF><EFBFBD>
//public string Content { get; set; }
public string Color { get; set; }
public string? Color { get; set; }
public long PlateId { get; set; }
@@ -38,10 +38,10 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
/// <summary>
/// <20><><EFBFBD><EFBFBD>
/// </summary>
public string Cover { get; set; }
public string? Cover { get; set; }
//˽<><CBBD><EFBFBD><EFBFBD>Ҫ<EFBFBD>ж<EFBFBD>codeȨ<65><C8A8>
public string PrivateCode { get; set; }
public string? PrivateCode { get; set; }
public DateTime CreationTime { get; set; }
public List<long> PermissionUserIds { get; set; }
@@ -50,11 +50,11 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
public void SetBan()
{
Title = DiscussConst.˽<EFBFBD><EFBFBD>;
Introduction = "";
Cover = null;
this.Title = DiscussConst.˽<EFBFBD><EFBFBD>;
this.Introduction = "";
this.Cover = null;
//<2F><><EFBFBD><EFBFBD>ֹ
IsBan = true;
this.IsBan = true;
}
}

10
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetOutputDto.cs
View File

@@ -11,12 +11,12 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
public long Id { get; set; }
public string Title { get; set; }
public string Types { get; set; }
public string Introduction { get; set; }
public string? Types { get; set; }
public string? Introduction { get; set; }
public int AgreeNum { get; set; }
public int SeeNum { get; set; }
public string Content { get; set; }
public string Color { get; set; }
public string? Color { get; set; }
public long PlateId { get; set; }
//<2F>Ƿ<EFBFBD><C7B7>ö<EFBFBD><C3B6><EFBFBD>Ĭ<EFBFBD><C4AC>false
@@ -25,12 +25,12 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
/// <summary>
/// <20><><EFBFBD><EFBFBD>
/// </summary>
public string Cover { get; set; }
public string? Cover { get; set; }
//<2F>Ƿ<EFBFBD>˽<EFBFBD>У<EFBFBD>Ĭ<EFBFBD><C4AC>false
public bool IsPrivate { get; set; }
//˽<><CBBD><EFBFBD><EFBFBD>Ҫ<EFBFBD>ж<EFBFBD>codeȨ<65><C8A8>
public string PrivateCode { get; set; }
public string? PrivateCode { get; set; }
public DateTime CreationTime { get; set; }
public DiscussPermissionTypeEnum PermissionType { get; set; }

8
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussUpdateInputVo.cs
View File

@@ -6,12 +6,12 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
public class DiscussUpdateInputVo
{
public string Title { get; set; }
public string Types { get; set; }
public string Introduction { get; set; }
public string? Types { get; set; }
public string? Introduction { get; set; }
public int AgreeNum { get; set; }
public int SeeNum { get; set; }
public string Content { get; set; }
public string Color { get; set; }
public string? Color { get; set; }
public List<long> PermissionUserIds { get; set; }
@@ -20,6 +20,6 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss
/// <summary>
/// <20><><EFBFBD><EFBFBD>
/// </summary>
public string Cover { get; set; }
public string? Cover { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeCreateInputVo.cs
View File

@@ -12,7 +12,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType
public class MyTypeCreateInputVo
{
public string Name { get; set; }
public string Color { get; set; }
public string BackgroundColor { get; set; }
public string? Color { get; set; }
public string? BackgroundColor { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListInputVo.cs
View File

@@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType
{
public long Id { get; set; }
public string Name { get; set; }
public string Color { get; set; }
public string BackgroundColor { get; set; }
public string? Color { get; set; }
public string? BackgroundColor { get; set; }
public long UserId { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeGetListOutputDto.cs
View File

@@ -6,8 +6,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType
{
public long Id { get; set; }
public string Name { get; set; }
public string Color { get; set; }
public string BackgroundColor { get; set; }
public string? Color { get; set; }
public string? BackgroundColor { get; set; }
public long UserId { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeOutputDto.cs
View File

@@ -6,8 +6,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType
{
public long Id { get; set; }
public string Name { get; set; }
public string Color { get; set; }
public string BackgroundColor { get; set; }
public string? Color { get; set; }
public string? BackgroundColor { get; set; }
public long UserId { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/MyType/MyTypeUpdateInputVo.cs
View File

@@ -10,8 +10,8 @@ namespace Yi.Furion.Core.Bbs.Dtos.MyType
{
public long Id { get; set; }
public string Name { get; set; }
public string Color { get; set; }
public string BackgroundColor { get; set; }
public string? Color { get; set; }
public string? BackgroundColor { get; set; }
public long UserId { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateCreateInputVo.cs
View File

@@ -13,7 +13,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate
{
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Introduction { get; set; }
public string? Logo { get; set; }
public string? Introduction { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListInputVo.cs
View File

@@ -6,7 +6,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate
{
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Introduction { get; set; }
public string? Logo { get; set; }
public string? Introduction { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetListOutputDto.cs
View File

@@ -14,7 +14,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Introduction { get; set; }
public string? Logo { get; set; }
public string? Introduction { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateGetOutputDto.cs
View File

@@ -6,7 +6,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate
{
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Introduction { get; set; }
public string? Logo { get; set; }
public string? Introduction { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Plate/PlateUpdateInputVo.cs
View File

@@ -12,7 +12,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Plate
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Introduction { get; set; }
public string? Logo { get; set; }
public string? Introduction { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/BannerEntity.cs
View File

@@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Entities
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Color { get; set; }
public string? Logo { get; set; }
public string? Color { get; set; }
public bool IsDeleted { get; set; }
public DateTime CreationTime { get; set; }

12
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/DiscussEntity.cs
View File

@@ -21,20 +21,20 @@ namespace Yi.Furion.Core.Bbs.Entities
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
public string Title { get; set; }
public string Types { get; set; }
public string Introduction { get; set; }
public string? Title { get; set; }
public string? Types { get; set; }
public string? Introduction { get; set; }
public int AgreeNum { get; set; }
public int SeeNum { get; set; }
/// <summary>
/// 封面
/// </summary>
public string Cover { get; set; }
public string? Cover { get; set; }
[SugarColumn(Length = 999999)]
public string Content { get; set; }
public string Color { get; set; }
public string? Color { get; set; }
public bool IsDeleted { get; set; }
@@ -58,6 +58,6 @@ namespace Yi.Furion.Core.Bbs.Entities
/// 当PermissionType为部分用户时候，以下列表中的用户+创建者 代表拥有权限
/// </summary>
[SugarColumn(IsJson = true)]//使用json处理
public List<long> PermissionUserIds { get; set; }
public List<long>? PermissionUserIds { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/MyTypeEntity.cs
View File

@@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Entities
public bool IsDeleted { get; set; }
public string Name { get; set; }
public string Color { get; set; }
public string BackgroundColor { get; set; }
public string? Color { get; set; }
public string? BackgroundColor { get; set; }
public long UserId { get; set; }
}

4
Yi.Furion.Net6/Yi.Furion.Core/Bbs/Entities/PlateEntity.cs
View File

@@ -11,8 +11,8 @@ namespace Yi.Furion.Core.Bbs.Entities
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
public string Name { get; set; }
public string Logo { get; set; }
public string Introduction { get; set; }
public string? Logo { get; set; }
public string? Introduction { get; set; }
public bool IsDeleted { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/RegisterDto.cs
View File

@@ -24,7 +24,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account
/// <summary>
/// 唯一标识码
/// </summary>
public string Uuid { get; set; }
public string? Uuid { get; set; }
/// <summary>
/// 电话
@@ -34,6 +34,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account
/// <summary>
/// 验证码
/// </summary>
public string Code { get; set; }
public string? Code { get; set; }
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Account/UpdateIconDto.cs
View File

@@ -8,6 +8,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account
{
public class UpdateIconDto
{
public string Icon { get; set; }
public string? Icon { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigCreateInputVo.cs
View File

@@ -9,9 +9,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
public string ConfigName { get; set; } = string.Empty;
public string ConfigKey { get; set; } = string.Empty;
public string ConfigValue { get; set; } = string.Empty;
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
public int OrderNum { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public DateTime CreationTime { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListInputVo.cs
View File

@@ -10,12 +10,12 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public string ConfigName { get; set; }
public string? ConfigName { get; set; }
/// <summary>
/// <20><><EFBFBD>ü<EFBFBD>
/// </summary>
public string ConfigKey { get; set; }
public string? ConfigKey { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetListOutputDto.cs
View File

@@ -21,7 +21,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD>
/// </summary>
@@ -30,7 +30,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
/// <summary>
/// <20><>ע
/// </summary>
public string Remark { get; set; }
public string? Remark { get; set; }
/// <summary>
/// <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigGetOutputDto.cs
View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
public string ConfigName { get; set; } = string.Empty;
public string ConfigKey { get; set; } = string.Empty;
public string ConfigValue { get; set; } = string.Empty;
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
public int OrderNum { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public DateTime CreationTime { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Config/ConfigUpdateInputVo.cs
View File

@@ -6,9 +6,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
public string ConfigName { get; set; } = string.Empty;
public string ConfigKey { get; set; } = string.Empty;
public string ConfigValue { get; set; } = string.Empty;
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
public int OrderNum { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public DateTime CreationTime { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptCreateInputVo.cs
View File

@@ -17,8 +17,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string? Leader { get; set; }
public long ParentId { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

6
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListInputVo.cs
View File

@@ -6,9 +6,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
{
public long Id { get; set; }
public bool? State { get; set; }
public string DeptName { get; set; }
public string DeptCode { get; set; }
public string Leader { get; set; }
public string? DeptName { get; set; }
public string? DeptCode { get; set; }
public string? Leader { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetListOutputDto.cs
View File

@@ -11,9 +11,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string? Leader { get; set; }
public long ParentId { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public int OrderNum { get; set; }
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptGetOutputDto.cs
View File

@@ -8,8 +8,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string Remark { get; set; }
public string? Leader { get; set; }
public string? Remark { get; set; }
public long? deptId { get; set; }

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Dept/DeptUpdateInputVo.cs
View File

@@ -14,8 +14,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string? Leader { get; set; }
public long ParentId { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

4
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListInputVo.cs
View File

@@ -4,8 +4,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.LoginLog
{
public class LoginLogGetListInputVo : PagedAllResultRequestDto
{
public string LoginUser { get; set; }
public string? LoginUser { get; set; }
public string LoginIp { get; set; }
public string? LoginIp { get; set; }
}
}

12
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/LoginLog/LoginLogGetListOutputDto.cs
View File

@@ -7,25 +7,25 @@ namespace Yi.Furion.Core.Rbac.Dtos.LoginLog
public DateTime CreationTime { get; }
public string LoginUser { get; set; }
public string? LoginUser { get; set; }
public string LoginLocation { get; set; }
public string? LoginLocation { get; set; }
/// <summary>
/// 登录Ip
///</summary>
public string LoginIp { get; set; }
public string? LoginIp { get; set; }
/// <summary>
/// 浏览器
///</summary>
public string Browser { get; set; }
public string? Browser { get; set; }
/// <summary>
/// 操作系统
///</summary>
public string Os { get; set; }
public string? Os { get; set; }
/// <summary>
/// 登录信息
///</summary>
public string LogMsg { get; set; }
public string? LogMsg { get; set; }
public long? CreatorId { get; set; }
}

13
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuCreateInputVo.cs
View File

@@ -14,16 +14,15 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public int OrderNum { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListInputVo.cs
View File

@@ -6,7 +6,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
{
public bool? State { get; set; }
public string MenuName { get; set; }
public string? MenuName { get; set; }
}
}

12
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetListOutputDto.cs
View File

@@ -12,16 +12,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
public int OrderNum { get; set; }
//public List<MenuEntity>? Children { get; set; }

12
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuGetOutputDto.cs
View File

@@ -12,16 +12,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
public int OrderNum { get; set; }

14
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Menu/MenuUpdateInputVo.cs
View File

@@ -11,18 +11,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public int OrderNum { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
//public List<MenuEntity>? Children { get; set; }
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheGetListOutputDto.cs
View File

@@ -11,6 +11,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.MonitorCache
public string CacheName { get; set; }
public string CacheKey { get; set; }
public string CacheValue { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/MonitorCache/MonitorCacheNameGetListOutputDto.cs
View File

@@ -9,6 +9,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.MonitorCache
public class MonitorCacheNameGetListOutputDto
{
public string CacheName { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostCreateInputVo.cs
View File

@@ -17,6 +17,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListInputVo.cs
View File

@@ -6,6 +6,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
{
public bool? State { get; set; }
//public string? PostCode { get; set; }=string.Empty;
public string PostName { get; set; } = string.Empty;
public string? PostName { get; set; } = string.Empty;
}
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetListOutputDto.cs
View File

@@ -9,7 +9,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
public int OrderNum { get; set; }
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostGetOutputDto.cs
View File

@@ -11,7 +11,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
public int OrderNum { get; set; }
}

2
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Post/PostUpdateInputVo.cs
View File

@@ -10,6 +10,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

6
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleCreateInputVo.cs
View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
/// </summary>
public class RoleCreateInputVo
{
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; } = true;

5
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListInputVo.cs
View File

@@ -4,9 +4,10 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
{
public class RoleGetListInputVo : PagedAllResultRequestDto
{
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public bool? State { get; set; }
}
}

6
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetListOutputDto.cs
View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
public long Id { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;
public long? CreatorId { get; set; }
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; }

6
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleGetOutputDto.cs
View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
public long Id { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;
public long? CreatorId { get; set; }
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; }

6
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleUpdateInputVo.cs
View File

@@ -4,9 +4,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
{
public class RoleUpdateInputVo
{
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; }

12
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/ProfileUpdateInputVo.cs
View File

@@ -4,14 +4,14 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
{
public class ProfileUpdateInputVo
{
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Address { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum? Sex { get; set; }
}
}

20
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserCreateInputVo.cs
View File

@@ -8,21 +8,21 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
/// </summary>
public class UserCreateInputVo
{
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public string Icon { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Address { get; set; }
public string? Icon { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum Sex { get; set; } = SexEnum.Unknown;
public List<long> RoleIds { get; set; }
public List<long> PostIds { get; set; }
public List<long>? RoleIds { get; set; }
public List<long>? PostIds { get; set; }
public long? DeptId { get; set; }
public bool State { get; set; } = true;
}
}
}

7
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListInputVo.cs
View File

@@ -4,15 +4,14 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
{
public class UserGetListInputVo : PagedAllResultRequestDto
{
public string Name { get; set; }
public string UserName { get; set; }
public string? Name { get; set; }
public string? UserName { get; set; }
public long? Phone { get; set; }
public bool? State { get; set; }
public long? DeptId { get; set; }
public string Ids { get; set; }
public string? Ids { get; set; }
}
}

16
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetListOutputDto.cs
View File

@@ -6,17 +6,17 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
public class UserGetListOutputDto : IEntityDto<long>
{
public long Id { get; set; }
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; } = string.Empty;
public string Icon { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Ip { get; set; }
public string Address { get; set; }
public string? Icon { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Ip { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum Sex { get; set; } = SexEnum.Unknown;
public long? DeptId { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;

16
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserGetOutputDto.cs
View File

@@ -9,17 +9,17 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
public class UserGetOutputDto : IEntityDto<long>
{
public long Id { get; set; }
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; } = string.Empty;
public string Icon { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Ip { get; set; }
public string Address { get; set; }
public string? Icon { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Ip { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum Sex { get; set; } = SexEnum.Unknown;
public bool State { get; set; }
public DateTime CreationTime { get; set; }

24
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/User/UserUpdateInputVo.cs
View File

@@ -4,25 +4,25 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
{
public class UserUpdateInputVo
{
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; }
public string? UserName { get; set; }
[AdaptIgnore]
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 string Address { 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 string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum? Sex { get; set; }
public long? DeptId { get; set; }
public List<long> PostIds { get; set; }
public List<long>? PostIds { get; set; }
public List<long> RoleIds { get; set; }
public List<long>? RoleIds { get; set; }
public bool? State { get; set; }
}
}

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

@@ -32,7 +32,7 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 配置类别
///</summary>
[SugarColumn(ColumnName = "ConfigType")]
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
/// <summary>
@@ -44,7 +44,7 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 描述
///</summary>
[SugarColumn(ColumnName = "Remark")]
public string Remark { get; set; }
public string? Remark { get; set; }
public bool IsDeleted { get; set; }
public DateTime CreationTime { get; set; }

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

@@ -19,32 +19,32 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 登录用户
///</summary>
[SugarColumn(ColumnName = "LoginUser")]
public string LoginUser { get; set; }
public string? LoginUser { get; set; }
/// <summary>
/// 登录地点
///</summary>
[SugarColumn(ColumnName = "LoginLocation")]
public string LoginLocation { get; set; }
public string? LoginLocation { get; set; }
/// <summary>
/// 登录Ip
///</summary>
[SugarColumn(ColumnName = "LoginIp")]
public string LoginIp { get; set; }
public string? LoginIp { get; set; }
/// <summary>
/// 浏览器
///</summary>
[SugarColumn(ColumnName = "Browser")]
public string Browser { get; set; }
public string? Browser { get; set; }
/// <summary>
/// 操作系统
///</summary>
[SugarColumn(ColumnName = "Os")]
public string Os { get; set; }
public string? Os { get; set; }
/// <summary>
/// 登录信息
///</summary>
[SugarColumn(ColumnName = "LogMsg")]
public string LogMsg { get; set; }
public string? LogMsg { get; set; }
public long? CreatorId { get; set; }
}

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

@@ -121,7 +121,7 @@ namespace Yi.Furion.Core.Rbac.Entities
public string? Query { get; set; }
[SugarColumn(IsIgnore = true)]
public List<MenuEntity> Children { get; set; }
public List<MenuEntity>? Children { get; set; }
}
/// <summary>

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

@@ -23,12 +23,12 @@ public partial class RoleDeptEntity : IEntity<long>
/// 角色id
///</summary>
[SugarColumn(ColumnName = "RoleId")]
public long? RoleId { get; set; }
public long RoleId { get; set; }
/// <summary>
/// 部门id
///</summary>
[SugarColumn(ColumnName = "DeptId")]
public long? DeptId { get; set; }
public long DeptId { get; set; }
}

6
Yi.Furion.Net6/Yi.Furion.Core/Rbac/Entities/RoleEntity.cs
View File

@@ -66,7 +66,7 @@ namespace Yi.Furion.Core.Rbac.Entities
/// 描述
///</summary>
[SugarColumn(ColumnName = "Remark")]
public string Remark { get; set; }
public string? Remark { get; set; }
/// <summary>
/// 角色数据范围
///</summary>
@@ -80,9 +80,9 @@ namespace Yi.Furion.Core.Rbac.Entities
[Navigate(typeof(RoleMenuEntity), nameof(RoleMenuEntity.RoleId), nameof(RoleMenuEntity.MenuId))]
public List<MenuEntity> Menus { get; set; }
public List<MenuEntity>? Menus { get; set; }
[Navigate(typeof(RoleDeptEntity), nameof(RoleDeptEntity.RoleId), nameof(RoleDeptEntity.DeptId))]
public List<DeptEntity> Depts { get; set; }
public List<DeptEntity>? Depts { get; set; }
}
}

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

@@ -43,7 +43,7 @@ namespace Yi.Furion.Core.Rbac.Entities
/// <summary>
/// 姓名
/// </summary>
public string Name { get; set; }
public string? Name { get; set; }
/// <summary>
/// 年龄

4
Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json
View File

@@ -18,7 +18,7 @@
"Url": "DataSource=yi-sqlsugar-dev.db",
"DbType": "Sqlite",
"EnabledReadWrite": false,
"EnabledCodeFirst": false,
"EnabledCodeFirst": true,
"ReadUrl": [
"DataSource=[xxxx]", //Sqlite
"server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
@@ -26,7 +26,7 @@
]
},
"EnabledDataSeed": false,
"EnabledDataSeed": true,
"JWTSettings": {
"ValidateIssuerSigningKey": true, // 是否验证密钥，bool 类型，默认true

BIN
Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db
View File

Binary file not shown.