Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/PushMessageController.cs

@@ -109,6 +109,7 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [HttpPost("receiveobtain")]
         [AllowAnonymous]
+        [OriginResponse]
         public async Task<OpenResponse> ReceiveObtain([FromForm] ReceiveMessageDto receiveMessageDto)
         {
             var result = await _pushDomainService.ReceiveObtain(receiveMessageDto);
@@ -128,13 +129,11 @@ namespace Hotline.Api.Controllers
         [HttpPost("receivesms")]
         [AllowAnonymous]
         [OriginResponse]
-        //public async Task<OpenResponse> ReceiveSms([FromForm] ReceiveMessageDto receiveMessageDto)
-        public string ReceiveSms()
+        public async Task<OpenResponse> ReceiveSms([FromForm] ReceiveMessageDto receiveMessageDto)
         {
-            //var result = await _pushDomainService.ReceiveSms(receiveMessageDto);
+            var result = await _pushDomainService.ReceiveSms(receiveMessageDto);
 
-            //return OpenResponse.Ok("result");
-            return "ok";
+            return OpenResponse.Ok(result);
         }
 
         #endregion