Ver Fonte

CANLIB位置移植

Shun há 2 anos atrás
pai
commit
c5a877fba4
100 ficheiros alterados com 23 adições e 19141 exclusões
  1. 1 1
      src/YSAI.DAQ/YSAI.Can.Pack/YSAI.Can.Pack.csproj
  2. 6 7
      src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj
  3. 1 1
      src/YSAI.DAQ/YSAI.DB.Pack/YSAI.DB.Pack.csproj
  4. 1 1
      src/YSAI.DAQ/YSAI.Kafka.Pack/YSAI.Kafka.Pack.csproj
  5. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.CanLib.dll
  6. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.CanLib.xml
  7. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvaDbLib.dll
  8. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvaDbLib.xml
  9. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvlcLib.dll
  10. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvlcLib.xml
  11. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvmLib.dll
  12. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvmLib.xml
  13. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvrLib.dll
  14. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvrLib.xml
  15. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.LinLib.dll
  16. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.LinLib.xml
  17. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.MemoLibXML.dll
  18. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.MemoLibXML.xml
  19. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser_DriversSetup.exe
  20. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Microsoft.AspNetCore.Http.Features.dll
  21. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Microsoft.Extensions.Primitives.dll
  22. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.pdb
  23. 0 2389
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.xml
  24. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.AspNetCore.Http.Features.dll
  25. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.Extensions.Primitives.dll
  26. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.pdb
  27. 0 2389
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.xml
  28. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/Microsoft.AspNetCore.Http.Features.dll
  29. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/Microsoft.Extensions.Primitives.dll
  30. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.pdb
  31. 0 2389
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.xml
  32. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/Microsoft.AspNetCore.Http.Features.dll
  33. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/Microsoft.Extensions.Primitives.dll
  34. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.pdb
  35. 0 2389
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.xml
  36. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.pdb
  37. 0 2389
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.xml
  38. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.pdb
  39. 0 2389
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.xml
  40. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/Microsoft.AspNetCore.Http.Features.dll
  41. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/Microsoft.Extensions.Primitives.dll
  42. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.pdb
  43. 0 2389
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.xml
  44. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/Microsoft.AspNetCore.Http.Features.dll
  45. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/Microsoft.Extensions.Primitives.dll
  46. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.pdb
  47. 0 2394
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.xml
  48. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.Param.json
  49. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.Param.json
  50. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Kafka.Param.json
  51. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.Param.json
  52. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Mqtt.Param.json
  53. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.Param.json
  54. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.Param.json
  55. 2 2
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.Param.json
  56. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json
  57. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.Param.json
  58. 1 1
      src/YSAI.DAQ/YSAI.Modbus.Pack/YSAI.Modbus.Pack.csproj
  59. 1 1
      src/YSAI.DAQ/YSAI.Mqtt.Pack/YSAI.Mqtt.Pack.csproj
  60. 1 1
      src/YSAI.DAQ/YSAI.Opc.Pack/YSAI.Opc.Pack.csproj
  61. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.Core.dll
  62. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.V8.ICUData.dll
  63. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.V8.dll
  64. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.Windows.Core.dll
  65. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.Windows.dll
  66. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Kvaser.CanLib.dll
  67. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Kvaser.CanLib.xml
  68. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Microsoft.IdentityModel.Abstractions.dll
  69. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Microsoft.IdentityModel.Logging.dll
  70. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Microsoft.IdentityModel.Tokens.dll
  71. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Newtonsoft.Json.dll
  72. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Pipelines.Sockets.Unofficial.dll
  73. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Serilog.Sinks.Console.dll
  74. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Serilog.Sinks.File.dll
  75. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Serilog.dll
  76. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/StackExchange.Redis.dll
  77. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/System.IO.Pipelines.dll
  78. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/System.IO.Ports.dll
  79. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Can.dll
  80. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Can.pdb
  81. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Can.xml
  82. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Core.dll
  83. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Log.dll
  84. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Unility.dll
  85. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/BouncyCastle.Crypto.dll
  86. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.Core.dll
  87. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.V8.ICUData.dll
  88. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.V8.dll
  89. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.Windows.Core.dll
  90. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.Windows.dll
  91. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Dapper.dll
  92. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/EntityFramework.SqlServer.dll
  93. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/EntityFramework.dll
  94. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Google.Protobuf.dll
  95. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/K4os.Compression.LZ4.Streams.dll
  96. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/K4os.Compression.LZ4.dll
  97. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/K4os.Hash.xxHash.dll
  98. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Microsoft.IdentityModel.Abstractions.dll
  99. 0 0
      src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Microsoft.IdentityModel.Logging.dll
  100. 0 0
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.IdentityModel.Tokens.dll

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
src/YSAI.DAQ/YSAI.Can.Pack/YSAI.Can.Pack.csproj


