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

10.6.7

Browse Source
This commit is contained in:
Diego
2025-05-19 18:43:03 +08:00
parent 6594937d0a
commit 0f78f81c1c
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Directory.Build.props
View File

@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<PluginVersion>10.6.6</PluginVersion>
<ProPluginVersion>10.6.6</ProPluginVersion>
<PluginVersion>10.6.7</PluginVersion>
<ProPluginVersion>10.6.7</ProPluginVersion>
<AuthenticationVersion>2.1.7</AuthenticationVersion>
</PropertyGroup>

4
src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs
View File

@@ -130,7 +130,7 @@ public class ControlController : ControllerBase
/// </summary>
[HttpPost("writeVariables")]
[DisplayName("写入变量")]
public async Task<Dictionary<string, Dictionary<string, IOperResult>>> WriteVariablesAsync([FromBody] Dictionary<string, Dictionary<string, string>> deviceDatas)
public async Task<Dictionary<string, Dictionary<string, OperResult>>> WriteVariablesAsync([FromBody] Dictionary<string, Dictionary<string, string>> deviceDatas)
{
foreach (var deviceData in deviceDatas)
{
@@ -141,7 +141,7 @@ public class ControlController : ControllerBase
}
}
return await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext?.GetRemoteIpAddressToIPv4()}", deviceDatas).ConfigureAwait(false);
return (await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext?.GetRemoteIpAddressToIPv4()}", deviceDatas).ConfigureAwait(false)).ToDictionary(a => a.Key, a => a.Value.ToDictionary(b => b.Key, b => (OperResult)b.Value));
}

5
src/Gateway/ThingsGateway.Gateway.Application/Model/ChannelRuntime.cs
View File

@@ -120,10 +120,7 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
// 通过插件名称获取插件信息
PluginInfo = GlobalData.PluginService.GetList().FirstOrDefault(A => A.FullName == PluginName);
if (PluginInfo == null)
{
//throw new Exception($"Plugin {PluginName} not found");
}
GlobalData.Channels.TryRemove(Id, out _);
GlobalData.Channels.TryAdd(Id, this);

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>10.6.6</Version>
<Version>10.6.7</Version>
</PropertyGroup>
<ItemGroup>