diff --git a/.idea/.idea.SlnMesnac/.idea/.gitignore b/.idea/.idea.SlnMesnac/.idea/.gitignore
new file mode 100644
index 0000000..b18145b
--- /dev/null
+++ b/.idea/.idea.SlnMesnac/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/.idea.SlnMesnac.iml
+/modules.xml
+/projectSettingsUpdater.xml
+/contentModel.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/.idea.SlnMesnac/.idea/encodings.xml b/.idea/.idea.SlnMesnac/.idea/encodings.xml
new file mode 100644
index 0000000..df87cf9
--- /dev/null
+++ b/.idea/.idea.SlnMesnac/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.idea.SlnMesnac/.idea/indexLayout.xml b/.idea/.idea.SlnMesnac/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/.idea/.idea.SlnMesnac/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.idea.SlnMesnac/.idea/vcs.xml b/.idea/.idea.SlnMesnac/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/.idea.SlnMesnac/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SlnMesnac.WPF/App.xaml b/SlnMesnac.WPF/App.xaml
deleted file mode 100644
index 48f0a12..0000000
--- a/SlnMesnac.WPF/App.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/SlnMesnac.WPF/App.xaml.cs b/SlnMesnac.WPF/App.xaml.cs
deleted file mode 100644
index 78c0506..0000000
--- a/SlnMesnac.WPF/App.xaml.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Lierda.WPFHelper;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Serilog;
-using SlnMesnac.Config;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace SlnMesnac.WPF
-{
- ///
- /// Interaction logic for App.xaml
- ///
- public partial class App : Application
- {
- private System.Threading.Mutex mutex;
- private LierdaCracker cracker = new LierdaCracker();
- public static IServiceProvider ServiceProvider;
-
- // Startup事件
- protected override async void OnStartup(StartupEventArgs e)
- {
- bool ret;
- mutex = new System.Threading.Mutex(true, System.Diagnostics.Process.GetCurrentProcess().ProcessName, out ret);
- if (!ret)
- {
- MessageBox.Show("应用程序已开启，禁止重复运行");
- Environment.Exit(0);
- }
-
- cracker.Cracker(100); //设置GC回收间隔
-
- base.OnStartup(e);
- var host = CreateHostBuilder(e.Args).Build();//生成宿主。
-
- ServiceProvider = host.Services;
- await host.StartAsync();
-
- var appConfig = host.Services.GetService();
- var logPath = $"{appConfig.logPath}/Logs/{DateTime.UtcNow:yyyy-MM-dd}/";
- Log.Information($"系统初始化完成,日志存放路径：{appConfig.logPath}");
-
-
- }
-
- ///
- /// CreateHostBuilder
- ///
- ///
- ///
- public static IHostBuilder CreateHostBuilder(string[] args) =>
- Host.CreateDefaultBuilder(args)
- .UseSerilog()
- .ConfigureWebHostDefaults(webBuilder =>
- {
- webBuilder.UseStartup();
- });
-
- // Exit事件
- protected override void OnExit(ExitEventArgs e)
- {
- base.OnExit(e);
-
- Log.Information($"系统退出，当前时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
- // 释放资源
- // ...
- }
-
-
- }
-}
diff --git a/SlnMesnac.WPF/AssemblyInfo.cs b/SlnMesnac.WPF/AssemblyInfo.cs
deleted file mode 100644
index 8b5504e..0000000
--- a/SlnMesnac.WPF/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(
- ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
- //(used if a resource is not found in the page,
- // or application resource dictionaries)
- ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
- //(used if a resource is not found in the page,
- // app, or any theme specific resource dictionaries)
-)]
diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml
deleted file mode 100644
index 6c6a0a4..0000000
--- a/SlnMesnac.WPF/MainWindow.xaml
+++ /dev/null
@@ -1,267 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SlnMesnac.WPF/MainWindow.xaml.cs b/SlnMesnac.WPF/MainWindow.xaml.cs
deleted file mode 100644
index 2139374..0000000
--- a/SlnMesnac.WPF/MainWindow.xaml.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using SlnMesnac.WPF.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace SlnMesnac.WPF
-{
- ///
- /// Interaction logic for MainWindow.xaml
- ///
- public partial class MainWindow : Window
- {
- public MainWindow()
- {
- InitializeComponent();
-
- this.DataContext = new MainWindowViewModel();
- }
- }
-}
diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
deleted file mode 100644
index 79a3beb..0000000
--- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- Exe
- net6.0-windows
- enable
- true
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SlnMesnac.WPF/Startup.cs b/SlnMesnac.WPF/Startup.cs
deleted file mode 100644
index 82f4adc..0000000
--- a/SlnMesnac.WPF/Startup.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using SlnMesnac.Config;
-using SlnMesnac.Common;
-using SlnMesnac.Quartz;
-using SlnMesnac.Repository;
-using SlnMesnac.Plc;
-using SlnMesnac.Serilog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
-using SlnMesnac.Mqtt;
-using SlnMesnac.TouchSocket;
-
-namespace SlnMesnac.WPF
-{
- ///
- ///
- ///
- public class Startup
- {
- ///
- /// This method gets called by the runtime. Use this method to add services to the container.
- ///
- ///
- [Obsolete]
- public void ConfigureServices(IServiceCollection services)
- {
- services.AddControllers();
-
- //注册AppConfig
- services.AddSingleton(provider =>
- {
- var configuration = provider.GetService();
- return configuration.GetSection("AppConfig").Get();
-
- });
-
- //注册通用类
- services.AddCommonSetup();
-
- //注册ORM
- services.AddSqlSugarSetup();
-
- //注册Service
- services.AddServices();
-
- //注册Quartz
- services.AddQuartzSetUp();
-
- //注册PLC
- services.AddPlcSetup();
-
- //注册MQTT
- services.AddMqttSetup();
-
- //注册TouchSocket
- services.AddTouchSocketSetup();
- }
-
- ///
- /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
- ///
- ///
- ///
- public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
- {
- if (env.IsDevelopment())
- {
- app.UseDeveloperExceptionPage();
- }
-
- //启用Serilog中间件
- app.UseSerilogExtensions();
-
- app.UseRouting();
-
- app.UseAuthorization();
-
- app.UseEndpoints(endpoints =>
- {
- endpoints.MapControllers();
- });
-
- }
- }
-}
\ No newline at end of file
diff --git a/SlnMesnac.WPF/Templates/icon/Icon.png b/SlnMesnac.WPF/Templates/icon/Icon.png
deleted file mode 100644
index 1560465..0000000
Binary files a/SlnMesnac.WPF/Templates/icon/Icon.png and /dev/null differ
diff --git a/SlnMesnac.WPF/Templates/image/background.jpg b/SlnMesnac.WPF/Templates/image/background.jpg
deleted file mode 100644
index 860c0b0..0000000
Binary files a/SlnMesnac.WPF/Templates/image/background.jpg and /dev/null differ
diff --git a/SlnMesnac.WPF/Templates/style/resourceStyle.xaml b/SlnMesnac.WPF/Templates/style/resourceStyle.xaml
deleted file mode 100644
index e7155f2..0000000
--- a/SlnMesnac.WPF/Templates/style/resourceStyle.xaml
+++ /dev/null
@@ -1,424 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
deleted file mode 100644
index 57a6d3c..0000000
--- a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using HslCommunication.Enthernet;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.IdentityModel.Logging;
-using SlnMesnac.Mqtt;
-using SlnMesnac.TouchSocket;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace SlnMesnac.WPF.ViewModel
-{
- public class MainWindowViewModel: ViewModelBase
- {
- private readonly ILogger _logger;
-
- #region 参数定义
- ///
- /// PLC设备状态
- ///
- private int _PlcStatus = 0;
- public int PlcStatus
- {
- get { return _PlcStatus; }
- set { _PlcStatus = value; RaisePropertyChanged(nameof(PlcStatus)); }
- }
- ///
- /// 箱壳扫码器状态
- ///
- private int _ShellScannerStatus = 0;
- public int ShellScannerStatus
- {
- get { return _ShellScannerStatus; }
- set { _ShellScannerStatus = value; RaisePropertyChanged(nameof(ShellScannerStatus)); }
- }
-
- ///
- /// 内胆扫码器状态
- ///
- private int _BoldScannerStatus = 0;
- public int BoldScannerStatus
- {
- get { return _BoldScannerStatus; }
- set { _BoldScannerStatus = value; RaisePropertyChanged(nameof(BoldScannerStatus)); }
- }
-
- public System.Windows.Controls.UserControl _content;
-
- public System.Windows.Controls.UserControl UserContent
- {
- get { return _content; }
-
- set
- {
- _content = value;
- RaisePropertyChanged(nameof(UserContent));
- }
- }
- #endregion
-
- #region 事件定义
- ///
- /// 界面跳转按钮事件
- ///
- public RelayCommand