diff --git a/DB/Class1.cs b/DB/Class1.cs
new file mode 100644
index 0000000..53efcfb
--- /dev/null
+++ b/DB/Class1.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DB
+{
+ public class Class1
+ {
+ }
+}
diff --git a/DB/DB.csproj b/DB/DB.csproj
index 5a999a4..3220cf2 100644
--- a/DB/DB.csproj
+++ b/DB/DB.csproj
@@ -1,20 +1,117 @@
-
-
-
- net48
- enable
- disable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Debug
+ AnyCPU
+ {2022D643-6B3A-4612-B664-2FD1D6BF1A8F}
+ Library
+ Properties
+ DB
+ DB
+ v4.8
+ 512
+ true
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ 5.33.0
+
+
+ 5.33.0
+
+
+ 5.33.0
+
+
+ 8.0.0
+
+
+ 1.1.1
+
+
+ 8.0.0
+
+
+ 8.0.0
+
+
+ 8.0.3
+
+
+
+ 4.5.1
+
+
+ 8.0.0
+
+
+
+ 8.0.0
+
+
+ 4.5.5
+
+
+
+ 4.5.0
+
+
+ 6.0.0
+
+
+ 8.0.0
+
+
+ 8.0.0
+
+
+ 8.0.0
+
+
+ 4.5.4
+
+
+ 4.5.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {a49bc7e3-39b7-4f68-8780-fb4da3461aff}
+ Tool
+
+
+
+
\ No newline at end of file
diff --git a/DB/DbCommandInterceptor.cs b/DB/DbCommandInterceptor.cs
index 547e5ef..e214dce 100644
--- a/DB/DbCommandInterceptor.cs
+++ b/DB/DbCommandInterceptor.cs
@@ -1,4 +1,5 @@
-using System.Data;
+using System;
+using System.Data;
using System.Diagnostics;
using System.Text;
using Chloe.Infrastructure.Interception;
diff --git a/DB/DbFactory.cs b/DB/DbFactory.cs
index 7a5dfea..30a66fa 100644
--- a/DB/DbFactory.cs
+++ b/DB/DbFactory.cs
@@ -2,7 +2,9 @@
using Chloe;
using Chloe.PostgreSQL;
using Npgsql;
-using RfidTool;
+
+using Tool;
+
namespace DB
{
diff --git a/DB/Properties/AssemblyInfo.cs b/DB/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f836438
--- /dev/null
+++ b/DB/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("DB")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DB")]
+[assembly: AssemblyCopyright("Copyright © 2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("2022d643-6b3a-4612-b664-2fd1d6bf1a8f")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/RFID电子标签层合裁切设备.sln b/RFID电子标签层合裁切设备.sln
index 97b71ab..9067703 100644
--- a/RFID电子标签层合裁切设备.sln
+++ b/RFID电子标签层合裁切设备.sln
@@ -3,7 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.11.35222.181
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DB", "DB\DB.csproj", "{2022D643-6B3A-4612-B664-2FD1D6BF1A8F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tool", "Tool\Tool.csproj", "{A49BC7E3-39B7-4F68-8780-FB4DA3461AFF}"
+EndProject
Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2022D643-6B3A-4612-B664-2FD1D6BF1A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2022D643-6B3A-4612-B664-2FD1D6BF1A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2022D643-6B3A-4612-B664-2FD1D6BF1A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2022D643-6B3A-4612-B664-2FD1D6BF1A8F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A49BC7E3-39B7-4F68-8780-FB4DA3461AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A49BC7E3-39B7-4F68-8780-FB4DA3461AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A49BC7E3-39B7-4F68-8780-FB4DA3461AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A49BC7E3-39B7-4F68-8780-FB4DA3461AFF}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
diff --git a/RfidTool/Properties/AssemblyInfo.cs b/RfidTool/Properties/AssemblyInfo.cs
deleted file mode 100644
index d133f04..0000000
--- a/RfidTool/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("RfidTool")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RfidTool")]
-[assembly: AssemblyCopyright("Copyright © 2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("89746EE2-B3A7-4F88-989C-2AC91AFDE614")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/RfidTool/RfidSetting.cs b/RfidTool/RfidSetting.cs
deleted file mode 100644
index 2c43dbf..0000000
--- a/RfidTool/RfidSetting.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.ComponentModel;
-using NewLife.Configuration;
-
-namespace RfidTool
-{
- [DisplayName("核心设置")]
- [Config("Core")]
- public class RfidSetting:Config
- {
- public string Db { get; set; } = "server=127.0.0.1;database=postgres;uid=postgres;pwd=yangwei";
- }
-}
\ No newline at end of file
diff --git a/Tool/Class1.cs b/Tool/Class1.cs
new file mode 100644
index 0000000..d342656
--- /dev/null
+++ b/Tool/Class1.cs
@@ -0,0 +1,18 @@
+using NewLife.Configuration;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tool
+{
+ [DisplayName("核心设置")]
+ [Config("Core")]
+ public class RfidSetting : Config
+ {
+ public string Db { get; set; } = "server=127.0.0.1;database=postgres;uid=postgres;pwd=yangwei";
+ }
+}
diff --git a/Tool/Properties/AssemblyInfo.cs b/Tool/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..da767bd
--- /dev/null
+++ b/Tool/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Tool")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Tool")]
+[assembly: AssemblyCopyright("Copyright © 2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("a49bc7e3-39b7-4f68-8780-fb4da3461aff")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/RfidTool/RfidTool.csproj b/Tool/Tool.csproj
similarity index 57%
rename from RfidTool/RfidTool.csproj
rename to Tool/Tool.csproj
index 7585878..4ca5971 100644
--- a/RfidTool/RfidTool.csproj
+++ b/Tool/Tool.csproj
@@ -1,19 +1,19 @@
-
+
Debug
AnyCPU
- {89746EE2-B3A7-4F88-989C-2AC91AFDE614}
+ {A49BC7E3-39B7-4F68-8780-FB4DA3461AFF}
Library
Properties
- RfidTool
- RfidTool
+ Tool
+ Tool
v4.8
512
+ true
- AnyCPU
true
full
false
@@ -23,7 +23,6 @@
4
- AnyCPU
pdbonly
true
bin\Release\
@@ -32,25 +31,36 @@
4
+
+ 12.1.0
+
+
+
+ 10.10.2024.902
+
+
+ 13.0.1
+
+
+
+
+ 4.5.0
+
+
+
+
+
+
+
-
+
-
-
-
-
+
-
\ No newline at end of file