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

src/Hotline.Api/Controllers/OrderController.cs

@@ -2240,7 +2240,11 @@ public class OrderController : BaseController
         }
 
         var call = await _trCallRecordRepository.Queryable().Where(x => x.CallAccept == order.CallId).FirstAsync();
-        if (call != null) dto.RecordingFileUrl = call.RecordingFileUrl;
+        if (call != null)
+        {
+            dto.RecordingBaseAddress = call.RecordingBaseAddress;
+            dto.RecordingAbsolutePath = call.RecordingAbsolutePath;
+        }
 
         var repeatablesMap = await _repeatableEventDetailRepository.Queryable()
             .Includes(x => x.Order)

src/Hotline.Api/Controllers/QualityController.cs

@@ -151,13 +151,21 @@ namespace Hotline.Api.Controllers
 			var qualityDto = _mapper.Map<QualityDto>(quality);
 			if (qualityDto.Order != null) {
 				var call = await _trCallRecordRepository.Queryable().Where(x => x.CallAccept == qualityDto.Order.CallId).FirstAsync();
-				if (call != null) qualityDto.Order.RecordingFileUrl = call.RecordingFileUrl;
+                if (call != null)
+                {
+					qualityDto.Order.RecordingBaseAddress = call.RecordingBaseAddress;
+					qualityDto.Order.RecordingAbsolutePath = call.RecordingAbsolutePath;
+                }
 			}
 			if (qualityDto.Visit != null)
 			{
 				var call = await _trCallRecordRepository.Queryable().Where(x => x.CallAccept == qualityDto.Visit.CallId).FirstAsync();
-				if (call != null) qualityDto.Visit.RecordingFileUrl = call.RecordingFileUrl;
-			}
+				if (call != null)
+                {
+                    qualityDto.Visit.RecordingBaseAddress = call.RecordingBaseAddress;
+                    qualityDto.Visit.RecordingAbsolutePath = call.RecordingAbsolutePath;
+                }
+            }
 			return qualityDto;
 		}
 		#endregion

src/Hotline.Api/Controllers/TestController.cs

@@ -336,14 +336,4 @@ public class TestController : BaseController
         var publicKey = keyList[1];
         return $"{publicKey} \r\n {privateKey}";
     }
-
-    [HttpGet("dl")]
-    public async Task<IActionResult> F([FromServices]IHttpClientFactory clientFactory)
-    {
-        var p = "https://pic1.zhimg.com/v2-cb480c9bd8c2d5565229dd3b2ecbf878_r.jpg";
-        using var client = clientFactory.CreateClient();
-        var s1 = await client.GetAsync(p, HttpContext.RequestAborted);
-        //var s = await client.GetStreamAsync(p, HttpContext.RequestAborted);
-        return File(s1.Content.ReadAsStream(), s1?.Content?.Headers?.ContentType?.MediaType??"image/jpeg");
-    }
 }

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -422,7 +422,8 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 可直接访问的通话录音地址
         /// </summary>
-        public string? RecordingFileUrl { get; set; }
+        public string? RecordingBaseAddress { get; set; }
+        public string? RecordingAbsolutePath { get; set; }
 
     }
 

src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -333,6 +333,9 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? RecordingFileUrl { get; set; }
 
+        public string? RecordingBaseAddress { get; set; }
+        public string? RecordingAbsolutePath { get; set; }
+
         /// <summary>
         /// 渠道为电话时，此字段存在
         /// </summary>

src/Hotline.Share/Dtos/TrCallCenter/TrTelDao.cs

@@ -465,12 +465,7 @@ namespace Hotline.Share.Dtos.TrCallCenter
         public string? RecordingFileUrl { get; set; }
         public string? RecordingBaseAddress { get; set; }
         public string? RecordingAbsolutePath { get; set; }
-
-        /// <summary>
-        /// 下载字段
-        /// </summary>
-        public string? DownRecordingFileUrl { get; set; }
-
+        
         /// <summary>
         /// 呼叫方向
         /// </summary>