Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vari update x testing client/server

Browse Source
This commit is contained in:
Samuele Locatelli
2020-05-22 18:23:25 +02:00
parent bc0a33cf7f
commit 302456b21b
7 changed files with 200 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/System.Windows.Interactivity.dll
BIN
View File
Binary file not shown.
Thermo.Active/App.config
+149 -77
View File
@@ -4,81 +4,153 @@
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
--> -->
<configuration> <configuration>
<configSections> <configSections>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections> </configSections>
<startup useLegacyV2RuntimeActivationPolicy="true"> <startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup> </startup>
<appSettings> <appSettings>
<add key="enableDirectoryBrowsing" value="true" /> <add key="enableDirectoryBrowsing" value="true" />
<add key="ClientSettingsProvider.ServiceUri" value="" /> <add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="ServerServiceName" value="MariaDB"/> <add key="ServerServiceName" value="MariaDB" />
</appSettings> </appSettings>
<system.web> <system.web>
<compilation debug="true" targetFramework="4.6.2" /> <compilation debug="true" targetFramework="4.6.2" />
<httpRuntime targetFramework="4.6.2" /> <httpRuntime targetFramework="4.6.2" />
<httpModules> <httpModules>
</httpModules> </httpModules>
<membership defaultProvider="ClientAuthenticationMembershipProvider"> <membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers> <providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" /> <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers> </providers>
</membership> </membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true"> <roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers> <providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" /> <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers> </providers>
</roleManager> </roleManager>
</system.web> </system.web>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" /> <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" /> <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" /> <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" /> <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.10.4.0" newVersion="6.10.4.0" /> <bindingRedirect oldVersion="0.0.0.0-6.10.4.0" newVersion="6.10.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> <dependentAssembly>
</runtime> <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<connectionStrings> <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
<add name="mySQLDatabaseConnection" providerName="MySql.Data.MySqlClient" connectionString="Server=localhost;Database=step;Uid=root;Pwd=root;" /> </dependentAssembly>
</connectionStrings> </assemblyBinding>
<entityFramework> </runtime>
<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" /> <connectionStrings>
<providers> <add name="mySQLDatabaseConnection" providerName="MySql.Data.MySqlClient" connectionString="Server=localhost;Database=step;Uid=root;Pwd=root;" />
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"> </connectionStrings>
</provider> <entityFramework>
</providers> <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
</entityFramework> <providers>
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
</provider>
</providers>
</entityFramework>
<system.diagnostics>
<sources>
<source name="SignalR.SqlMessageBus">
<listeners>
<add name="SignalR-Bus" />
</listeners>
</source>
<source name="SignalR.ServiceBusMessageBus">
<listeners>
<add name="SignalR-Bus" />
</listeners>
</source>
<source name="SignalR.RedisMessageBus">
<listeners>
<add name="SignalR-Bus" />
</listeners>
</source>
<source name="SignalR.ScaleoutMessageBus">
<listeners>
<add name="SignalR-Bus" />
</listeners>
</source>
<source name="SignalR.Transports.WebSocketTransport">
<listeners>
<add name="SignalR-Transports" />
</listeners>
</source>
<source name="SignalR.Transports.ServerSentEventsTransport">
<listeners>
<add name="SignalR-Transports" />
</listeners>
</source>
<source name="SignalR.Transports.ForeverFrameTransport">
<listeners>
<add name="SignalR-Transports" />
</listeners>
</source>
<source name="SignalR.Transports.LongPollingTransport">
<listeners>
<add name="SignalR-Transports" />
</listeners>
</source>
<source name="SignalR.Transports.TransportHeartBeat">
<listeners>
<add name="SignalR-Transports" />
</listeners>
</source>
<source name="SignalR.ReflectedHubDescriptorProvider">
<listeners>
<add name="SignalR-Init" />
</listeners>
</source>
</sources>
<!-- Sets the trace verbosity level -->
<switches>
<add name="SignalRSwitch" value="Verbose" />
</switches>
<!-- Specifies the trace writer for output -->
<sharedListeners>
<!-- Listener for transport events -->
<add name="SignalR-Transports" type="System.Diagnostics.TextWriterTraceListener" initializeData="logs/transports.log" />
<!-- Listener for scaleout provider events -->
<add name="SignalR-Bus" type="System.Diagnostics.TextWriterTraceListener" initializeData="logs/bus.log" />
<!-- Listener for hub discovery events -->
<add name="SignalR-Init" type="System.Diagnostics.TextWriterTraceListener" initializeData="logs/init.log" />
</sharedListeners>
<trace autoflush="true" />
</system.diagnostics>
</configuration> </configuration>
Thermo.Active/App_Start/Startup.cs
+5 -5
View File
@@ -107,11 +107,11 @@ namespace Thermo.Active.App_Start
{ {
map.UseCors(CorsOptions.AllowAll); map.UseCors(CorsOptions.AllowAll);
map.UseOAuthBearerAuthentication(new OAuthBearerAuthenticationOptions() //map.UseOAuthBearerAuthentication(new OAuthBearerAuthenticationOptions()
{ //{
Provider = new SignalROAuthBearerProvider(), // Provider = new SignalROAuthBearerProvider(),
AuthenticationType = AUTHENTICATION_TYPE // AuthenticationType = AUTHENTICATION_TYPE
}); //});
var hubConfiguration = new HubConfiguration var hubConfiguration = new HubConfiguration
{ {
Resolver = GlobalHost.DependencyResolver, Resolver = GlobalHost.DependencyResolver,
Thermo.Active/Thermo.Active.csproj
+8
View File
@@ -119,6 +119,8 @@
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL"> <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath> <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference> </Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL"> <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
<HintPath>..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll</HintPath> <HintPath>..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll</HintPath>
</Reference> </Reference>
@@ -163,6 +165,10 @@
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath> <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity">
<HintPath>..\Libs\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Abstractions" />
@@ -204,6 +210,7 @@
<Reference Include="WebMatrix.WebData, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="WebMatrix.WebData, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.WebData.2.0.20505.0\lib\net40\WebMatrix.WebData.dll</HintPath> <HintPath>..\packages\Microsoft.AspNet.WebPages.WebData.2.0.20505.0\lib\net40\WebMatrix.WebData.dll</HintPath>
</Reference> </Reference>
<Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="App_Start\SignalRContractResolver.cs" /> <Compile Include="App_Start\SignalRContractResolver.cs" />
@@ -16427,6 +16434,7 @@
<TypeScriptCompile Include="wwwroot\src\_base\utils.ts" /> <TypeScriptCompile Include="wwwroot\src\_base\utils.ts" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="logs\" />
<Folder Include="wwwroot\src\router\" /> <Folder Include="wwwroot\src\router\" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
Thermo.Active/wwwroot/index.html
+1 -1
View File
@@ -13,7 +13,7 @@
<script src="Scripts/jquery.mousewheel.js"></script> <script src="Scripts/jquery.mousewheel.js"></script>
<script src="Scripts/jquery.signalR-2.2.2.min.js"></script> <script src="Scripts/jquery.signalR-2.2.2.min.js"></script>
<script src="Scripts/raphael-2.1.4.min.js"></script> <script src="Scripts/raphael-2.1.4.min.js"></script>
<script src="http://seriate.steamware.net:9000/signalr/hubs"></script> <script src="http://10.74.82.72:9000/signalr/hubs"></script>
<link href="assets/styles/style.css" rel="stylesheet" /> <link href="assets/styles/style.css" rel="stylesheet" />
</head> </head>
Thermo.Active/wwwroot/src/main.ts
+6 -1
View File
@@ -88,7 +88,12 @@ router.beforeEach((to, from, next) => {
// Initialize default language // Initialize default language
import { LocalizationService } from "src/services/localizationService"; import { LocalizationService } from "src/services/localizationService";
new LocalizationService().init(); try
{
new LocalizationService().init();
}
catch
{ }
let v = new Vue({ let v = new Vue({
Thermo.Active/wwwroot/src/services/hub.ts
+31 -27
View File
@@ -70,27 +70,29 @@ export class Hub {
try { $.connection.ncHub.logging = true; } catch{ } try { $.connection.ncHub.logging = true; } catch{ }
// Registro le callback; // Registro le callback;
this._hub.client.alarms = this.manageAlarmsCallbacks; // this._hub.client.alarms = this.manageAlarmsCallbacks;
this._hub.client.powerOn = this.managePowerCallbacks; this._hub.client.powerOn = this.managePowerCallbacks;
this._hub.client.ncNetworkStatus = Hub.manageNcStatus; // this._hub.client.ncNetworkStatus = Hub.manageNcStatus;
this._hub.client.processesData = Hub.manageProcesses; // this._hub.client.processesData = Hub.manageProcesses;
this._hub.client.functionalityData = Hub.functionalityData; // this._hub.client.functionalityData = Hub.functionalityData;
this._hub.client.expiredMaintenances = Hub.expiredMaintenances; // this._hub.client.expiredMaintenances = Hub.expiredMaintenances;
this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged; // this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;
this._hub.client.userSoftKeys = Hub.userSoftKeyChanged; // this._hub.client.userSoftKeys = Hub.userSoftKeyChanged;
this._hub.client.headsData = Hub.headsDataChanged; // this._hub.client.headsData = Hub.headsDataChanged;
this._hub.client.processesData = Hub.processDataChanged; // this._hub.client.processesData = Hub.processDataChanged;
this._hub.client.axesNames = Hub.axesNamesDataChanged; // this._hub.client.axesNames = Hub.axesNamesDataChanged;
this._hub.client.axesPositions = Hub.axesPositionsDataChanged; // this._hub.client.axesPositions = Hub.axesPositionsDataChanged;
this._hub.client.magazinesStatus = Hub.magazineStatusChanged; // this._hub.client.magazinesStatus = Hub.magazineStatusChanged;
this._hub.client.activeProgramData = Hub.activeProgramData; // this._hub.client.activeProgramData = Hub.activeProgramData;
this._hub.client.magazineIsActive = Hub.magazineIsActive; // this._hub.client.magazineIsActive = Hub.magazineIsActive;
this._hub.client.m155Data = Hub.m155Data; // this._hub.client.m155Data = Hub.m155Data;
this._hub.client.partProgramQueue = Hub.partProgramQueue; // this._hub.client.partProgramQueue = Hub.partProgramQueue;
this._hub.client.scadaData = Hub.scadaDataChanged; // this._hub.client.scadaData = Hub.scadaDataChanged;
this._hub.client.cmsConnectGatewayRebbot = Hub.cmsConnectGatewayRebbot; // this._hub.client.cmsConnectGatewayRebbot = Hub.cmsConnectGatewayRebbot;
// sottoscrivere qui i metodi NUOVI dal server (Recipe, gauges)
this._hub.client.logout = this.logout; this._hub.client.logout = this.logout;
@@ -108,15 +110,15 @@ export class Hub {
$.connection.hub.start({ transport: ['serverSentEvents'] }); $.connection.hub.start({ transport: ['serverSentEvents'] });
}, 5000); // Restart connection after 5 seconds. }, 5000); // Restart connection after 5 seconds.
}); });
$.connection.hub.stateChanged(async (state) => { // $.connection.hub.stateChanged(async (state) => {
if (state.newState == $.signalR.connectionState.connected) { // if (state.newState == $.signalR.connectionState.connected) {
try { // try {
await scadaService.ListScada(); // await scadaService.ListScada();
} // }
catch (err) { } // catch (err) { }
Hub.manageServerStatus("connected"); // Hub.manageServerStatus("connected");
} // }
}) // })
$.connection.hub.start({ transport: ['serverSentEvents'] }); $.connection.hub.start({ transport: ['serverSentEvents'] });
@@ -428,6 +430,8 @@ export class Hub {
}); });
} }
// mettere qui metodo x pubblicare su server
public RefreshAlarm(id: string) { public RefreshAlarm(id: string) {
this._hub.server.refreshAlarm(id) this._hub.server.refreshAlarm(id)
.catch((err) => { .catch((err) => {