g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-20 10:50:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新依赖库

Browse Source
This commit is contained in:
2248356998 qq.com
2025-07-15 21:24:19 +08:00
parent 2960c13ef1
commit 5e4f0057e4
11 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
View File

@@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
<PackageReference Include="BootstrapBlazor" Version="9.8.0" />
<PackageReference Include="BootstrapBlazor" Version="9.8.1" />
</ItemGroup>
<ItemGroup>

7
src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj
View File

@@ -9,12 +9,7 @@
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
<PackageReference Include="BootstrapBlazor" Version="9.8.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\README.md" Pack="true" PackagePath="\" />

2
src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj
View File

@@ -6,8 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor" Version="9.8.0" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>
<ItemGroup>

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.9.38</PluginVersion>
<ProPluginVersion>10.9.38</ProPluginVersion>
<DefaultVersion>10.9.38</DefaultVersion>
<PluginVersion>10.9.39</PluginVersion>
<ProPluginVersion>10.9.39</ProPluginVersion>
<DefaultVersion>10.9.39</DefaultVersion>
<AuthenticationVersion>2.9.18</AuthenticationVersion>
<SourceGeneratorVersion>10.9.18</SourceGeneratorVersion>
<NET8Version>8.0.18</NET8Version>

2
src/Gateway/ThingsGateway.Gateway.Razor/Components/QuickActions.razor
View File

@@ -1,5 +1,5 @@
@inherits ThingsGatewayModuleComponentBase
@attribute [JSModuleAutoLoader("Components/QuickActions.razor.js")]
@attribute [JSModuleAutoLoader("Components/QuickActions.razor.js", AutoInvokeDispose = false)]
@namespace ThingsGateway.Gateway.Razor
<div id="@Id">

1
src/Gateway/ThingsGateway.Gateway.Razor/Components/QuickActions.razor.cs
View File

@@ -86,7 +86,6 @@ public partial class QuickActions
protected override async Task InvokeInitAsync()
{
await base.InvokeInitAsync();
var autoRestartThread = await Module!.InvokeAsync<bool>("getAutoRestartThread");
await OnAutoRestartThreadChanged(autoRestartThread);
}

2
src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor
View File

@@ -1,5 +1,5 @@
@inherits ThingsGatewayModuleComponentBase
@attribute [JSModuleAutoLoader("Pages/GatewayMonitorPage/ChannelDeviceTree.razor.js")]
@attribute [JSModuleAutoLoader("Pages/GatewayMonitorPage/ChannelDeviceTree.razor.js", AutoInvokeDispose = false)]
@namespace ThingsGateway.Gateway.Razor
@using ThingsGateway.Admin.Application
@using ThingsGateway.Admin.Razor

1
src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
View File

@@ -51,7 +51,6 @@ public partial class ChannelDeviceTree
}
protected override async Task InvokeInitAsync()
{
await base.InvokeInitAsync();
var showType = await Module!.InvokeAsync<ShowTypeEnum>("getShowType");
await OnShowTypeChanged(showType);
}

2
src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/RulesPage.razor
View File

@@ -1,6 +1,6 @@
@page "/gateway/rules"
@inherits ThingsGatewayModuleComponentBase
@attribute [JSModuleAutoLoader("Pages/RulesEngine/RulesPage.razor.js")]
@attribute [JSModuleAutoLoader("Pages/RulesEngine/RulesPage.razor.js", AutoInvokeDispose = false)]
@namespace ThingsGateway.Gateway.Razor
@using ThingsGateway.Admin.Application
@using ThingsGateway.Admin.Razor

2
src/Plugin/ThingsGateway.Plugin.Kafka/ThingsGateway.Plugin.Kafka.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\Version.props" />
<Import Project="..\..\PackNuget.props" />
<PropertyGroup>

51
src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs
View File

@@ -130,37 +130,42 @@ public partial class OpcUaServer : BusinessBase
{
ApplicationInstance.MessageDlg = null;
try
if (m_server != null)
{
//https://github.com/OPCFoundation/UA-.NETStandard/pull/3113
var typeDict = m_server.MessageContext.Factory.GetValue("m_encodeableTypes") as Dictionary<ExpandedNodeId, Type>;
typeDict.Clear();
m_server.MessageContext.Factory.TryDispose();
typeof(EncodeableFactory).GetField("s_globalFactory", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, new EncodeableFactory());
typeof(ServiceMessageContext).GetField("s_globalContext", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, typeof(ServiceMessageContext).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(bool) }, null).Invoke(new object[] { true }));
var listeners = m_server.GetValue("m_listeners") as List<ITransportListener>;
if (listeners != null)
try
{
foreach (var item in listeners)
//https://github.com/OPCFoundation/UA-.NETStandard/pull/3113
if (m_server?.MessageContext?.Factory != null)
{
if (item is TcpTransportListener transportListener)
var typeDict = m_server.MessageContext.Factory.GetValue("m_encodeableTypes") as Dictionary<ExpandedNodeId, Type>;
typeDict.Clear();
m_server.MessageContext.Factory.TryDispose();
}
typeof(EncodeableFactory).GetField("s_globalFactory", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, new EncodeableFactory());
typeof(ServiceMessageContext).GetField("s_globalContext", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, typeof(ServiceMessageContext).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(bool) }, null).Invoke(new object[] { true }));
var listeners = m_server.GetValue("m_listeners") as List<ITransportListener>;
if (listeners != null)
{
foreach (var item in listeners)
{
var timer = transportListener.GetValue("m_inactivityDetectionTimer") as IDisposable;
timer?.Dispose();
if (item is TcpTransportListener transportListener)
{
var timer = transportListener.GetValue("m_inactivityDetectionTimer") as IDisposable;
timer?.Dispose();
}
}
}
}
}
catch
{
catch
{
}
}
m_server?.Stop();
m_server?.NodeManager?.SafeDispose();