diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
index c557cb68..52e1524f 100644
--- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
+++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
@@ -920,10 +920,6 @@
"target": "Package",
"version": "[7.0.0, )"
},
- "TouchSocket": {
- "target": "Package",
- "version": "[1.3.0, )"
- },
"log4net": {
"target": "Package",
"version": "[2.0.12, )"
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 648896e7..4502d975 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+5cf54f161bb434f34e3453817192aca063d32ff4")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5fd8d1f8b2501c03c4fa9320596fc659eaaa2dde")]
[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 396a6d8a..70495f50 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 @@
-a22ffb70c3624b5184910c59b4042df90f3f75c5bfafb020bbaec9208ed377f5
+81b078e6e2876990cacfafd5d1ff5a8e9baa5949f2b8b9d2054c830ec74bd3e0
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache
index ebf9ef90..fe080fce 100644
Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache differ
diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json
index a0a3bd0a..c1acff9f 100644
--- a/Admin.Core.Api/obj/project.assets.json
+++ b/Admin.Core.Api/obj/project.assets.json
@@ -3990,19 +3990,6 @@
"lib/netstandard1.3/System.Xml.XmlDocument.dll": {}
}
},
- "TouchSocket/1.3.0": {
- "type": "package",
- "compile": {
- "lib/netcoreapp3.1/TouchSocket.dll": {
- "related": ".xml"
- }
- },
- "runtime": {
- "lib/netcoreapp3.1/TouchSocket.dll": {
- "related": ".xml"
- }
- }
- },
"UAParser/3.1.47": {
"type": "package",
"compile": {
@@ -4196,7 +4183,6 @@
"Admin.Core.Common": "1.0.0",
"Admin.Core.IService": "1.0.0",
"System.Speech": "7.0.0",
- "TouchSocket": "1.3.0",
"log4net": "2.0.12"
},
"compile": {
@@ -11266,27 +11252,6 @@
"system.xml.xmldocument.nuspec"
]
},
- "TouchSocket/1.3.0": {
- "sha512": "z6sJfYv/l5pT3pwCpEZ7KsmQbd7dqiJemQ1DSr8t0lqVZEssTYWnxHjAd5GhxelLy/EdsyF2i17lICASbswGSw==",
- "type": "package",
- "path": "touchsocket/1.3.0",
- "files": [
- ".nupkg.metadata",
- ".signature.p7s",
- "LICENSE.txt",
- "lib/net45/TouchSocket.dll",
- "lib/net45/TouchSocket.xml",
- "lib/net7.0/TouchSocket.dll",
- "lib/net7.0/TouchSocket.xml",
- "lib/netcoreapp3.1/TouchSocket.dll",
- "lib/netcoreapp3.1/TouchSocket.xml",
- "lib/netstandard2.0/TouchSocket.dll",
- "lib/netstandard2.0/TouchSocket.xml",
- "logo.png",
- "touchsocket.1.3.0.nupkg.sha512",
- "touchsocket.nuspec"
- ]
- },
"UAParser/3.1.47": {
"sha512": "I68Jl/Vs5RQZdz9BbmYtnXgujg0jVd61LhKbyNZOCm9lBxZFGxLbiQo6yFj21VYi7DzPvEvrVOmeC6v41AoLfw==",
"type": "package",
diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache
index da93f22a..d96c7cf0 100644
--- a/Admin.Core.Api/obj/project.nuget.cache
+++ b/Admin.Core.Api/obj/project.nuget.cache
@@ -1,6 +1,6 @@
{
"version": 2,
- "dgSpecHash": "8OEVqYq9LP4/Zquk0QAXy85fFYCYMQevZ2NPgY3pXW4kBIKAFgqDq35KYBm/tY06lfK7FWxaLf3xs7SH99Ti7w==",
+ "dgSpecHash": "J5jaKkkBa1hP+fG2B4Llawxq5LtxoWmKqZxt4rRTQDhaSrtHiudJwHWpHoQG3GlWnoQ4wbGr8/SmLP0AFmG69A==",
"success": true,
"projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"expectedPackageFiles": [
@@ -228,7 +228,6 @@
"C:\\Users\\admin\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
- "C:\\Users\\admin\\.nuget\\packages\\touchsocket\\1.3.0\\touchsocket.1.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512"
],
"logs": []
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 f68aad1b..a733e3a2 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+5cf54f161bb434f34e3453817192aca063d32ff4")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5fd8d1f8b2501c03c4fa9320596fc659eaaa2dde")]
[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 5da9a6c9..ee348b18 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 @@
-43cce3e1729b66c69101c338ad89d905087f628183d713ef8cde43dac540c86d
+c1489c8e2d683ed88a44aad3559baa3dc29d0ab5b907f19f35127b10964ec232
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 62c960e9..1db4abc9 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+1c24e3b71af58170904fd584601e6d11096091b8")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5fd8d1f8b2501c03c4fa9320596fc659eaaa2dde")]
[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 05816f8f..6467cfb0 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 @@
-147a4f923b8161c7419e523c19ebd4b4c4acf34f3fee21885153282fe995d97e
+f3bcd3e1c56a179b4d9ded4f9d800938626c0a87b667a7ef363f04e06afcdb1d
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 53ca4a3a..e3b30ed0 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+5cf54f161bb434f34e3453817192aca063d32ff4")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5fd8d1f8b2501c03c4fa9320596fc659eaaa2dde")]
[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 7f6e789f..895274ce 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 @@
-0c9df6ce96f987f9ac1850b6dbf48d6fff639b1781b36f0e83c50bd5c619490e
+6ea8e195212a6ab3a8dd7607fce0ff0c770020ea581293c9fbe3e835937e907f
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 21cc9c80..fa88d25a 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+5cf54f161bb434f34e3453817192aca063d32ff4")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5fd8d1f8b2501c03c4fa9320596fc659eaaa2dde")]
[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 b0d7cc55..f694528b 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 @@
-ca2b1ef2c2f23ccc2401f80970a5253e0ed301b5e159b0b614e1a8dc233b10c3
+f72ca47d88bd0d04a42fef216d9931efca278759c436d7a1a13d273b0ac1aac3
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 8a58716f..5052aacc 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+bbafaee8fe732961eae6546590b0f4d57ea4a80a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5fd8d1f8b2501c03c4fa9320596fc659eaaa2dde")]
[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 fa348ee0..a510f82a 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 @@
-b01301148dd261d777cc6215850c3de411dbc5ed92b5077685a3e1bd7cacdd0f
+aa70184927f849cc97fd8b5979ed0e6cb3e662cf0e3541545dfac471f14fe639
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 66164cf4..79a89cc5 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+5cf54f161bb434f34e3453817192aca063d32ff4")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5fd8d1f8b2501c03c4fa9320596fc659eaaa2dde")]
[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 18233b0a..79d6602e 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 @@
-90d5c4b7ecc3b4b31fb9f49079ec52849371bc289f6b26664a0dd9019427843f
+a7667efe80dcb19d70c9510918800b19893e6d71d5ac415d75c5bd0b13f6a467
diff --git a/Admin.Core.Socket/Admin.Core.Socket.csproj b/Admin.Core.Socket/Admin.Core.Socket.csproj
index 0363fb82..297335fd 100644
--- a/Admin.Core.Socket/Admin.Core.Socket.csproj
+++ b/Admin.Core.Socket/Admin.Core.Socket.csproj
@@ -9,7 +9,6 @@
-
@@ -21,4 +20,10 @@
+
+
+ ..\dll\TouchSocket.dll
+
+
+
diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
index 91725cac..62fb1c86 100644
--- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
@@ -30,8 +30,6 @@ namespace Aucma.Core.BoxFoam.ViewModels
MonitorPageView monitorPage = new MonitorPageView();//任务监控
FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView();
-
-
public MainWindowViewModel()
{
UserContent = firstPage;
diff --git a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
index d8a4d3e3..f4debab3 100644
--- a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
@@ -17,6 +17,7 @@ using System.Collections.ObjectModel;
using System.Collections;
using Admin.Core.Socket;
using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
+using Admin.Core.Common;
namespace Aucma.Core.DoorFoam.ViewModels
{
@@ -35,7 +36,8 @@ namespace Aucma.Core.DoorFoam.ViewModels
{
UserContent = firstPage;
TouchSocketService.RefreshStateEvent += RefreshScanner;
- RefreshScanner("10.10.92.130", false);
+ string address = Appsettings.app("Middleware", "TouchSocket", "Address").ObjToString();
+ RefreshScanner(address, false);
init();
diff --git a/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs
index 8fd43116..d91240c3 100644
--- a/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs
@@ -47,7 +47,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
_printBarCodeServices = App.ServiceProvider.GetService();
_materialCompletionServices = App.ServiceProvider.GetService();
- TouchSocketService.DoorReceiveCodeDelegateEvent += OnLoadPlanData;
+ TouchSocketService.ReceiveCodeDelegateEvent += OnLoadPlanData;
Task.Run(async () =>
{
diff --git a/dll/TouchSocket.dll b/dll/TouchSocket.dll
new file mode 100644
index 00000000..929b66d6
Binary files /dev/null and b/dll/TouchSocket.dll differ