From 7b75053f63214d2180bc6e0bf3b4d5556f9a2b7a Mon Sep 17 00:00:00 2001 From: LiuXin Date: Thu, 21 Aug 2025 11:44:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DahAlarm/DahuaGeneralCtlService.cs | 4 ++-- .../AlarmService/AlarmService.API/Program.cs | 11 +++++++---- .../AlarmService/AlarmService.API/appsettings.json | 2 ++ .../Common.Shared.API/Program.cs | 6 +++++- .../Common.Shared.API/appsettings.json | 3 +++ .../Core/CorsWithOrigins.cs | 13 +++++++++++++ .../ParkingLotService.API/Program.cs | 14 +++++++------- .../VideoService/Video.API/appsettings.json | 10 +++------- 8 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Core/CorsWithOrigins.cs diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs index b83941a..03f6bee 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs @@ -209,8 +209,8 @@ namespace Alarm.DomainService.DahAlarm if (dto.Info.AlarmType == 4321) { //拼接物联平台标准的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() + "\"}]"; + // 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); diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/Program.cs b/WeiCloud.Fusion/AlarmService/AlarmService.API/Program.cs index cd8821f..c60425b 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/Program.cs +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/Program.cs @@ -1,6 +1,7 @@ using AlarmService.API.Infrastructure; using Autofac; using Autofac.Extensions.DependencyInjection; +using Common.Shared.Application.Core; using Common.Shared.DomainService; using Microsoft.OpenApi.Models; using NLog; @@ -22,18 +23,20 @@ namespace AlarmService.API builder.Services.AddHttpContextAccessor(); builder.Services.AddHttpClient(); - builder.Services.AddControllers(); builder.Services.AddSingleton(builder.Configuration); #region Cors + var isconfig = builder.Configuration.GetSection("IdentityClientConfig").Get(); builder.Services.AddCors(options => { options.AddPolicy("_myAllowSpecificOrigins", builder => { - builder.AllowAnyOrigin() //ԴʱAPIã + builder + //.WithOrigins(isconfig.CorsOrigins) //Դʹöŷָ + .AllowAnyOrigin() //ԴʱAPIã .AllowAnyHeader() .AllowAnyMethod() .AllowCredentials() @@ -112,9 +115,9 @@ namespace AlarmService.API }); } - app.UseHttpsRedirection(); + // app.UseHttpsRedirection(); - app.UseAuthorization(); + // app.UseAuthorization(); app.MapControllers(); app.MapGet("/healthz", () => Results.Ok("OK")); diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json index acba8f5..128b131 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json @@ -5,6 +5,7 @@ "Microsoft.AspNetCore": "Warning" } }, + "SubscribeMQTT": { "TopicName": "/zrh/sun/alarm", "ProjectId": 530522108656160, @@ -16,6 +17,7 @@ "ClientId": "datasource_points_AXYJPT_v4", "ApiUrl": "http://v4.weienergy.cn/datastream" }, + "CorsWithOrigins": [ "https://demo.weienergy.cn:15214", "http://59.110.150.214", "https://demo.weienergy.cn/" ], "AllowedHosts": "*", //大华摄像头的配置 "DahuaAuth": { diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/Program.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/Program.cs index c2abe8d..cf08a5b 100644 --- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/Program.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/Program.cs @@ -1,6 +1,7 @@ using Autofac; using Autofac.Extensions.DependencyInjection; using Common.Shared.API.Infrastructure; +using Common.Shared.Application.Core; using Microsoft.OpenApi.Models; using NLog; using NLog.Extensions.Logging; @@ -27,12 +28,15 @@ namespace Common.Shared.API #region Cors + var isconfig = builder.Configuration.GetSection("IdentityClientConfig").Get(); builder.Services.AddCors(options => { options.AddPolicy("_myAllowSpecificOrigins", builder => { - builder.AllowAnyOrigin() //ԴʱAPIã + builder + //.WithOrigins(isconfig.CorsOrigins) //Դʹöŷָ + .AllowAnyOrigin() //ԴʱAPIã .AllowAnyHeader() .AllowAnyMethod() .AllowCredentials() diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/appsettings.json b/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/appsettings.json index cc0cc39..86530d5 100644 --- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/appsettings.json +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.API/appsettings.json @@ -5,6 +5,9 @@ "Microsoft.AspNetCore": "Warning" } }, + "IdentityClientConfig": { + "CorsWithOrigins": [ "http://10.0.102.104:8100" ] + }, //大华摄像头的配置 "DahuaAuth": { "Host": "demo.weienergy.cn:15214", diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Core/CorsWithOrigins.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Core/CorsWithOrigins.cs new file mode 100644 index 0000000..44411f5 --- /dev/null +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Core/CorsWithOrigins.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Common.Shared.Application.Core +{ + public class CorsWithOrigins + { + public string[] CorsOrigins { get; set; } + } +} \ No newline at end of file diff --git a/WeiCloud.Fusion/ParkingLotService/ParkingLotService.API/Program.cs b/WeiCloud.Fusion/ParkingLotService/ParkingLotService.API/Program.cs index fa93277..c1bc856 100644 --- a/WeiCloud.Fusion/ParkingLotService/ParkingLotService.API/Program.cs +++ b/WeiCloud.Fusion/ParkingLotService/ParkingLotService.API/Program.cs @@ -1,4 +1,3 @@ - using Microsoft.EntityFrameworkCore; using Microsoft.OpenApi.Models; using ParkingLotEntity.DB; @@ -6,6 +5,7 @@ using ParkingLotEntity.ParkingLotModels; using ParkingLotService.API.HostService; using ParkLotInfoService; using Serilog; + namespace ParkingLotService.API { public class Program @@ -44,9 +44,11 @@ namespace ParkingLotService.API builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - + //--- + #region ־ + Log.Logger = new LoggerConfiguration() .MinimumLevel.Information() // ־ .WriteTo.File( @@ -60,7 +62,8 @@ namespace ParkingLotService.API builder.Services.AddHttpClient(); //ʹ Serilog 滻Ĭ־ builder.Host.UseSerilog(); - #endregion + + #endregion ־ // עPingService builder.Services.AddHostedService(); @@ -75,8 +78,6 @@ namespace ParkingLotService.API c.SwaggerEndpoint("/swagger/v1/swagger.json", "ParkingLotAPI V1"); }); } - - //var app = builder.Build(); @@ -91,10 +92,9 @@ namespace ParkingLotService.API app.UseAuthorization(); - app.MapControllers(); app.Run(); } } -} +} \ No newline at end of file diff --git a/WeiCloud.Fusion/VideoService/Video.API/appsettings.json b/WeiCloud.Fusion/VideoService/Video.API/appsettings.json index 84dcd9a..8cdbf31 100644 --- a/WeiCloud.Fusion/VideoService/Video.API/appsettings.json +++ b/WeiCloud.Fusion/VideoService/Video.API/appsettings.json @@ -9,13 +9,9 @@ "ConnectionStrings": { "RedisNodes": "Zrhredis#2019@v4.weienergy.cn:6380 " }, - "IdentityClientConfig": { - "Scheme": "Bearer", - "Authority": "http://v4.weienergy.cn:8100", - "RequireHttpsMetadata": false, - "ApiName": "WeiCloudInfoAPI", - "CorsWithOrigins": [ "http://10.0.102.104:8100" ] - }, + + "CorsWithOrigins": [ "https://demo.weienergy.cn:15214", "http://59.110.150.214", "https://demo.weienergy.cn/" ], + "Cap": { //"CapGroupName": "local-ax-group-api-msg", "CapGroupName": "v4-ax-group-api-msg", From 7203fb1cb27f508adf99d5440461f381bb0d5b41 Mon Sep 17 00:00:00 2001 From: LiuXin Date: Thu, 21 Aug 2025 20:18:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DahAlarm/DahuaGeneralCtlService.cs | 26 ++++----- .../AlarmService.API/appsettings.json | 6 +- .../DaHTokenService/TokenProviderService.cs | 58 ++++++++++++++----- .../VideoService/Video.API/Program.cs | 8 +-- .../Dahvision/DahuaGeneralCtlService.cs | 38 ++++++------ 5 files changed, 83 insertions(+), 53 deletions(-) diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs index 03f6bee..829c51f 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs @@ -18,7 +18,7 @@ namespace Alarm.DomainService.DahAlarm private readonly IMqttClientService _mqttClientService; private readonly ITokenProviderService _tokenProviderService; - private readonly HttpClient _http; + // private readonly HttpClient _http; private string mqttHostIp; private int mqttHostPort; @@ -50,16 +50,16 @@ namespace Alarm.DomainService.DahAlarm topicName = _configuration["SubscribeMQTT:TopicName"]!; _mqttClientService = mqttClientService; _tokenProviderService = tokenProviderService; - _http = http; + // _http = http; } - ///// - ///// 开发测试的时候，忽略证书 - ///// - //private static readonly HttpClient _http = new(new HttpClientHandler - //{ - // ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator, - //}); + /// + /// 开发测试的时候，忽略证书 + /// + private static readonly HttpClient _http = new(new HttpClientHandler + { + ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator, + }); /// /// 新增报警事件订阅 @@ -209,8 +209,8 @@ namespace Alarm.DomainService.DahAlarm if (dto.Info.AlarmType == 4321) { //拼接物联平台标准的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() + "\"}]"; + 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); @@ -288,8 +288,8 @@ namespace Alarm.DomainService.DahAlarm _logger.LogWarning("获取事件列表：token无效"); return new DaHApiResult { Success = false, Code = "1009", Msg = "token无效" }; } - var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-brm/1.0.0/device/1000021"; - //var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-event/1.0.0/subscribe/subscribe-list?monitorType=url&category={name}"; + // var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-brm/1.0.0/device/1000021"; + var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-event/1.0.0/subscribe/subscribe-list?monitorType=url&category={name}"; try { diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json index 128b131..ea44d24 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json @@ -27,8 +27,8 @@ "ClientSecret": "6d6c78f8-3d4c-4e76-ab6b-827942a7b725", "Username": "system", "Password": "Admin123", - "Callback": "http://demo.weienergy.cn:5000/api/Alarm/DahuaAuthCallback", - "SubsystemName": "192.168.21.43_alarm", - "SubsystemMagic": "192.168.21.43_5001" + "Callback": "http://demo.weienergy.cn/axalarm/api/Alarm/DahuaAuthCallback", + "SubsystemName": "59.110.150.214_alarm", + "SubsystemMagic": "59.110.150.214_12013" } } \ No newline at end of file diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.DomainService/DaHTokenService/TokenProviderService.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.DomainService/DaHTokenService/TokenProviderService.cs index 602ce25..a05af23 100644 --- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.DomainService/DaHTokenService/TokenProviderService.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.DomainService/DaHTokenService/TokenProviderService.cs @@ -1,6 +1,8 @@ using Common.Shared.Application.DaHua; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; +using MongoDB.Bson; +using OfficeOpenXml.FormulaParsing.LexicalAnalysis; using Org.BouncyCastle.Crypto.Parameters; using Org.BouncyCastle.Security; using System.Net.Http.Json; @@ -34,12 +36,18 @@ namespace Common.Shared.DomainService public async Task GetTokenAsync(string clientId) { if (TokenCache.TokenMap.TryGetValue(clientId, out var tokenEntry) - && tokenEntry.ExpireAt > DateTimeOffset.UtcNow.AddMinutes(5)) + && tokenEntry.ExpireAt > DateTimeOffset.UtcNow.AddMinutes(1)) { - return tokenEntry.AccessToken!; + if (!IsTokenValid(tokenEntry.AccessToken!)) + { + _logger.LogWarning("从字典里匹配"); + + return tokenEntry.AccessToken!; + } } var tokenLock = TokenLockProvider.GetLock(clientId); + _logger.LogWarning("枷锁"); await tokenLock.WaitAsync(); try { @@ -47,7 +55,12 @@ namespace Common.Shared.DomainService if (TokenCache.TokenMap.TryGetValue(clientId, out tokenEntry) && tokenEntry.ExpireAt > DateTimeOffset.UtcNow.AddMinutes(5)) { - return tokenEntry.AccessToken!; + if (!IsTokenValid(tokenEntry.AccessToken!)) + { + _logger.LogWarning("再次匹配"); + + return tokenEntry.AccessToken!; + } } var refreshed = await TryRefreshOrLoginAsync(clientId, tokenEntry); @@ -137,7 +150,8 @@ namespace Common.Shared.DomainService dto.ClientSecret = _configuration["DahuaAuth:ClientSecret"]!; dto.Password = _configuration["DahuaAuth:Password"]!; dto.Username = _configuration["DahuaAuth:Username"]!; - + _logger.LogWarning("在GetDaHToken方法中的记录：Dahua Host = {Host}, ClientId = {ClientId}", + _configuration["DahuaAuth:Host"], _configuration["DahuaAuth:ClientId"], _configuration["DahuaAuth:ClientSecret"]); DaHApiResult loginResult = await GetToken(dto); TokenEntry refreshed = new() @@ -207,10 +221,11 @@ namespace Common.Shared.DomainService try { var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-oauth/1.0.0/oauth/public-key"; - + _logger.LogWarning($"获取的url{url}"); using var resp = await _http.GetAsync(url); resp.EnsureSuccessStatusCode(); var json = await resp.Content.ReadAsStringAsync(); + _logger.LogWarning($"获取密钥的结果json{json}"); var envelope = JsonSerializer.Deserialize>(json, new JsonSerializerOptions { PropertyNameCaseInsensitive = true @@ -230,7 +245,7 @@ namespace Common.Shared.DomainService } catch (Exception ex) { - _logger.LogWarning(ex, "大华平台获取公钥出错"); + _logger.LogWarning(ex, $"大华平台获取公钥出错{ex.Message}"); result.Success = false; result.Code = "1001"; result.Msg = "获取大华公钥失败"; @@ -267,33 +282,44 @@ namespace Common.Shared.DomainService { var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-oauth/1.0.0/oauth/extend/token"; //必须加密 + _logger.LogWarning($"获取token的url{url}"); + _logger.LogWarning($"获取token的dto的json{dto.ToJson()}"); dto.Password = EncryptByPublicKey(dto.Password, dto.PublicKey!); using var resp = await _http.PostAsJsonAsync(url, dto); resp.EnsureSuccessStatusCode(); - + _logger.LogWarning("这是正式请求的：Dahua Host = {Host}, ClientId = {ClientId}，ClientSecret={ClientSecret}", _configuration["DahuaAuth:Host"], _configuration["DahuaAuth:ClientId"], _configuration["DahuaAuth:ClientSecret"]); var tokenInfo = await resp.Content.ReadFromJsonAsync>(); - + _logger.LogWarning($"获取大华登录令牌返回结果：{tokenInfo.ToJson()}"); if (tokenInfo == null || !result.Success || result.Code != "0") { result.Success = false; result.Code = "1004"; result.Msg = "获取大华登录令牌失败"; - _logger.LogWarning("获取大华登录令牌失败，返回结果：{Result}", result); + _logger.LogWarning($"获取大华登录令牌失败，返回结果：{result}"); } result = tokenInfo!; //固定的拼接方式 - result.Data!.AccessToken = string.Concat(tokenInfo?.Data!.TokenType, " ", tokenInfo?.Data!.AccessToken); - - TokenEntry refreshed = new TokenEntry + if (tokenInfo?.Data!.AccessToken != null && tokenInfo?.Data!.AccessToken.Length > 1) { - AccessToken = string.Concat(result!.Data.TokenType, " ", result.Data.AccessToken), + result.Data!.AccessToken = string.Concat(tokenInfo?.Data!.TokenType, " ", tokenInfo?.Data!.AccessToken); + TokenEntry refreshed = new TokenEntry + { + AccessToken = string.Concat(result!.Data.TokenType, " ", result.Data.AccessToken), - ExpireAt = DateTimeOffset.UtcNow.AddSeconds(result.Data.ExpiresIn) - }; + ExpireAt = DateTimeOffset.UtcNow.AddSeconds(result.Data.ExpiresIn) + }; + } + else + { + result.Success = false; + result.Code = "1006"; + result.Msg = "没拿到token"; + _logger.LogWarning($"获取大华登录令牌失败，返回结果：{result}"); + } } catch (Exception ex) { - _logger.LogError(ex, "获取大华登录令牌出错"); + _logger.LogError(ex, $"获取大华登录令牌出错{ex.Message}"); result.Success = false; result.Code = "1004"; result.Msg = "获取大华登录令牌失败"; diff --git a/WeiCloud.Fusion/VideoService/Video.API/Program.cs b/WeiCloud.Fusion/VideoService/Video.API/Program.cs index 45bc79b..d28df52 100644 --- a/WeiCloud.Fusion/VideoService/Video.API/Program.cs +++ b/WeiCloud.Fusion/VideoService/Video.API/Program.cs @@ -41,8 +41,8 @@ namespace Video.API builder => { builder - .WithOrigins(isconfig.CorsWithOrigins) //Դʹöŷָ - //.AllowAnyOrigin() //ԴʱAPIã + // .WithOrigins(isconfig.CorsWithOrigins) //Դʹöŷָ + .AllowAnyOrigin() //ԴʱAPIã .AllowAnyHeader() .AllowAnyMethod() .AllowCredentials() @@ -150,9 +150,9 @@ namespace Video.API }); } - app.UseHttpsRedirection(); + // app.UseHttpsRedirection(); - app.UseAuthorization(); + // app.UseAuthorization(); app.MapGet("/healthz", () => Results.Ok("OK")); app.MapControllers(); diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs index 4cd968b..5f3a217 100644 --- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs @@ -2,6 +2,7 @@ using Common.Shared.DomainService; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; +using NPOI.XWPF.UserModel; using System.Net.Http.Json; using System.Text.Json; using Video.DomainService.Dahvision; @@ -13,7 +14,7 @@ namespace Video.DomainService private readonly ILogger _logger; private readonly IConfiguration _configuration; private readonly ITokenProviderService _tokenProviderService; - private readonly HttpClient _http; + // private readonly HttpClient _http; public DahuaGeneralCtlService(ILogger logger, IConfiguration configuration, ITokenProviderService tokenProviderService, HttpClient http) { @@ -21,16 +22,16 @@ namespace Video.DomainService _configuration = configuration; _tokenProviderService = tokenProviderService; - _http = http; + // _http = http; } - ///// - ///// 开发测试的时候，忽略证书 - ///// - //private static readonly HttpClient _http = new HttpClient(new HttpClientHandler - //{ - // ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator - //}); + /// + /// 开发测试的时候，忽略证书 + /// + private static readonly HttpClient _http = new HttpClient(new HttpClientHandler + { + ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator + }); /// /// hls等录像回放 @@ -416,11 +417,12 @@ namespace Video.DomainService if (dto == null || dto.Data == null) { _logger.LogWarning("实时流请求失败：请求参数不能为空"); - return new DaHApiResult { Success = false, Code = "1009", Msg = "请求参数不能为空" }; + return new DaHApiResult { Success = false, Code = "1005", Msg = "请求参数不能为空" }; } var clientId = _configuration["DahuaAuth:ClientId"]; var token = await _tokenProviderService.GetTokenAsync(clientId!); + _logger.LogWarning($"我的token: {token}"); if (!_tokenProviderService.IsTokenValid(token)) { _logger.LogWarning("rtsp实时预览接口方式：token无效"); @@ -432,7 +434,7 @@ namespace Video.DomainService { url = $"https://{ipaddress}/evo-apigw/admin/API/MTS/Video/StartVideo"; } - + _logger.LogWarning($"我的url: {url}"); using var req = new HttpRequestMessage(HttpMethod.Post, url) { Content = JsonContent.Create(dto) // 等价于 PostAsJsonAsync，但和 req 绑定 @@ -447,14 +449,15 @@ namespace Video.DomainService if (!resp.IsSuccessStatusCode) { _logger.LogWarning("实时流请求 HTTP 失败: {Status}, Body: {Body}", (int)resp.StatusCode, body); - return new DaHApiResult { Success = false, Code = "1010", Msg = $"HTTP错误 {(int)resp.StatusCode}" }; + _logger.LogWarning($"{resp.StatusCode}: {body}"); + return new DaHApiResult { Success = false, Code = "1014", Msg = $"HTTP错误 {(int)resp.StatusCode}" }; } - + _logger.LogWarning($"大华实时流请求返回body{body}"); var result = JsonSerializer.Deserialize>(body); if (result == null || !result.Success) { - _logger.LogWarning("实时流请求业务失败: {Body}", body); - return new DaHApiResult { Success = false, Code = "1010", Msg = "实时流请求失败" }; + _logger.LogWarning("实时流请求业务反序列化失败: {Body}", body); + return new DaHApiResult { Success = false, Code = "1013", Msg = "实时流请求业务反序列化失败" }; } result.Data!.Url = UrlHostReplacer.ReplaceHost( result.Data.Url, @@ -466,8 +469,9 @@ namespace Video.DomainService } catch (Exception ex) { - _logger.LogError(ex, "大华实时流请求出错"); - return new DaHApiResult { Success = false, Code = "1010", Msg = "实时流请求失败" }; + _logger.LogError(ex, $"大华实时流请求出错{ex.Message}"); + _logger.LogWarning($"{ex.Message}"); + return new DaHApiResult { Success = false, Code = "1012", Msg = $"实时流请求失败{ex.Message}" }; } } From 121a4a0d3dbe51ea8f4effec1a07567ec6511a66 Mon Sep 17 00:00:00 2001 From: LiuXin Date: Fri, 22 Aug 2025 09:34:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs | 7 ++++--- .../DahAlarm/IDahuaGeneralCtlService.cs | 2 +- .../AlarmService.API/Controllers/AlarmController.cs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs index 829c51f..ac3bb43 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs @@ -189,12 +189,13 @@ namespace Alarm.DomainService.DahAlarm /// /// /// - public async Task> HandleAsync(EventEnvelopeDto dto) + public async Task> HandleAsync(object dto2) { DaHApiResult result = new() { Code = "200", Msg = "接口调用成功", Data = true }; + _logger.LogWarning($"报警回调的数据{dto2}"); try { - if (dto is null) + if (dto2 is null) { result.Code = "500"; result.Msg = "请求参数不能为空"; @@ -202,7 +203,7 @@ namespace Alarm.DomainService.DahAlarm _logger.LogWarning("大华报警事件订阅回调处理失败，参数不能为空"); return result; } - + EventEnvelopeDto dto = dto2 as EventEnvelopeDto; if (dto.Info is not null) { //这是大华的残卫报警类型 diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs index 2f9c716..7a06401 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs @@ -25,6 +25,6 @@ namespace Alarm.DomainService.DahAlarm /// /// /// - Task> HandleAsync(EventEnvelopeDto env); + Task> HandleAsync(object env); } } \ No newline at end of file diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs index 6a795e8..2f3665d 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs @@ -37,7 +37,7 @@ namespace AlarmService.API.Controllers /// /// [HttpPost] - public async Task> DahuaAuthCallback(EventEnvelopeDto env) + public async Task> DahuaAuthCallback(object env) { return await _generalCtlService.HandleAsync(env); } From 71376ba1531c0c5cb13135376ae5ee0ef1f1a42c Mon Sep 17 00:00:00 2001 From: LiuXin Date: Fri, 22 Aug 2025 19:52:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DahAlarm/DahuaGeneralCtlService.cs | 15 ++-- .../DahAlarm/IDahuaGeneralCtlService.cs | 2 +- .../Controllers/AlarmController.cs | 2 +- .../AlarmService.API/appsettings.json | 2 +- .../DaHua/ResponeDto/EventEnvelopeDto.cs | 86 ++++--------------- 5 files changed, 29 insertions(+), 78 deletions(-) diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs index ac3bb43..1b4b099 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs @@ -280,18 +280,17 @@ namespace Alarm.DomainService.DahAlarm /// /// /// - public async Task> GetEventList(string name = "alarm") + public async Task> GetEventList(string name = "alarm") { var clientId = _configuration["DahuaAuth:ClientId"]; var token = await _tokenProviderService.GetTokenAsync(clientId!); if (!_tokenProviderService.IsTokenValid(token)) { _logger.LogWarning("获取事件列表：token无效"); - return new DaHApiResult { Success = false, Code = "1009", Msg = "token无效" }; + return new DaHApiResult { Success = false, Code = "1009", Msg = "token无效" }; } - // var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-brm/1.0.0/device/1000021"; + // var url = $"http://demo.weienergy.cn:15230/open-api/token/v1/oauth/token?client_id=69591850&client_secret=WHcpAryKFc28suzL&grant_type=client_credentials"; var url = $"https://{_configuration["DahuaAuth:Host"]}/evo-apigw/evo-event/1.0.0/subscribe/subscribe-list?monitorType=url&category={name}"; - try { var request = new HttpRequestMessage(HttpMethod.Get, url); @@ -304,14 +303,14 @@ namespace Alarm.DomainService.DahAlarm if (!resp.IsSuccessStatusCode) { _logger.LogWarning("实时流请求 HTTP 失败: {Status}, Body: {Body}", (int)resp.StatusCode, body); - return new DaHApiResult { Success = false, Code = "1010", Msg = $"HTTP错误 {(int)resp.StatusCode}" }; + return new DaHApiResult { Success = false, Code = "1010", Msg = $"HTTP错误 {(int)resp.StatusCode}" }; } - var result = JsonSerializer.Deserialize>(body); + var result = JsonSerializer.Deserialize>(body); if (result == null || !result.Success) { _logger.LogWarning("实时流请求业务失败: {Body}", body); - return new DaHApiResult { Success = false, Code = "1010", Msg = "实时流请求失败" }; + return new DaHApiResult { Success = false, Code = "1010", Msg = "实时流请求失败" }; } return result; @@ -319,7 +318,7 @@ namespace Alarm.DomainService.DahAlarm catch (Exception ex) { _logger.LogError(ex, "大华实时流请求出错"); - return new DaHApiResult { Success = false, Code = "1010", Msg = "实时流请求失败" }; + return new DaHApiResult { Success = false, Code = "1010", Msg = "实时流请求失败" }; } } diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs index 7a06401..e419693 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs @@ -16,7 +16,7 @@ namespace Alarm.DomainService.DahAlarm Task DeleteEvent(string name); - Task> GetEventList(string name = "alarm"); + Task> GetEventList(string name = "alarm"); /// /// AddSubscribeEvent回调函数处理 diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs index 2f3665d..09e7dc8 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs @@ -48,7 +48,7 @@ namespace AlarmService.API.Controllers /// /// [HttpGet] - public async Task> GetEventList(string name = "alarm") + public async Task> GetEventList(string name = "alarm") { return await _generalCtlService.GetEventList(name); diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json index ea44d24..3325ece 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json @@ -27,7 +27,7 @@ "ClientSecret": "6d6c78f8-3d4c-4e76-ab6b-827942a7b725", "Username": "system", "Password": "Admin123", - "Callback": "http://demo.weienergy.cn/axalarm/api/Alarm/DahuaAuthCallback", + "Callback": "http://192.168.21.42:18080/axalarm/api/Alarm/DahuaAuthCallback", "SubsystemName": "59.110.150.214_alarm", "SubsystemMagic": "59.110.150.214_12013" } diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs index 299ec22..3ddd1a5 100644 --- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs @@ -120,101 +120,53 @@ namespace Common.Shared.Application.DaHua public JsonElement? Extend { get; set; } } - /// - /// 订阅映射配置 - /// 用于定义不同服务节点的订阅参数配置 - /// - public class SubscriptionMapDto + public sealed class SubscribeDataDto { - /// - /// 订阅配置字典 - /// 键：服务节点标识（格式：IP地址_端口号） - /// 值：该节点的订阅参数列表 - /// - public Dictionary>? Items { get; set; } = new Dictionary>(); + [JsonPropertyName("subscribeMap")] + public SubscribeMap? SubscribeMap { get; set; } } /// - /// 订阅配置项 - /// 定义单个订阅的具体参数 + /// 语义化的字典类型：键为如 "59.110.150.214_alarm" 的分组名，值为该分组下的一组订阅项。 + /// 继承 Dictionary 便于序列化/反序列化，保持类型语义。 /// - public class SubscriptionConfig + public class SubscribeMap : Dictionary> + { + public SubscribeMap() : base() + { + } + } + + public sealed class SubscribeItem { /// - /// 订阅类型列表 - /// 可为空，表示订阅所有类型 + /// 事件类型编码；上游可能给字符串形式的数字，保持字符串列表以兼容。 /// [JsonPropertyName("types")] public List? Types { get; set; } - /// - /// 节点编码列表 - /// 可为空，表示订阅所有节点 - /// [JsonPropertyName("nodeCodes")] public List? NodeCodes { get; set; } - /// - /// 组织机构列表 - /// 可为空，表示订阅所有组织 - /// [JsonPropertyName("orgs")] public List? Orgs { get; set; } - /// - /// 等级列表 - /// 可为空，表示订阅所有等级 - /// [JsonPropertyName("grades")] public List? Grades { get; set; } - /// - /// 域订阅级别 - /// 枚举值： - /// 0 = 不订阅 - /// 1 = 订阅本域 - /// 2 = 订阅本域及下级域 - /// [JsonPropertyName("domainSubscribe")] - public int DomainSubscribe { get; set; } + public int? DomainSubscribe { get; set; } - /// - /// 传输方案 - /// 枚举值： - /// 0 = HTTP - /// 1 = HTTPS - /// 2 = WebSocket - /// 3 = MQTT - /// [JsonPropertyName("scheme")] - public int Scheme { get; set; } + public int? Scheme { get; set; } - /// - /// 事件类型 - /// 枚举值： - /// 0 = 所有事件 - /// 1 = 告警事件 - /// 2 = 状态事件 - /// 3 = 操作事件 - /// [JsonPropertyName("eventType")] - public int EventType { get; set; } + public int? EventType { get; set; } - /// - /// 监控回调地址 - /// 接收事件推送的目标URL - /// [JsonPropertyName("monitor")] - public string Monitor { get; set; } = string.Empty; + public string? Monitor { get; set; } - /// - /// 监控类型 - /// 枚举值： - /// "url" = HTTP/HTTPS 回调 - /// "websocket" = WebSocket 连接 - /// "queue" = 消息队列 - /// [JsonPropertyName("monitorType")] - public string MonitorType { get; set; } = string.Empty; + public string? MonitorType { get; set; } } } \ No newline at end of file From e291549642b7eec5d2e85097108a0f91a16e2e12 Mon Sep 17 00:00:00 2001 From: LiuXin Date: Mon, 25 Aug 2025 10:50:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs | 2 +- .../AlarmService/AlarmService.API/appsettings.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs index 1b4b099..68c3155 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs @@ -247,7 +247,7 @@ namespace Alarm.DomainService.DahAlarm try { var request = new HttpRequestMessage(HttpMethod.Delete, url); - request.Headers.Authorization = new AuthenticationHeaderValue("Authorization", token); + request.Headers.TryAddWithoutValidation("Authorization", token); using var resp = await _http.SendAsync(request); var body = await resp.Content.ReadAsStringAsync(); diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json index 3325ece..fb4d991 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/appsettings.json @@ -28,7 +28,7 @@ "Username": "system", "Password": "Admin123", "Callback": "http://192.168.21.42:18080/axalarm/api/Alarm/DahuaAuthCallback", - "SubsystemName": "59.110.150.214_alarm", - "SubsystemMagic": "59.110.150.214_12013" + "SubsystemName": "192.168.21.42_alarm", + "SubsystemMagic": "192.168.21.42_18080" } } \ No newline at end of file