From 3429de9eb621cc3f8a09a12c302945813db1e1e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Wed, 22 May 2024 14:35:08 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E8=81=9A=E5=90=88?= =?UTF-8?q?=E8=B7=9F=E7=B1=BB=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SqlSugarDbContext.cs | 4 + .../Services/AccessLogService.cs | 10 +- .../Analyses/BbsForumAnalyseService.cs | 2 +- .../Services/Bank/BankService.cs | 6 +- .../Services/Forum/AgreeService.cs | 4 +- .../Services/Forum/ArticleService.cs | 6 +- .../Services/Forum/BannerService.cs | 6 +- .../Services/Forum/CommentService.cs | 8 +- .../Services/Forum/DiscussService.cs | 16 +- .../Services/Forum/PlateService.cs | 6 +- .../Services/Integral/LevelService.cs | 6 +- ...LogEntity.cs => AccessLogAggregateRoot.cs} | 2 +- ...CardEntity.cs => BankCardAggregateRoot.cs} | 6 +- ...ity.cs => InterestRecordsAggregateRoot.cs} | 6 +- .../Entities/BbsNoticeAggregateRoot.cs | 32 +++ .../Forum/{AgreeEntity .cs => AgreeEntity.cs} | 0 ...ticleEntity.cs => ArticleAggregateRoot.cs} | 12 +- ...BannerEntity.cs => BannerAggregateRoot.cs} | 2 +- ...mmentEntity.cs => CommentAggregateRoot.cs} | 12 +- ...scussEntity.cs => DiscussAggregateRoot.cs} | 6 +- .../{PlateEntity.cs => PlateAggregateRoot.cs} | 2 +- .../{LevelEntity.cs => LevelAggregateRoot.cs} | 6 +- ...SignInEntity.cs => SignInAggregateRoot.cs} | 2 +- ...ttingEntity.cs => SettingAggregateRoot.cs} | 2 +- .../EventHandlers/AgreeChangedEventHandler.cs | 4 +- .../CommentCreatedEventHandler.cs | 4 +- .../DiscussCreatedEventHandler.cs | 4 +- .../EventHandlers/SeeDiscussEventHandler.cs | 4 +- .../ArticleImport/AbstractArticleImport.cs | 4 +- .../ArticleImport/DefaultArticleImport.cs | 4 +- .../ArticleImport/VuePressArticleImport.cs | 4 +- .../Managers/BankManager.cs | 12 +- .../Managers/BbsUserManager.cs | 4 +- .../Managers/ForumManager.cs | 16 +- .../Managers/IntegralManager.cs | 10 +- .../Repositories/IArticleRepository.cs | 4 +- .../YiFrameworkBbsDomainModule.cs | 2 +- .../DataSeeds/BannerDataSeed.cs | 12 +- .../DataSeeds/BbsMenuDataSeed.cs | 14 +- .../DataSeeds/BbsUserInfoDataSeed.cs | 4 +- .../DataSeeds/ConfigDataSeed.cs | 16 +- .../DataSeeds/LevelDataSeed.cs | 28 +-- .../Repositories/ArticleRepository.cs | 4 +- ...ssageEntity.cs => MessageAggregateRoot.cs} | 4 +- .../Managers/UserMessageManager.cs | 6 +- .../Services/TemplateService.cs | 6 +- ...lateEntity.cs => TemplateAggregateRoot.cs} | 2 +- .../Managers/CodeFileManager.cs | 4 +- .../TemplateDataSeed.cs | 26 +-- .../Services/AccountService.cs | 10 +- .../Services/ConfigService.cs | 6 +- .../Services/NoticeService.cs | 6 +- .../Services/RecordLog/LoginLogService.cs | 6 +- .../Services/System/DeptService.cs | 2 +- .../Services/System/MenuService.cs | 6 +- .../Services/System/PostService.cs | 6 +- .../Services/System/RoleService.cs | 12 +- .../Services/System/UserService.cs | 12 +- .../SignalRHubs/OnlineHub.cs | 2 +- ...ConfigEntity.cs => ConfigAggregateRoot.cs} | 2 +- .../{DeptEntity.cs => DeptAggregateRoot.cs} | 8 +- ...nLogEntity.cs => LoginLogAggregateRoot.cs} | 6 +- .../{MenuEntity.cs => MenuAggregateRoot.cs} | 12 +- ...NoticeEntity.cs => NoticeAggregateRoot.cs} | 2 +- .../{PostEntity.cs => PostAggregateRoot.cs} | 2 +- .../{RoleEntity.cs => RoleAggregateRoot.cs} | 7 +- .../{UserEntity.cs => UserAggregateRoot.cs} | 15 +- .../EventHandlers/LoginEventHandler.cs | 6 +- .../Managers/AccountManager.cs | 14 +- .../Managers/IAccountManager.cs | 2 +- .../Managers/RoleManager.cs | 4 +- .../Managers/UserManager.cs | 16 +- .../Repositories/IDeptRepository.cs | 4 +- .../Repositories/IUserRepository.cs | 6 +- .../DataSeeds/DeptDataSeed.cs | 28 +-- .../DataSeeds/MenuDataSeed.cs | 190 +++++++++--------- .../DataSeeds/PostDataSeed.cs | 16 +- .../DataSeeds/RoleDataSeed.cs | 16 +- .../DataSeeds/UserDataSeed.cs | 12 +- .../Repositories/DeptRepository.cs | 4 +- .../Repositories/UserRepository.cs | 6 +- .../YiRbacDbContext.cs | 6 +- .../Jobs/TestJob.cs | 4 +- .../Yi.Abp.Application/Jobs/DemoResetJob.cs | 10 +- .../src/Yi.Abp.Application/Jobs/TestJob.cs | 4 +- .../Services/TestService.cs | 10 +- .../System/Account_Test.cs | 4 +- .../System/User_Test.cs | 4 +- .../YiFrameworkRbacTestModule.cs | 4 +- 89 files changed, 446 insertions(+), 412 deletions(-) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/{AccessLogEntity.cs => AccessLogAggregateRoot.cs} (81%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/{BankCardEntity.cs => BankCardAggregateRoot.cs} (93%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/{InterestRecordsEntity.cs => InterestRecordsAggregateRoot.cs} (80%) create mode 100644 Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/BbsNoticeAggregateRoot.cs rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/{AgreeEntity .cs => AgreeEntity.cs} (100%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/{ArticleEntity.cs => ArticleAggregateRoot.cs} (77%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/{BannerEntity.cs => BannerAggregateRoot.cs} (88%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/{CommentEntity.cs => CommentAggregateRoot.cs} (81%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/{DiscussEntity.cs => DiscussAggregateRoot.cs} (92%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/{PlateEntity.cs => PlateAggregateRoot.cs} (91%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/{LevelEntity.cs => LevelAggregateRoot.cs} (84%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/{SignInEntity.cs => SignInAggregateRoot.cs} (91%) rename Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/{SettingEntity.cs => SettingAggregateRoot.cs} (89%) rename Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Entities/{MessageEntity.cs => MessageAggregateRoot.cs} (91%) rename Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/{TemplateEntity.cs => TemplateAggregateRoot.cs} (93%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{ConfigEntity.cs => ConfigAggregateRoot.cs} (94%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{DeptEntity.cs => DeptAggregateRoot.cs} (86%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{LoginLogEntity.cs => LoginLogAggregateRoot.cs} (92%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{MenuEntity.cs => MenuAggregateRoot.cs} (93%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{NoticeEntity.cs => NoticeAggregateRoot.cs} (91%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{PostEntity.cs => PostAggregateRoot.cs} (94%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{RoleEntity.cs => RoleAggregateRoot.cs} (90%) rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/{UserEntity.cs => UserAggregateRoot.cs} (91%) diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs index ef40f34e..76a032e3 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs @@ -259,6 +259,10 @@ namespace Yi.Framework.SqlSugarCore /// protected virtual void EntityService(PropertyInfo property, EntityColumnInfo column) { + if (property.Name == "ConcurrencyStamp") + { + column.IsIgnore = true; + } if (property.PropertyType == typeof(ExtraPropertyDictionary)) { column.IsIgnore = true; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/AccessLogService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/AccessLogService.cs index 84d51ab4..34917be8 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/AccessLogService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/AccessLogService.cs @@ -10,8 +10,8 @@ namespace Yi.Framework.Bbs.Application.Services { public class AccessLogService : ApplicationService, IAccessLogService { - private readonly ISqlSugarRepository _repository; - public AccessLogService(ISqlSugarRepository repository) { _repository = repository; } + private readonly ISqlSugarRepository _repository; + public AccessLogService(ISqlSugarRepository repository) { _repository = repository; } public DateTime GetWeekFirst() { @@ -71,11 +71,11 @@ namespace Yi.Framework.Bbs.Application.Services if (last is null || last.CreationTime.Date != DateTime.Today) { - await _repository.InsertAsync(new AccessLogEntity()); + await _repository.InsertAsync(new AccessLogAggregateRoot()); } else { - await _repository._Db.Updateable().SetColumns(it => it.Number == it.Number + 1).Where(it => it.Id == last.Id).ExecuteCommandAsync(); + await _repository._Db.Updateable().SetColumns(it => it.Number == it.Number + 1).Where(it => it.Id == last.Id).ExecuteCommandAsync(); } } @@ -95,7 +95,7 @@ namespace Yi.Framework.Bbs.Application.Services /// /// /// - private AccessLogDto[] WeekTimeHandler(AccessLogEntity[] data) + private AccessLogDto[] WeekTimeHandler(AccessLogAggregateRoot[] data) { data = data.Where(x => x.CreationTime >= GetWeekFirst()).OrderByDescending(x => x.CreationTime).DistinctBy(x => x.CreationTime.DayOfWeek).ToArray(); diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsForumAnalyseService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsForumAnalyseService.cs index 926bb53b..62cbb971 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsForumAnalyseService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsForumAnalyseService.cs @@ -31,7 +31,7 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses { var output = await _forumManager._discussRepository._DbQueryable .Where(discuss=>discuss.PermissionType== DiscussPermissionTypeEnum.Public) - .LeftJoin((discuss, user) => discuss.CreatorId == user.Id) + .LeftJoin((discuss, user) => discuss.CreatorId == user.Id) .LeftJoin((discuss, user, info) => user.Id == info.UserId) .OrderBy(discuss => SqlFunc.GetRandom()) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Bank/BankService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Bank/BankService.cs index 38ca024e..182b6a64 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Bank/BankService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Bank/BankService.cs @@ -13,9 +13,9 @@ namespace Yi.Framework.Bbs.Application.Services.Bank { private BankManager _bankManager; private BbsUserManager _bbsUserManager; - private ISqlSugarRepository _repository; - private ISqlSugarRepository _interestRepository; - public BankService(BankManager bankManager, BbsUserManager userManager, ISqlSugarRepository repository, ISqlSugarRepository interestRepository) + private ISqlSugarRepository _repository; + private ISqlSugarRepository _interestRepository; + public BankService(BankManager bankManager, BbsUserManager userManager, ISqlSugarRepository repository, ISqlSugarRepository interestRepository) { _bankManager = bankManager; _bbsUserManager = userManager; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/AgreeService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/AgreeService.cs index 5e1d076e..737b3a76 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/AgreeService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/AgreeService.cs @@ -13,7 +13,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum /// public class AgreeService : ApplicationService, IApplicationService { - public AgreeService(ISqlSugarRepository repository, ISqlSugarRepository discssRepository) + public AgreeService(ISqlSugarRepository repository, ISqlSugarRepository discssRepository) { _repository = repository; _discssRepository = discssRepository; @@ -21,7 +21,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum private ISqlSugarRepository _repository { get; set; } - private ISqlSugarRepository _discssRepository { get; set; } + private ISqlSugarRepository _discssRepository { get; set; } /// diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/ArticleService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/ArticleService.cs index d46a0681..d168b814 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/ArticleService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/ArticleService.cs @@ -31,11 +31,11 @@ namespace Yi.Framework.Bbs.Application.Services.Forum /// Article服务实现 /// - public class ArticleService : YiCrudAppService, + public class ArticleService : YiCrudAppService, IArticleService { public ArticleService(IArticleRepository articleRepository, - ISqlSugarRepository discussRepository, + ISqlSugarRepository discussRepository, IDiscussService discussService, ForumManager forumManager) : base(articleRepository) { @@ -48,7 +48,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum } private ForumManager _forumManager; private IArticleRepository _articleRepository; - private ISqlSugarRepository _discussRepository; + private ISqlSugarRepository _discussRepository; private IDiscussService _discussService; public override async Task> GetListAsync(ArticleGetListInputVo input) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/BannerService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/BannerService.cs index 77879fd5..805149c8 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/BannerService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/BannerService.cs @@ -12,11 +12,11 @@ namespace Yi.Framework.Bbs.Application.Services.Forum /// /// Banner服务实现 /// - public class BannerService : YiCrudAppService, + public class BannerService : YiCrudAppService, IBannerService { - private ISqlSugarRepository _repository; - public BannerService(ISqlSugarRepository repository) : base(repository) + private ISqlSugarRepository _repository; + public BannerService(ISqlSugarRepository repository) : base(repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/CommentService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/CommentService.cs index 43793995..52db5120 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/CommentService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/CommentService.cs @@ -21,12 +21,12 @@ namespace Yi.Framework.Bbs.Application.Services.Forum /// /// 评论 /// - public class CommentService : YiCrudAppService, + public class CommentService : YiCrudAppService, ICommentService { - private readonly ISqlSugarRepository _repository; + private readonly ISqlSugarRepository _repository; private readonly BbsUserManager _bbsUserManager; - public CommentService(ForumManager forumManager, ISqlSugarRepository discussRepository, IDiscussService discussService, ISqlSugarRepository CommentRepository, BbsUserManager bbsUserManager) : base(CommentRepository) + public CommentService(ForumManager forumManager, ISqlSugarRepository discussRepository, IDiscussService discussService, ISqlSugarRepository CommentRepository, BbsUserManager bbsUserManager) : base(CommentRepository) { _forumManager = forumManager; _discussRepository = discussRepository; @@ -39,7 +39,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum - private ISqlSugarRepository _discussRepository { get; set; } + private ISqlSugarRepository _discussRepository { get; set; } private IDiscussService _discussService { get; set; } /// diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs index e2717d93..2df69d8c 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs @@ -29,12 +29,12 @@ namespace Yi.Framework.Bbs.Application.Services.Forum /// /// Discuss应用服务实现,用于参数校验、领域服务业务组合、日志记录、事务处理、账户信息 /// - public class DiscussService : YiCrudAppService, + public class DiscussService : YiCrudAppService, IDiscussService { private ISqlSugarRepository _discussTopEntityRepository; private BbsUserManager _bbsUserManager; - public DiscussService(BbsUserManager bbsUserManager, ForumManager forumManager, ISqlSugarRepository discussTopEntityRepository, ISqlSugarRepository plateEntityRepository, ILocalEventBus localEventBus) : base(forumManager._discussRepository) + public DiscussService(BbsUserManager bbsUserManager, ForumManager forumManager, ISqlSugarRepository discussTopEntityRepository, ISqlSugarRepository plateEntityRepository, ILocalEventBus localEventBus) : base(forumManager._discussRepository) { _forumManager = forumManager; _plateEntityRepository = plateEntityRepository; @@ -46,7 +46,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum private ForumManager _forumManager { get; set; } - private ISqlSugarRepository _plateEntityRepository { get; set; } + private ISqlSugarRepository _plateEntityRepository { get; set; } @@ -60,9 +60,9 @@ namespace Yi.Framework.Bbs.Application.Services.Forum { //查询主题发布 浏览主题 事件，浏览数+1 - var item = await _forumManager._discussRepository._DbQueryable.LeftJoin((discuss, user) => discuss.CreatorId == user.Id) + var item = await _forumManager._discussRepository._DbQueryable.LeftJoin((discuss, user) => discuss.CreatorId == user.Id) .LeftJoin((discuss, user, info) => user.Id == info.UserId) - .LeftJoin((discuss, user, info, plate) => plate.Id == discuss.PlateId) + .LeftJoin((discuss, user, info, plate) => plate.Id == discuss.PlateId) .Select((discuss, user, info, plate) => new DiscussGetOutputDto { Id = discuss.Id, @@ -114,7 +114,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum .WhereIF(input.PlateId is not null, x => x.PlateId == input.PlateId) .WhereIF(input.IsTop is not null, x => x.IsTop == input.IsTop) .WhereIF(input.UserId is not null,x=>x.CreatorId==input.UserId) - .LeftJoin((discuss, user) => discuss.CreatorId == user.Id) + .LeftJoin((discuss, user) => discuss.CreatorId == user.Id) .WhereIF(input.UserName is not null, (discuss, user)=>user.UserName==input.UserName!) .LeftJoin((discuss, user, info) => user.Id == info.UserId) @@ -157,8 +157,8 @@ namespace Yi.Framework.Bbs.Application.Services.Forum /// public async Task> GetListTopAsync() { - var output = await _discussTopEntityRepository._DbQueryable.LeftJoin((top, discuss) => top.DiscussId == discuss.Id) - .LeftJoin((top, discuss, user) => discuss.CreatorId == user.Id) + var output = await _discussTopEntityRepository._DbQueryable.LeftJoin((top, discuss) => top.DiscussId == discuss.Id) + .LeftJoin((top, discuss, user) => discuss.CreatorId == user.Id) .LeftJoin((top, discuss, user, info) => user.Id == info.UserId) .OrderByDescending(top => top.OrderNum) .Select((top, discuss, user, info) => new DiscussGetListOutputDto diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/PlateService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/PlateService.cs index 2c4aecef..71e8f5d6 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/PlateService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/PlateService.cs @@ -13,11 +13,11 @@ namespace Yi.Framework.Bbs.Application.Services.Forum /// /// Plate服务实现 /// - public class PlateService : YiCrudAppService, + public class PlateService : YiCrudAppService, IPlateService { - private ISqlSugarRepository _repository; - public PlateService(ISqlSugarRepository repository) : base(repository) + private ISqlSugarRepository _repository; + public PlateService(ISqlSugarRepository repository) : base(repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Integral/LevelService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Integral/LevelService.cs index 3c5c52ec..735e1bd9 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Integral/LevelService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Integral/LevelService.cs @@ -22,11 +22,11 @@ namespace Yi.Framework.Bbs.Application.Services.Integral /// /// 等级服务 /// - public class LevelService : YiCrudAppService, ILevelService + public class LevelService : YiCrudAppService, ILevelService { - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private LevelManager _levelManager; - public LevelService(ISqlSugarRepository repository, LevelManager levelManager) : base(repository) + public LevelService(ISqlSugarRepository repository, LevelManager levelManager) : base(repository) { _repository = repository; _levelManager = levelManager; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/AccessLogEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/AccessLogAggregateRoot.cs similarity index 81% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/AccessLogEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/AccessLogAggregateRoot.cs index 8e56ce4a..4eb55a89 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/AccessLogEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/AccessLogAggregateRoot.cs @@ -5,7 +5,7 @@ using Volo.Abp.Domain.Entities; namespace Yi.Framework.Bbs.Domain.Entities { [SugarTable("AccessLog")] - public class AccessLogEntity : Entity, IHasModificationTime, IHasCreationTime + public class AccessLogAggregateRoot : AggregateRoot, IHasModificationTime, IHasCreationTime { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] public override Guid Id { get; protected set; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/BankCardEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/BankCardAggregateRoot.cs similarity index 93% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/BankCardEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/BankCardAggregateRoot.cs index a2e59485..5b2e99a2 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/BankCardEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/BankCardAggregateRoot.cs @@ -14,13 +14,13 @@ namespace Yi.Framework.Bbs.Domain.Entities.Bank /// 银行卡 /// [SugarTable("BankCard")] - public class BankCardEntity : Entity, IHasCreationTime + public class BankCardAggregateRoot : AggregateRoot, IHasCreationTime { - public BankCardEntity() + public BankCardAggregateRoot() { } - public BankCardEntity(Guid userId) + public BankCardAggregateRoot(Guid userId) { this.UserId = userId; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/InterestRecordsEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/InterestRecordsAggregateRoot.cs similarity index 80% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/InterestRecordsEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/InterestRecordsAggregateRoot.cs index 245d4e40..1ce5d5e4 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/InterestRecordsEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Bank/InterestRecordsAggregateRoot.cs @@ -13,11 +13,11 @@ namespace Yi.Framework.Bbs.Domain.Entities.Bank /// 利息记录 /// [SugarTable("InterestRecords")] - public class InterestRecordsEntity : Entity, IHasCreationTime + public class InterestRecordsAggregateRoot : AggregateRoot, IHasCreationTime { - public InterestRecordsEntity() + public InterestRecordsAggregateRoot() { } - public InterestRecordsEntity(decimal comparisonValue, decimal inputValue, bool isFluctuate = false) + public InterestRecordsAggregateRoot(decimal comparisonValue, decimal inputValue, bool isFluctuate = false) { ComparisonValue = comparisonValue; Value = inputValue; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/BbsNoticeAggregateRoot.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/BbsNoticeAggregateRoot.cs new file mode 100644 index 00000000..5ed3dd53 --- /dev/null +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/BbsNoticeAggregateRoot.cs @@ -0,0 +1,32 @@ +namespace Yi.Framework.Bbs.Domain.Entities +{ + public class BbsNoticeAggregateRoot + { + public Guid AcceptUserId { get; set; } + + /// + /// 消息 + /// + public string Message { get; set; } + + public MessageTypeEnum MessageType { get; set; } + + /// + /// 是否已读 + /// + public bool IsRead { get; set; } + + /// + /// 已读时间 + /// + public DateTime? ReadTime { get; set; } + } + + /// + /// 消息类型 + /// + public enum MessageTypeEnum + { + + } +} diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/AgreeEntity .cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/AgreeEntity.cs similarity index 100% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/AgreeEntity .cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/AgreeEntity.cs diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/ArticleEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/ArticleAggregateRoot.cs similarity index 77% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/ArticleEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/ArticleAggregateRoot.cs index 4edd2a96..ea3483f7 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/ArticleEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/ArticleAggregateRoot.cs @@ -9,7 +9,7 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum [SugarIndex($"index_{nameof(Name)}", nameof(Name), OrderByType.Asc)] [SugarIndex($"index_{nameof(ParentId)}", nameof(ParentId), OrderByType.Asc)] [SugarIndex($"index_{nameof(DiscussId)}", nameof(DiscussId), OrderByType.Asc)] - public class ArticleEntity : Entity, ISoftDelete, IAuditedObject + public class ArticleAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] public override Guid Id { get; protected set; } @@ -26,7 +26,7 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum [SugarColumn(IsIgnore = true)] - public List? Children { get; set; } + public List? Children { get; set; } public DateTime CreationTime { get; set; } @@ -50,14 +50,14 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum /// /// /// - public static List Tile(this List entities) + public static List Tile(this List entities) { - if (entities is null) return new List(); - var result = new List(); + if (entities is null) return new List(); + var result = new List(); return StartRecursion(entities, result); } - private static List StartRecursion(List entities, List result) + private static List StartRecursion(List entities, List result) { foreach (var entity in entities) { diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/BannerEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/BannerAggregateRoot.cs similarity index 88% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/BannerEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/BannerAggregateRoot.cs index 009ff29b..89359502 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/BannerEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/BannerAggregateRoot.cs @@ -6,7 +6,7 @@ using Volo.Abp.Domain.Entities; namespace Yi.Framework.Bbs.Domain.Entities.Forum { [SugarTable("Banner")] - public class BannerEntity : Entity, ISoftDelete, IAuditedObject + public class BannerAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] public override Guid Id { get; protected set; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/CommentEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/CommentAggregateRoot.cs similarity index 81% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/CommentEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/CommentAggregateRoot.cs index 827afd36..1a4cb7da 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/CommentEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/CommentAggregateRoot.cs @@ -13,16 +13,16 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum [SugarTable("Comment")] [SugarIndex($"index_{nameof(DiscussId)}", nameof(DiscussId), OrderByType.Asc)] [SugarIndex($"index_{nameof(ParentId)}", nameof(ParentId), OrderByType.Asc)] - public class CommentEntity : Entity, ISoftDelete, IAuditedObject + public class CommentAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject { /// /// 采用二维数组方式，不使用树形方式 /// - public CommentEntity() + public CommentAggregateRoot() { } - public CommentEntity(Guid discussId) + public CommentAggregateRoot(Guid discussId) { DiscussId = discussId; } @@ -45,20 +45,20 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum public Guid RootId { get; set; } [SugarColumn(IsIgnore = true)] - public List Children { get; set; } = new(); + public List Children { get; set; } = new(); /// /// 用户,评论人用户信息 /// [Navigate(NavigateType.OneToOne, nameof(CreatorId))] - public UserEntity CreateUser { get; set; } + public UserAggregateRoot CreateUser { get; set; } /// /// 被评论的用户信息 /// [SugarColumn(IsIgnore = true)] - public UserEntity CommentedUser { get; set; } + public UserAggregateRoot CommentedUser { get; set; } public Guid? CreatorId { get; set; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussAggregateRoot.cs similarity index 92% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussAggregateRoot.cs index 3ae3a92c..0e40d147 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussAggregateRoot.cs @@ -10,12 +10,12 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum [SugarIndex($"index_{nameof(Title)}", nameof(Title), OrderByType.Asc)] [SugarIndex($"index_{nameof(PlateId)}", nameof(PlateId), OrderByType.Asc)] [SugarIndex($"index_{nameof(CreationTime)}", nameof(CreationTime), OrderByType.Desc)] - public class DiscussEntity : Entity, ISoftDelete, IAuditedObject + public class DiscussAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject { - public DiscussEntity() + public DiscussAggregateRoot() { } - public DiscussEntity(Guid plateId) + public DiscussAggregateRoot(Guid plateId) { PlateId = plateId; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/PlateEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/PlateAggregateRoot.cs similarity index 91% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/PlateEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/PlateAggregateRoot.cs index 9bd05527..a0cbf353 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/PlateEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/PlateAggregateRoot.cs @@ -6,7 +6,7 @@ using Volo.Abp.Auditing; namespace Yi.Framework.Bbs.Domain.Entities.Forum { [SugarTable("Plate")] - public class PlateEntity : Entity, ISoftDelete, IAuditedObject + public class PlateAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/LevelEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/LevelAggregateRoot.cs similarity index 84% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/LevelEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/LevelAggregateRoot.cs index 329f69bd..e755a701 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/LevelEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/LevelAggregateRoot.cs @@ -7,11 +7,11 @@ namespace Yi.Framework.Bbs.Domain.Entities.Integral /// 等级表 /// [SugarTable("Level")] - public class LevelEntity : Entity + public class LevelAggregateRoot : AggregateRoot { - public LevelEntity() { } + public LevelAggregateRoot() { } - public LevelEntity(int currentLevel, string name, decimal minExperience) + public LevelAggregateRoot(int currentLevel, string name, decimal minExperience) { this.CurrentLevel = currentLevel; this.Name = name; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/SignInEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/SignInAggregateRoot.cs similarity index 91% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/SignInEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/SignInAggregateRoot.cs index c4c2e5a5..ed4bf396 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/SignInEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Integral/SignInAggregateRoot.cs @@ -15,7 +15,7 @@ namespace Yi.Framework.Bbs.Domain.Entities.Integral [SugarTable("SignIn")] [SugarIndex($"index_{nameof(CreatorId)}", nameof(CreatorId), OrderByType.Asc)] - public class SignInEntity : Entity, ICreationAuditedObject + public class SignInAggregateRoot : AggregateRoot, ICreationAuditedObject { [SugarColumn(IsPrimaryKey = true)] diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingAggregateRoot.cs similarity index 89% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingEntity.cs rename to Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingAggregateRoot.cs index 7567365c..a4881e0e 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/SettingAggregateRoot.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities; namespace Yi.Framework.Bbs.Domain.Entities { [SugarTable("Setting")] - public class SettingEntity : Entity + public class SettingAggregateRoot : AggregateRoot { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/AgreeChangedEventHandler.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/AgreeChangedEventHandler.cs index 25ee5941..aaeae641 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/AgreeChangedEventHandler.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/AgreeChangedEventHandler.cs @@ -23,7 +23,7 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers public async Task HandleEventAsync(EntityCreatedEventData eventData) { var agreeEntity = eventData.Entity; - var userId = await _agreeRepository._DbQueryable.LeftJoin((agree, discuss) => agree.DiscussId == discuss.Id) + var userId = await _agreeRepository._DbQueryable.LeftJoin((agree, discuss) => agree.DiscussId == discuss.Id) .Select((agree, discuss) => discuss.CreatorId).FirstAsync(); //给创建者发布数量+1 @@ -50,7 +50,7 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers public async Task HandleEventAsync(EntityCreatedEventData eventData) { var agreeEntity = eventData.Entity; - var userId = await _agreeRepository._DbQueryable.LeftJoin((agree, discuss) => agree.DiscussId == discuss.Id) + var userId = await _agreeRepository._DbQueryable.LeftJoin((agree, discuss) => agree.DiscussId == discuss.Id) .Select((agree, discuss) => discuss.CreatorId).FirstAsync(); //给创建者发布数量-1 diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs index e2f77cdc..ebcdaba0 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs @@ -10,7 +10,7 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers /// /// 评论创建的领域事件 /// - public class CommentCreatedEventHandler : ILocalEventHandler>, + public class CommentCreatedEventHandler : ILocalEventHandler>, ITransientDependency { private ISqlSugarRepository _userRepository; @@ -18,7 +18,7 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers { _userRepository = userRepository; } - public async Task HandleEventAsync(EntityCreatedEventData eventData) + public async Task HandleEventAsync(EntityCreatedEventData eventData) { var commentEntity = eventData.Entity; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/DiscussCreatedEventHandler.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/DiscussCreatedEventHandler.cs index 51b1e9c8..fcebe0f5 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/DiscussCreatedEventHandler.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/DiscussCreatedEventHandler.cs @@ -10,7 +10,7 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers /// /// 主题创建的领域事件 /// - public class DiscussCreatedEventHandler : ILocalEventHandler>, + public class DiscussCreatedEventHandler : ILocalEventHandler>, ITransientDependency { private ISqlSugarRepository _userRepository; @@ -18,7 +18,7 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers { _userRepository = userRepository; } - public async Task HandleEventAsync(EntityCreatedEventData eventData) + public async Task HandleEventAsync(EntityCreatedEventData eventData) { var disucussEntity = eventData.Entity; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/SeeDiscussEventHandler.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/SeeDiscussEventHandler.cs index b81529f4..b9411b40 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/SeeDiscussEventHandler.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/SeeDiscussEventHandler.cs @@ -13,8 +13,8 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers { public class SeeDiscussEventHandler : ILocalEventHandler, ITransientDependency { - private IRepository _repository; - public SeeDiscussEventHandler(IRepository repository) + private IRepository _repository; + public SeeDiscussEventHandler(IRepository repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs index 8919b717..3f3a66e5 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs @@ -17,7 +17,7 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport LoggerFactory = loggerFactory; } protected ILoggerFactory LoggerFactory { get; set; } - public virtual List Import(Guid discussId, Guid articleParentId, List fileObjs) + public virtual List Import(Guid discussId, Guid articleParentId, List fileObjs) { var articles = Convert(fileObjs); var orderNum = 0; @@ -29,6 +29,6 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport }); return articles; } - public abstract List Convert(List fileObjs); + public abstract List Convert(List fileObjs); } } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/DefaultArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/DefaultArticleImport.cs index d67281b8..5428dbef 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/DefaultArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/DefaultArticleImport.cs @@ -10,9 +10,9 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport { internal class DefaultArticleImport : AbstractArticleImport { - public override List Convert(List fileObjs) + public override List Convert(List fileObjs) { - return fileObjs.OrderBy(x => x.FileName).Select(x => new ArticleEntity { Name = x.FileName, Content = x.Content }).ToList(); + return fileObjs.OrderBy(x => x.FileName).Select(x => new ArticleAggregateRoot { Name = x.FileName, Content = x.Content }).ToList(); } } } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index c29325d8..d8437f37 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -11,7 +11,7 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport { internal class VuePressArticleImport : AbstractArticleImport { - public override List Convert(List fileObjs) + public override List Convert(List fileObjs) { var logger = LoggerFactory.CreateLogger(); @@ -65,7 +65,7 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport f.Content = result; return f; }); - var output = fileContentHandler.Select(x => new ArticleEntity() { Content = x.Content, Name = x.FileName }).ToList(); + var output = fileContentHandler.Select(x => new ArticleAggregateRoot() { Content = x.Content, Name = x.FileName }).ToList(); return output; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs index 25253e3c..8b87a88f 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs @@ -15,11 +15,11 @@ namespace Yi.Framework.Bbs.Domain.Managers /// public class BankManager : DomainService { - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private ILocalEventBus _localEventBus; - private ISqlSugarRepository _interestRepository; + private ISqlSugarRepository _interestRepository; private IBankValueProvider _bankValueProvider; - public BankManager(ISqlSugarRepository repository, ILocalEventBus localEventBus, ISqlSugarRepository interestRepository, IBankValueProvider bankValueProvider) + public BankManager(ISqlSugarRepository repository, ILocalEventBus localEventBus, ISqlSugarRepository interestRepository, IBankValueProvider bankValueProvider) { _repository = repository; _localEventBus = localEventBus; @@ -72,7 +72,7 @@ namespace Yi.Framework.Bbs.Domain.Managers /// 强制创建一个记录，不管时间到没到 /// /// - public async Task CreateInterestRecordsAsync() + public async Task CreateInterestRecordsAsync() { //获取最新的实体 var lastEntity = await _interestRepository._DbQueryable.OrderByDescending(x => x.CreationTime).FirstAsync(); @@ -106,7 +106,7 @@ namespace Yi.Framework.Bbs.Domain.Managers //根据上一次的老值进行变化率比较 var currentValue = oldValue + (oldValue* changeRate); - var entity = new InterestRecordsEntity(lastThirdPartyStandardValue, currentValue); + var entity = new InterestRecordsAggregateRoot(lastThirdPartyStandardValue, currentValue); var output = await _interestRepository.InsertReturnEntityAsync(entity); return output; @@ -129,7 +129,7 @@ namespace Yi.Framework.Bbs.Domain.Managers /// public async Task ApplyingBankCardAsync(Guid userId, int cardNumber) { - var entities = Enumerable.Range(1, cardNumber).Select(x => new BankCardEntity(userId)).ToList(); + var entities = Enumerable.Range(1, cardNumber).Select(x => new BankCardAggregateRoot(userId)).ToList(); await _repository.InsertManyAsync(entities); } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs index 094b9702..31c23246 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs @@ -12,10 +12,10 @@ namespace Yi.Framework.Bbs.Domain.Managers { public class BbsUserManager : DomainService { - public ISqlSugarRepository _userRepository; + public ISqlSugarRepository _userRepository; public ISqlSugarRepository _bbsUserInfoRepository; public Dictionary _levelCacheDic; - public BbsUserManager(ISqlSugarRepository userRepository, + public BbsUserManager(ISqlSugarRepository userRepository, ISqlSugarRepository bbsUserInfoRepository, IDistributedCache> levelCache ) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs index ade1d964..52cdef2a 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs @@ -14,11 +14,11 @@ namespace Yi.Framework.Bbs.Domain.Managers /// public class ForumManager : DomainService { - public readonly ISqlSugarRepository _discussRepository; - public readonly ISqlSugarRepository _plateEntityRepository; - public readonly ISqlSugarRepository _commentRepository; - public readonly ISqlSugarRepository _articleRepository; - public ForumManager(ISqlSugarRepository discussRepository, ISqlSugarRepository plateEntityRepository, ISqlSugarRepository commentRepository, ISqlSugarRepository articleRepository) + public readonly ISqlSugarRepository _discussRepository; + public readonly ISqlSugarRepository _plateEntityRepository; + public readonly ISqlSugarRepository _commentRepository; + public readonly ISqlSugarRepository _articleRepository; + public ForumManager(ISqlSugarRepository discussRepository, ISqlSugarRepository plateEntityRepository, ISqlSugarRepository commentRepository, ISqlSugarRepository articleRepository) { _discussRepository = discussRepository; _plateEntityRepository = plateEntityRepository; @@ -27,7 +27,7 @@ namespace Yi.Framework.Bbs.Domain.Managers } //主题是不能直接创建的，需要由领域服务统一创建 - public async Task CreateDiscussAsync(DiscussEntity entity) + public async Task CreateDiscussAsync(DiscussAggregateRoot entity) { entity.CreationTime = DateTime.Now; entity.AgreeNum = 0; @@ -35,9 +35,9 @@ namespace Yi.Framework.Bbs.Domain.Managers return await _discussRepository.InsertReturnEntityAsync(entity); } - public async Task CreateCommentAsync(Guid discussId, Guid parentId, Guid rootId, string content) + public async Task CreateCommentAsync(Guid discussId, Guid parentId, Guid rootId, string content) { - var entity = new CommentEntity(discussId); + var entity = new CommentAggregateRoot(discussId); entity.Content = content; entity.ParentId = parentId; entity.RootId = rootId; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/IntegralManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/IntegralManager.cs index 519f2a92..45aa297a 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/IntegralManager.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/IntegralManager.cs @@ -10,10 +10,10 @@ namespace Yi.Framework.Bbs.Domain.Managers { public class IntegralManager : DomainService { - public ISqlSugarRepository _levelRepository; - public ISqlSugarRepository _signInRepository; + public ISqlSugarRepository _levelRepository; + public ISqlSugarRepository _signInRepository; private readonly ILocalEventBus _localEventBus; - public IntegralManager(ISqlSugarRepository levelRepository, ISqlSugarRepository signInRepository, ILocalEventBus localEventBus) + public IntegralManager(ISqlSugarRepository levelRepository, ISqlSugarRepository signInRepository, ILocalEventBus localEventBus) { _levelRepository = levelRepository; _localEventBus = localEventBus; @@ -56,7 +56,7 @@ namespace Yi.Framework.Bbs.Domain.Managers //插入记录 - var entity = new SignInEntity() { ContinuousNumber = continuousNumber }; + var entity = new SignInAggregateRoot() { ContinuousNumber = continuousNumber }; await _signInRepository.InsertAsync(entity); //发布一个其他领域的事件 @@ -112,7 +112,7 @@ namespace Yi.Framework.Bbs.Domain.Managers /// /// 获取连续次数 /// - private int GetContinuousNumber(SignInEntity sigInLast) + private int GetContinuousNumber(SignInAggregateRoot sigInLast) { var continuousNumber = 1; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Repositories/IArticleRepository.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Repositories/IArticleRepository.cs index f6e4b0bf..3aa6123a 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Repositories/IArticleRepository.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Repositories/IArticleRepository.cs @@ -9,8 +9,8 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Framework.Bbs.Domain.Repositories { - public interface IArticleRepository: ISqlSugarRepository + public interface IArticleRepository: ISqlSugarRepository { - Task> GetTreeAsync(Expression> where); + Task> GetTreeAsync(Expression> where); } } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs index bc8bfae1..9cf930e3 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs @@ -28,7 +28,7 @@ namespace Yi.Framework.Bbs.Domain var logger = services.GetRequiredService>(); logger.LogInformation("正在初始化【BBS-等级数据】......"); - var levelRepository = services.GetRequiredService>(); + var levelRepository = services.GetRequiredService>(); var levelCache = services.GetRequiredService>>(); var cacheItem = (await levelRepository.GetListAsync()).Adapt>(); await levelCache.SetAsync(LevelConst.LevelCacheKey, cacheItem); diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BannerDataSeed.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BannerDataSeed.cs index 35517f64..ffb4a100 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BannerDataSeed.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BannerDataSeed.cs @@ -14,8 +14,8 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds { public class BannerDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; - public BannerDataSeed(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public BannerDataSeed(ISqlSugarRepository repository) { _repository = repository; } @@ -26,18 +26,18 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds await _repository.InsertManyAsync(GetSeedData()); } } - public List GetSeedData() + public List GetSeedData() { //这里临时使用了图床，图床地址：https://mjj.today/ - List entities = new List() + List entities = new List() { - new BannerEntity{ + new BannerAggregateRoot{ Name="欢迎", Logo="https://i.miji.bid/2023/12/15/e6478d5d15a4b941077e336790c414f6.png", Color="" }, - new BannerEntity{ + new BannerAggregateRoot{ Name="前端", Logo="https://i.miji.bid/2023/12/15/07e9291c9311889a31a2b433d4decca0.jpeg", Color="" diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsMenuDataSeed.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsMenuDataSeed.cs index 4c75b13e..36b5b83e 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsMenuDataSeed.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsMenuDataSeed.cs @@ -16,8 +16,8 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds public class BbsMenuDataSeed : IDataSeedContributor, ITransientDependency { private IGuidGenerator _guidGenerator; - private ISqlSugarRepository _repository; - public BbsMenuDataSeed(ISqlSugarRepository repository, IGuidGenerator guidGenerator) + private ISqlSugarRepository _repository; + public BbsMenuDataSeed(ISqlSugarRepository repository, IGuidGenerator guidGenerator) { _repository=repository; _guidGenerator=guidGenerator; @@ -30,11 +30,11 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds } } - public List GetSeedData() + public List GetSeedData() { - List entities = new List(); + List entities = new List(); //BBS - MenuEntity bbs = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot bbs = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "BBS", MenuType = MenuTypeEnum.Catalogue, @@ -50,7 +50,7 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds //板块管理 - MenuEntity plate = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot plate = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "板块管理", @@ -69,7 +69,7 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds entities.Add(plate); //文章管理 - MenuEntity article = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot article = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "文章管理", diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsUserInfoDataSeed.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsUserInfoDataSeed.cs index 4093e115..70238117 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsUserInfoDataSeed.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsUserInfoDataSeed.cs @@ -15,8 +15,8 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds public class BbsUserInfoDataSeed : IDataSeedContributor, ITransientDependency { private ISqlSugarRepository _repository; - private ISqlSugarRepository _userRepository; - public BbsUserInfoDataSeed(ISqlSugarRepository repository, ISqlSugarRepository userReponse) + private ISqlSugarRepository _userRepository; + public BbsUserInfoDataSeed(ISqlSugarRepository repository, ISqlSugarRepository userReponse) { _repository = repository; _userRepository = userReponse; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/ConfigDataSeed.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/ConfigDataSeed.cs index 42dcdfea..428e0764 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/ConfigDataSeed.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/ConfigDataSeed.cs @@ -15,8 +15,8 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds { public class ConfigDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; - public ConfigDataSeed(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public ConfigDataSeed(ISqlSugarRepository repository) { _repository = repository; } @@ -27,10 +27,10 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds await _repository.InsertManyAsync(GetSeedData()); } } - public List GetSeedData() + public List GetSeedData() { - List entities = new List(); - ConfigEntity config1 = new ConfigEntity() + List entities = new List(); + ConfigAggregateRoot config1 = new ConfigAggregateRoot() { ConfigKey = "bbs.site.name", ConfigName = "站点名称", @@ -38,7 +38,7 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds }; entities.Add(config1); - ConfigEntity config2 = new ConfigEntity() + ConfigAggregateRoot config2 = new ConfigAggregateRoot() { ConfigKey = "bbs.site.author", ConfigName = "站点作者", @@ -46,7 +46,7 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds }; entities.Add(config2); - ConfigEntity config3 = new ConfigEntity() + ConfigAggregateRoot config3 = new ConfigAggregateRoot() { ConfigKey = "bbs.site.icp", ConfigName = "站点Icp备案", @@ -55,7 +55,7 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds entities.Add(config3); - ConfigEntity config4 = new ConfigEntity() + ConfigAggregateRoot config4 = new ConfigAggregateRoot() { ConfigKey = "bbs.site.bottom", ConfigName = "站点底部信息", diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/LevelDataSeed.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/LevelDataSeed.cs index e62c0f73..acf9f460 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/LevelDataSeed.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/LevelDataSeed.cs @@ -7,8 +7,8 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds { public class LevelDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; - public LevelDataSeed(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public LevelDataSeed(ISqlSugarRepository repository) { _repository = repository; } @@ -19,20 +19,20 @@ namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds await _repository.InsertManyAsync(GetSeedData()); } } - public List GetSeedData() + public List GetSeedData() { - List entities = new List() + List entities = new List() { - new LevelEntity(1,"小白",10), - new LevelEntity(2,"中白",30), - new LevelEntity(3,"大白",100), - new LevelEntity(4,"精英",300), - new LevelEntity(5,"熟练",600), - new LevelEntity(6,"高手",1000), - new LevelEntity(7,"老手",1500), - new LevelEntity(8,"大佬",2000), - new LevelEntity(9,"巨佬",2500), - new LevelEntity(10,"大神",3000), + new LevelAggregateRoot(1,"小白",10), + new LevelAggregateRoot(2,"中白",30), + new LevelAggregateRoot(3,"大白",100), + new LevelAggregateRoot(4,"精英",300), + new LevelAggregateRoot(5,"熟练",600), + new LevelAggregateRoot(6,"高手",1000), + new LevelAggregateRoot(7,"老手",1500), + new LevelAggregateRoot(8,"大佬",2000), + new LevelAggregateRoot(9,"巨佬",2500), + new LevelAggregateRoot(10,"大神",3000), }; return entities; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs index 84d6fe22..a820e194 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs @@ -7,13 +7,13 @@ using Yi.Framework.SqlSugarCore.Repositories; namespace Yi.Framework.Bbs.SqlSugarCore.Repositories { - public class ArticleRepository : SqlSugarRepository, IArticleRepository,ITransientDependency + public class ArticleRepository : SqlSugarRepository, IArticleRepository,ITransientDependency { public ArticleRepository(ISugarDbContextProvider sugarDbContextProvider) : base(sugarDbContextProvider) { } - public async Task> GetTreeAsync(Expression> where) + public async Task> GetTreeAsync(Expression> where) { return await _DbQueryable.Where(where).OrderBy(x=>x.OrderNum).OrderBy(x=>x.CreationTime).ToTreeAsync(x => x.Children, x => x.ParentId, Guid.Empty); } diff --git a/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Entities/MessageEntity.cs b/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Entities/MessageAggregateRoot.cs similarity index 91% rename from Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Entities/MessageEntity.cs rename to Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Entities/MessageAggregateRoot.cs index 073608ea..dc0d1843 100644 --- a/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Entities/MessageEntity.cs +++ b/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Entities/MessageAggregateRoot.cs @@ -12,11 +12,11 @@ using Yi.Framework.ChatHub.Domain.Shared.Model; namespace Yi.Framework.ChatHub.Domain.Entities { [SugarTable("YiMessage")] - [SugarIndex($"index_{nameof(MessageEntity)}", + [SugarIndex($"index_{nameof(MessageAggregateRoot)}", nameof(ReceiveId), OrderByType.Asc, nameof(SendUserId), OrderByType.Asc, nameof(CreationTime), OrderByType.Asc)] - public class MessageEntity : Entity, IHasCreationTime + public class MessageAggregateRoot : AggregateRoot, IHasCreationTime { public static MessageContext CreatePersonal(string content, Guid userId, Guid sendUserId) { diff --git a/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/UserMessageManager.cs b/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/UserMessageManager.cs index d0a52bde..fdb65016 100644 --- a/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/UserMessageManager.cs +++ b/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/UserMessageManager.cs @@ -19,8 +19,8 @@ namespace Yi.Framework.ChatHub.Domain.Managers public class UserMessageManager : DomainService { private IHubContext _hubContext; - public ISqlSugarRepository _repository; - public UserMessageManager(IHubContext hubContext, ISqlSugarRepository repository) + public ISqlSugarRepository _repository; + public UserMessageManager(IHubContext hubContext, ISqlSugarRepository repository) { _hubContext = hubContext; _repository = repository; @@ -57,7 +57,7 @@ namespace Yi.Framework.ChatHub.Domain.Managers public async Task CreateMessageStoreAsync(MessageContext context) { - await _repository.InsertAsync(context.Adapt()); + await _repository.InsertAsync(context.Adapt()); } public async Task> GetAllUserAsync() diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TemplateService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TemplateService.cs index 5bffd43c..a5684b4e 100644 --- a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TemplateService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TemplateService.cs @@ -9,10 +9,10 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Framework.CodeGen.Application.Services; -public class TemplateService : YiCrudAppService, ITemplateService +public class TemplateService : YiCrudAppService, ITemplateService { - private ISqlSugarRepository _repository; - public TemplateService(ISqlSugarRepository repository) : base(repository) + private ISqlSugarRepository _repository; + public TemplateService(ISqlSugarRepository repository) : base(repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateEntity.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateAggregateRoot.cs similarity index 93% rename from Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateEntity.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateAggregateRoot.cs index 6a2282a0..477c0d07 100644 --- a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateEntity.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateAggregateRoot.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities; namespace Yi.Framework.CodeGen.Domain.Entities { [SugarTable("YiTemplate")] - public class TemplateEntity : Entity + public class TemplateAggregateRoot : AggregateRoot { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/CodeFileManager.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/CodeFileManager.cs index c323a541..043b9691 100644 --- a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/CodeFileManager.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/CodeFileManager.cs @@ -11,9 +11,9 @@ namespace Yi.Framework.CodeGen.Domain.Managers public class CodeFileManager : DomainService { private IEnumerable _templateHandlers; - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private ISqlSugarRepository _fieldRepository; - public CodeFileManager(IEnumerable templateHandlers, ISqlSugarRepository fieldRepository, ISqlSugarRepository repository) + public CodeFileManager(IEnumerable templateHandlers, ISqlSugarRepository fieldRepository, ISqlSugarRepository repository) { _templateHandlers = templateHandlers; _repository = repository; diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.SqlSugarCore/TemplateDataSeed.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.SqlSugarCore/TemplateDataSeed.cs index 06b01136..53ae4f3f 100644 --- a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.SqlSugarCore/TemplateDataSeed.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.SqlSugarCore/TemplateDataSeed.cs @@ -8,8 +8,8 @@ namespace Yi.Framework.CodeGen.SqlSugarCore { public class TemplateDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; - public TemplateDataSeed(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public TemplateDataSeed(ISqlSugarRepository repository) { _repository = repository; } @@ -20,10 +20,10 @@ namespace Yi.Framework.CodeGen.SqlSugarCore await _repository.InsertManyAsync(GetSeedData()); } } - public List GetSeedData() + public List GetSeedData() { - var entities = new List(); - TemplateEntity entityTemplate = new TemplateEntity() + var entities = new List(); + TemplateAggregateRoot entityTemplate = new TemplateAggregateRoot() { Name = "Entity", BuildPath = "D:\\code\\Entities\\@ModelEntity.cs", @@ -33,7 +33,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore entities.Add(entityTemplate); - TemplateEntity getListInputTemplate = new TemplateEntity() + TemplateAggregateRoot getListInputTemplate = new TemplateAggregateRoot() { Name = "GetListInput", BuildPath = "D:\\code\\Dtos\\@Model\\@ModelGetListInput.cs", @@ -43,7 +43,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore entities.Add(getListInputTemplate); - TemplateEntity getListOutputDtoTemplate = new TemplateEntity() + TemplateAggregateRoot getListOutputDtoTemplate = new TemplateAggregateRoot() { Name = "GetListOutputDto", BuildPath = "D:\\code\\Dtos\\@Model\\@ModelGetListOutputDto.cs", @@ -53,7 +53,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore entities.Add(getListOutputDtoTemplate); - TemplateEntity getOutputDtoTemplate = new TemplateEntity() + TemplateAggregateRoot getOutputDtoTemplate = new TemplateAggregateRoot() { Name = "GetOutputDto", BuildPath = "D:\\code\\Dtos\\@Model\\@ModelGetOutputDto.cs", @@ -62,7 +62,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore }; entities.Add(getOutputDtoTemplate); - TemplateEntity updateInputTemplate = new TemplateEntity() + TemplateAggregateRoot updateInputTemplate = new TemplateAggregateRoot() { Name = "UpdateInput", BuildPath = "D:\\code\\Dtos\\@Model\\@ModelUpdateInput.cs", @@ -71,7 +71,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore }; entities.Add(updateInputTemplate); - TemplateEntity createInputTemplate = new TemplateEntity() + TemplateAggregateRoot createInputTemplate = new TemplateAggregateRoot() { Name = "CreateInput", BuildPath = "D:\\code\\Dtos\\@Model\\@ModelCreateInput.cs", @@ -81,7 +81,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore entities.Add(createInputTemplate); - TemplateEntity iServicesTemplate = new TemplateEntity() + TemplateAggregateRoot iServicesTemplate = new TemplateAggregateRoot() { Name = "IServices", BuildPath = "D:\\code\\IServices\\I@ModelService.cs", @@ -92,7 +92,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore - TemplateEntity servicesTemplate = new TemplateEntity() + TemplateAggregateRoot servicesTemplate = new TemplateAggregateRoot() { Name = "Service", BuildPath = "D:\\code\\Services\\@ModelService.cs", @@ -101,7 +101,7 @@ namespace Yi.Framework.CodeGen.SqlSugarCore }; entities.Add(servicesTemplate); - TemplateEntity apiTemplate = new TemplateEntity() + TemplateAggregateRoot apiTemplate = new TemplateAggregateRoot() { TemplateStr = "import request from '@/utils/request'\r\n\r\n// 分页查询\r\nexport function listData(query) {\r\n return request({\r\n url: '/@model',\r\n method: 'get',\r\n params: query\r\n })\r\n}\r\n\r\n// id查询\r\nexport function getData(id) {\r\n return request({\r\n url: `/@model/${id}`,\r\n method: 'get'\r\n })\r\n}\r\n\r\n// 新增\r\nexport function addData(data) {\r\n return request({\r\n url: '/@model',\r\n method: 'post',\r\n data: data\r\n })\r\n}\r\n\r\n// 修改\r\nexport function updateData(id,data) {\r\n return request({\r\n url: `/@model/${id}`,\r\n method: 'put',\r\n data: data\r\n })\r\n}\r\n\r\n// 删除\r\nexport function delData(ids) {\r\n return request({\r\n url: `/@model`,\r\n method: 'delete',\r\n params:{id:ids}\r\n })\r\n}\r\n", Name = "api", 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 8d5adc88..ceb452f1 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 @@ -39,7 +39,7 @@ namespace Yi.Framework.Rbac.Application.Services public AccountService(IUserRepository userRepository, ICurrentUser currentUser, IAccountManager accountManager, - ISqlSugarRepository menuRepository, + ISqlSugarRepository menuRepository, IDistributedCache phoneCache, IDistributedCache userCache, ICaptcha captcha, @@ -65,7 +65,7 @@ namespace Yi.Framework.Rbac.Application.Services private IUserRepository _userRepository; private ICurrentUser _currentUser; private IAccountManager _accountManager; - private ISqlSugarRepository _menuRepository; + private ISqlSugarRepository _menuRepository; /// /// 校验图片登录验证码,无需和账号绑定 /// @@ -100,7 +100,7 @@ namespace Yi.Framework.Rbac.Application.Services //校验验证码 ValidationImageCaptcha(input); - UserEntity user = new(); + UserAggregateRoot user = new(); //校验 await _accountManager.LoginValidationAsync(input.UserName, input.Password, x => user = x); @@ -267,10 +267,10 @@ namespace Yi.Framework.Rbac.Application.Services //为超级管理员直接给全部路由 if (UserConst.Admin.Equals(data.User.UserName)) { - menus = ObjectMapper.Map, List>(await _menuRepository.GetListAsync()); + menus = ObjectMapper.Map, List>(await _menuRepository.GetListAsync()); } //将后端菜单转换成前端路由，组件级别需要过滤 - List routers = ObjectMapper.Map, List>(menus).Vue3RouterBuild(); + List routers = ObjectMapper.Map, List>(menus).Vue3RouterBuild(); return routers; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/ConfigService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/ConfigService.cs index 731a2ebd..85c398bf 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/ConfigService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/ConfigService.cs @@ -12,11 +12,11 @@ namespace Yi.Framework.Rbac.Application.Services /// /// Config服务实现 /// - public class ConfigService : YiCrudAppService, + public class ConfigService : YiCrudAppService, IConfigService { - private ISqlSugarRepository _repository; - public ConfigService(ISqlSugarRepository repository) : base(repository) + private ISqlSugarRepository _repository; + public ConfigService(ISqlSugarRepository repository) : base(repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/NoticeService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/NoticeService.cs index dc77fbac..f1eb66f4 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/NoticeService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/NoticeService.cs @@ -14,12 +14,12 @@ namespace Yi.Framework.Rbac.Application.Services /// /// Notice服务实现 /// - public class NoticeService : YiCrudAppService, + public class NoticeService : YiCrudAppService, INoticeService { - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private IHubContext _hubContext; - public NoticeService(ISqlSugarRepository repository, IHubContext hubContext) : base(repository) + public NoticeService(ISqlSugarRepository repository, IHubContext hubContext) : base(repository) { _hubContext = hubContext; _repository = repository; diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/RecordLog/LoginLogService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/RecordLog/LoginLogService.cs index 95c09dc6..e0944033 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/RecordLog/LoginLogService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/RecordLog/LoginLogService.cs @@ -9,10 +9,10 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Framework.Rbac.Application.Services.RecordLog { - public class LoginLogService : YiCrudAppService + public class LoginLogService : YiCrudAppService { - private readonly ISqlSugarRepository _repository; - public LoginLogService(ISqlSugarRepository repository) : base(repository) + private readonly ISqlSugarRepository _repository; + public LoginLogService(ISqlSugarRepository repository) : base(repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/DeptService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/DeptService.cs index 25401d96..37947ac6 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/DeptService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/DeptService.cs @@ -13,7 +13,7 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// Dept服务实现 /// - public class DeptService : YiCrudAppService, IDeptService + public class DeptService : YiCrudAppService, IDeptService { private IDeptRepository _deptRepository; public DeptService(IDeptRepository deptRepository) : base(deptRepository) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/MenuService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/MenuService.cs index ee3f839e..0dfbf38e 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/MenuService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/MenuService.cs @@ -12,11 +12,11 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// Menu服务实现 /// - public class MenuService : YiCrudAppService, + public class MenuService : YiCrudAppService, IMenuService { - private readonly ISqlSugarRepository _repository; - public MenuService(ISqlSugarRepository repository) : base(repository) + private readonly ISqlSugarRepository _repository; + public MenuService(ISqlSugarRepository repository) : base(repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs index 50faead5..07fc8d4b 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs @@ -12,11 +12,11 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// Post服务实现 /// - public class PostService : YiCrudAppService, + public class PostService : YiCrudAppService, IPostService { - private readonly ISqlSugarRepository _repository; - public PostService(ISqlSugarRepository repository) : base(repository) + private readonly ISqlSugarRepository _repository; + public PostService(ISqlSugarRepository repository) : base(repository) { _repository = repository; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs index 0f20ef50..f230591d 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs @@ -19,16 +19,16 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// Role服务实现 /// - public class RoleService : YiCrudAppService, + public class RoleService : YiCrudAppService, IRoleService { - public RoleService(RoleManager roleManager, ISqlSugarRepository roleDeptRepository, ISqlSugarRepository userRoleRepository, ISqlSugarRepository repository) : base(repository) + public RoleService(RoleManager roleManager, ISqlSugarRepository roleDeptRepository, ISqlSugarRepository userRoleRepository, ISqlSugarRepository repository) : base(repository) { (_roleManager, _roleDeptRepository, _userRoleRepository, _repository) = (roleManager, roleDeptRepository, userRoleRepository, repository); } - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private RoleManager _roleManager { get; set; } private ISqlSugarRepository _roleDeptRepository; @@ -44,7 +44,7 @@ namespace Yi.Framework.Rbac.Application.Services.System var insertEntities = input.DeptIds.Select(x => new RoleDeptEntity { DeptId = x, RoleId = input.RoleId }).ToList(); await _roleDeptRepository.InsertRangeAsync(insertEntities); } - var entity = new RoleEntity() { DataScope = input.DataScope }; + var entity = new RoleAggregateRoot() { DataScope = input.DataScope }; EntityHelper.TrySetId(entity, () => input.RoleId); await _repository._Db.Updateable(entity).UpdateColumns(x => x.DataScope).ExecuteCommandAsync(); @@ -154,7 +154,7 @@ namespace Yi.Framework.Rbac.Application.Services.System { RefAsync total = 0; var output = await _userRoleRepository._DbQueryable - .LeftJoin((ur, u) => ur.UserId == u.Id && ur.RoleId == roleId) + .LeftJoin((ur, u) => ur.UserId == u.Id && ur.RoleId == roleId) .Where((ur, u) => ur.RoleId == roleId) .WhereIF(!string.IsNullOrEmpty(input.UserName), (ur, u) => u.UserName.Contains(input.UserName)) .WhereIF(input.Phone is not null, (ur, u) => u.Phone.ToString().Contains(input.Phone.ToString())) @@ -166,7 +166,7 @@ namespace Yi.Framework.Rbac.Application.Services.System private async Task> GetNotAllocatedAuthUserByRoleIdAsync(Guid roleId, RoleAuthUserGetListInput input) { RefAsync total = 0; - var entities = await _userRoleRepository._Db.Queryable() + var entities = await _userRoleRepository._Db.Queryable() .Where(u => SqlFunc.Subqueryable().Where(x => x.RoleId == roleId).Where(x => x.UserId == u.Id).NotAny()) .WhereIF(!string.IsNullOrEmpty(input.UserName), u => u.UserName.Contains(input.UserName)) .WhereIF(input.Phone is not null, u => u.Phone.ToString().Contains(input.Phone.ToString())) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs index c3bcab92..bc6cb216 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs @@ -24,15 +24,15 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// User服务实现 /// - public class UserService : YiCrudAppService, IUserService + public class UserService : YiCrudAppService, IUserService //IUserService { - public UserService(ISqlSugarRepository repository, UserManager userManager, IUserRepository userRepository, ICurrentUser currentUser, IDeptService deptService, ILocalEventBus localEventBus, IDistributedCache userCache) : base(repository) + public UserService(ISqlSugarRepository repository, UserManager userManager, IUserRepository userRepository, ICurrentUser currentUser, IDeptService deptService, ILocalEventBus localEventBus, IDistributedCache userCache) : base(repository) => (_userManager, _userRepository, _currentUser, _deptService, _repository, _localEventBus) = (userManager, userRepository, currentUser, deptService, repository, localEventBus); private UserManager _userManager { get; set; } - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private IUserRepository _userRepository { get; set; } private IDeptService _deptService { get; set; } @@ -68,7 +68,7 @@ namespace Yi.Framework.Rbac.Application.Services.System .WhereIF(ids is not null, x => ids.Contains(x.Id)) - .LeftJoin((user, dept) => user.DeptId == dept.Id) + .LeftJoin((user, dept) => user.DeptId == dept.Id) .OrderByDescending(user => user.CreationTime) .Select((user, dept) => new UserGetListOutputDto(), true) .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); @@ -80,7 +80,7 @@ namespace Yi.Framework.Rbac.Application.Services.System } - protected override UserEntity MapToEntity(UserCreateInputVo createInput) + protected override UserAggregateRoot MapToEntity(UserCreateInputVo createInput) { var output = base.MapToEntity(createInput); output.EncryPassword = new Domain.Entities.ValueObjects.EncryPasswordValueObject(createInput.Password); @@ -107,7 +107,7 @@ namespace Yi.Framework.Rbac.Application.Services.System return result; } - protected override async Task MapToEntityAsync(UserCreateInputVo createInput) + protected override async Task MapToEntityAsync(UserCreateInputVo createInput) { var entitiy = await base.MapToEntityAsync(createInput); entitiy.BuildPassword(); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineHub.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineHub.cs index e2824f0e..5e7df65f 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineHub.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineHub.cs @@ -34,7 +34,7 @@ namespace Yi.Framework.Rbac.Application.SignalRHubs lock (objLock) { var name = CurrentUser.UserName; - var loginUser = new LoginLogEntity().GetInfoByHttpContext(_httpContext); + var loginUser = new LoginLogAggregateRoot().GetInfoByHttpContext(_httpContext); OnlineUserModel user = new(Context.ConnectionId) { diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs similarity index 94% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs index 4b3eb73c..87b01365 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/ConfigAggregateRoot.cs @@ -10,7 +10,7 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 配置表 /// [SugarTable("Config")] - public class ConfigEntity : Entity, IAuditedObject, IOrderNum, ISoftDelete + public class ConfigAggregateRoot : AggregateRoot, IAuditedObject, IOrderNum, ISoftDelete { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] public override Guid Id { get; protected set; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptAggregateRoot.cs similarity index 86% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptAggregateRoot.cs index b256663c..ad855069 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptAggregateRoot.cs @@ -10,15 +10,15 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 部门表 /// [SugarTable("Dept")] - public class DeptEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + public class DeptAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject, IOrderNum, IState { - public DeptEntity() + public DeptAggregateRoot() { } - public DeptEntity(Guid Id) { this.Id = Id; ParentId = Guid.Empty; } + public DeptAggregateRoot(Guid Id) { this.Id = Id; ParentId = Guid.Empty; } - public DeptEntity(Guid Id, Guid parentId) { this.Id = Id; ParentId = parentId; } + public DeptAggregateRoot(Guid Id, Guid parentId) { this.Id = Id; ParentId = parentId; } /// /// 主键 /// diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/LoginLogEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/LoginLogAggregateRoot.cs similarity index 92% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/LoginLogEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/LoginLogAggregateRoot.cs index e8fe3167..6898d819 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/LoginLogEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/LoginLogAggregateRoot.cs @@ -10,7 +10,7 @@ namespace Yi.Framework.Rbac.Domain.Entities { [SugarTable("LoginLog")] [SugarIndex($"index_{nameof(LoginUser)}", nameof(LoginUser), OrderByType.Asc)] - public class LoginLogEntity : Entity, ICreationAuditedObject + public class LoginLogAggregateRoot : AggregateRoot, ICreationAuditedObject { [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] public override Guid Id { get; protected set; } @@ -50,7 +50,7 @@ namespace Yi.Framework.Rbac.Domain.Entities public Guid? CreatorId { get; set; } - public LoginLogEntity GetInfoByHttpContext(HttpContext context) + public LoginLogAggregateRoot GetInfoByHttpContext(HttpContext context) { ClientInfo GetClientInfo(HttpContext context) { @@ -78,7 +78,7 @@ namespace Yi.Framework.Rbac.Domain.Entities location = IpTool.Search(ipAddr); } ClientInfo clientInfo = GetClientInfo(context); - LoginLogEntity entity = new() + LoginLogAggregateRoot entity = new() { Browser = clientInfo.Device.Family, Os = clientInfo.OS.ToString(), diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs similarity index 93% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs index 6134fe41..7ebed1ea 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/MenuAggregateRoot.cs @@ -13,12 +13,12 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 菜单表 /// [SugarTable("Menu")] - public partial class MenuEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + public partial class MenuAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject, IOrderNum, IState { - public MenuEntity() { } + public MenuAggregateRoot() { } - public MenuEntity(Guid id) { Id = id; ParentId = Guid.Empty; } - public MenuEntity(Guid id, Guid parentId) { Id = id; ParentId = parentId; } + public MenuAggregateRoot(Guid id) { Id = id; ParentId = Guid.Empty; } + public MenuAggregateRoot(Guid id, Guid parentId) { Id = id; ParentId = parentId; } /// /// 主键 /// @@ -123,7 +123,7 @@ namespace Yi.Framework.Rbac.Domain.Entities public string? Query { get; set; } [SugarColumn(IsIgnore = true)] - public List? Children { get; set; } + public List? Children { get; set; } } @@ -137,7 +137,7 @@ namespace Yi.Framework.Rbac.Domain.Entities /// /// /// - public static List Vue3RouterBuild(this List menus) + public static List Vue3RouterBuild(this List menus) { menus = menus.Where(m => m.MenuType != MenuTypeEnum.Component).ToList(); List routers = new(); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeAggregateRoot.cs similarity index 91% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeAggregateRoot.cs index f25aa89f..900406ac 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/NoticeAggregateRoot.cs @@ -12,7 +12,7 @@ using Yi.Framework.Rbac.Domain.Shared.Enums; namespace Yi.Framework.Rbac.Domain.Entities { [SugarTable("Notice")] - public class NoticeEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + public class NoticeAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject, IOrderNum, IState { [SugarColumn(IsPrimaryKey = true)] diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostAggregateRoot.cs similarity index 94% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostAggregateRoot.cs index a88457e7..02e03ca8 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/PostAggregateRoot.cs @@ -10,7 +10,7 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 岗位表 /// [SugarTable("Post")] - public class PostEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + public class PostAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject, IOrderNum, IState { /// diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleAggregateRoot.cs similarity index 90% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleAggregateRoot.cs index d04995f3..453ff7cb 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/RoleAggregateRoot.cs @@ -1,5 +1,4 @@ using SqlSugar; -using Volo.Abp; using Volo.Abp.Auditing; using Volo.Abp.Domain.Entities; using Yi.Framework.Core.Data; @@ -11,7 +10,7 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 角色表 /// [SugarTable("Role")] - public class RoleEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + public class RoleAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject, IOrderNum, IState { /// /// 主键 @@ -79,9 +78,9 @@ namespace Yi.Framework.Rbac.Domain.Entities [Navigate(typeof(RoleMenuEntity), nameof(RoleMenuEntity.RoleId), nameof(RoleMenuEntity.MenuId))] - public List? Menus { get; set; } + public List? Menus { get; set; } [Navigate(typeof(RoleDeptEntity), nameof(RoleDeptEntity.RoleId), nameof(RoleDeptEntity.DeptId))] - public List? Depts { get; set; } + public List? Depts { get; set; } } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserEntity.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserAggregateRoot.cs similarity index 91% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserEntity.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserAggregateRoot.cs index 12865286..78012041 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserEntity.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserAggregateRoot.cs @@ -1,5 +1,4 @@ using SqlSugar; -using Volo.Abp; using Volo.Abp.Auditing; using Volo.Abp.Domain.Entities; using Yi.Framework.Core.Data; @@ -14,13 +13,13 @@ namespace Yi.Framework.Rbac.Domain.Entities /// [SugarTable("User")] [SugarIndex($"index_{nameof(UserName)}", nameof(UserName), OrderByType.Asc)] - public class UserEntity : Entity, ISoftDelete, IAuditedObject, IOrderNum, IState + public class UserAggregateRoot : AggregateRoot, ISoftDelete, IAuditedObject, IOrderNum, IState { - public UserEntity() + public UserAggregateRoot() { } - public UserEntity(string userName, string password, long phone, string nick = "萌新") + public UserAggregateRoot(string userName, string password, long phone, string nick = "萌新") { UserName = userName; EncryPassword.Password = password; @@ -158,26 +157,26 @@ namespace Yi.Framework.Rbac.Domain.Entities /// 角色 /// [Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))] - public List Roles { get; set; } + public List Roles { get; set; } /// /// 岗位 /// [Navigate(typeof(UserPostEntity), nameof(UserPostEntity.UserId), nameof(UserPostEntity.PostId))] - public List Posts { get; set; } + public List Posts { get; set; } /// /// 部门 /// [Navigate(NavigateType.OneToOne, nameof(DeptId))] - public DeptEntity? Dept { get; set; } + public DeptAggregateRoot? Dept { get; set; } /// /// 构建密码，MD5盐值加密 /// - public UserEntity BuildPassword(string password = null) + public UserAggregateRoot BuildPassword(string password = null) { //如果不传值，那就把自己的password当作传进来的password if (password == null) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/EventHandlers/LoginEventHandler.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/EventHandlers/LoginEventHandler.cs index 17d2dd86..03ad116b 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/EventHandlers/LoginEventHandler.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/EventHandlers/LoginEventHandler.cs @@ -17,12 +17,12 @@ namespace Yi.Framework.Rbac.Domain.EventHandlers ITransientDependency { private readonly ILogger _logger; - private readonly IRepository _loginLogRepository; - public LoginEventHandler(ILogger logger, IRepository loginLogRepository) { _logger = logger; _loginLogRepository = loginLogRepository; } + private readonly IRepository _loginLogRepository; + public LoginEventHandler(ILogger logger, IRepository loginLogRepository) { _logger = logger; _loginLogRepository = loginLogRepository; } public async Task HandleEventAsync(LoginEventArgs eventData) { _logger.LogInformation($"用户【{eventData.UserId}:{eventData.UserName}】登入系统"); - var loginLogEntity = eventData.Adapt(); + var loginLogEntity = eventData.Adapt(); loginLogEntity.LogMsg = eventData.UserName + "登录系统"; loginLogEntity.LoginUser = eventData.UserName; loginLogEntity.CreatorId = eventData.UserId; diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs index a6953067..4e2ba7ff 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs @@ -36,7 +36,7 @@ namespace Yi.Framework.Rbac.Domain.Managers private readonly RbacOptions _options; private IHttpContextAccessor _httpContextAccessor; private UserManager _userManager; - private ISqlSugarRepository _roleRepository; + private ISqlSugarRepository _roleRepository; private RefreshJwtOptions _refreshJwtOptions; public AccountManager(IUserRepository repository @@ -45,7 +45,7 @@ namespace Yi.Framework.Rbac.Domain.Managers , ILocalEventBus localEventBus , UserManager userManager , IOptions refreshJwtOptions - , ISqlSugarRepository roleRepository + , ISqlSugarRepository roleRepository , IOptions options) { _repository = repository; @@ -86,7 +86,7 @@ namespace Yi.Framework.Rbac.Domain.Managers //这里抛出一个登录的事件 if (_httpContextAccessor.HttpContext is not null) { - var loginEntity = new LoginLogEntity().GetInfoByHttpContext(_httpContextAccessor.HttpContext); + var loginEntity = new LoginLogAggregateRoot().GetInfoByHttpContext(_httpContextAccessor.HttpContext); var loginEto = loginEntity.Adapt(); loginEto.UserName = userInfo.User.UserName; loginEto.UserId = userInfo.User.Id; @@ -149,9 +149,9 @@ namespace Yi.Framework.Rbac.Domain.Managers /// /// /// - public async Task LoginValidationAsync(string userName, string password, Action userAction = null) + public async Task LoginValidationAsync(string userName, string password, Action userAction = null) { - var user = new UserEntity(); + var user = new UserAggregateRoot(); if (await ExistAsync(userName, o => user = o)) { if (userAction is not null) @@ -173,7 +173,7 @@ namespace Yi.Framework.Rbac.Domain.Managers /// /// /// - public async Task ExistAsync(string userName, Action userAction = null) + public async Task ExistAsync(string userName, Action userAction = null) { var user = await _repository.GetFirstAsync(u => u.UserName == userName && u.State == true); if (userAction is not null) @@ -280,7 +280,7 @@ namespace Yi.Framework.Rbac.Domain.Managers /// public async Task RegisterAsync(string userName, string password, long phone) { - var user = new UserEntity(userName, password, phone); + var user = new UserAggregateRoot(userName, password, phone); await _userManager.CreateAsync(user); await _userManager.SetDefautRoleAsync(user.Id); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs index dd8b0e18..c4581d46 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs @@ -12,7 +12,7 @@ namespace Yi.Framework.Rbac.Domain.Managers { string CreateRefreshToken(Guid userId); Task GetTokenByUserIdAsync(Guid userId); - Task LoginValidationAsync(string userName, string password, Action userAction = null); + Task LoginValidationAsync(string userName, string password, Action userAction = null); Task RegisterAsync(string userName, string password, long phone); Task RestPasswordAsync(Guid userId, string password); Task UpdatePasswordAsync(Guid userId, string newPassword, string oldPassword); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/RoleManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/RoleManager.cs index 878777f6..cd5c2c32 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/RoleManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/RoleManager.cs @@ -6,9 +6,9 @@ namespace Yi.Framework.Rbac.Domain.Managers { public class RoleManager : DomainService { - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private ISqlSugarRepository _roleMenuRepository; - public RoleManager(ISqlSugarRepository repository, ISqlSugarRepository roleMenuRepository) + public RoleManager(ISqlSugarRepository repository, ISqlSugarRepository roleMenuRepository) { _repository = repository; _roleMenuRepository = roleMenuRepository; diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs index 7c5a1b39..cfc4d1cc 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs @@ -21,15 +21,15 @@ namespace Yi.Framework.Rbac.Domain.Managers { public class UserManager : DomainService { - public readonly ISqlSugarRepository _repository; + public readonly ISqlSugarRepository _repository; public readonly ISqlSugarRepository _repositoryUserRole; public readonly ISqlSugarRepository _repositoryUserPost; - private readonly ISqlSugarRepository _roleRepository; + private readonly ISqlSugarRepository _roleRepository; private IDistributedCache _userCache; private readonly IGuidGenerator _guidGenerator; private IUserRepository _userRepository; private ILocalEventBus _localEventBus; - public UserManager(ISqlSugarRepository repository, ISqlSugarRepository repositoryUserRole, ISqlSugarRepository repositoryUserPost, IGuidGenerator guidGenerator, IDistributedCache userCache, IUserRepository userRepository, ILocalEventBus localEventBus, ISqlSugarRepository roleRepository) => + public UserManager(ISqlSugarRepository repository, ISqlSugarRepository repositoryUserRole, ISqlSugarRepository repositoryUserPost, IGuidGenerator guidGenerator, IDistributedCache userCache, IUserRepository userRepository, ILocalEventBus localEventBus, ISqlSugarRepository roleRepository) => (_repository, _repositoryUserRole, _repositoryUserPost, _guidGenerator, _userCache, _userRepository, _localEventBus, _roleRepository) = (repository, repositoryUserRole, repositoryUserPost, guidGenerator, userCache, userRepository, localEventBus, roleRepository); @@ -96,7 +96,7 @@ namespace Yi.Framework.Rbac.Domain.Managers /// 创建用户 /// /// - public async Task CreateAsync(UserEntity userEntity) + public async Task CreateAsync(UserAggregateRoot userEntity) { //校验用户名 ValidateUserName(userEntity); @@ -139,7 +139,7 @@ namespace Yi.Framework.Rbac.Domain.Managers } } - private void ValidateUserName(UserEntity input) + private void ValidateUserName(UserAggregateRoot input) { if (input.UserName == UserConst.Admin || input.UserName == UserConst.TenantAdmin) { @@ -217,7 +217,7 @@ namespace Yi.Framework.Rbac.Domain.Managers - private UserRoleMenuDto EntityMapToDto(UserEntity user) + private UserRoleMenuDto EntityMapToDto(UserAggregateRoot user) { var userRoleMenu = new UserRoleMenuDto(); @@ -259,11 +259,11 @@ namespace Yi.Framework.Rbac.Domain.Managers } //刚好可以去除一下多余的导航属性 - role.Menus = new List(); + role.Menus = new List(); userRoleMenu.Roles.Add(role.Adapt()); } - user.Roles = new List(); + user.Roles = new List(); userRoleMenu.User = user.Adapt(); userRoleMenu.Menus = userRoleMenu.Menus.OrderByDescending(x => x.OrderNum).ToHashSet(); return userRoleMenu; diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IDeptRepository.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IDeptRepository.cs index 40b0891e..e550d593 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IDeptRepository.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IDeptRepository.cs @@ -3,9 +3,9 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Framework.Rbac.Domain.Repositories { - public interface IDeptRepository : ISqlSugarRepository + public interface IDeptRepository : ISqlSugarRepository { Task> GetChildListAsync(Guid deptId); - Task> GetListRoleIdAsync(Guid roleId); + Task> GetListRoleIdAsync(Guid roleId); } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IUserRepository.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IUserRepository.cs index d602e222..9d015e29 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IUserRepository.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Repositories/IUserRepository.cs @@ -5,20 +5,20 @@ using Yi.Framework.SqlSugarCore.Abstractions; namespace Yi.Framework.Rbac.Domain.Repositories { - public interface IUserRepository : ISqlSugarRepository + public interface IUserRepository : ISqlSugarRepository { /// /// 获取用户的所有信息 /// /// /// - Task GetUserAllInfoAsync(Guid userId); + Task GetUserAllInfoAsync(Guid userId); /// /// 批量获取用户的所有信息 /// /// /// - Task> GetListUserAllInfoAsync(List userIds); + Task> GetListUserAllInfoAsync(List userIds); } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs index c61b08e1..d3e3ae49 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs @@ -9,9 +9,9 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds public class DeptDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private IGuidGenerator _guidGenerator; - public DeptDataSeed(ISqlSugarRepository repository, IGuidGenerator guidGenerator) + public DeptDataSeed(ISqlSugarRepository repository, IGuidGenerator guidGenerator) { _repository = repository; _guidGenerator = guidGenerator; @@ -23,11 +23,11 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds await _repository.InsertManyAsync(GetSeedData()); } } - public List GetSeedData() + public List GetSeedData() { - var entities = new List(); + var entities = new List(); - DeptEntity chengziDept = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot chengziDept = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "橙子科技", DeptCode = "Yi", @@ -39,7 +39,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(chengziDept); - DeptEntity shenzhenDept = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot shenzhenDept = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "深圳总公司", @@ -50,7 +50,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(shenzhenDept); - DeptEntity jiangxiDept = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot jiangxiDept = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "江西总公司", @@ -62,7 +62,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds - DeptEntity szDept1 = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot szDept1 = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "研发部门", @@ -72,7 +72,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(szDept1); - DeptEntity szDept2 = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot szDept2 = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "市场部门", @@ -82,7 +82,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(szDept2); - DeptEntity szDept3 = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot szDept3 = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "测试部门", @@ -92,7 +92,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(szDept3); - DeptEntity szDept4 = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot szDept4 = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "财务部门", @@ -102,7 +102,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(szDept4); - DeptEntity szDept5 = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot szDept5 = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "运维部门", @@ -113,7 +113,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(szDept5); - DeptEntity jxDept1 = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot jxDept1 = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "市场部门", @@ -124,7 +124,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(jxDept1); - DeptEntity jxDept2 = new DeptEntity(_guidGenerator.Create()) + DeptAggregateRoot jxDept2 = new DeptAggregateRoot(_guidGenerator.Create()) { DeptName = "财务部门", diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs index 5eb36340..18861b03 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs @@ -9,9 +9,9 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds { public class MenuDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private IGuidGenerator _guidGenerator; - public MenuDataSeed(ISqlSugarRepository repository, IGuidGenerator guidGenerator) + public MenuDataSeed(ISqlSugarRepository repository, IGuidGenerator guidGenerator) { _repository = repository; _guidGenerator = guidGenerator; @@ -24,14 +24,14 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds await _repository.InsertManyAsync(GetSeedData()); } } - public List GetSeedData() + public List GetSeedData() { - List entities = new List(); + List entities = new List(); //系统管理 - MenuEntity system = new MenuEntity(_guidGenerator.Create(), Guid.Empty) + MenuAggregateRoot system = new MenuAggregateRoot(_guidGenerator.Create(), Guid.Empty) { MenuName = "系统管理", MenuType = MenuTypeEnum.Catalogue, @@ -45,7 +45,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(system); //代码生成 - MenuEntity code = new MenuEntity(_guidGenerator.Create(), Guid.Empty) + MenuAggregateRoot code = new MenuAggregateRoot(_guidGenerator.Create(), Guid.Empty) { MenuName = "代码生成", MenuType = MenuTypeEnum.Catalogue, @@ -59,7 +59,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(code); //数据表管理 - MenuEntity table = new MenuEntity(_guidGenerator.Create(), code.Id) + MenuAggregateRoot table = new MenuAggregateRoot(_guidGenerator.Create(), code.Id) { MenuName = "数据表管理", PermissionCode = "code:table:list", @@ -76,7 +76,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(table); //字段管理 - MenuEntity field = new MenuEntity(_guidGenerator.Create(), code.Id) + MenuAggregateRoot field = new MenuAggregateRoot(_guidGenerator.Create(), code.Id) { MenuName = "字段管理", PermissionCode = "code:field:list", @@ -95,7 +95,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //模板管理 - MenuEntity template = new MenuEntity(_guidGenerator.Create(), code.Id) + MenuAggregateRoot template = new MenuAggregateRoot(_guidGenerator.Create(), code.Id) { MenuName = "模板管理", PermissionCode = "code:template:list", @@ -118,7 +118,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //系统监控 - MenuEntity monitoring = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot monitoring = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "系统监控", MenuType = MenuTypeEnum.Catalogue, @@ -133,7 +133,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //在线用户 - MenuEntity online = new MenuEntity(_guidGenerator.Create(), monitoring.Id) + MenuAggregateRoot online = new MenuAggregateRoot(_guidGenerator.Create(), monitoring.Id) { MenuName = "在线用户", PermissionCode = "monitor:online:list", @@ -150,7 +150,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(online); //缓存列表 - MenuEntity cache = new MenuEntity(_guidGenerator.Create(), monitoring.Id) + MenuAggregateRoot cache = new MenuAggregateRoot(_guidGenerator.Create(), monitoring.Id) { MenuName = "缓存列表", PermissionCode = "monitor:cache:list", @@ -167,7 +167,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(cache); //服务监控 - MenuEntity server = new MenuEntity(_guidGenerator.Create(), monitoring.Id) + MenuAggregateRoot server = new MenuAggregateRoot(_guidGenerator.Create(), monitoring.Id) { MenuName = "服务监控", PermissionCode = "monitor:server:list", @@ -184,7 +184,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(server); //定时任务 - MenuEntity task = new MenuEntity(_guidGenerator.Create(), monitoring.Id) + MenuAggregateRoot task = new MenuAggregateRoot(_guidGenerator.Create(), monitoring.Id) { MenuName = "定时任务", PermissionCode = "monitor:job:list", @@ -202,7 +202,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //系统工具 - MenuEntity tool = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot tool = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "系统工具", MenuType = MenuTypeEnum.Catalogue, @@ -215,7 +215,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(tool); //swagger文档 - MenuEntity swagger = new MenuEntity(_guidGenerator.Create(), tool.Id) + MenuAggregateRoot swagger = new MenuAggregateRoot(_guidGenerator.Create(), tool.Id) { MenuName = "接口文档", MenuType = MenuTypeEnum.Menu, @@ -230,7 +230,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //ERP - MenuEntity erp = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot erp = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "ERP(待更新)", MenuType = MenuTypeEnum.Catalogue, @@ -246,7 +246,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //供应商定义 - MenuEntity supplier = new MenuEntity(_guidGenerator.Create(), erp.Id) + MenuAggregateRoot supplier = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id) { MenuName = "供应商定义", PermissionCode = "erp:supplier:list", @@ -262,7 +262,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(supplier); - MenuEntity supplierQuery = new MenuEntity(_guidGenerator.Create(), supplier.Id) + MenuAggregateRoot supplierQuery = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id) { MenuName = "供应商查询", PermissionCode = "erp:supplier:query", @@ -272,7 +272,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(supplierQuery); - MenuEntity supplierAdd = new MenuEntity(_guidGenerator.Create(), supplier.Id) + MenuAggregateRoot supplierAdd = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id) { MenuName = "供应商新增", PermissionCode = "erp:supplier:add", @@ -283,7 +283,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(supplierAdd); - MenuEntity supplierEdit = new MenuEntity(_guidGenerator.Create(), supplier.Id) + MenuAggregateRoot supplierEdit = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id) { MenuName = "供应商修改", PermissionCode = "erp:supplier:edit", @@ -293,7 +293,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(supplierEdit); - MenuEntity supplierRemove = new MenuEntity(_guidGenerator.Create(), supplier.Id) + MenuAggregateRoot supplierRemove = new MenuAggregateRoot(_guidGenerator.Create(), supplier.Id) { MenuName = "供应商删除", PermissionCode = "erp:supplier:remove", @@ -305,7 +305,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //仓库定义 - MenuEntity warehouse = new MenuEntity(_guidGenerator.Create(), erp.Id) + MenuAggregateRoot warehouse = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id) { MenuName = "仓库定义", PermissionCode = "erp:warehouse:list", @@ -321,7 +321,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(warehouse); - MenuEntity warehouseQuery = new MenuEntity(_guidGenerator.Create(), warehouse.Id) + MenuAggregateRoot warehouseQuery = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id) { MenuName = "仓库查询", PermissionCode = "erp:warehouse:query", @@ -332,7 +332,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(warehouseQuery); - MenuEntity warehouseAdd = new MenuEntity(_guidGenerator.Create(), warehouse.Id) + MenuAggregateRoot warehouseAdd = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id) { MenuName = "仓库新增", PermissionCode = "erp:warehouse:add", @@ -342,7 +342,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(warehouseAdd); - MenuEntity warehouseEdit = new MenuEntity(_guidGenerator.Create(), warehouse.Id) + MenuAggregateRoot warehouseEdit = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id) { MenuName = "仓库修改", PermissionCode = "erp:warehouse:edit", @@ -352,7 +352,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(warehouseEdit); - MenuEntity warehouseRemove = new MenuEntity(_guidGenerator.Create(), warehouse.Id) + MenuAggregateRoot warehouseRemove = new MenuAggregateRoot(_guidGenerator.Create(), warehouse.Id) { MenuName = "仓库删除", PermissionCode = "erp:warehouse:remove", @@ -364,7 +364,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //单位定义 - MenuEntity unit = new MenuEntity(_guidGenerator.Create(), erp.Id) + MenuAggregateRoot unit = new MenuAggregateRoot(_guidGenerator.Create(), erp.Id) { MenuName = "单位定义", PermissionCode = "erp:unit:list", @@ -380,7 +380,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(unit); - MenuEntity unitQuery = new MenuEntity(_guidGenerator.Create(), unit.Id) + MenuAggregateRoot unitQuery = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id) { MenuName = "单位查询", PermissionCode = "erp:unit:query", @@ -390,7 +390,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(unitQuery); - MenuEntity unitAdd = new MenuEntity(_guidGenerator.Create(), unit.Id) + MenuAggregateRoot unitAdd = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id) { MenuName = "单位新增", PermissionCode = "erp:unit:add", @@ -400,7 +400,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(unitAdd); - MenuEntity unitEdit = new MenuEntity(_guidGenerator.Create(), unit.Id) + MenuAggregateRoot unitEdit = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id) { MenuName = "单位修改", PermissionCode = "erp:unit:edit", @@ -410,7 +410,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(unitEdit); - MenuEntity unitRemove = new MenuEntity(_guidGenerator.Create(), unit.Id) + MenuAggregateRoot unitRemove = new MenuAggregateRoot(_guidGenerator.Create(), unit.Id) { MenuName = "单位删除", PermissionCode = "erp:unit:remove", @@ -422,7 +422,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //物料定义 - MenuEntity material = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot material = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "物料定义", @@ -440,7 +440,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(material); - MenuEntity materialQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot materialQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "物料查询", @@ -452,7 +452,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(materialQuery); - MenuEntity materialAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot materialAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "物料新增", @@ -464,7 +464,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(materialAdd); - MenuEntity materialEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot materialEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "物料修改", @@ -476,7 +476,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(materialEdit); - MenuEntity materialRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot materialRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "物料删除", @@ -490,7 +490,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //采购订单 - MenuEntity purchase = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot purchase = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "采购订单", @@ -508,7 +508,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(purchase); - MenuEntity purchaseQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot purchaseQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "采购订单查询", @@ -520,7 +520,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(purchaseQuery); - MenuEntity purchaseAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot purchaseAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "采购订单新增", @@ -532,7 +532,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(purchaseAdd); - MenuEntity purchaseEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot purchaseEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "采购订单修改", @@ -544,7 +544,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(purchaseEdit); - MenuEntity purchaseRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot purchaseRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "采购订单删除", @@ -559,7 +559,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //Yi框架 - MenuEntity guide = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot guide = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "Yi框架", @@ -574,7 +574,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(guide); //租户管理 - MenuEntity tenant = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot tenant = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "租户管理", PermissionCode = "system:tenant:list", @@ -591,7 +591,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(tenant); - MenuEntity tenantQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot tenantQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "租户查询", @@ -603,7 +603,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(tenantQuery); - MenuEntity tenantAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot tenantAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "租户新增", @@ -615,7 +615,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(tenantAdd); - MenuEntity tenantEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot tenantEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "租户修改", @@ -627,7 +627,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(tenantEdit); - MenuEntity tenantRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot tenantRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "租户删除", @@ -651,7 +651,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //用户管理 - MenuEntity user = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot user = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "用户管理", @@ -669,7 +669,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(user); - MenuEntity userQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot userQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "用户查询", @@ -681,7 +681,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(userQuery); - MenuEntity userAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot userAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "用户新增", @@ -693,7 +693,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(userAdd); - MenuEntity userEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot userEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "用户修改", @@ -705,7 +705,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(userEdit); - MenuEntity userRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot userRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "用户删除", @@ -719,7 +719,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //角色管理 - MenuEntity role = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot role = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "角色管理", @@ -737,7 +737,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(role); - MenuEntity roleQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot roleQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "角色查询", @@ -749,7 +749,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(roleQuery); - MenuEntity roleAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot roleAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "角色新增", @@ -761,7 +761,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(roleAdd); - MenuEntity roleEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot roleEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "角色修改", @@ -773,7 +773,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(roleEdit); - MenuEntity roleRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot roleRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "角色删除", @@ -787,7 +787,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //菜单管理 - MenuEntity menu = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot menu = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "菜单管理", @@ -805,7 +805,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(menu); - MenuEntity menuQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot menuQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "菜单查询", @@ -817,7 +817,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(menuQuery); - MenuEntity menuAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot menuAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "菜单新增", @@ -829,7 +829,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(menuAdd); - MenuEntity menuEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot menuEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "菜单修改", @@ -841,7 +841,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(menuEdit); - MenuEntity menuRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot menuRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "菜单删除", @@ -854,7 +854,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(menuRemove); //部门管理 - MenuEntity dept = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot dept = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "部门管理", @@ -872,7 +872,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(dept); - MenuEntity deptQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot deptQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "部门查询", @@ -884,7 +884,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(deptQuery); - MenuEntity deptAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot deptAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "部门新增", @@ -896,7 +896,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(deptAdd); - MenuEntity deptEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot deptEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "部门修改", @@ -908,7 +908,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(deptEdit); - MenuEntity deptRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot deptRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "部门删除", @@ -923,7 +923,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //岗位管理 - MenuEntity post = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot post = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "岗位管理", @@ -941,7 +941,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(post); - MenuEntity postQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot postQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "岗位查询", @@ -953,7 +953,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(postQuery); - MenuEntity postAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot postAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "岗位新增", @@ -965,7 +965,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(postAdd); - MenuEntity postEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot postEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "岗位修改", @@ -977,7 +977,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(postEdit); - MenuEntity postRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot postRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "岗位删除", @@ -990,7 +990,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(postRemove); //字典管理 - MenuEntity dict = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot dict = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "字典管理", @@ -1008,7 +1008,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(dict); - MenuEntity dictQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot dictQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "字典查询", @@ -1020,7 +1020,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(dictQuery); - MenuEntity dictAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot dictAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "字典新增", @@ -1032,7 +1032,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(dictAdd); - MenuEntity dictEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot dictEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "字典修改", @@ -1044,7 +1044,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(dictEdit); - MenuEntity dictRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot dictRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "字典删除", @@ -1058,7 +1058,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //参数设置 - MenuEntity config = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot config = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "参数设置", @@ -1076,7 +1076,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(config); - MenuEntity configQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot configQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "参数查询", @@ -1088,7 +1088,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(configQuery); - MenuEntity configAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot configAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "参数新增", @@ -1100,7 +1100,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(configAdd); - MenuEntity configEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot configEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "参数修改", @@ -1112,7 +1112,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(configEdit); - MenuEntity configRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot configRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "参数删除", @@ -1128,7 +1128,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //通知公告 - MenuEntity notice = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot notice = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "通知公告", @@ -1146,7 +1146,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(notice); - MenuEntity noticeQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot noticeQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "通知查询", @@ -1158,7 +1158,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(noticeQuery); - MenuEntity noticeAdd = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot noticeAdd = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "通知新增", @@ -1170,7 +1170,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(noticeAdd); - MenuEntity noticeEdit = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot noticeEdit = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "通知修改", @@ -1182,7 +1182,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(noticeEdit); - MenuEntity noticeRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot noticeRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "通知删除", @@ -1197,7 +1197,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //日志管理 - MenuEntity log = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot log = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "日志管理", @@ -1213,7 +1213,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(log); //操作日志 - MenuEntity operationLog = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot operationLog = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "操作日志", @@ -1231,7 +1231,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(operationLog); - MenuEntity operationLogQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot operationLogQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "操作查询", @@ -1243,7 +1243,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(operationLogQuery); - MenuEntity operationLogRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot operationLogRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "操作删除", @@ -1257,7 +1257,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds //登录日志 - MenuEntity loginLog = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot loginLog = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "登录日志", @@ -1275,7 +1275,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(loginLog); - MenuEntity loginLogQuery = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot loginLogQuery = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "登录查询", @@ -1287,7 +1287,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(loginLogQuery); - MenuEntity loginLogRemove = new MenuEntity(_guidGenerator.Create()) + MenuAggregateRoot loginLogRemove = new MenuAggregateRoot(_guidGenerator.Create()) { MenuName = "登录删除", diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/PostDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/PostDataSeed.cs index dab651d4..c80c9c19 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/PostDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/PostDataSeed.cs @@ -7,8 +7,8 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds { public class PostDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; - public PostDataSeed(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public PostDataSeed(ISqlSugarRepository repository) { _repository = repository; } @@ -19,11 +19,11 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds await _repository.InsertManyAsync(GetSeedData()); } } - public List GetSeedData() + public List GetSeedData() { - var entites = new List(); + var entites = new List(); - PostEntity Post1 = new PostEntity() + PostAggregateRoot Post1 = new PostAggregateRoot() { PostName = "董事长", @@ -33,7 +33,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entites.Add(Post1); - PostEntity Post2 = new PostEntity() + PostAggregateRoot Post2 = new PostAggregateRoot() { PostName = "项目经理", @@ -43,7 +43,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entites.Add(Post2); - PostEntity Post3 = new PostEntity() + PostAggregateRoot Post3 = new PostAggregateRoot() { PostName = "人力资源", @@ -53,7 +53,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entites.Add(Post3); - PostEntity Post4 = new PostEntity() + PostAggregateRoot Post4 = new PostAggregateRoot() { PostName = "普通员工", 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 aa1602c6..82cfb5cd 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 @@ -8,16 +8,16 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds { public class RoleDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; - public RoleDataSeed(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public RoleDataSeed(ISqlSugarRepository repository) { _repository = repository; } - public List GetSeedData() + public List GetSeedData() { - var entities = new List(); - RoleEntity role1 = new RoleEntity() + var entities = new List(); + RoleAggregateRoot role1 = new RoleAggregateRoot() { RoleName = "管理员", @@ -29,7 +29,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(role1); - RoleEntity role2 = new RoleEntity() + RoleAggregateRoot role2 = new RoleAggregateRoot() { RoleName = "测试角色", @@ -41,7 +41,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(role2); - RoleEntity role3 = new RoleEntity() + RoleAggregateRoot role3 = new RoleAggregateRoot() { RoleName = "普通角色", @@ -53,7 +53,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds }; entities.Add(role3); - RoleEntity role4 = new RoleEntity() + RoleAggregateRoot role4 = new RoleAggregateRoot() { RoleName = "默认角色", diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs index 963621b0..7ad87887 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs @@ -11,9 +11,9 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds { public class UserDataSeed : IDataSeedContributor, ITransientDependency { - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; private RbacOptions _options; - public UserDataSeed(ISqlSugarRepository repository, IOptions options) + public UserDataSeed(ISqlSugarRepository repository, IOptions options) { _repository = repository; _options = options.Value; @@ -22,8 +22,8 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds { if (!await _repository.IsAnyAsync(x => true)) { - var entities = new List(); - UserEntity user1 = new UserEntity() + var entities = new List(); + UserAggregateRoot user1 = new UserAggregateRoot() { Name = "大橙子", UserName = "cc", @@ -42,7 +42,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds user1.BuildPassword(); entities.Add(user1); - UserEntity user2 = new UserEntity() + UserAggregateRoot user2 = new UserAggregateRoot() { Name = "大测试", @@ -63,7 +63,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds user2.BuildPassword(); entities.Add(user2); - UserEntity user3 = new UserEntity() + UserAggregateRoot user3 = new UserAggregateRoot() { Name = "游客", diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/DeptRepository.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/DeptRepository.cs index b4e82519..9ca247dc 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/DeptRepository.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/DeptRepository.cs @@ -7,7 +7,7 @@ using Yi.Framework.SqlSugarCore.Repositories; namespace Yi.Framework.Rbac.SqlSugarCore.Repositories { - public class DeptRepository : SqlSugarRepository, IDeptRepository, ITransientDependency + public class DeptRepository : SqlSugarRepository, IDeptRepository, ITransientDependency { public DeptRepository(ISugarDbContextProvider sugarDbContextProvider) : base(sugarDbContextProvider) { @@ -18,7 +18,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.Repositories var entities = await _DbQueryable.ToChildListAsync(x => x.ParentId, deptId); return entities.Select(x => x.Id).ToList(); } - public async Task> GetListRoleIdAsync(Guid roleId) + public async Task> GetListRoleIdAsync(Guid roleId) { return await _DbQueryable.Where(d => SqlFunc.Subqueryable().Where(rd => rd.RoleId == roleId && d.Id == rd.DeptId).Any()).ToListAsync(); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/UserRepository.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/UserRepository.cs index 4dd6e5b1..4a2f7680 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/UserRepository.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/UserRepository.cs @@ -10,7 +10,7 @@ using Yi.Framework.SqlSugarCore.Repositories; namespace Yi.Framework.Rbac.SqlSugarCore.Repositories { - public class UserRepository : SqlSugarRepository, IUserRepository, ITransientDependency + public class UserRepository : SqlSugarRepository, IUserRepository, ITransientDependency { public UserRepository(ISugarDbContextProvider sugarDbContextProvider) : base(sugarDbContextProvider) { @@ -21,7 +21,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.Repositories /// /// /// - public async Task> GetListUserAllInfoAsync(List userIds) + public async Task> GetListUserAllInfoAsync(List userIds) { var users = await _DbQueryable.Where(x => userIds.Contains(x.Id)).Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).ToListAsync(); return users; @@ -34,7 +34,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.Repositories /// /// /// - public async Task GetUserAllInfoAsync(Guid userId) + public async Task GetUserAllInfoAsync(Guid userId) { //得到用户 var user = await _DbQueryable.Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).InSingleAsync(userId); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/YiRbacDbContext.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/YiRbacDbContext.cs index 2ffa92e1..4d00b1a9 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/YiRbacDbContext.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/YiRbacDbContext.cs @@ -36,8 +36,8 @@ namespace Yi.Framework.Rbac.SqlSugarCore if (CurrentUser.Id == null || CurrentUser.IsRefreshToken()) return; //管理员不过滤 if (CurrentUser.UserName.Equals(UserConst.Admin) || CurrentUser.Roles.Any(f => f.Equals(UserConst.AdminRolesCode))) return; - var expUser = Expressionable.Create(); - var expRole = Expressionable.Create(); + var expUser = Expressionable.Create(); + var expRole = Expressionable.Create(); var roleInfo = CurrentUser.GetRoleInfo(); @@ -70,7 +70,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore else if (DataScopeEnum.DEPT_FOLLOW.Equals(dataScope))//本部门及以下数据 { //SQl OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) ) - var allChildDepts = sqlSugarClient.Queryable().ToChildList(it => it.ParentId, CurrentUser.GetDeptId()); + var allChildDepts = sqlSugarClient.Queryable().ToChildList(it => it.ParentId, CurrentUser.GetDeptId()); expUser.Or(it => allChildDepts.Select(f => f.Id).ToList().Contains(it.DeptId ?? Guid.Empty)); } diff --git a/Yi.Abp.Net8/sample/Acme.BookStore.Application/Jobs/TestJob.cs b/Yi.Abp.Net8/sample/Acme.BookStore.Application/Jobs/TestJob.cs index 69897d8d..50643901 100644 --- a/Yi.Abp.Net8/sample/Acme.BookStore.Application/Jobs/TestJob.cs +++ b/Yi.Abp.Net8/sample/Acme.BookStore.Application/Jobs/TestJob.cs @@ -13,8 +13,8 @@ namespace Acme.BookStore.Application.Jobs /// public class TestJob : QuartzBackgroundWorkerBase { - private ISqlSugarRepository _repository; - public TestJob(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public TestJob(ISqlSugarRepository repository) { _repository = repository; JobDetail = JobBuilder.Create().WithIdentity(nameof(TestJob)).Build(); diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs index ee795343..a91e7c5e 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs @@ -34,14 +34,14 @@ namespace Yi.Abp.Application.Jobs //定时任务，非常简单 _logger.LogWarning("演示环境正在还原！"); var db = _dbContext.SqlSugarClient.CopyNew(); - db.DbMaintenance.TruncateTable(); + db.DbMaintenance.TruncateTable(); db.DbMaintenance.TruncateTable(); - db.DbMaintenance.TruncateTable(); + db.DbMaintenance.TruncateTable(); db.DbMaintenance.TruncateTable(); - db.DbMaintenance.TruncateTable(); + db.DbMaintenance.TruncateTable(); db.DbMaintenance.TruncateTable(); - db.DbMaintenance.TruncateTable(); - db.DbMaintenance.TruncateTable(); + db.DbMaintenance.TruncateTable(); + db.DbMaintenance.TruncateTable(); db.DbMaintenance.TruncateTable(); //删除种子数据 diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs index 441ba506..e0b68065 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs @@ -13,8 +13,8 @@ namespace Yi.Abp.Application.Jobs /// public class TestJob : QuartzBackgroundWorkerBase { - private ISqlSugarRepository _repository; - public TestJob(ISqlSugarRepository repository) + private ISqlSugarRepository _repository; + public TestJob(ISqlSugarRepository repository) { _repository = repository; JobDetail = JobBuilder.Create().WithIdentity(nameof(TestJob)).Build(); diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs index 124b19bb..d3180d46 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs @@ -20,7 +20,7 @@ namespace Yi.Abp.Application.Services /// 属性注入 /// 不推荐，坑太多，容易把自己玩死，简单的东西可以用一用 /// - public ISqlSugarRepository sqlSugarRepository { get; set; } + public ISqlSugarRepository sqlSugarRepository { get; set; } /// /// 动态Api @@ -62,14 +62,14 @@ namespace Yi.Abp.Application.Services { tasks.Add(Task.Run(async () => { - await sqlSugarRepository.InsertAsync(new BannerEntity { Name = "插入2" }); + await sqlSugarRepository.InsertAsync(new BannerAggregateRoot { Name = "插入2" }); using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true)) { - await sqlSugarRepository.InsertAsync(new BannerEntity { Name = "插入1" }); + await sqlSugarRepository.InsertAsync(new BannerAggregateRoot { Name = "插入1" }); await uow.CompleteAsync(); } })); - await sqlSugarRepository.InsertAsync(new BannerEntity { Name = "插入3" }); + await sqlSugarRepository.InsertAsync(new BannerAggregateRoot { Name = "插入3" }); i--; } @@ -115,7 +115,7 @@ namespace Yi.Abp.Application.Services public void GetMapper() { //直接无脑Adapt，无需配置 - var entity = new BannerEntity(); + var entity = new BannerAggregateRoot(); var dto = entity.Adapt(); } diff --git a/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/Account_Test.cs b/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/Account_Test.cs index a52554c7..c500f597 100644 --- a/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/Account_Test.cs +++ b/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/Account_Test.cs @@ -22,11 +22,11 @@ namespace Yi.Framework.Rbac.Test.System { private IAccountService _accountService; - private ISqlSugarRepository _userRepository; + private ISqlSugarRepository _userRepository; public Account_Test() { _accountService = GetRequiredService(); - _userRepository = GetRequiredService>(); + _userRepository = GetRequiredService>(); } /// diff --git a/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/User_Test.cs b/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/User_Test.cs index d6e655ad..aee0f30f 100644 --- a/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/User_Test.cs +++ b/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/User_Test.cs @@ -16,11 +16,11 @@ namespace Yi.Framework.Rbac.Test.System public class User_Test : YiTestBase { private IUserService _userService; - private ISqlSugarRepository _repository; + private ISqlSugarRepository _repository; public User_Test() { _userService = ServiceProvider.GetRequiredService(); - _repository = ServiceProvider.GetRequiredService>(); + _repository = ServiceProvider.GetRequiredService>(); } /// diff --git a/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/YiFrameworkRbacTestModule.cs b/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/YiFrameworkRbacTestModule.cs index 78ee9f83..956492f6 100644 --- a/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/YiFrameworkRbacTestModule.cs +++ b/Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/YiFrameworkRbacTestModule.cs @@ -45,8 +45,8 @@ namespace Yi.Framework.Rbac.Test #region 给默认角色设置一些权限，防止注册后无权限禁止登录 var roleManager = services.GetRequiredService(); - var roleRep = services.GetRequiredService>(); - var menuRep = services.GetRequiredService>(); + var roleRep = services.GetRequiredService>(); + var menuRep = services.GetRequiredService>(); var defaultRoleEntity = await roleRep._DbQueryable.Where(x => x.RoleCode == UserConst.DefaultRoleCode).FirstAsync(); var menuIds = await menuRep._DbQueryable.Where(x => x.PermissionCode.Contains("user")).Select(x => x.Id).ToListAsync(); await roleManager.GiveRoleSetMenuAsync(new List { defaultRoleEntity.Id }, menuIds);