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

7.2.3.5

Browse Source 
opcuaclient: 心跳机制异常
This commit is contained in:
2248356998 qq.com
2025-01-05 00:46:52 +08:00
parent 866e907b7e
commit 120c6e6d87
9 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Admin

Submodule Admin updated: cff164b972...cbdf46eba4

8
src/Directory.Build.props
View File

@@ -1,10 +1,10 @@
<Project>
<PropertyGroup>
<AdminVersion>7.2.0.61</AdminVersion>
<GatewayVersion>7.2.3.3</GatewayVersion>
<PluginVersion>9.0.3.3</PluginVersion>
<ProPluginVersion>9.0.3.4</ProPluginVersion>
<AdminVersion>7.2.0.62</AdminVersion>
<GatewayVersion>7.2.3.5</GatewayVersion>
<PluginVersion>9.0.3.4</PluginVersion>
<ProPluginVersion>9.0.3.5</ProPluginVersion>
</PropertyGroup>
<PropertyGroup>

8
src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/AdapterDebugComponent.razor
View File

@@ -26,7 +26,7 @@
<div class="p-1">
<BootstrapInputNumber @bind-Value=@ArrayLength ShowLabel="true" />
<Select @bind-Value="@DataType" ShowLabel="true" IsPopover="true"/>
<Select @bind-Value="@DataType" ShowLabel="true" IsPopover="true" />
</div>
</div>
@@ -106,13 +106,11 @@
</div>
<div class="col-12 col-md-7 ">
@if (Plc?.Logger != null || Logger!=null)
{
<LogConsole LogLevel=@((Plc?.Logger??Logger).LogLevel) LogLevelChanged="(a)=>{
<LogConsole LogLevel=@((Plc?.Logger??Logger)?.LogLevel??TouchSocket.Core.LogLevel.Trace) LogLevelChanged="(a)=>{
var log=Plc?.Logger??Logger;
if(log!=null)
log.LogLevel=a;
}" LogPath=@LogPath HeaderText=@HeaderText></LogConsole>
}
</div>
</div>

3
src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs
View File

@@ -32,7 +32,8 @@ public partial class LogConsole : IDisposable
[Parameter, EditorRequired]
public LogLevel LogLevel { get; set; }
[Parameter, EditorRequired]
[Parameter]
public EventCallback<LogLevel> LogLevelChanged { get; set; }
[Parameter]

2
src/FoundationVersion.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>9.0.3.3</Version>
<Version>9.0.3.4</Version>
</PropertyGroup>
<ItemGroup>

5
src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs
View File

@@ -35,11 +35,6 @@ namespace ThingsGateway.Gateway.Application;
/// </summary>
internal sealed class PluginService : IPluginService
{
/// <summary>
/// 主程序上下文驱动父名称
/// </summary>
public const string DefaultKey = nameof(ThingsGateway);
/// <summary>
/// 插件驱动文件夹名称
/// </summary>

2
src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginServiceUtil.cs
View File

@@ -164,7 +164,7 @@ public static class PluginServiceUtil
else
{
// 如果没有找到 '.'，或者 '.' 是最后一个字符，则返回默认的键和插件名称
return (PluginService.DefaultKey, pluginName);
return (nameof(ThingsGateway), pluginName);
}
}

2
src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
View File

@@ -4,7 +4,7 @@
<Import Project="$(SolutionDir)PackNuget.props" />
<ItemGroup>
<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.0" />
<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.1" />
<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.9" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.9" />

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>7.2.3.4</Version>
<Version>7.2.3.5</Version>
</PropertyGroup>
<ItemGroup>