GithubStar/ThingsGateway
1
0
Fork 0
mirror of https://github.com/ThingsGateway/ThingsGateway.git synced 2026-10-29 04:16:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

传播token;

Browse Source 
更新admin解决方案
This commit is contained in:
Kimdiego2098
2023-08-14 16:43:30 +08:00
parent 89f9c537f8
commit 5bf64a8bec
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Siemens/Siemens/Helper/SiemensHelper.cs
+1 -1
View File
@@ -301,7 +301,7 @@ internal partial class SiemensHelper
{
return new OperResult<string>("在PLC中不是字符串类型");
}
var result2 = await plc.ReadAsync(address, 2 + result1.Content[1]);
var result2 = await plc.ReadAsync(address, 2 + result1.Content[1], token);
if (!result2.IsSuccess)
{
return result2.Copy<string>();
framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttClient.cs
+1 -1
View File
@@ -311,7 +311,7 @@ public class MqttClient : UpLoadBase
{
var mqttFactory = new MqttFactory(new PrivateLogger(LogMessage));
_mqttClientOptions = mqttFactory.CreateClientOptionsBuilder()
.WithClientId(driverPropertys.ConnectId)
.WithClientId(driverPropertys.ConnectId)
.WithCredentials(driverPropertys.UserName, driverPropertys.Password)//账密
.WithTcpServer(driverPropertys.IP, driverPropertys.Port)//服务器
.WithCleanSession(true)
framework/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj
+18 -15
View File
@@ -5,26 +5,29 @@
</PropertyGroup>
<ItemGroup>
<Content Include="Configuration\App.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configuration\Database.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configuration\JWT.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configuration\Swagger.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configuration\App.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configuration\Database.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configuration\JWT.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Configuration\Swagger.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<!--Admin-->
<ProjectReference Include="..\ThingsGateway.Admin.ApiController\ThingsGateway.Admin.ApiController.csproj" />
<ProjectReference Include="..\ThingsGateway.Admin.Blazor\ThingsGateway.Admin.Blazor.csproj" />
<ProjectReference Include="..\ThingsGateway.Admin.ApiController\ThingsGateway.Admin.ApiController.csproj" />
<ProjectReference Include="..\ThingsGateway.Admin.Blazor\ThingsGateway.Admin.Blazor.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway'">
<!--采集网关-->
<ProjectReference Include="..\ThingsGateway.ApiController\ThingsGateway.ApiController.csproj" />
<ProjectReference Include="..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" />