关闭ssl

main
xiaoguo 2 years ago
parent aefdf8aa7d
commit 6cf243d09c

Binary file not shown.

@ -1,4 +1,5 @@
using PVDEMCS.Services; using PVDEMCS.Services;
using System.Threading;
namespace PVDEMCS.Common.Devices.Impl namespace PVDEMCS.Common.Devices.Impl
{ {
@ -15,6 +16,7 @@ namespace PVDEMCS.Common.Devices.Impl
public void Load() public void Load()
{ {
monitors.Clear();
var result = this.deviceService.GetDeviceInfoList("", "", true); var result = this.deviceService.GetDeviceInfoList("", "", true);
if (result.IsSuccess) if (result.IsSuccess)
{ {
@ -27,9 +29,21 @@ namespace PVDEMCS.Common.Devices.Impl
{ {
deviceMonitor.Load(devicePoints.Content.ToArray()); deviceMonitor.Load(devicePoints.Content.ToArray());
} }
deviceMonitor.ErrorMessage += DeviceMonitor_ErrorMessage;
deviceMonitor.PointChnage += DeviceMonitor_PointChnage;
monitors.Add(deviceMonitor); monitors.Add(deviceMonitor);
Task<bool> task = deviceMonitor.StartAsync();
} }
} }
}
private void DeviceMonitor_PointChnage(object sender, Services.Models.DevicePoint e)
{
}
private void DeviceMonitor_ErrorMessage(object sender, string e)
{
} }
} }

@ -44,7 +44,7 @@ if (app.Environment.IsDevelopment())
//使用跨域策略 //使用跨域策略
app.UseCors("CorsPolicy"); app.UseCors("CorsPolicy");
app.UseHttpsRedirection(); //app.UseHttpsRedirection();
app.UseAuthorization(); app.UseAuthorization();
@ -53,11 +53,7 @@ app.MapControllers();
app.Lifetime.ApplicationStarted.Register(() => app.Lifetime.ApplicationStarted.Register(() =>
{ {
var deviceConfiguration = app.Services.GetService<IDeviceConfiguration>(); var deviceConfiguration = app.Services.GetService<IDeviceConfiguration>();
//deviceConfiguration
if (deviceConfiguration == null)
{
}
}); });
app.Run(); app.Run();

@ -1,23 +1,14 @@
{ {
"$schema": "https://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:34771",
"sslPort": 44348
}
},
"profiles": { "profiles": {
"PVDEMCS": { "PVDEMCS": {
"commandName": "Project", "commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "swagger", "launchUrl": "swagger",
"applicationUrl": "https://localhost:7200;http://localhost:5223",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} },
"dotnetRunMessages": true,
"applicationUrl": "http://localhost:5223"
}, },
"IIS Express": { "IIS Express": {
"commandName": "IISExpress", "commandName": "IISExpress",
@ -27,5 +18,14 @@
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }
} }
},
"$schema": "https://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:34771",
"sslPort": 0
}
} }
} }
Loading…
Cancel
Save