g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加Keys文件夹

Browse Source
This commit is contained in:
Diego
2025-07-07 16:54:58 +08:00
parent 4155c07269
commit 2e310b919e
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Admin/ThingsGateway.Admin.Application/Extensions/SchemeHelper.cs
View File

@@ -19,7 +19,7 @@ public static class SchemeHelper
public static string GetOrCreate()
{
var path = "SchemeKey";
var path = "Keys/SchemeKey.txt";
if (File.Exists(path))
{
var data = File.ReadAllText(path);
@@ -28,6 +28,7 @@ public static class SchemeHelper
else
{
var data = DateTime.UtcNow.ToDefaultDateTimeFormat();
Directory.CreateDirectory("Keys");
File.WriteAllText(path, data);
return data;
}

2
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs
View File

@@ -78,7 +78,7 @@ public abstract class BusinessBaseWithCacheAlarm : BusinessBaseWithCache
{
if (CurrentDevice?.Pause != false)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (AlarmModelEnable) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作

6
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs
View File

@@ -248,7 +248,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
{
if (CurrentDevice?.Pause != false)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (!AlarmModelEnable) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作
@@ -305,7 +305,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
{
if (CurrentDevice?.Pause != false)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (!DevModelEnable) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作
//if (_businessPropertyWithCacheInterval?.IsInterval != true)
@@ -326,7 +326,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
if (CurrentDevice?.Pause != false)
return;
if (!VarModelEnable) return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
// 如果业务属性的缓存为间隔上传，则不执行后续操作
//if (_businessPropertyWithCacheInterval?.IsInterval != true)

3
src/Plugin/ThingsGateway.Foundation.Test/SiemensS7Test.cs
View File

@@ -49,11 +49,10 @@ public class SiemensS7Test
}
});
await Task.Delay(100);
bytes[12] = (byte)(((IClientChannel)(siemensS7Master.Channel)).WaitHandlePool.GetValue("m_currentSign").ToInt() - 1);
var task2 = Task.Run(async () =>
{
await Task.Delay(100).ConfigureAwait(false);
bytes[12] = (byte)(((IClientChannel)(siemensS7Master.Channel)).WaitHandlePool.GetValue("m_currentSign").ToInt() - 1);
foreach (var item in bytes)
{
var data = new ByteBlock([item]);

2
src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs
View File

@@ -248,7 +248,7 @@ public class ModbusSlave : BusinessBase
{
if (CurrentDevice?.Pause != false)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
var address = variableRuntime.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress));
if (address != null && variableRuntime.Value != null)
{

6
src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs
View File

@@ -219,7 +219,7 @@ public class OpcDaMaster : CollectBase
{
if (CurrentDevice.Pause)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (DisposedValue)
return;
LogMessage?.Trace($"{ToString()} Change:{Environment.NewLine} {values?.ToSystemTextJsonString()}");
@@ -228,7 +228,7 @@ public class OpcDaMaster : CollectBase
{
if (CurrentDevice.Pause)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (DisposedValue)
return;
var type = data.Value.GetType();
@@ -242,7 +242,7 @@ public class OpcDaMaster : CollectBase
{
if (CurrentDevice.Pause)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (DisposedValue)
return;
var value = data.Value;

4
src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs
View File

@@ -363,7 +363,7 @@ public class OpcUaMaster : CollectBase
return;
if (DisposedValue)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
@@ -387,7 +387,7 @@ public class OpcUaMaster : CollectBase
return;
if (DisposedValue)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (isGood)
{

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

@@ -397,7 +397,7 @@ public partial class OpcUaServer : BusinessBase
{
if (CurrentDevice.Pause)
return;
if (TaskSchedulerLoop?.Stoped==true) return;
if (TaskSchedulerLoop?.Stoped == true) return;
if (DisposedValue) return;
if (IdVariableRuntimes.ContainsKey(variableData.Id))
CollectVariableRuntimes.AddOrUpdate(variableData.Id, id => variableData, (id, addValue) => variableData);