Merge branch 'release/yibin' of http://110.188.24.182:10023/Fengwo/hotline into release/yibin

src/Hotline.Api/Controllers/TestController.cs

@@ -194,7 +194,7 @@ public class TestController : BaseController
             Name ="张三",
             TemplateCode = "1005",
             Params = new List<string>() { "20240610000022", "12345" },
-            TelNumber = "13683420932",
+            TelNumber = "15881689499",
 
         };
         await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);

src/Hotline/Push/FWMessage/PushDomainService.cs

@@ -119,14 +119,17 @@ public class PushDomainService : IPushDomainService, IScopeDependency
             Name = message.Name,
             TelNumber = message.TelNumber
         };
+        //消息队列
+         await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.SendSms, pushMessage, cancellationToken: cancellation);
 
-        var result = await ExecuteAsync<PushMessageDto, SendSmsReponse>(_sendSmsConfiguration.Value.Url, pushMessage, cancellationToken: cancellation);
-        if (result != null && result.code == 0)
-        {
-            message.Status = EPushStatus.Success;
-            message.SendState = ESendState.Sending;
-            await _messageRepository.UpdateAsync(message, cancellation);
-        }
+        ////http请求
+        //var result = await ExecuteAsync<PushMessageDto, SendSmsReponse>(_sendSmsConfiguration.Value.Url, pushMessage, cancellationToken: cancellation);
+        //if (result != null && result.code == 0)
+        //{
+        //    message.Status = EPushStatus.Success;
+        //    message.SendState = ESendState.Sending;
+        //    await _messageRepository.UpdateAsync(message, cancellation);
+        //}
     }
 
     /// <summary>
@@ -163,8 +166,9 @@ public class PushDomainService : IPushDomainService, IScopeDependency
                 data.IsSmsReply = dto.IsSmsReply;
                 data.SmsReplyTime = Convert.ToDateTime(dto.SmsReplyTime);
                 data.SmsReplyContent = dto.SmsReplyContent;
+                
             }
-
+            data.Reason = dto.Reason;
             await _messageRepository.UpdateAsync(data, cancellation);
         }
     }
@@ -189,7 +193,7 @@ public class PushDomainService : IPushDomainService, IScopeDependency
             data.IsSmsReply = dto.IsSmsReply;
             data.SmsReplyTime = Convert.ToDateTime(dto.SmsReplyTime);
             data.SmsReplyContent = dto.SmsReplyContent;
-            data.Reason=dto.Reason;
+            data.Reason = dto.Reason;
             await _messageRepository.UpdateAsync(data, cancellation);
         }
     }