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",