src/DataSharing.Host/config/appsettings.Development.json

@@ -120,7 +120,7 @@
         "PushOpinion": "CityHandOver.asmx/UndertakAdvice",
         "NewPushOrder": "api/v1/CityDataExchange/city_hand_data",
         "NewPushOpinion": "api/v1/CityDataExchange/city_undertak_advice_data",
-        "IsNew": true
+        "IsNew": false
       },
 
       //新老数据交换配置

src/DataSharing/CityStateDataExchange/CityStateDataExchangePusherProviderService.cs

@@ -70,14 +70,24 @@ namespace DataSharing.CityStateDataExchange
             var baseAddress = userInfo.AddressUrl;
             if (!baseAddress.EndsWith('/'))
                 baseAddress += "/";
-
-            var response = await _dataExchangeClient.ExecuteAsync<CityStateDataExchangeResponseDto>(baseAddress + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
+            CityStateDataExchangeResponseDto response = new();
+            string error = "";
+            try
+            {
+                response = await _dataExchangeClient.ExecuteAsync<CityStateDataExchangeResponseDto>(baseAddress + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                error = ex.Message;
+            }
+             
             //写入推送明细表
             DsSendTaskDetailInfo dsSendTaskInfo = new()
             {
                 TaskId = dto.Id,
                 Result = System.Text.Json.JsonSerializer.Serialize(response),
-                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
+                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices(),
+                ResultErrorData = error
             };
 
             //如果推送成功修改数据状态

src/DataSharing/CityStateDataExchange/CityStateDataExchangeService.cs

@@ -59,7 +59,7 @@ namespace DataSharing.CityStateDataExchange
         {
             //判断推送市州
             string sendSource = _sharingConfigurationManager.GetHotlineName();
-      
+
             var userInfo = await _dsUserTokenInfoRepository.GetAsync(p => p.PlatformSource == platformSource && p.State == "1", cancellationToken);
             if (userInfo is null)
                 return;
@@ -87,7 +87,7 @@ namespace DataSharing.CityStateDataExchange
                 { "Mail","" },
                 { "Address", HttpUtility.UrlEncode( dto.FullAddress )},
                 { "Content", HttpUtility.UrlEncode(dto.Content)},
-                { "Source",HttpUtility.UrlEncode( sendSource )}
+                { "Source",sendSource }
             };
 
             var config = _sharingConfigurationManager.GetYiBinConfig().CityHandOver;
@@ -100,8 +100,8 @@ namespace DataSharing.CityStateDataExchange
             else
                 path = config.PushOrder;
             //写入待推送数据
-          //  await _initPushDataService.InitPushDataAsync(platformSource, path, System.Text.Json.JsonSerializer.Serialize(dicParam),
-          //  dto.No, platformSource: EPlatformSource.CityDataExchange, cancellationToken: cancellationToken);
+            //  await _initPushDataService.InitPushDataAsync(platformSource, path, System.Text.Json.JsonSerializer.Serialize(dicParam),
+            //  dto.No, platformSource: EPlatformSource.CityDataExchange, cancellationToken: cancellationToken);
 
             var request = JsonSerializer.Serialize(dicParam, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
             await _initPushDataService.InitDsSendTaskOtherPlatforms(platformSource, path, dto.No,
@@ -131,7 +131,7 @@ namespace DataSharing.CityStateDataExchange
                 { "Code", secretKey }, //请求Code
                 { "SCDRCode", dto.ExternalId }, //工单编号
                 { "UndertakAdvice", HttpUtility.UrlEncode(dto.ActualOpinion.Trim()) }, //承办意见
-                { "Source", HttpUtility.UrlEncode(sendSource) } //来源
+                { "Source", sendSource } //来源
             };
 
             var config = _sharingConfigurationManager.GetYiBinConfig().CityHandOver;

src/DataSharing/SendTask/TaskOtherPlatformsJob.cs

@@ -48,7 +48,8 @@ namespace DataSharing.SendTask
         {
             //加载数据
             var tasks = await _waitSendTaskOtherPlatformsRepository.Queryable()
-               .Where(d => d.State == EWaitSendTaskState.WaitPush && d.SendTimes <= 6)
+             //  .Where(d => d.State == EWaitSendTaskState.WaitPush && d.SendTimes <= 6)
+             .Where(p => p.Id == "08dca495-06f7-490f-8cbe-5c9bd0fa9657")
                .OrderBy(d => d.CreationTime)
                .Take(10)
                .ToListAsync(context.CancellationToken);