From 58cf08db34f86846f0e548bc48b694e930c48ea5 Mon Sep 17 00:00:00 2001 From: wenjy Date: Fri, 29 Mar 2024 15:18:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?change=20-=20=E7=94=B5=E8=A1=A8=E9=87=87?= =?UTF-8?q?=E9=9B=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +- .../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.EventBus.AssemblyInfo.cs | 2 +- ...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Extensions.AssemblyInfo.cs | 2 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.FrameWork.AssemblyInfo.cs | 2 +- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 2 +- ....Core.IRepository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IService.AssemblyInfo.cs | 2 +- ...min.Core.IService.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +- ...Admin.Core.RealTimeService.AssemblyInfo.cs | 2 +- ...e.RealTimeService.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Repository.AssemblyInfo.cs | 2 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +- .../DataCollectorFactory.cs | 64 +++++++++++++++---- Aucma.Core.HwPLc/IPlc.cs | 2 + Aucma.Core.HwPLc/Impl/MelsecPlc.cs | 27 +++++++- Aucma.Core.HwPLc/Impl/SiemensPlc.cs | 5 ++ .../HwControlLib.AssemblyInfo.cs | 2 +- .../HwControlLib.AssemblyInfoInputs.cache | 2 +- 32 files changed, 113 insertions(+), 41 deletions(-) diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index a5b05827..2a1ca096 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache index 344bf0d4..f1acefb9 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -d876449b0e8a05ad524d60c64b588e410c53f85521599b7ff943b815ccce8343 +012b5feb0b100630b160bba1ad7e15dc9f608b7fe941c8b2f95acdeff5cfc527 diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index b8f0bc30..a1c6d2cf 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index 96ac78bd..f0ccfe37 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -6be9db650a8d8bff4140d0bbf31c83bd11865db201599fd593f5a315e63ce2bf +ad6df547e11a08c3b107e98014be2fe40f25ffbe2528e2bc9da5ff2d84ecf84a diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index d9aa6bef..91ee9b87 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index ed520ab8..ea1952ce 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -0ee46d7000a959c5af737321e5a6fa9902809161139b4d504e5b9ce11007b118 +e19b6aebe727a5a1ca87143f5459358cca0dd8c38fca590f08beac03455a793e diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index b5d4f7b4..47d0b67f 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index d5bd9535..ea046d70 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -0067d3d82de1193dcddb43c7d3e102921aadf588776d3e1ec96644e223ad55dc +e601dac2316b123489036e6e19406cbe1752d349cfd7ec44ebeaeb35d8fbd8c6 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 37a2fdbd..0c824818 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index 7474b7f3..63f6aa9c 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1 @@ -b9ee2cda1f5bf1572094fc104d8a4ebb8e8bca2323bfccbd0589759456144781 +add35215afdba91ae6d5729ec949c68d36620b4aa4f78635f379d4723bdc1e0b diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 98dcab4a..513df85a 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index 628e768e..3715b7d7 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -d398f3b0eab633951c1c8519654d02bbe6acbd8ccfe1cd726a70d2fe1f12f0a8 +c2c91f24ed08cfc337a8312aacb728e9c70a6bae5e7839e73c4de3b67fa147f6 diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index 5586c51c..8182741c 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index a466be4c..cc939ff6 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1 @@ -99a95143dfe1df5d5d28153c6b714eb0c8be066326c7d297e89d609c9328934b +04fab3d23ecf2eec2dc4b10c2ebe78d422766a7129e575c314cbb623916d6b65 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index e7430eb8..57caaaaa 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index d36e9596..8f53cd74 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -4585e0f8a2b4013148250ceaa63875923bfb14b411030bcd783fc8a6e36fb829 +a7541d823c489a44fbdb0be03d93f5a8a937a2a41658588ed28887708313a241 diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index 6c8f3c91..c643d59c 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index ca00f36c..ede03cb2 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1 +1 @@ -8140cee0110192d338783b7d890859de94d8e7ce570515eb1724f535615ad9db +047a3956c934ff42d64eac8ec8a757198b24f60dc725b38a51a9f1cba68521a9 diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index d4c1aa5d..b17ce03b 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index cb589cc7..f24a11a5 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -97962d578fd64685d0ef3a4a853a70a8c076186aeba8bc5ae941a5bd4a5f80bc +004fe946d46cbbb81e13a900fe5d715dbe7ab6e778d4ff6d448cbaca46f8b231 diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index ceef934c..e255f2ee 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 9f3beb56..4abbd0db 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1 @@ -afc06f10a959a325d63a96d622d3efb448e14ac9b2cbea6611ea5b02ee0c233c +de53cafa263b9828b6828805393c8fbc81f8a366d8c8566b32deb1f40c873002 diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index 228f9312..449e589a 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index 6404ed5c..871cd1a2 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -2abb3a48977f91def2b27b81fa2d16987041c6823d1a2c8d734d8ee095f2989a +f02b0a3c7821ffaa88f331e5e87a990a42ad879c3d2b2379f7e8ece462e5251b diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index 73e9d6d3..ed133d89 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index 10c30bb3..867fff6e 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1 @@ -81197e7a019dbcaf54123c23552597fbc7c696b79a7fcaa2c269210f12d6d871 +806d62ca96994a5fd35346f3b839395e8a97eef74b30bd2e11c1dd9e26085bf8 diff --git a/Aucma.Core.DataCollector/DataCollectorFactory.cs b/Aucma.Core.DataCollector/DataCollectorFactory.cs index d84c68d8..223f0cad 100644 --- a/Aucma.Core.DataCollector/DataCollectorFactory.cs +++ b/Aucma.Core.DataCollector/DataCollectorFactory.cs @@ -3,6 +3,8 @@ using Admin.Core.Model.Model_New; using Aucma.Core.DataCollector.Factory; using Aucma.Core.HwPLc; using log4net; +using NPOI.SS.Formula.Functions; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; @@ -22,7 +24,7 @@ namespace Aucma.Core.DataCollector public readonly IRecordDeviceAlarmInfoServices _deviceAlarmInfoServices; public readonly IRecordDeviceElectricityServices _deviceElectricityServices; - public int AlarmReadTimer = (1000 * 20); + public int AlarmReadTimer = (1000 * 5); public int EleReadTimer = (1000 * 20); public DataCollectorFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) @@ -52,21 +54,31 @@ namespace Aucma.Core.DataCollector /// public void ReadDeviceElectricity(string[] address,IPlc plc,ref Record_DeviceElectricity deviceElectricity) { - var ground = plc.ReadRandomInt16(address); + var ground = plc.ReadRandomInt32(address); if (ground != null) { if (ground.Length >= 10) { - //deviceElectricity.Glys = ground[0]; - deviceElectricity.Va = ground[0]; - deviceElectricity.Vb = ground[1]; - deviceElectricity.Vc = ground[2]; - deviceElectricity.Ia = ground[6]; - deviceElectricity.Ib = ground[7]; - deviceElectricity.Ic = ground[8]; - deviceElectricity.Zxyg = ground[9]; - deviceElectricity.CollectTime = DateTime.Now; - deviceElectricity.RecordTime = DateTime.Now; + var info = ParseAndReverseByteArray(ground, 0, address.Length * 2); + if(info != null) + { + if(info.Length >= 10) + { + //deviceElectricity.Glys = ground[0]; + deviceElectricity.Va = (decimal)info[0]/100; + deviceElectricity.Vb = (decimal)info[1]/100; + deviceElectricity.Vc = (decimal)info[2]/100; + deviceElectricity.Ia = (decimal)info[6]/100; + deviceElectricity.Ib = (decimal)info[7]/100; + deviceElectricity.Ic = (decimal)info[8]/100; + deviceElectricity.Zxyg = (decimal)info[9]/100; + deviceElectricity.CollectType = 0; + deviceElectricity.CollectTime = DateTime.Now; + deviceElectricity.RecordTime = DateTime.Now; + } + } + + } } else @@ -108,5 +120,33 @@ namespace Aucma.Core.DataCollector paramValue = Convert.ToInt32(result); } + + /// + /// 电表数据解析 + /// + /// + /// + /// + /// + /// + private int[] ParseAndReverseByteArray(byte[] data, int startIndex, int length) + { + if (data == null || data.Length < startIndex + length) + { + throw new ArgumentException("Invalid data or startIndex/length parameter."); + } + + int[] resultArray = new int[length / 2]; + for (int i = 0; i < resultArray.Length; i++) + { + byte[] subset = new byte[2]; + Array.Copy(data, startIndex + (i * 2), subset, 0, 2); + Array.Reverse(subset); + string hexString = BitConverter.ToString(subset).Replace("-", ""); + resultArray[i] = Convert.ToInt32(hexString, 16); + } + + return resultArray; + } } } diff --git a/Aucma.Core.HwPLc/IPlc.cs b/Aucma.Core.HwPLc/IPlc.cs index 275b5e65..84addb83 100644 --- a/Aucma.Core.HwPLc/IPlc.cs +++ b/Aucma.Core.HwPLc/IPlc.cs @@ -29,6 +29,8 @@ namespace Aucma.Core.HwPLc public short[] ReadRandomInt16(string[] address); + public byte[] ReadRandomInt32(string[] address); + /// /// 读取byte数据 /// diff --git a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs index e09e4ab6..b2cc7361 100644 --- a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs +++ b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs @@ -653,7 +653,32 @@ namespace Aucma.Core.HwPLc iflag = false; } return iflag; - } + } + + public byte[] ReadRandomInt32(string[] address) + { + try + { + var info = melsecMcNet.ReadRandom(address); + if (info.IsSuccess) + { + IsConnected = true; + + return info.Content; + } + else + { + Console.WriteLine($"读取失败信息：{info.Message}"); + } + } + catch (Exception ex) + { + + Console.WriteLine($"读取失败信息：{ex.Message}"); + } + return null; + } + #endregion } } diff --git a/Aucma.Core.HwPLc/Impl/SiemensPlc.cs b/Aucma.Core.HwPLc/Impl/SiemensPlc.cs index 75951a4c..e73d27eb 100644 --- a/Aucma.Core.HwPLc/Impl/SiemensPlc.cs +++ b/Aucma.Core.HwPLc/Impl/SiemensPlc.cs @@ -570,5 +570,10 @@ namespace Aucma.Core.HwPLc { throw new NotImplementedException(); } + + public byte[] ReadRandomInt32(string[] address) + { + throw new NotImplementedException(); + } } } diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs index e915e44d..24f02c11 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] [assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache index 510378c0..181fd223 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache @@ -1 +1 @@ -884193e333d4b722a3816ea6e579b624e393398a42dd9b3834e4ef7fa5893d77 +c2a5f27f8e68e14e00de73c811ff79920e8c972b62f3f27109ea60e57b5d2193 From fec2d43164270267177e4dcec97de3511429d444 Mon Sep 17 00:00:00 2001 From: wenjy Date: Fri, 29 Mar 2024 15:20:17 +0800 Subject: [PATCH 2/2] Init --- .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.EventBus.AssemblyInfo.cs | 2 +- ...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Extensions.csproj | 8 - .../Admin.Core.Extensions.AssemblyInfo.cs | 2 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.FrameWork.AssemblyInfo.cs | 2 +- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 2 +- ....Core.IRepository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IService.AssemblyInfo.cs | 2 +- ...min.Core.IService.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Repository.AssemblyInfo.cs | 2 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +- Admin.Core.Service/Admin.Core.Service.csproj | 1 - .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +- Admin.Core.Tasks/Admin.Core.Tasks.csproj | 2 - .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +- Admin.Core.sln | 160 +----------------- 26 files changed, 25 insertions(+), 190 deletions(-) diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index a1c6d2cf..564e94b8 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index f0ccfe37..95c5d634 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -ad6df547e11a08c3b107e98014be2fe40f25ffbe2528e2bc9da5ff2d84ecf84a +5f40515da7a6cefe352f565b4c376c2d73625b7dc81032d2ac1915b0083c9fba diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index 91ee9b87..68e80ed4 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index ea1952ce..48defd47 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -e19b6aebe727a5a1ca87143f5459358cca0dd8c38fca590f08beac03455a793e +4129b6c8384b3676ecfefc4127fed82584f7904ca0a53b985e038b1b236cedec diff --git a/Admin.Core.Extensions/Admin.Core.Extensions.csproj b/Admin.Core.Extensions/Admin.Core.Extensions.csproj index c287e908..37d73ea7 100644 --- a/Admin.Core.Extensions/Admin.Core.Extensions.csproj +++ b/Admin.Core.Extensions/Admin.Core.Extensions.csproj @@ -24,15 +24,7 @@ - - - - - - - - diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index 47d0b67f..270aba57 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index ea046d70..aa7c93b3 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -e601dac2316b123489036e6e19406cbe1752d349cfd7ec44ebeaeb35d8fbd8c6 +ee9649ce7482d968c598fd4c51755c6195adb8fa10130c73cc6455c210b72c19 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 0c824818..8261c45a 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index 63f6aa9c..9e0a0db6 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1 @@ -add35215afdba91ae6d5729ec949c68d36620b4aa4f78635f379d4723bdc1e0b +da2724a50cceaf8b6ae8cf719b163a954c27de3b5f287da95e0e60a10d9c1148 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 513df85a..3d3bfedf 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index 3715b7d7..3ef1ca09 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -c2c91f24ed08cfc337a8312aacb728e9c70a6bae5e7839e73c4de3b67fa147f6 +e3fc1c1bea76d04df714f16a004f8c6b0c445de5f218575ab2523d74b203c5be diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index 8182741c..959805e1 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index cc939ff6..7fea12ad 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1 @@ -04fab3d23ecf2eec2dc4b10c2ebe78d422766a7129e575c314cbb623916d6b65 +ca75383e5888e4d6d2af31387c9390a320803a1bfa5caac679f5ac002053d3ed diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 57caaaaa..3ae14bd1 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index 8f53cd74..8a9d684c 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -a7541d823c489a44fbdb0be03d93f5a8a937a2a41658588ed28887708313a241 +4097c0062022674d82ee0856e2cdcf7267e98d4cac0aea05b8e111eca2608e60 diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index b17ce03b..59c44884 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index f24a11a5..1bc86a03 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -004fe946d46cbbb81e13a900fe5d715dbe7ab6e778d4ff6d448cbaca46f8b231 +aa374fe4523f3f465255c6320f370d53d6404c4537f1872f2ec0f6ed2fb58134 diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index e255f2ee..0015bcef 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 4abbd0db..52489bd5 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1 @@ -de53cafa263b9828b6828805393c8fbc81f8a366d8c8566b32deb1f40c873002 +ec623deec8d5b38f223962f36299fa49d1e82dd231238ea93e16407ccff39fc3 diff --git a/Admin.Core.Service/Admin.Core.Service.csproj b/Admin.Core.Service/Admin.Core.Service.csproj index e1379137..20382b99 100644 --- a/Admin.Core.Service/Admin.Core.Service.csproj +++ b/Admin.Core.Service/Admin.Core.Service.csproj @@ -21,7 +21,6 @@ - diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index 449e589a..c23ce7bf 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index 871cd1a2..37d20993 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -f02b0a3c7821ffaa88f331e5e87a990a42ad879c3d2b2379f7e8ece462e5251b +527a67a19fd81d93264b63bde90bf95c5fcfd8db2a48a5bdfbc6d53e511758a4 diff --git a/Admin.Core.Tasks/Admin.Core.Tasks.csproj b/Admin.Core.Tasks/Admin.Core.Tasks.csproj index 4fbcb9c0..6aa0aa79 100644 --- a/Admin.Core.Tasks/Admin.Core.Tasks.csproj +++ b/Admin.Core.Tasks/Admin.Core.Tasks.csproj @@ -12,8 +12,6 @@ - - diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index ed133d89..a8bb69ce 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index 867fff6e..0bbcb8ec 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1 @@ -806d62ca96994a5fd35346f3b839395e8a97eef74b30bd2e11c1dd9e26085bf8 +9347d5f5077767f6c9573d26331f56cfd0129031725c59191fab99fa8d9f24f7 diff --git a/Admin.Core.sln b/Admin.Core.sln index 543878f4..b214ae21 100644 --- a/Admin.Core.sln +++ b/Admin.Core.sln @@ -37,55 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.EventBus", "Admi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.Tasks", "Admin.Core.Tasks\Admin.Core.Tasks.csproj", "{FCCDE486-2047-492A-A81B-E2239768ACB1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Wpf", "1.Wpf", "{BD987F3A-4E6C-4C47-B28F-1671F875EAE3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1", "1", "{BD987F3A-4E6C-4C47-B28F-1671F875EAE3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Console", "5.Console", "{FA2FF2A3-135E-4CA2-9042-76BB71623D5A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5", "5", "{FA2FF2A3-135E-4CA2-9042-76BB71623D5A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.RealTimeService", "Admin.Core.RealTimeService\Admin.Core.RealTimeService.csproj", "{73F3C0A3-D255-4A8A-9510-F3F556E28BCA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.SheetMetal", "Aucma.Core.SheetMetal\Aucma.Core.SheetMetal.csproj", "{AD2C008F-7D9F-43EB-9B44-F15A46F05583}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.Palletiz", "Aucma.Core.Palletiz\Aucma.Core.Palletiz.csproj", "{B7FE7F2F-D01C-421F-A7F6-23971AF9530C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.DoorFoam", "Aucma.Core.DoorFoam\Aucma.Core.DoorFoam.csproj", "{EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.BoxFoam", "Aucma.Core.BoxFoam\Aucma.Core.BoxFoam.csproj", "{563882EC-C110-4BCB-B913-3B62124BF680}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.Scanner", "Aucma.Core.Scanner\Aucma.Core.Scanner.csproj", "{5CF85AD7-DBC9-4466-952B-6742F37E417D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6.Other", "6.Other", "{F8FB57F6-5465-4E60-B052-D3A63C3C56AE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PLc", "Aucma.Core.PLc\Aucma.Core.PLc.csproj", "{9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.RunPlc", "Aucma.Core.RunPlc\Aucma.Core.RunPlc.csproj", "{680718C5-E39C-442F-AC9E-4A56E15AF261}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.ScannerGun", "Aucma.Core.ScannerGun\Aucma.Core.ScannerGun.csproj", "{61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.CodeBinding", "Aucma.Core.CodeBinding\Aucma.Core.CodeBinding.csproj", "{5515C937-1E2E-4111-8775-EE6898E5933A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.ProductOffLine", "Aucma.Core.ProductOffLine\Aucma.Core.ProductOffLine.csproj", "{C70810CE-041A-4880-99B3-FFCC8B672B42}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucam.Core.PerfusionService", "Aucam.Core.PerfusionService\Aucam.Core.PerfusionService.csproj", "{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.Tasks", "Aucma.Core.Tasks\Aucma.Core.Tasks.csproj", "{A7FF5119-A6DE-4947-A1F2-90FE0C628A88}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.OldBoxFoam", "Aucma.Core.OldBoxFoam\Aucma.Core.OldBoxFoam.csproj", "{A9E66830-A801-4423-BBC6-8F03BA5EB5BF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.HwPLc", "Aucma.Core.HwPLc\Aucma.Core.HwPLc.csproj", "{A1473270-1D54-40D5-9E68-5C917347CFE8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucam.Core.TemperatureService", "Aucam.Core.TemperatureService\Aucam.Core.TemperatureService.csproj", "{87B08C88-4258-4D57-B9E5-EC6C7F3899BC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PrintTo", "Aucma.Core.PrintTo\Aucma.Core.PrintTo.csproj", "{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.SheetMetalTasks", "Aucma.Core.SheetMetalTasks\Aucma.Core.SheetMetalTasks.csproj", "{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.TemperatureTask", "Aucma.Core.TemperatureTask\Aucma.Core.TemperatureTask.csproj", "{F427E68F-100D-4136-8761-F2C9CB0E7940}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PerfusionTask", "Aucma.Core.PerfusionTask\Aucma.Core.PerfusionTask.csproj", "{9762EE52-F073-4CF6-AAAE-7FCDC894C967}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.Socket", "Admin.Core.Socket\Admin.Core.Socket.csproj", "{DBF7F128-0643-43BE-AD1A-370866962BD0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.DataCollector", "Aucma.Core.DataCollector\Aucma.Core.DataCollector.csproj", "{C9356C95-115C-47BF-A70E-AE830A7D2DB2}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6", "6", "{F8FB57F6-5465-4E60-B052-D3A63C3C56AE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -137,94 +93,6 @@ Global {FCCDE486-2047-492A-A81B-E2239768ACB1}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCCDE486-2047-492A-A81B-E2239768ACB1}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCCDE486-2047-492A-A81B-E2239768ACB1}.Release|Any CPU.Build.0 = Release|Any CPU - {73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Release|Any CPU.Build.0 = Release|Any CPU - {AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Release|Any CPU.Build.0 = Release|Any CPU - {B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Release|Any CPU.Build.0 = Release|Any CPU - {EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Release|Any CPU.Build.0 = Release|Any CPU - {563882EC-C110-4BCB-B913-3B62124BF680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {563882EC-C110-4BCB-B913-3B62124BF680}.Debug|Any CPU.Build.0 = Debug|Any CPU - {563882EC-C110-4BCB-B913-3B62124BF680}.Release|Any CPU.ActiveCfg = Release|Any CPU - {563882EC-C110-4BCB-B913-3B62124BF680}.Release|Any CPU.Build.0 = Release|Any CPU - {5CF85AD7-DBC9-4466-952B-6742F37E417D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CF85AD7-DBC9-4466-952B-6742F37E417D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CF85AD7-DBC9-4466-952B-6742F37E417D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CF85AD7-DBC9-4466-952B-6742F37E417D}.Release|Any CPU.Build.0 = Release|Any CPU - {9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Release|Any CPU.Build.0 = Release|Any CPU - {680718C5-E39C-442F-AC9E-4A56E15AF261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {680718C5-E39C-442F-AC9E-4A56E15AF261}.Debug|Any CPU.Build.0 = Debug|Any CPU - {680718C5-E39C-442F-AC9E-4A56E15AF261}.Release|Any CPU.ActiveCfg = Release|Any CPU - {680718C5-E39C-442F-AC9E-4A56E15AF261}.Release|Any CPU.Build.0 = Release|Any CPU - {61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Release|Any CPU.Build.0 = Release|Any CPU - {5515C937-1E2E-4111-8775-EE6898E5933A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5515C937-1E2E-4111-8775-EE6898E5933A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5515C937-1E2E-4111-8775-EE6898E5933A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5515C937-1E2E-4111-8775-EE6898E5933A}.Release|Any CPU.Build.0 = Release|Any CPU - {C70810CE-041A-4880-99B3-FFCC8B672B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C70810CE-041A-4880-99B3-FFCC8B672B42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C70810CE-041A-4880-99B3-FFCC8B672B42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C70810CE-041A-4880-99B3-FFCC8B672B42}.Release|Any CPU.Build.0 = Release|Any CPU - {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Release|Any CPU.Build.0 = Release|Any CPU - {A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Release|Any CPU.Build.0 = Release|Any CPU - {A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Release|Any CPU.Build.0 = Release|Any CPU - {A1473270-1D54-40D5-9E68-5C917347CFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1473270-1D54-40D5-9E68-5C917347CFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1473270-1D54-40D5-9E68-5C917347CFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1473270-1D54-40D5-9E68-5C917347CFE8}.Release|Any CPU.Build.0 = Release|Any CPU - {87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Release|Any CPU.Build.0 = Release|Any CPU - {AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Release|Any CPU.Build.0 = Release|Any CPU - {F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Release|Any CPU.Build.0 = Release|Any CPU - {F427E68F-100D-4136-8761-F2C9CB0E7940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F427E68F-100D-4136-8761-F2C9CB0E7940}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F427E68F-100D-4136-8761-F2C9CB0E7940}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F427E68F-100D-4136-8761-F2C9CB0E7940}.Release|Any CPU.Build.0 = Release|Any CPU - {9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Release|Any CPU.Build.0 = Release|Any CPU - {DBF7F128-0643-43BE-AD1A-370866962BD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBF7F128-0643-43BE-AD1A-370866962BD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBF7F128-0643-43BE-AD1A-370866962BD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBF7F128-0643-43BE-AD1A-370866962BD0}.Release|Any CPU.Build.0 = Release|Any CPU - {C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -244,28 +112,6 @@ Global {7D547E98-0DB5-4A2F-8A8F-9C8F62E82EE3} = {CB159E16-8DA0-4125-B42F-BB5381AEDD4D} {F8302B3D-3C01-402B-A76F-84AFB22FB5D9} = {CB159E16-8DA0-4125-B42F-BB5381AEDD4D} {FCCDE486-2047-492A-A81B-E2239768ACB1} = {CB159E16-8DA0-4125-B42F-BB5381AEDD4D} - {73F3C0A3-D255-4A8A-9510-F3F556E28BCA} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A} - {AD2C008F-7D9F-43EB-9B44-F15A46F05583} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {B7FE7F2F-D01C-421F-A7F6-23971AF9530C} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {EC1A6A43-1B6B-42AF-B00E-94DF4DF42111} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {563882EC-C110-4BCB-B913-3B62124BF680} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {5CF85AD7-DBC9-4466-952B-6742F37E417D} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {9EE12F11-F9E4-46DD-935D-F6EDD495A6FC} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {680718C5-E39C-442F-AC9E-4A56E15AF261} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {5515C937-1E2E-4111-8775-EE6898E5933A} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {C70810CE-041A-4880-99B3-FFCC8B672B42} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {BFABE9E5-C71D-42FE-94AE-934B9F74B3D0} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A} - {A7FF5119-A6DE-4947-A1F2-90FE0C628A88} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {A9E66830-A801-4423-BBC6-8F03BA5EB5BF} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {A1473270-1D54-40D5-9E68-5C917347CFE8} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {87B08C88-4258-4D57-B9E5-EC6C7F3899BC} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A} - {AC2B98A8-09CF-42A5-93B5-DF74185B8D3A} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} - {F78F41F3-8B38-4CA1-A254-C18CCDCA8291} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {F427E68F-100D-4136-8761-F2C9CB0E7940} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {9762EE52-F073-4CF6-AAAE-7FCDC894C967} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {DBF7F128-0643-43BE-AD1A-370866962BD0} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} - {C9356C95-115C-47BF-A70E-AE830A7D2DB2} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8047AB56-042B-4AE4-B06A-34137067A86A}