Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/FileController.cs

@@ -18,18 +18,20 @@ namespace Hotline.Api.Controllers
         private readonly IMapper _mapper;
         private readonly ISystemDicDataCacheManager _sysDicDataCacheManager;
         private readonly IRepository<File.File> _fileRepository;
+        private readonly ILogger<FileController> _logger;
 
         public FileController(
             ISessionContext sessionContext,
             IMapper mapper,
             ISystemDicDataCacheManager sysDicDataCacheManager,
-            IRepository<File.File> fileRepository
-            )
+            IRepository<File.File> fileRepository,
+            ILogger<FileController> logger)
         {
             _sessionContext = sessionContext;
             _mapper = mapper;
             _sysDicDataCacheManager = sysDicDataCacheManager;
             _fileRepository = fileRepository;
+            _logger = logger;
         }
         #region 附件管理
         /// <summary>
@@ -146,11 +148,11 @@ namespace Hotline.Api.Controllers
         [HttpGet("download-proxy")]
         public async Task<IActionResult> DownloadProxy([FromServices] IHttpClientFactory clientFactory, string path)
         {
-            using var client = clientFactory.CreateClient();
-            var responseMessage = await client.GetAsync(path, HttpContext.RequestAborted);
-            responseMessage.EnsureSuccessStatusCode();
-            var stream = await responseMessage.Content.ReadAsStreamAsync(HttpContext.RequestAborted);
-            return File(stream, responseMessage?.Content?.Headers?.ContentType?.MediaType);
+                using var client = clientFactory.CreateClient();
+                var responseMessage = await client.GetAsync(path, HttpContext.RequestAborted);
+                responseMessage.EnsureSuccessStatusCode();
+                var stream = await responseMessage.Content.ReadAsStreamAsync(HttpContext.RequestAborted);
+                return File(stream, responseMessage?.Content?.Headers?.ContentType?.MediaType);
         }
     }
 }

src/Hotline.Api/Controllers/TestController.cs

@@ -7,6 +7,7 @@ using Google.Protobuf.WellKnownTypes;
 using Hotline.Ai.Visit;
 using Hotline.Application.ExportExcel;
 using Hotline.CallCenter.BlackLists;
+using Hotline.CallCenter.Calls;
 using Hotline.CallCenter.Devices;
 using Hotline.CallCenter.Ivrs;
 using Hotline.FlowEngine.WorkflowModules;
@@ -336,4 +337,5 @@ public class TestController : BaseController
         var publicKey = keyList[1];
         return $"{publicKey} \r\n {privateKey}";
     }
+    
 }