From 5bf64a8becec2c2f7e3cd025dd1b7b029309671a Mon Sep 17 00:00:00 2001
From: Kimdiego2098 <2248356998@qq.com>
Date: Mon, 14 Aug 2023 16:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E6=92=ADtoken;=20=E6=9B=B4=E6=96=B0ad?=
 =?UTF-8?q?min=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Siemens/Helper/SiemensHelper.cs           |  2 +-
 .../ThingsGateway.Mqtt/MqttClient.cs          |  2 +-
 .../ThingsGateway.Web.Core.csproj             | 33 ++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Siemens/Siemens/Helper/SiemensHelper.cs b/framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Siemens/Siemens/Helper/SiemensHelper.cs
index f71aeeb27..aaef5ae1d 100644
--- a/framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Siemens/Siemens/Helper/SiemensHelper.cs
+++ b/framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Siemens/Siemens/Helper/SiemensHelper.cs
@@ -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>();
diff --git a/framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttClient.cs b/framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttClient.cs
index 9af9086bb..ed1b1b536 100644
--- a/framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttClient.cs
+++ b/framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttClient.cs
@@ -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)
diff --git a/framework/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj b/framework/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj
index 8d9774295..85a796c80 100644
--- a/framework/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj
+++ b/framework/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj
@@ -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" />