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

Merge branch 'variablePage' of https://gitee.com/ThingsGateway/ThingsGateway into variablePage

Browse Source
This commit is contained in:
2248356998 qq.com
2025-10-16 14:43:31 +08:00
parent 67354e70b3 b22e90609b
commit 2e83c19e0c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Admin/ThingsGateway.Common/Common/ConcurrentList.cs
View File

@@ -1,4 +1,4 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
// 此代码版权（除特别声明外的代码）归作者本人Diego所有
// 源代码使用协议遵循本仓库的开源协议及附加协议
@@ -477,7 +477,7 @@ public class ConcurrentList<T> : IList<T>, IReadOnlyList<T>
{
lock (((ICollection)m_list).SyncRoot)
{
return m_list.IndexOf(item);
return m_list.LastIndexOf(item);
}
}

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.11.107</PluginVersion>
<ProPluginVersion>10.11.107</ProPluginVersion>
<DefaultVersion>10.11.107</DefaultVersion>
<PluginVersion>10.11.108</PluginVersion>
<ProPluginVersion>10.11.108</ProPluginVersion>
<DefaultVersion>10.11.108</DefaultVersion>
<AuthenticationVersion>10.11.6</AuthenticationVersion>
<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
<NET8Version>8.0.21</NET8Version>

6
src/Plugin/ThingsGateway.Foundation.SiemensS7/S7/SiemensS7Master.cs
View File

@@ -118,20 +118,20 @@ public partial class SiemensS7Master : DeviceBase
return new DeviceSingleStreamDataHandleAdapter<S7Message>
{
CacheTimeout = TimeSpan.FromMilliseconds(Channel.ChannelOptions.CacheTimeout),
IsSingleThread = false
//IsSingleThread = false
};
case ChannelTypeEnum.UdpSession:
return new DeviceUdpDataHandleAdapter<S7Message>()
{
IsSingleThread = false
//IsSingleThread = false
};
}
return new DeviceSingleStreamDataHandleAdapter<S7Message>
{
CacheTimeout = TimeSpan.FromMilliseconds(Channel.ChannelOptions.CacheTimeout),
IsSingleThread = false
//IsSingleThread = false
};
}