1

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
+	  <PackageReference Include="YSAI.Core" Version="1.0.0.4" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
 		<PackageReference Include="Microsoft.ClearScript" Version="7.4.3" />
 		<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />

src/YSAI.DAQ/YSAI.Core/interface/only/IManage.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

@@ -1,11 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
 	</ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -8,8 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
+		  <PackageReference Include="YSAI.Core" Version="1.0.0.4" />
   </ItemGroup>
 
-
 </Project>

src/YSAI.DAQ/YSAI.Manage/Controllers/DaqOperateController.cs

@@ -11,7 +11,6 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class DaqOperateController : Controller
     {
         /// <summary>

src/YSAI.DAQ/YSAI.Manage/Controllers/FileOperateController.cs

@@ -10,7 +10,6 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class FileOperateController : Controller
     {
         /// <summary>

src/YSAI.DAQ/YSAI.Manage/Controllers/InfoOperateController.cs

@@ -12,7 +12,6 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class InfoOperateController : Controller
     {
         /// <summary>

src/YSAI.DAQ/YSAI.Manage/Controllers/RelayOperateController.cs

@@ -9,7 +9,6 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class RelayOperateController : Controller
     {
         /// <summary>

src/YSAI.DAQ/YSAI.Manage/YSAI.Manage.csproj

@@ -1,11 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
@@ -100,7 +99,6 @@
 
   <ItemGroup>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\YSAI.DaqManage\YSAI.DaqManage.csproj" />

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Kafka.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "c7ba6456-dde5-4fc1-90a1-f8e0a418f422",
+    "SN": "1e0d789d-ec26-48af-a772-219c31788cf3",
     "BootstrapServers": null,
     "WaitTime": 1000,
     "SecurityProtocol": "Plaintext",

src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "2cf31d9f-d7c4-4ad6-a9af-5089e8dc1963",
+    "SN": "2a943d02-ff08-427b-a2f2-c31125ad140d",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -9,8 +9,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.2.1.781" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.2.1.781" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
+	  <PackageReference Include="YSAI.Core" Version="1.0.0.4" />
   </ItemGroup>
 
-
 </Project>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -19,13 +19,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
-  <ItemGroup>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
+	<ItemGroup>
+		<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.371.96" />
   </ItemGroup>
 
-
   <ItemGroup>
     <Folder Include="da\lib\" />
     <Folder Include="Properties\" />

src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientOperate.cs

@@ -828,14 +828,15 @@ namespace YSAI.Opc.ua.client
                                 subscription.AddItem(monitoredItem);   //添加订阅通知项
                                 monitoredItem.Notification += delegate (MonitoredItem monitoredItem, MonitoredItemNotificationEventArgs e) { OnMonitoredItemNotification(monitoredItem, e, item); };  //重写事件添加一个参数
                             }
+                            //把此订阅添加到集合，方便后续移除订阅(当存在此键则更新值，不存在则添加)
+                            allSubscriptions?.AddOrUpdate(Tag, subscription, (k, v) => subscription);
                             //添加订阅
                             clientSession?.AddSubscription(allSubscriptions[Tag]);
                             //在服务器端创建订阅
                             allSubscriptions[Tag].Create();
                             // 在服务器端创建监控项
                             allSubscriptions[Tag].ApplyChanges();
-                            //把此订阅添加到集合，方便后续移除订阅(当存在此键则更新值，不存在则添加)
-                            allSubscriptions?.AddOrUpdate(Tag, subscription, (k, v) => subscription);
+                            
                         }
                         return Break("AddSubscribe", true);
                     }

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -8,8 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.4" />
+	  <PackageReference Include="YSAI.Core" Version="1.0.0.4" />
   </ItemGroup>
 
-
 </Project>

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -5,8 +5,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  <ItemGroup>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="YSAI.Core" Version="1.0.0.4" />
+	</ItemGroup>
 	
 </Project>

src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.2.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.4" />
+		  <PackageReference Include="YSAI.Core" Version="1.0.0.4" />
   </ItemGroup>
 
   <ItemGroup>