src/DataSharing/DataExchange/DataExchangePusherProviderService.cs

@@ -1,6 +1,6 @@
 using DataSharing.SendTask;
 using DataSharing.Share.Dtos.DataExchange;
-using MediatR;
+using Microsoft.Extensions.Logging;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
@@ -8,21 +8,21 @@ namespace DataSharing.DataExchange
 {
     public class DataExchangePusherProviderService : IDataExchangePusherProviderService, IScopeDependency
     {
-        private readonly IMediator _mediator;
+        private readonly ILogger<DataExchangePusherProviderService> _logger;
         private readonly DataExchangeClient _dataExchangeClient;
         private readonly IRepository<DsSendTask> _dsSendTaskRepository;
 
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="mediator"></param>
+        /// <param name="logger"></param>
         /// <param name="dataExchangeClient"></param>
         /// <param name="dsSendTaskRepository"></param>
-        public DataExchangePusherProviderService(IMediator mediator,
+        public DataExchangePusherProviderService(ILogger<DataExchangePusherProviderService> logger,
              DataExchangeClient dataExchangeClient,
             IRepository<DsSendTask> dsSendTaskRepository)
         {
-            _mediator = mediator;
+            _logger = logger;
             _dataExchangeClient = dataExchangeClient;
             _dsSendTaskRepository = dsSendTaskRepository;
         }

src/DataSharing/Enterprise/EnterprisePusherProviderService.cs

@@ -1,7 +1,7 @@
 using DataSharing.SendTask;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.Enterprise;
-using MediatR;
+using Microsoft.Extensions.Logging;
 using System.Net;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
@@ -10,7 +10,7 @@ namespace DataSharing.Enterprise
 {
     public class EnterprisePusherProviderService : IEnterprisePusherProviderService, IScopeDependency
     {
-        private readonly IMediator _mediator;
+        private readonly ILogger<EnterprisePusherProviderService> _logger;
         private readonly IChannelConfigurationManager _channelConfigurationManager;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly EnterpriseClient _enterpriseClient;
@@ -19,18 +19,18 @@ namespace DataSharing.Enterprise
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="mediator"></param>
+        /// <param name="logger"></param>
         /// <param name="channelConfigurationManager"></param>
         /// <param name="httpClientFactory"></param>
         /// <param name="enterpriseClient"></param>
         /// <param name="dsSendTaskRepository"></param>
-        public EnterprisePusherProviderService(IMediator mediator,
+        public EnterprisePusherProviderService(ILogger<EnterprisePusherProviderService> logger,
             IChannelConfigurationManager channelConfigurationManager,
             IHttpClientFactory httpClientFactory,
            EnterpriseClient enterpriseClient,
             IRepository<DsSendTask> dsSendTaskRepository)
         {
-            _mediator = mediator;
+            _logger = logger;
             _channelConfigurationManager = channelConfigurationManager;
             _httpClientFactory = httpClientFactory;
             _enterpriseClient = enterpriseClient;

src/DataSharing/Province/PusherProviderService.cs

@@ -1,6 +1,6 @@
 using DataSharing.SendTask;
 using DataSharing.Share.Enums;
-using MediatR;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Net;
 using XF.Domain.Dependency;
@@ -10,7 +10,7 @@ namespace DataSharing.Province
 {
     public class PusherProviderService : IPusherProviderService, IScopeDependency
     {
-        private readonly IMediator _mediator;
+        private readonly ILogger<PusherProviderService> _logger;
         private readonly IChannelConfigurationManager _channelConfigurationManager;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly XieTongClient _xieTongClient;
@@ -20,20 +20,20 @@ namespace DataSharing.Province
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="mediator"></param>
+        /// <param name="logger"></param>
         /// <param name="channelConfigurationManager"></param>
         /// <param name="httpClientFactory"></param>
         /// <param name="xieTongClient"></param>
         /// <param name="huiJuClient"></param>
         /// <param name="dsSendTaskRepository"></param>
-        public PusherProviderService(IMediator mediator,
+        public PusherProviderService(ILogger<PusherProviderService> logger,
             IChannelConfigurationManager channelConfigurationManager,
             IHttpClientFactory httpClientFactory,
             XieTongClient xieTongClient,
             HuiJuClient huiJuClient,
             IRepository<DsSendTask> dsSendTaskRepository)
         {
-            _mediator = mediator;
+            _logger = logger;
             _channelConfigurationManager = channelConfigurationManager;
             _httpClientFactory = httpClientFactory;
             _xieTongClient = xieTongClient;
@@ -85,7 +85,6 @@ namespace DataSharing.Province
             }
         }
 
-
         /// <summary>
         /// 附件读取以及附件上传 
         /// </summary>

src/DataSharing/SendTask/SendTaskDataService.cs

@@ -1,7 +1,7 @@
 using DataSharing.DataExchange;
 using DataSharing.Enterprise;
 using DataSharing.Province;
-using MediatR;
+using Microsoft.Extensions.Logging;
 using XF.Domain.Dependency;
 
 namespace DataSharing.SendTask
@@ -11,8 +11,7 @@ namespace DataSharing.SendTask
     /// </summary>
     public class SendTaskDataService : ISendTaskDataService, IScopeDependency
     {
-        private readonly IMediator _mediator;
-        private readonly IChannelConfigurationManager _channelConfigurationManager;
+        private readonly ILogger<SendTaskDataService> _logger;
         private readonly IPusherProviderService _pusherProviderService;
         private readonly IEnterprisePusherProviderService _enterprisePusherProviderService;
         private readonly IDataExchangePusherProviderService _dataExchangePusherProviderService;
@@ -20,19 +19,16 @@ namespace DataSharing.SendTask
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="mediator"></param>
-        /// <param name="channelConfigurationManager"></param>
+        /// <param name="logger"></param>
         /// <param name="pusherProviderService"></param>
         /// <param name="enterprisePusherProviderService"></param>
         /// <param name="dataExchangePusherProviderService"></param>
-        public SendTaskDataService(IMediator mediator,
-         IChannelConfigurationManager channelConfigurationManager,
+        public SendTaskDataService(ILogger<SendTaskDataService> logger,
          IPusherProviderService pusherProviderService,
          IEnterprisePusherProviderService enterprisePusherProviderService,
          IDataExchangePusherProviderService dataExchangePusherProviderService)
         {
-            _mediator = mediator;
-            _channelConfigurationManager = channelConfigurationManager;
+            _logger = logger;
             _pusherProviderService = pusherProviderService;
             _enterprisePusherProviderService = enterprisePusherProviderService;
             _dataExchangePusherProviderService = dataExchangePusherProviderService;