Shun 2 rokov pred
rodič
commit
9d9aaa82dc
28 zmenil súbory, kde vykonal 55 pridanie a 3583 odobranie
  1. BIN
      YSAI.Lib/YSAI.Can.Pack/ClearScript.Core.dll
  2. BIN
      YSAI.Lib/YSAI.Can.Pack/ClearScript.V8.ICUData.dll
  3. BIN
      YSAI.Lib/YSAI.Can.Pack/ClearScript.V8.dll
  4. BIN
      YSAI.Lib/YSAI.Can.Pack/ClearScript.Windows.Core.dll
  5. BIN
      YSAI.Lib/YSAI.Can.Pack/ClearScript.Windows.dll
  6. BIN
      YSAI.Lib/YSAI.Can.Pack/Kvaser.CanLib.dll
  7. 0 3564
      YSAI.Lib/YSAI.Can.Pack/Kvaser.CanLib.xml
  8. BIN
      YSAI.Lib/YSAI.Can.Pack/Microsoft.AspNetCore.Http.Features.dll
  9. BIN
      YSAI.Lib/YSAI.Can.Pack/Microsoft.Extensions.Primitives.dll
  10. BIN
      YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Abstractions.dll
  11. BIN
      YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Logging.dll
  12. BIN
      YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Tokens.dll
  13. BIN
      YSAI.Lib/YSAI.Can.Pack/Newtonsoft.Json.dll
  14. BIN
      YSAI.Lib/YSAI.Can.Pack/Pipelines.Sockets.Unofficial.dll
  15. BIN
      YSAI.Lib/YSAI.Can.Pack/StackExchange.Redis.dll
  16. BIN
      YSAI.Lib/YSAI.Can.Pack/System.IO.Pipelines.dll
  17. BIN
      YSAI.Lib/YSAI.Can.Pack/System.IO.Ports.dll
  18. BIN
      YSAI.Lib/YSAI.Can.Pack/YSAI.Can.Pack.dll
  19. BIN
      YSAI.Lib/YSAI.Can.Pack/YSAI.Can.Pack.pdb
  20. BIN
      YSAI.Lib/YSAI.Can.Pack/YSAI.Can.dll
  21. BIN
      YSAI.Lib/YSAI.Can.Pack/YSAI.Can.pdb
  22. BIN
      YSAI.Lib/YSAI.Can.Pack/YSAI.Core.dll
  23. BIN
      YSAI.Lib/YSAI.Can.Pack/YSAI.Log.dll
  24. BIN
      YSAI.Lib/YSAI.Can.Pack/YSAI.Unility.dll
  25. 1 0
      src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj
  26. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json
  27. 13 0
      src/YSAI.DAQ/YSAI.RabbitMQ/Properties/PublishProfiles/FolderProfile.pubxml
  28. 40 18
      src/YSAI.DAQ/YSAI.Test.Console/Program.cs

BIN
YSAI.Lib/YSAI.Can.Pack/ClearScript.Core.dll


BIN
YSAI.Lib/YSAI.Can.Pack/ClearScript.V8.ICUData.dll


BIN
YSAI.Lib/YSAI.Can.Pack/ClearScript.V8.dll


BIN
YSAI.Lib/YSAI.Can.Pack/ClearScript.Windows.Core.dll


BIN
YSAI.Lib/YSAI.Can.Pack/ClearScript.Windows.dll


BIN
YSAI.Lib/YSAI.Can.Pack/Kvaser.CanLib.dll


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 3564
YSAI.Lib/YSAI.Can.Pack/Kvaser.CanLib.xml


BIN
YSAI.Lib/YSAI.Can.Pack/Microsoft.AspNetCore.Http.Features.dll


BIN
YSAI.Lib/YSAI.Can.Pack/Microsoft.Extensions.Primitives.dll


BIN
YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Abstractions.dll


BIN
YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Logging.dll


BIN
YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Tokens.dll


BIN
YSAI.Lib/YSAI.Can.Pack/Newtonsoft.Json.dll


BIN
YSAI.Lib/YSAI.Can.Pack/Pipelines.Sockets.Unofficial.dll


BIN
YSAI.Lib/YSAI.Can.Pack/StackExchange.Redis.dll


BIN
YSAI.Lib/YSAI.Can.Pack/System.IO.Pipelines.dll


BIN
YSAI.Lib/YSAI.Can.Pack/System.IO.Ports.dll


BIN
YSAI.Lib/YSAI.Can.Pack/YSAI.Can.Pack.dll