+ 6 - 7
src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -5,26 +5,25 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.15</Version>
+	  <Version>1.0.0.16</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
 	  <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
-
   <ItemGroup>
-    <Reference Include="Kvaser.CanLib">
-      <HintPath>lib\Kvaser.CanLib.dll</HintPath>
-    </Reference>
+    <Folder Include="Properties\" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.36" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.36" />
+    <Reference Include="Kvaser.CanLib">
+      <HintPath>..\YSAI.Lib\YSAI.Can.Lib\Kvaser.CanLib.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
   <!--<ItemGroup>

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
src/YSAI.DAQ/YSAI.DB.Pack/YSAI.DB.Pack.csproj


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
src/YSAI.DAQ/YSAI.Kafka.Pack/YSAI.Kafka.Pack.csproj


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.CanLib.dll → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.CanLib.dll


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.CanLib.xml → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.CanLib.xml


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvaDbLib.dll → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvaDbLib.dll


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvaDbLib.xml → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvaDbLib.xml


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvlcLib.dll → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvlcLib.dll


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvlcLib.xml → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvlcLib.xml


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvmLib.dll → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvmLib.dll


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvmLib.xml → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvmLib.xml


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvrLib.dll → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvrLib.dll


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.KvrLib.xml → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.KvrLib.xml


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.LinLib.dll → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.LinLib.dll


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.LinLib.xml → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.LinLib.xml


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.MemoLibXML.dll → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.MemoLibXML.dll


src/YSAI.DAQ/YSAI.Can/lib/Kvaser.MemoLibXML.xml → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser.MemoLibXML.xml


src/YSAI.DAQ/YSAI.Can/lib/Kvaser_DriversSetup.exe → src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Lib/Kvaser_DriversSetup.exe


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


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


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2389
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.xml


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.AspNetCore.Http.Features.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.Extensions.Primitives.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2389
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.xml


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/Microsoft.AspNetCore.Http.Features.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/Microsoft.Extensions.Primitives.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2389
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.xml


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/Microsoft.AspNetCore.Http.Features.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/Microsoft.Extensions.Primitives.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2389
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.xml


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2389
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.xml


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2389
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.xml


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/Microsoft.AspNetCore.Http.Features.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/Microsoft.Extensions.Primitives.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2389
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.xml


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/Microsoft.AspNetCore.Http.Features.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/Microsoft.Extensions.Primitives.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.pdb


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 2394
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.xml


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

