diff --git a/App.config b/App.config
index 86f9c76..06c17f3 100644
--- a/App.config
+++ b/App.config
@@ -37,6 +37,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Login.xaml.cs b/Login.xaml.cs
index dfbeb2f..9fa6fde 100644
--- a/Login.xaml.cs
+++ b/Login.xaml.cs
@@ -42,6 +42,8 @@ namespace formula_manage
private void Button_Click(object sender, RoutedEventArgs e) //退出按钮事件
{
UserClass.LogGing.LogGingDATA("FORMULA_LogStop");
+ Window window = Window.GetWindow(this);
+ window.Close();
}
private void Button_Click_1(object sender, RoutedEventArgs e) //登录按钮事件
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 3eee09e..dfc52af 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -255,13 +255,13 @@ namespace formula_manage
if (result == MessageBoxResult.Cancel) //判断是否确认
{
e.Cancel = true; // 中断点击事件
+ return;
}
}
// UserClass.LogGing.LogGingDATA(Log_time + "HttpSERVER_STOP");
// UserClass.HttpSERVER.Stop(); //停止网络通信
UserClass.LogGing.LogGingDATA("FORMULA_STOP");
-
}
private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e) //回车跳转功能
{
diff --git a/formula_manage.csproj b/formula_manage.csproj
index 2028b82..2f41cdc 100644
--- a/formula_manage.csproj
+++ b/formula_manage.csproj
@@ -1,6 +1,6 @@
-
+
@@ -125,47 +125,47 @@
packages\CommunityToolkit.Mvvm.8.2.2\lib\netstandard2.0\CommunityToolkit.Mvvm.dll
-
- packages\DotNetty.Buffers.0.6.0\lib\net45\DotNetty.Buffers.dll
+
+ packages\DotNetty.Buffers.0.7.6\lib\net472\DotNetty.Buffers.dll
-
- packages\DotNetty.Codecs.0.6.0\lib\net45\DotNetty.Codecs.dll
+
+ packages\DotNetty.Codecs.0.7.6\lib\net472\DotNetty.Codecs.dll
-
- packages\DotNetty.Codecs.Http.0.6.0\lib\net45\DotNetty.Codecs.Http.dll
+
+ packages\DotNetty.Codecs.Http.0.7.6\lib\net472\DotNetty.Codecs.Http.dll
-
- packages\DotNetty.Common.0.6.0\lib\net45\DotNetty.Common.dll
+
+ packages\DotNetty.Common.0.7.6\lib\net472\DotNetty.Common.dll
-
- packages\DotNetty.Handlers.0.6.0\lib\net45\DotNetty.Handlers.dll
+
+ packages\DotNetty.Handlers.0.7.6\lib\net472\DotNetty.Handlers.dll
-
- packages\DotNetty.Transport.0.6.0\lib\net45\DotNetty.Transport.dll
+
+ packages\DotNetty.Transport.0.7.6\lib\net472\DotNetty.Transport.dll
packages\DotNettySocket.1.2.0\lib\net45\DotNettySocket.dll
-
- packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.dll
+
+ packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.dll
-
- packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Bars.dll
+
+ packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.Bars.dll
-
- packages\FastReport.Compat.2024.2.2\lib\net462\FastReport.Compat.dll
+
+ packages\FastReport.Compat.2024.2.11\lib\net462\FastReport.Compat.dll
-
- packages\FastReport.DataVisualization.2024.2.2\lib\net462\FastReport.DataVisualization.dll
+
+ packages\FastReport.DataVisualization.2024.2.11\lib\net462\FastReport.DataVisualization.dll
-
- packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Editor.dll
+
+ packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.Editor.dll
-
- packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.VSDesign.dll
+
+ packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.VSDesign.dll
-
- packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Web.dll
+
+ packages\FastReport.Net.Demo.2024.2.11\lib\net462\FastReport.Web.dll
packages\ModernUI.WPF.1.0.9\lib\net45\FirstFloor.ModernUI.dll
@@ -179,20 +179,29 @@
packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
-
- packages\log4net.2.0.3\lib\net40-full\log4net.dll
+
+ packages\log4net.2.0.17\lib\net45\log4net.dll
-
- packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
+ packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
-
- packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+ packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll
-
- packages\Microsoft.Extensions.Logging.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.dll
+
+ packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
- packages\Microsoft.Extensions.Logging.Abstractions.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll
+
+ packages\Microsoft.Extensions.Logging.8.0.0\lib\net462\Microsoft.Extensions.Logging.dll
+
+
+ packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+
+
+ packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll
+
+
+ packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll
packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll
@@ -232,8 +241,8 @@
packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
-
- packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll
+
+ packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll
packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll
@@ -241,15 +250,15 @@
-
- packages\System.Console.4.3.0\lib\net46\System.Console.dll
+
+ packages\System.Console.4.3.1\lib\net46\System.Console.dll
True
True
-
- packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+ packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll
packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll
@@ -302,8 +311,8 @@
packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
-
- packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll
+
+ packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll
True
True
@@ -322,16 +331,16 @@
True
True
-
- packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll
+
+ packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll
True
True
packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
-
- packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll
+
+ packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll
True
True
@@ -347,7 +356,7 @@
- packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll
+ packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll
True
True
@@ -361,20 +370,24 @@
True
True
-
- packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
+
+ packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll
True
True
- packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll
+ packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll
True
True
packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
+ packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
+
packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll
@@ -388,7 +401,7 @@
4.0
- packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll
+ packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll
True
True
@@ -699,8 +712,10 @@
这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
+
+
+
\ No newline at end of file
diff --git a/packages.config b/packages.config
index 682c4b3..cd4da6c 100644
--- a/packages.config
+++ b/packages.config
@@ -3,29 +3,32 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -35,13 +38,13 @@
-
+
-
+
-
+
@@ -54,8 +57,8 @@
-
-
+
+
@@ -63,25 +66,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
+
\ No newline at end of file