diff --git a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs b/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs index 1980c44..ff41d52 100644 --- a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs +++ b/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs @@ -106,14 +106,14 @@ namespace Video.API.Controllers.DaHua } var remoteUrl = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-httpnode/vod/cam/download.mp4" + - $"?vcuid={dto.Vcuid}" + + $"?vcuid={dto.Vcuid.Replace("$", "%24")}" + $"&subtype=1" + $"&starttime={dto.Starttime:yyyy_MM_dd_HH_mm_ss}" + $"&endtime={dto.Endtime:yyyy_MM_dd_HH_mm_ss}" + $"&videoType={dto.VideoType}" + - $"&token={token}" + + $"&token={token.Replace("bearer ", "")}" + $"&recordType={dto.RecordType}"; - // return await Task.FromResult(remoteUrl); + try { var handler = new HttpClientHandler diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs index 5d1949a..ca8e1a3 100644 --- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs @@ -496,7 +496,7 @@ namespace Video.DomainService { url = dto.IpAddress; } - return $"https://" + url + $" /evo-apigw/evo-httpnode/vod/cam/download.mp4?vcuid={dto.Vcuid}&subtype={dto.Subtype}&starttime={dto.StartTime}endtime={dto.EndTime}&videoType={dto.VideoType}&token={token}&recordType={dto.RecordType}"; + return $"https://" + url + $"/evo-apigw/evo-httpnode/vod/cam/download.mp4?vcuid={dto.Vcuid.Replace("$", "%24")}&subtype={dto.Subtype}&starttime={dto.StartTime}&endtime={dto.EndTime}&videoType={dto.VideoType}&token={token.Replace("bearer ", "")}&recordType={dto.RecordType}"; } } } \ No newline at end of file