@@ -1,5 +1,5 @@
 {
-    "SN": "0e65bed3-bfd7-4d53-a74a-90e783a41f1e",
+    "SN": "4244cd68-2aa4-47c8-9b09-119af170a1b2",
     "BaudRate": 0,
     "CanChannel": 0,
     "HandleInterval": 1000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "a066d944-b192-44d2-a3d4-9b9c776102c5",
+    "SN": "c0d975f5-c997-4e99-923c-529c6fcfa8f7",
     "ConnectStr": null,
     "DBType": "SqlServer",
     "HandleInterval": 1000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "b41447b7-c9c5-410e-bbb0-32651924347e",
+    "SN": "bc3259ea-c813-4534-bb2a-6e6ddfa70e66",
     "BootstrapServers": null,
     "WaitTime": 1000,
     "SecurityProtocol": "Plaintext",

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

@@ -1,5 +1,5 @@
 {
-    "SN": "0279052e-dc23-45a0-825a-a70fbaa5f442",
+    "SN": "53765113-491b-432e-bf34-fac21340bd1a",
     "SlaveAddress": 1,
     "ProtocolType": "Tcp",
     "ReadTimeOut": 2000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "aac3ad3a-fe0d-474b-babe-a5e187d9a5c2",
+    "SN": "f7c6ad56-0b67-4be5-85f7-ea09e4f1dd52",
     "Ip": null,
     "Port": 0,
     "UserName": null,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "0571e5e0-4a0e-464c-97d4-c10e3fd42477",
+    "SN": "0377ea88-cc48-419f-afc4-28b7a9e41ebf",
     "SName": "Knight.OPC.Server.Demo",
     "ApiVerType": "COM_DA_30",
     "UpdateRate": 100,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "d9f0b403-67e7-4d5d-8399-47c3c32541b3",
+    "SN": "4397ff31-31a4-48a4-974b-5127b38c3ee1",
     "Ip": "127.0.0.1",
     "Port": 6688,
     "Key": null,

+ 2 - 2
src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.Param.json

@@ -1,11 +1,11 @@
 {
-    "SN": "2eede438-09ea-4cc5-ad6a-5a3d6b36adb7",
+    "SN": "a516b3eb-c123-448b-8c5c-14c8a0c37ae6",
     "UserName": null,
     "Password": null,
     "Cer": null,
     "SecreKey": null,
     "ServerUrl": null,
-    "CustomName": "8772D551E5464D76B1A3B1A77D3CB362",
+    "CustomName": "368A083AB4E24BE992D2EFB6ECDCA1EE",
     "Timeout": 5000,
     "SamplingInterval": 1000,
     "PublishingInterval": 1000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "468d8fde-31bd-4a9c-8fd3-0463c2f9905e",
+    "SN": "0e6ded56-255f-46f2-b3bf-0b78c70da594",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "a9394b43-17d0-466a-b9da-6b12a41c8eea",
+    "SN": "b5c2a574-28fa-4d03-8901-c9496d8a897b",
     "Ip": null,
     "Port": 0,
     "S7CpuType": "S7200",

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
src/YSAI.DAQ/YSAI.Modbus.Pack/YSAI.Modbus.Pack.csproj


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
src/YSAI.DAQ/YSAI.Mqtt.Pack/YSAI.Mqtt.Pack.csproj


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
src/YSAI.DAQ/YSAI.Opc.Pack/YSAI.Opc.Pack.csproj


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/ClearScript.Core.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.Core.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/ClearScript.V8.ICUData.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.V8.ICUData.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/ClearScript.V8.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.V8.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/ClearScript.Windows.Core.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.Windows.Core.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/ClearScript.Windows.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/ClearScript.Windows.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Kvaser.CanLib.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Kvaser.CanLib.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Kvaser.CanLib.xml → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Kvaser.CanLib.xml


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Abstractions.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Microsoft.IdentityModel.Abstractions.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Logging.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Microsoft.IdentityModel.Logging.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Microsoft.IdentityModel.Tokens.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Microsoft.IdentityModel.Tokens.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Newtonsoft.Json.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Newtonsoft.Json.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Pipelines.Sockets.Unofficial.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Pipelines.Sockets.Unofficial.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Serilog.Sinks.Console.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Serilog.Sinks.Console.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Serilog.Sinks.File.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Serilog.Sinks.File.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/Serilog.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/Serilog.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/StackExchange.Redis.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/StackExchange.Redis.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/System.IO.Pipelines.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/System.IO.Pipelines.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/System.IO.Ports.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/System.IO.Ports.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Can.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.pdb → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Can.pdb


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.xml → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Can.xml


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Core.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Log.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Log.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Unility.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.Can.Pack/YSAI.Unility.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/BouncyCastle.Crypto.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/BouncyCastle.Crypto.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/ClearScript.Core.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.Core.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/ClearScript.V8.ICUData.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.V8.ICUData.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/ClearScript.V8.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.V8.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/ClearScript.Windows.Core.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.Windows.Core.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/ClearScript.Windows.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/ClearScript.Windows.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Dapper.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Dapper.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/EntityFramework.SqlServer.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/EntityFramework.SqlServer.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/EntityFramework.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/EntityFramework.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Google.Protobuf.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Google.Protobuf.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/K4os.Compression.LZ4.Streams.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/K4os.Compression.LZ4.Streams.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/K4os.Compression.LZ4.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/K4os.Compression.LZ4.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/K4os.Hash.xxHash.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/K4os.Hash.xxHash.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.IdentityModel.Abstractions.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Microsoft.IdentityModel.Abstractions.dll


src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.IdentityModel.Logging.dll → src/YSAI.DAQ/YSAI.Pack/YSAI.DB.Pack/Microsoft.IdentityModel.Logging.dll


+ 0 - 0
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/Microsoft.IdentityModel.Tokens.dll


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff