diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs index 56c06a01..ab998928 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs @@ -63,7 +63,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl { if (!await _discussRepository.IsAnyAsync(x => x.Id == discussId)) { - throw new UserFriendlyException(DiscussConst.主题不存在); + throw new UserFriendlyException(DiscussConst.No_Exist); } var entities = await _articleRepository.GetTreeAsync(x => x.DiscussId == discussId); @@ -82,11 +82,11 @@ namespace Yi.Furion.Application.Bbs.Services.Impl var discuss = await _discussRepository.GetFirstAsync(x => x.Id == input.DiscussId); if (discuss is null) { - throw new UserFriendlyException(DiscussConst.主题不存在); + throw new UserFriendlyException(DiscussConst.No_Exist); } if (input.ParentId != 0 && !await _repository.IsAnyAsync(x => x.Id == input.ParentId)) { - throw new UserFriendlyException(ArticleConst.文章不存在); + throw new UserFriendlyException(ArticleConst.No_Exist); } await VerifyDiscussCreateIdAsync(discuss.CreatorId); return await base.CreateAsync(input); diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs index 3af40a6d..dc364196 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs @@ -98,7 +98,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl { if (!await _discussRepository.IsAnyAsync(x => x.Id == input.DiscussId)) { - throw new UserFriendlyException(DiscussConst.主题不存在); + throw new UserFriendlyException(DiscussConst.No_Exist); } var entity = await _forumManager.CreateCommentAsync(input.DiscussId, input.ParentId, input.RootId, input.Content); return await MapToGetOutputDtoAsync(entity); diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs index 842db2bd..e07a0780 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs @@ -109,7 +109,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl { if (!await _plateEntityRepository.IsAnyAsync(x => x.Id == input.PlateId)) { - throw new UserFriendlyException(PlateConst.板块不存在); + throw new UserFriendlyException(PlateConst.No_Exist); } var entity = await _forumManager.CreateDiscussAsync(await MapToEntityAsync(input)); return await MapToGetOutputDtoAsync(entity); @@ -129,20 +129,20 @@ namespace Yi.Furion.Application.Bbs.Services.Impl var discuss = await _repository.GetFirstAsync(x => x.Id == discussId); if (discuss is null) { - throw new UserFriendlyException(DiscussConst.主题不存在); + throw new UserFriendlyException(DiscussConst.No_Exist); } if (discuss.PermissionType == DiscussPermissionTypeEnum.Oneself) { if (discuss.CreatorId != _currentUser.Id) { - throw new UserFriendlyException(DiscussConst.私密); + throw new UserFriendlyException(DiscussConst.Privacy); } } if (discuss.PermissionType == DiscussPermissionTypeEnum.User) { if (discuss.CreatorId != _currentUser.Id && !discuss.PermissionUserIds.Contains(_currentUser.Id)) { - throw new UserFriendlyException(DiscussConst.私密); + throw new UserFriendlyException(DiscussConst.Privacy); } } } diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Domain/AccountManager.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Domain/AccountManager.cs index d74f568d..cdf54217 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Domain/AccountManager.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Domain/AccountManager.cs @@ -40,9 +40,9 @@ namespace Yi.Furion.Application.Rbac.Domain { return; } - throw new UserFriendlyException(UserConst.登录失败_错误); + throw new UserFriendlyException(UserConst.Login_Error); } - throw new UserFriendlyException(UserConst.登录失败_不存在); + throw new UserFriendlyException(UserConst.Login_User_No_Exist); } /// diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs index 35b4a570..6cb78b3a 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs @@ -125,7 +125,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl if (userInfo.RoleCodes.Count == 0) { - throw new UserFriendlyException(UserConst.用户无角色分配); + throw new UserFriendlyException(UserConst.No_Role); } //这里抛出一个登录的事件 var loginLogEntity = _httpContextAccessor.HttpContext.GetLoginLogInfo(); diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs index 2af8dcac..1a0bccab 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs @@ -85,11 +85,11 @@ namespace Yi.Furion.Application.Rbac.Services.Impl { if (string.IsNullOrEmpty(input.Password)) { - throw new UserFriendlyException(UserConst.添加失败_密码为空); + throw new UserFriendlyException(UserConst.Login_Passworld_Error); } if (await _repository.IsAnyAsync(u => input.UserName.Equals(u.UserName))) { - throw new UserFriendlyException(UserConst.添加失败_用户存在); + throw new UserFriendlyException(UserConst.User_Exist); } var entities = await MapToEntityAsync(input); diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/ArticleConst.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/ArticleConst.cs index f1136cde..16e9c1e6 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/ArticleConst.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/ArticleConst.cs @@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Consts public class ArticleConst { - public const string 文章不存在 = "传入的文章id不存在"; + public const string No_Exist = "传入的文章id不存在"; - public const string 文章无权限 = "该文章无权限"; + public const string No_Permission = "该文章无权限"; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/DiscussConst.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/DiscussConst.cs index c878daa7..7a240a77 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/DiscussConst.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/DiscussConst.cs @@ -12,8 +12,8 @@ namespace Yi.Furion.Core.Bbs.Consts public class DiscussConst { - public const string 主题不存在 = "传入的主题id不存在"; + public const string No_Exist = "传入的主题id不存在"; - public const string 私密 = "【私密】您无该主题权限,可联系作者申请开放"; + public const string Privacy = "【私密】您无该主题权限,可联系作者申请开放"; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/PlateConst.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/PlateConst.cs index de710c03..35bf309b 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/PlateConst.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Consts/PlateConst.cs @@ -12,6 +12,6 @@ namespace Yi.Furion.Core.Bbs.Consts public class PlateConst { - public const string 板块不存在 = "传入的板块id不存在"; + public const string No_Exist = "传入的板块id不存在"; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs index bc9c0f9d..92f9478b 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Bbs/Dtos/Discuss/DiscussGetListOutputDto.cs @@ -50,7 +50,7 @@ namespace Yi.Furion.Core.Bbs.Dtos.Discuss public void SetBan() { - this.Title = DiscussConst.˽; + this.Title = DiscussConst.Privacy; this.Introduction = ""; this.Cover = null; //ֹ diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Consts/UserConst.cs b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Consts/UserConst.cs index ff38a443..cbd71730 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Consts/UserConst.cs +++ b/Yi.Furion.Net6/Yi.Furion.Core/Rbac/Consts/UserConst.cs @@ -12,12 +12,12 @@ namespace Yi.Furion.Core.Rbac.Consts public class UserConst { - public const string 登录失败_错误 = "登录失败!用户名或密码错误!"; - public const string 登录失败_不存在 = "登录失败!用户名不存在!"; - public const string 添加失败_密码为空 = "密码为空,添加失败!"; - public const string 添加失败_用户存在 = "用户已经存在,添加失败!"; - public const string 用户无权限分配 = "登录禁用!该用户分配无任何权限,无意义登录!"; - public const string 用户无角色分配 = "登录禁用!该用户分配无任何角色,无意义登录!"; + public const string Login_Error = "登录失败!用户名或密码错误!"; + public const string Login_User_No_Exist = "登录失败!用户名不存在!"; + public const string Login_Passworld_Error = "密码为空,添加失败!"; + public const string User_Exist = "用户已经存在,添加失败!"; + public const string No_Permission = "登录禁用!该用户分配无任何权限,无意义登录!"; + public const string No_Role = "登录禁用!该用户分配无任何角色,无意义登录!"; public const string Admin = "cc"; public const string AdminRolesCode = "admin";