diff --git a/Common/Common.csproj b/Common/Common.csproj
index 18357c4..941439a 100644
--- a/Common/Common.csproj
+++ b/Common/Common.csproj
@@ -8,11 +8,15 @@
+
+
-
+
+ lib\HybirdFrameworkCore.dll
+
diff --git a/Common/lib/HybirdFrameworkCore.dll b/Common/lib/HybirdFrameworkCore.dll
new file mode 100644
index 0000000..b3f2f85
Binary files /dev/null and b/Common/lib/HybirdFrameworkCore.dll differ
diff --git a/Common/lib/HybirdFrameworkDriver.dll b/Common/lib/HybirdFrameworkDriver.dll
new file mode 100644
index 0000000..66c5b7a
Binary files /dev/null and b/Common/lib/HybirdFrameworkDriver.dll differ
diff --git a/ConsoleStarter/ConsoleStarter.csproj b/ConsoleStarter/ConsoleStarter.csproj
index 71c312e..2a57280 100644
--- a/ConsoleStarter/ConsoleStarter.csproj
+++ b/ConsoleStarter/ConsoleStarter.csproj
@@ -8,17 +8,24 @@
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+ ..\Common\lib\HybirdFrameworkCore.dll
+
+
+ ..\Common\lib\HybirdFrameworkDriver.dll
+
diff --git a/Entity/Entity.csproj b/Entity/Entity.csproj
index 7263985..873abf9 100644
--- a/Entity/Entity.csproj
+++ b/Entity/Entity.csproj
@@ -29,11 +29,16 @@
-
+
+
+ ..\Common\lib\HybirdFrameworkCore.dll
+
+
+
diff --git a/Repository/Repository.csproj b/Repository/Repository.csproj
index 11d9b11..21979fd 100644
--- a/Repository/Repository.csproj
+++ b/Repository/Repository.csproj
@@ -7,17 +7,22 @@
-
+
-
-
+
+
+
+ ..\Common\lib\HybirdFrameworkCore.dll
+
+
+
diff --git a/Service/Init/Entity/PlcInfo.cs b/Service/Init/Entity/PlcInfo.cs
index 74e3ebe..32b8e20 100644
--- a/Service/Init/Entity/PlcInfo.cs
+++ b/Service/Init/Entity/PlcInfo.cs
@@ -1,10 +1,5 @@
-using DotNetty.Codecs.Mqtt.Packets;
-using HybirdFrameworkDriver.ModbusTcpMaster;
+using HybirdFrameworkDriver.ModbusTcpMaster;
using HybirdFrameworkDriver.Session;
-using Newtonsoft.Json.Linq;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
-using Pipelines.Sockets.Unofficial.Arenas;
-using System.Net.NetworkInformation;
using Service.Plc.Msg;
namespace Service.Init.Entity
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 2f92105..4496171 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -7,12 +7,16 @@
+
+
+
+
@@ -26,6 +30,7 @@
+
@@ -33,10 +38,17 @@
-
-
+
+
+ ..\Common\lib\HybirdFrameworkCore.dll
+
+
+ ..\Common\lib\HybirdFrameworkDriver.dll
+
+
+
diff --git a/WebStarter/HybirdFrameworkCore.xml b/WebStarter/HybirdFrameworkCore.xml
new file mode 100644
index 0000000..0bd87ad
--- /dev/null
+++ b/WebStarter/HybirdFrameworkCore.xml
@@ -0,0 +1,413 @@
+
+
+
+ HybirdFrameworkCore
+
+
+
+
+ 常量特性
+
+
+
+
+ 验证值类型不能0
+
+
+
+
+
+
+
+
+
+ 缩放
+ 舍入方式，用于处理浮点数的精度问题
+ 偏移量
+
+
+
+ 向容器注入bean，默认单例模式
+
+
+
+
+
+ 配置文件格式化
+
+
+
+
+ 获取数据库连接字符串
+
+
+
+
+ 获取数据库类型
+
+
+
+
+ 自动更新开关
+
+
+
+
+ 版本号
+
+
+
+
+ 更新服务器地址
+
+
+
+
+ 获取Appsettings配置信息
+
+
+
+
+ 封装要操作的字符
+ AppSettingsHelper.GetContent(new string[] { "JwtConfig", "SecretKey" });
+
+ 节点配置
+
+
+
+
+
+
+
+
+
+
+
+ 大小端常量，c#默认小端 DCBA
+
+
+
+
+ 字节序,C# 默认BA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 字序 c# 默认DC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序列化
+
+
+
+
+ 当前页标
+
+
+
+
+ 每页大小
+
+
+
+
+ 返回数据
+
+
+
+
+ 当前页标
+
+
+
+
+ 页码
+
+
+
+
+ 页数
+
+
+
+
+ 通用返回信息类
+
+
+
+
+ 状态码
+
+
+
+
+ 操作是否成功
+
+
+
+
+ 返回信息
+
+
+
+
+ 返回数据集合
+
+
+
+
+ 返回成功
+
+ 消息
+
+
+
+
+ 返回成功
+
+ 数据
+ 消息
+
+
+
+
+ 返回失败
+
+ 消息
+
+
+
+
+ 返回失败
+
+ 消息
+ 数据
+
+
+
+
+ 返回消息
+
+ 失败/成功
+ 消息
+ 数据
+
+
+
+
+ 返回消息
+
+ 失败/成功
+ 消息
+ 数据
+
+
+
+
+
+ 连接字符串
+ 实例名称
+ 默认数据库
+
+
+
+ 获取ConnectionMultiplexer
+
+
+
+
+
+ 获取数据库
+
+
+ 默认为0：优先代码的db配置，其次config中的配置
+
+
+
+
+ 获取数据库
+
+
+ 默认为0：优先代码的db配置，其次config中的配置
+
+
+
+
+ 获取Redis中的值（同步版本）
+
+ 键
+ 对应的值，如果键不存在则返回null
+
+
+
+ 先进先出队列
+
+
+
+
+
+
+
+ 获取Redis中的值（异步版本）
+
+ 键
+ 一个表示异步操作的任务，任务的结果是对应的值，如果键不存在则返回null
+
+
+
+ 设置Redis中的值（同步版本）
+
+ 键
+ 值
+ 值
+ 操作是否成功
+
+
+
+ 设置Redis中的值（异步版本）
+
+ 键
+ 值
+ 一个表示异步操作的任务
+
+
+
+
+
+
+
+
+
+
+ 设置一个 Redis LIST
+
+
+
+
+
+
+
+ 原始字节数组
+ 字段类型：bool byte等
+ 当前字段第一个bit所处开始位置
+ bit的数量
+ 精度
+ 保留几位小数
+ 位偏移
+ 对float和double 默认无符号
+
+
+
+
+
+ 按字节序反序
+
+
+
+
+
+
+ 按字序反序
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 字节数组转16进制字符串：空格分隔
+
+
+
+
+
+
+ 00 00 01000000
+ 00000000 01010000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebStarter/WebStarter.csproj b/WebStarter/WebStarter.csproj
index 6826f80..1330ba7 100644
--- a/WebStarter/WebStarter.csproj
+++ b/WebStarter/WebStarter.csproj
@@ -14,16 +14,23 @@
bin\Release\WebStarter.xml
+
+
+
+
+
+
+
+
+
-
-
@@ -38,4 +45,19 @@
+
+
+ ..\Common\lib\HybirdFrameworkCore.dll
+
+
+ ..\Common\lib\HybirdFrameworkDriver.dll
+
+
+
+
+
+ Always
+
+
+
diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll
index 3a12ec4..335bb77 100644
Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll and b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll differ
diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll
index 081abea..bdad45f 100644
Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll and b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll differ
diff --git a/WebStarter/bin/Debug/net6.0/System.Text.Json.dll b/WebStarter/bin/Debug/net6.0/System.Text.Json.dll
index 2078226..53d08cb 100644
Binary files a/WebStarter/bin/Debug/net6.0/System.Text.Json.dll and b/WebStarter/bin/Debug/net6.0/System.Text.Json.dll differ
diff --git a/WebStarter/obj/WebStarter.csproj.nuget.g.targets b/WebStarter/obj/WebStarter.csproj.nuget.g.targets
index 0ebaa83..b4c8382 100644
--- a/WebStarter/obj/WebStarter.csproj.nuget.g.targets
+++ b/WebStarter/obj/WebStarter.csproj.nuget.g.targets
@@ -1,7 +1,7 @@
-
+
diff --git a/WinFormStarter/WinFormStarter.csproj b/WinFormStarter/WinFormStarter.csproj
index 9d65814..2e56686 100644
--- a/WinFormStarter/WinFormStarter.csproj
+++ b/WinFormStarter/WinFormStarter.csproj
@@ -9,17 +9,24 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+ ..\Common\lib\HybirdFrameworkCore.dll
+
+
+ ..\Common\lib\HybirdFrameworkDriver.dll
+
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.Abstractions.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.Abstractions.dll
deleted file mode 100644
index 3a12ec4..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.Abstractions.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.FileExtensions.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.FileExtensions.dll
deleted file mode 100644
index 9db3318..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.FileExtensions.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.Json.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.Json.dll
deleted file mode 100644
index c97254c..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.Json.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.dll
deleted file mode 100644
index 8baf931..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Configuration.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileProviders.Abstractions.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileProviders.Abstractions.dll
deleted file mode 100644
index 897af44..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileProviders.Abstractions.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileProviders.Physical.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileProviders.Physical.dll
deleted file mode 100644
index 449d845..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileProviders.Physical.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileSystemGlobbing.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileSystemGlobbing.dll
deleted file mode 100644
index 3881e49..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.FileSystemGlobbing.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Primitives.dll b/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Primitives.dll
deleted file mode 100644
index 081abea..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/Microsoft.Extensions.Primitives.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/System.Text.Encodings.Web.dll b/WinFormStarter/bin/Debug/net6.0-windows/System.Text.Encodings.Web.dll
deleted file mode 100644
index 13a219a..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/System.Text.Encodings.Web.dll and /dev/null differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/System.Text.Json.dll b/WinFormStarter/bin/Debug/net6.0-windows/System.Text.Json.dll
index 2078226..061fc7a 100644
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/System.Text.Json.dll and b/WinFormStarter/bin/Debug/net6.0-windows/System.Text.Json.dll differ
diff --git a/WinFormStarter/bin/Debug/net6.0-windows/runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll b/WinFormStarter/bin/Debug/net6.0-windows/runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll
deleted file mode 100644
index de065f6..0000000
Binary files a/WinFormStarter/bin/Debug/net6.0-windows/runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll and /dev/null differ
diff --git a/WinFormStarter/obj/WinFormStarter.csproj.nuget.g.targets b/WinFormStarter/obj/WinFormStarter.csproj.nuget.g.targets
index de65237..f770533 100644
--- a/WinFormStarter/obj/WinFormStarter.csproj.nuget.g.targets
+++ b/WinFormStarter/obj/WinFormStarter.csproj.nuget.g.targets
@@ -1,7 +1,7 @@
-
+
diff --git a/WpfStarter/WpfStarter.csproj b/WpfStarter/WpfStarter.csproj
index acf2725..23b9fde 100644
--- a/WpfStarter/WpfStarter.csproj
+++ b/WpfStarter/WpfStarter.csproj
@@ -8,11 +8,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -25,11 +25,18 @@
-
-
-
-
-
+
+
+
+
+
+
+
+ ..\Common\lib\HybirdFrameworkCore.dll
+
+
+ ..\Common\lib\HybirdFrameworkDriver.dll
+
diff --git a/hnBackMain.sln b/hnBackMain.sln
index fec533b..bbb40ef 100644
--- a/hnBackMain.sln
+++ b/hnBackMain.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.9.34701.34
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStarter", "WebStarter\WebStarter.csproj", "{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkCore", "HybirdFrameworkCore\HybirdFrameworkCore.csproj", "{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository", "Repository\Repository.csproj", "{01D2CC15-F1FD-4E22-845A-2D2473662860}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Service", "Service\Service.csproj", "{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC}"
@@ -15,19 +13,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormStarter", "WinFormSt
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entity", "Entity\Entity.csproj", "{C2380814-15D4-491D-ADF2-ADC68617C3FA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkDriver", "HybirdFrameworkDriver\HybirdFrameworkDriver.csproj", "{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleStarter", "ConsoleStarter\ConsoleStarter.csproj", "{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starter", "Starter", "{E0B949DC-17FE-414D-8898-937A317BB853}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfStarter", "WpfStarter\WpfStarter.csproj", "{17044C11-3794-4938-BA80-C061BD871AE0}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Business", "Business", "{C9515084-B676-4C33-9FE7-E0B860493A4F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{7FC3F04C-9B90-471B-9D43-2AA723DF44CB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "Common\Common.csproj", "{7FC3F04C-9B90-471B-9D43-2AA723DF44CB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,10 +33,6 @@ Global
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Release|Any CPU.Build.0 = Release|Any CPU
- {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Release|Any CPU.Build.0 = Release|Any CPU
{01D2CC15-F1FD-4E22-845A-2D2473662860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01D2CC15-F1FD-4E22-845A-2D2473662860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01D2CC15-F1FD-4E22-845A-2D2473662860}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -59,10 +49,6 @@ Global
{C2380814-15D4-491D-ADF2-ADC68617C3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2380814-15D4-491D-ADF2-ADC68617C3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2380814-15D4-491D-ADF2-ADC68617C3FA}.Release|Any CPU.Build.0 = Release|Any CPU
- {6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Release|Any CPU.Build.0 = Release|Any CPU
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -81,12 +67,10 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33} = {E0B949DC-17FE-414D-8898-937A317BB853}
- {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
{01D2CC15-F1FD-4E22-845A-2D2473662860} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
{A6757DAD-EF5A-41FD-9323-F3FCF05ED777} = {E0B949DC-17FE-414D-8898-937A317BB853}
{C2380814-15D4-491D-ADF2-ADC68617C3FA} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
- {6ACFA707-E72E-4BA1-8262-9F2E5B758D46} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8} = {E0B949DC-17FE-414D-8898-937A317BB853}
{17044C11-3794-4938-BA80-C061BD871AE0} = {E0B949DC-17FE-414D-8898-937A317BB853}
{7FC3F04C-9B90-471B-9D43-2AA723DF44CB} = {C9515084-B676-4C33-9FE7-E0B860493A4F}