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

10.9.35

Browse Source
This commit is contained in:
Diego
2025-07-11 07:14:52 +08:00
parent ba008ef8ba
commit 9bb9cd7419
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.9.34</PluginVersion>
<ProPluginVersion>10.9.34</ProPluginVersion>
<DefaultVersion>10.9.34</DefaultVersion>
<PluginVersion>10.9.35</PluginVersion>
<ProPluginVersion>10.9.35</ProPluginVersion>
<DefaultVersion>10.9.35</DefaultVersion>
<AuthenticationVersion>2.9.16</AuthenticationVersion>
<SourceGeneratorVersion>10.9.15</SourceGeneratorVersion>
<NET8Version>8.0.18</NET8Version>

1
src/Foundation/ThingsGateway.CSScript/CSharpScriptEngineExtension.cs
View File

@@ -81,6 +81,7 @@ public static class CSharpScriptEngineExtension
/// </summary>
public static T Do<T>(string source, params Assembly[] assemblies) where T : class
{
if (source.IsNullOrEmpty()) return null;
var field = $"{CacheKey}-{source}";
var runScript = Instance.Get<T>(field);
if (runScript == null)

25
src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Actuator/ExecuteScriptNode.cs
View File

@@ -91,7 +91,7 @@ public class ExecuteScriptNode : TextNode, IActuatorNode, IExexcuteExpressionsBa
try
{
var exexcuteExpressions = CSharpScriptEngineExtension.Do<IExexcuteExpressions>(text);
exexcuteExpressions.TryDispose();
exexcuteExpressions?.TryDispose();
}
catch
{
@@ -110,6 +110,10 @@ public class ExecuteScriptNode : TextNode, IActuatorNode, IExexcuteExpressionsBa
{
Logger?.Trace($"Execute script");
var exexcuteExpressions = CSharpScriptEngineExtension.Do<IExexcuteExpressions>(Text);
if (exexcuteExpressions == null)
{
return new OperResult<NodeOutput>("exexcuteExpressions is null");
}
exexcuteExpressions.Logger = Logger;
var data = await exexcuteExpressions.ExecuteAsync(input, cancellationToken).ConfigureAwait(false);
return new OperResult<NodeOutput>() { Content = data };
@@ -125,18 +129,19 @@ public class ExecuteScriptNode : TextNode, IActuatorNode, IExexcuteExpressionsBa
public void Dispose()
{
if (text.IsNullOrWhiteSpace())
return;
try
{
var exexcuteExpressions = CSharpScriptEngineExtension.Do<IExexcuteExpressions>(text);
exexcuteExpressions.TryDispose();
}
catch
if (!text.IsNullOrWhiteSpace())
{
try
{
var exexcuteExpressions = CSharpScriptEngineExtension.Do<IExexcuteExpressions>(text);
exexcuteExpressions.TryDispose();
}
catch
{
}
CSharpScriptEngineExtension.Remove(text);
}
CSharpScriptEngineExtension.Remove(text);
GC.SuppressFinalize(this);
}
}

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

@@ -54,9 +54,11 @@ public partial class OpcUaServer : BusinessBase
//opcua类库内部有大量缓存，如果刷新变量次数大于一定数量，应该重启服务以防止OOM
if (Interlocked.Increment(ref VariableChangedCount) > 100)
{
await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
_ = Task.Run(async () =>
{
await DeviceThreadManage.RestartDeviceAsync(CurrentDevice, false).ConfigureAwait(false);
if (!cancellationToken.IsCancellationRequested)
await DeviceThreadManage.RestartDeviceAsync(CurrentDevice, false).ConfigureAwait(false);
}
, cancellationToken);
return;
@@ -122,6 +124,7 @@ public partial class OpcUaServer : BusinessBase
}
private void UaDispose()
{
ApplicationInstance.MessageDlg = null;
m_server?.Stop();
m_server?.NodeManager?.SafeDispose();
m_server?.SafeDispose();