From 906409921fded5b52058571788d2f9b268424e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 22 Dec 2023 17:37:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAdefalut=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/AccountService.cs | 2 +- .../Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs | 2 +- .../DataSeeds/RoleDataSeed.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs index 148ee3f7..55e98847 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs @@ -293,7 +293,7 @@ namespace Yi.Framework.Rbac.Application.Services var entity = await _userRepository.InsertReturnEntityAsync(newUser); //赋上一个初始角色 - var role = await _roleRepository.GetFirstAsync(x => x.RoleCode == UserConst.GuestRoleCode); + var role = await _roleRepository.GetFirstAsync(x => x.RoleCode == UserConst.DefaultRoleCode); if (role is not null) { await _userManager.GiveUserSetRoleAsync(new List { entity.Id }, new List { role.Id }); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs index d3e75db1..8e226350 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Consts/UserConst.cs @@ -24,7 +24,7 @@ namespace Yi.Framework.Rbac.Domain.Shared.Consts public const string AdminRolesCode = "admin"; public const string AdminPermissionCode = "*:*:*"; - public const string GuestRoleCode = "guest"; + public const string DefaultRoleCode = "default"; public const string CommonRoleName = "common"; } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs index 13bee7d4..aa1602c6 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/RoleDataSeed.cs @@ -44,7 +44,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds RoleEntity role3 = new RoleEntity() { - RoleName = "普通用户", + RoleName = "普通角色", RoleCode = "common", DataScope = DataScopeEnum.ALL, OrderNum = 1, @@ -56,8 +56,8 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds RoleEntity role4 = new RoleEntity() { - RoleName = "游客用户", - RoleCode = "guest", + RoleName = "默认角色", + RoleCode = "default", DataScope = DataScopeEnum.ALL, OrderNum = 1, Remark = "可简单浏览",