修改token判定

WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs

@@ -122,7 +122,7 @@ namespace Alarm.DomainService.DahAlarm
                 var clientId = _configuration["DahuaAuth:ClientId"];
                 var token = await _tokenProviderService.GetTokenAsync(clientId!);
 
-                if (_tokenProviderService.IsTokenValid(token))
+                if (!_tokenProviderService.IsTokenValid(token))
                 {
                     _logger.LogWarning("新增报警事件订阅：token无效");
                     return new DaHApiResult<object> { Success = false, Code = "1009", Msg = "token无效" };
@@ -206,7 +206,7 @@ namespace Alarm.DomainService.DahAlarm
                     {
                         //拼接物联平台标准的mqtt消息格式
                         var payload = "[{\"taglabel\":\"" + dto.Info.DeviceCode + ".alart." + dto.Info.DeviceName + "\",\"value\":\"" + dto.Info.AlarmStat + "\",\"time\":\"" + DateTimeOffset.UtcNow.ToUnixTimeSeconds() + "\"}]";
-
+                        //var payload = "[{\"taglabel\":\"残卫测试报警按钮.alarmStat\",\"value\":\"" + dto.Info.AlarmStat + "\",\"time\":\"" + DateTimeOffset.UtcNow.ToUnixTimeSeconds() + "\"}]";
                         await _mqttClient.EnsureConnectedAsync(mqttHostIp, mqttHostPort, mqttUsername, mqttPassword, topicName, mqttClientId);
 
                         await _mqttClientService.PublishAsync(topicName, payload);
@@ -232,7 +232,7 @@ namespace Alarm.DomainService.DahAlarm
         {
             var clientId = _configuration["DahuaAuth:ClientId"];
             var token = await _tokenProviderService.GetTokenAsync(clientId!);
-            if (_tokenProviderService.IsTokenValid(token))
+            if (!_tokenProviderService.IsTokenValid(token))
             {
                 _logger.LogWarning("取消订阅某个报警事件：token无效");
                 return false;
@@ -279,11 +279,12 @@ namespace Alarm.DomainService.DahAlarm
         {
             var clientId = _configuration["DahuaAuth:ClientId"];
             var token = await _tokenProviderService.GetTokenAsync(clientId!);
-            if (_tokenProviderService.IsTokenValid(token))
+            if (!_tokenProviderService.IsTokenValid(token))
             {
                 _logger.LogWarning("获取事件列表：token无效");
                 return new DaHApiResult<SubscriptionMapDto> { Success = false, Code = "1009", Msg = "token无效" };
             }
+            // var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-brm/1.0.0/device/1000014";
             var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-event/1.0.0/subscribe/subscribe-list?monitorType=url&category={name}";
 
             try

WeiCloud.Fusion/VideoService/Video.API/appsettings.json

@@ -35,7 +35,7 @@
       "DefaultRoot": "192.168.21.18:9100",
       "DefaultReplace": "demo.weienergy.cn:15210",
       "Overrides": {
-        "192.168.21.20:9100": "demo.weienergy.cn:15210",
+        "192.168.21.18:9100": "demo.weienergy.cn:15210",
         "10.20.30.40:9100": "demo.weienergy.cn:15210"
       }
     },
@@ -43,7 +43,7 @@
       "DefaultRoot": "192.168.21.18:9320",
       "DefaultReplace": "demo.weienergy.cn:15211",
       "Overrides": {
-        "192.168.21.20:9320": "demo.weienergy.cn:15211"
+        "192.168.21.18:9320": "demo.weienergy.cn:15211"
       }
     }
   }

WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs

@@ -337,7 +337,7 @@ namespace Video.DomainService
 
         /// <summary>
         /// rtsp录像回放
-        /// (播放命令：ffplay  -rtsp_transport tcp -i  "rtsp://demo.weienergy.cn:15211/playback/pu/3?token=3")强制走tcp
+        /// (播放命令：ffplay  -rtsp_transport tcp -i  "rtsp://demo.weienergy.cn:15210/dss/monitor/param/cameraid=1000021%24104%26substream=1?token=430")强制走tcp
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>