diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/AuditLogManager.cs b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/AuditLogManager.cs index 12f935164..b254d10ca 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/AuditLogManager.cs +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/AuditLogManager.cs @@ -17,7 +17,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore; [Dependency(ReplaceServices = true)] public class AuditLogManager : IAuditLogManager, ITransientDependency { - protected IObjectMapper ObjectMapper { get; } + protected IObjectMapper ObjectMapper { get; } protected IAuditLogRepository AuditLogRepository { get; } protected IUnitOfWorkManager UnitOfWorkManager { get; } protected AbpAuditingOptions Options { get; } @@ -26,11 +26,11 @@ public class AuditLogManager : IAuditLogManager, ITransientDependency public ILogger Logger { protected get; set; } public AuditLogManager( - IObjectMapper objectMapper, IAuditLogRepository auditLogRepository, IUnitOfWorkManager unitOfWorkManager, IOptions options, - IAuditLogInfoToAuditLogConverter converter) + IAuditLogInfoToAuditLogConverter converter, + IObjectMapper objectMapper) { ObjectMapper = objectMapper; AuditLogRepository = auditLogRepository; diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EntityChangeStore.cs b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EntityChangeStore.cs index d73d219ef..948dbe0ad 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EntityChangeStore.cs +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/EntityChangeStore.cs @@ -14,14 +14,14 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore; [Dependency(ReplaceServices = true)] public class EntityChangeStore : IEntityChangeStore, ITransientDependency { - protected IObjectMapper ObjectMapper { get; } + protected IObjectMapper ObjectMapper { get; } protected IAuditLogRepository AuditLogRepository { get; } public ILogger Logger { protected get; set; } public EntityChangeStore( - IObjectMapper objectMapper, - IAuditLogRepository auditLogRepository) + IAuditLogRepository auditLogRepository, + IObjectMapper objectMapper) { ObjectMapper = objectMapper; AuditLogRepository = auditLogRepository; diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/SecurityLogManager.cs b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/SecurityLogManager.cs index 5bc10a57c..759350042 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/SecurityLogManager.cs +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/SecurityLogManager.cs @@ -17,15 +17,14 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore; public class SecurityLogManager : ISecurityLogManager, ITransientDependency { public ILogger Logger { get; set; } - - protected IObjectMapper ObjectMapper { get; } + protected IObjectMapper ObjectMapper { get; } protected AbpSecurityLogOptions SecurityLogOptions { get; } protected IIdentitySecurityLogRepository IdentitySecurityLogRepository { get; } protected IGuidGenerator GuidGenerator { get; } protected IUnitOfWorkManager UnitOfWorkManager { get; } public SecurityLogManager( - IObjectMapper objectMapper, + IObjectMapper objectMapper, ILogger logger, IOptions securityLogOptions, IIdentitySecurityLogRepository identitySecurityLogRepository, diff --git a/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs b/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs index 7859b7284..2e111cf4e 100644 --- a/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs +++ b/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs @@ -26,19 +26,19 @@ public class SerilogElasticsearchLoggingManager : ILoggingManager, ISingletonDep private readonly static Regex IndexFormatRegex = new Regex(@"^(.*)(?:\{0\:.+\})(.*)$"); private readonly IClock _clock; - private readonly IObjectMapper _objectMapper; private readonly ICurrentTenant _currentTenant; private readonly AbpLoggingSerilogElasticsearchOptions _options; private readonly IElasticsearchClientFactory _clientFactory; + private readonly IObjectMapper _objectMapper; public ILogger Logger { protected get; set; } public SerilogElasticsearchLoggingManager( IClock clock, - IObjectMapper objectMapper, ICurrentTenant currentTenant, IOptions options, - IElasticsearchClientFactory clientFactory) + IElasticsearchClientFactory clientFactory, + IObjectMapper objectMapper) { _clock = clock; _objectMapper = objectMapper; diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs index 5e9e12e93..d2c6261a8 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs @@ -18,8 +18,6 @@ public class MessageStore : IMessageStore, ITransientDependency { private readonly IFriendStore _friendStore; - private readonly IObjectMapper _objectMapper; - private readonly ICurrentTenant _currentTenant; private readonly IUnitOfWorkManager _unitOfWorkManager; @@ -29,14 +27,16 @@ public class MessageStore : IMessageStore, ITransientDependency private readonly IMessageRepository _messageRepository; private readonly IUserChatSettingRepository _userChatSettingRepository; + + private readonly IObjectMapper _objectMapper; public MessageStore( IFriendStore friendStore, - IObjectMapper objectMapper, ICurrentTenant currentTenant, IUnitOfWorkManager unitOfWorkManager, IGroupRepository groupRepository, IMessageRepository messageRepository, - IUserChatSettingRepository userChatSettingRepository) + IUserChatSettingRepository userChatSettingRepository, + IObjectMapper objectMapper) { _friendStore = friendStore; _objectMapper = objectMapper; diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Groups/GroupStore.cs b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Groups/GroupStore.cs index 6ff2f4698..c1ed0b110 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Groups/GroupStore.cs +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Groups/GroupStore.cs @@ -11,14 +11,14 @@ namespace LINGYUN.Abp.MessageService.Groups; public class GroupStore : IGroupStore, ITransientDependency { - private readonly IObjectMapper _objectMapper; private readonly ICurrentTenant _currentTenant; private readonly IGroupRepository _groupRepository; + private readonly IObjectMapper _objectMapper; public GroupStore( - IObjectMapper objectMapper, ICurrentTenant currentTenant, - IGroupRepository groupRepository) + IGroupRepository groupRepository, + IObjectMapper objectMapper) { _objectMapper = objectMapper; _currentTenant = currentTenant; diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/NotificationStore.cs b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/NotificationStore.cs index a28945df8..4d13f2cda 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/NotificationStore.cs +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/NotificationStore.cs @@ -19,8 +19,6 @@ public class NotificationStore : INotificationStore { private readonly IClock _clock; - private readonly IObjectMapper _objectMapper; - private readonly ICurrentTenant _currentTenant; private readonly IUnitOfWorkManager _unitOfWorkManager; @@ -33,16 +31,17 @@ public class NotificationStore : INotificationStore private readonly AbpNotificationsPublishOptions _options; + private readonly IObjectMapper _objectMapper; + public NotificationStore( IClock clock, - IObjectMapper objectMapper, ICurrentTenant currentTenant, IUnitOfWorkManager unitOfWorkManager, INotificationRepository notificationRepository, IUserSubscribeRepository userSubscribeRepository, IUserNotificationRepository userNotificationRepository, - IOptions options - ) + IOptions options, + IObjectMapper objectMapper) { _clock = clock; _objectMapper = objectMapper; diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobStore.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobStore.cs index 21fbd131d..2e2eb9244 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobStore.cs +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobStore.cs @@ -14,18 +14,18 @@ namespace LINGYUN.Abp.TaskManagement; [Dependency(ReplaceServices = true)] public class BackgroundJobStore : IJobStore, ITransientDependency { - protected IObjectMapper ObjectMapper { get; } protected ICurrentTenant CurrentTenant { get; } protected IUnitOfWorkManager UnitOfWorkManager { get; } protected IBackgroundJobInfoRepository JobInfoRepository { get; } protected IBackgroundJobLogRepository JobLogRepository { get; } + protected IObjectMapper ObjectMapper { get; } public BackgroundJobStore( - IObjectMapper objectMapper, ICurrentTenant currentTenant, IUnitOfWorkManager unitOfWorkManager, IBackgroundJobInfoRepository jobInfoRepository, - IBackgroundJobLogRepository jobLogRepository) + IBackgroundJobLogRepository jobLogRepository, + IObjectMapper objectMapper) { ObjectMapper = objectMapper; CurrentTenant = currentTenant;