diff --git a/SlnMesnac.TouchSocket/TouchSocketSetup.cs b/SlnMesnac.TouchSocket/TouchSocketSetup.cs index 637d77f..4634ac4 100644 --- a/SlnMesnac.TouchSocket/TouchSocketSetup.cs +++ b/SlnMesnac.TouchSocket/TouchSocketSetup.cs @@ -37,8 +37,8 @@ namespace SlnMesnac.TouchSocket public static IApplicationBuilder UseTouchSocketExtensions(this IApplicationBuilder app) { - var _server = app.ApplicationServices.GetService(); - _server.Init(20108); + // var _server = app.ApplicationServices.GetService(); + // _server.Init(20108); var _apiServer = app.ApplicationServices.GetService(); _apiServer.Init(); diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml index 150870a..7ae7598 100644 --- a/SlnMesnac.WPF/MainWindow.xaml +++ b/SlnMesnac.WPF/MainWindow.xaml @@ -40,9 +40,9 @@ - - - + + + diff --git a/SlnMesnac.WPF/Startup.cs b/SlnMesnac.WPF/Startup.cs index e4251dc..abe8f06 100644 --- a/SlnMesnac.WPF/Startup.cs +++ b/SlnMesnac.WPF/Startup.cs @@ -45,7 +45,7 @@ namespace SlnMesnac.WPF services.AddPlcFactorySetup(); //注册RFID工厂 - services.AddRfidFactorySetup(); + //services.AddRfidFactorySetup(); } /// diff --git a/SlnMesnac.WPF/Templates/image/background.jpg b/SlnMesnac.WPF/Templates/image/background.jpg index 860c0b0..601cf28 100644 Binary files a/SlnMesnac.WPF/Templates/image/background.jpg and b/SlnMesnac.WPF/Templates/image/background.jpg differ diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json index 9346894..d31f9f6 100644 --- a/SlnMesnac.WPF/appsettings.json +++ b/SlnMesnac.WPF/appsettings.json @@ -8,7 +8,7 @@ }, "AllowedHosts": "*", "AppConfig": { - "logPath": "E:\\桌面\\SlnMesnac\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows", + "logPath": "F:\\Mesnac\\2023部门项目\\机场AGV调度\\HightWay_AirPot_WCS\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows\\log", "SqlConfig": [ { "configId": "mes",