BIN
YSAI.Lib/YSAI.Can.Pack/YSAI.Can.Pack.pdb


BIN
YSAI.Lib/YSAI.Can.Pack/YSAI.Can.dll


BIN
YSAI.Lib/YSAI.Can.Pack/YSAI.Can.pdb


BIN
YSAI.Lib/YSAI.Can.Pack/YSAI.Core.dll


BIN
YSAI.Lib/YSAI.Can.Pack/YSAI.Log.dll


BIN
YSAI.Lib/YSAI.Can.Pack/YSAI.Unility.dll


+ 1 - 0
src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -20,6 +20,7 @@
 		<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" />
+		<PackageReference Include="System.Memory" Version="4.5.5" />
 		<PackageReference Include="YSAI.Log" Version="1.0.0.4" />
 		<PackageReference Include="YSAI.Unility" Version="1.0.0.4" />
 	</ItemGroup>

+ 1 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "2a943d02-ff08-427b-a2f2-c31125ad140d",
+    "SN": "f676e415-5e04-4d66-9cd2-9cf3d8a0217b",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

+ 13 - 0
src/YSAI.DAQ/YSAI.RabbitMQ/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>

+ 40 - 18
src/YSAI.DAQ/YSAI.Test.Console/Program.cs

@@ -7,37 +7,59 @@ using YSAI.DaqManage;
 using YSAI.Mqtt.client;
 using YSAI.Mqtt.service.websocket;
 using YSAI.Opc.ua.client;
+using YSAI.RabbitMQ;
 using YSAI.RelayManage;
 using YSAI.Unility;
 
 
-OpcUaClientData.Basics opcUaClientData1 = new OpcUaClientData.Basics() 
+RabbitMQData.Basics s= new RabbitMQData.Basics()
 {
-    Name="ys",
-    Password= "ys123456",
-    ServerUrl= "opc.tcp://192.168.2.200:49310/Opc.Ua.Service",
-    SN="OPCUA1",
-    UserName="ysai"
+    ExChangeName = "test",
+    HostName = "192.168.2.200",
+    Password = "ys123456",
+    UserName = "ys",
+    Port = 5672,
+    SN = "RMQ1"
 };
 
-OpcUaClientOperate opcUaClientOperate = OpcUaClientOperate.Instance(opcUaClientData1);
+FileTool.StringToFile("RMQ1.json", s.ToJson().JsonFormatting());
+RabbitMQOperate rabbitMQOperate =new RabbitMQOperate(s) ;
 
-OperateResult operateResult = opcUaClientOperate.On();
+
+
+OperateResult operateResult = await rabbitMQOperate.OnAsync();
+
+operateResult = rabbitMQOperate.Produce("a","666");
 
 Console.WriteLine();
 
-OpcUaClientData.Basics opcUaClientData2 = new OpcUaClientData.Basics()
-{
-    Name = "ysai",
-    Password = "ysai",
-    ServerUrl = "opc.tcp://192.168.2.200:49310/Opc.Ua.Service",
-    SN = "OPCUA2",
-    UserName = "ysai"
-};
+//OpcUaClientData.Basics opcUaClientData1 = new OpcUaClientData.Basics() 
+//{
+//    Name="ys",
+//    Password= "ys123456",
+//    ServerUrl= "opc.tcp://192.168.2.200:49310/Opc.Ua.Service",
+//    SN="OPCUA1",
+//    UserName="ysai"
+//};
+
+//OpcUaClientOperate opcUaClientOperate = OpcUaClientOperate.Instance(opcUaClientData1);
+
+//OperateResult operateResult = opcUaClientOperate.On();
+
+//Console.WriteLine();
+
+//OpcUaClientData.Basics opcUaClientData2 = new OpcUaClientData.Basics()
+//{
+//    Name = "ysai",
+//    Password = "ysai",
+//    ServerUrl = "opc.tcp://192.168.2.200:49310/Opc.Ua.Service",
+//    SN = "OPCUA2",
+//    UserName = "ysai"
+//};
 
-opcUaClientOperate = OpcUaClientOperate.Instance(opcUaClientData2);
+//opcUaClientOperate = OpcUaClientOperate.Instance(opcUaClientData2);
 
-operateResult = opcUaClientOperate.On();
+//operateResult = opcUaClientOperate.On();
 
 
 //FileTool.StringToFile("config/YSAI.Opc.ua.client.OpcUaClientReadController.OPCUA1.Daq.Config.json", opcUaClientData.ToJson().JsonFormatting());