From 943090cddfb9e3e96f2bfc2531a4d6a964379221 Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Thu, 21 Dec 2023 16:09:19 +0800
Subject: [PATCH] new

---
 Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs |  1 +
 Admin.Core.RealTimeService/Startup.cs                | 10 ++++++----
 Aucma.Core.ScannerGun/ScannerGunService.cs           |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs b/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs
index 9d0684ac..21a8d00d 100644
--- a/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs
+++ b/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs
@@ -21,6 +21,7 @@ namespace Admin.Core.Extensions
                 if (Appsettings.app("Middleware", "ScannerGun", "Enabled").ObjToBool())
                 {
                      scannerGun.ScannerGunAsync();
+                    Console.WriteLine("扫码枪服务启动");
                 }
             }
             catch (Exception e)
diff --git a/Admin.Core.RealTimeService/Startup.cs b/Admin.Core.RealTimeService/Startup.cs
index b0a12e18..2c132c63 100644
--- a/Admin.Core.RealTimeService/Startup.cs
+++ b/Admin.Core.RealTimeService/Startup.cs
@@ -2,6 +2,7 @@ using Admin.Core.Common;
 using Admin.Core.Extensions;
 using Admin.Core.IService.ISys;
 using Admin.Core.Tasks;
+using Aucma.Core.ScannerGun;
 using Aucma.Core.Tasks;
 using Autofac;
 using Microsoft.AspNetCore.Builder;
@@ -54,10 +55,10 @@ namespace Admin.Core.RealTimeService
             services.AddAutoMapperSetup();
 
             //�������
-            services.AddJobSetup();
+            //services.AddJobSetup();
             //����
             // services.AddAucmaTaskSetup();
-
+            services.AddScannerGunSetup();
             //֧�ֱ����ȫ ����:֧�� System.Text.Encoding.GetEncoding("GB2312")  System.Text.Encoding.GetEncoding("GB18030") 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
@@ -78,13 +79,14 @@ namespace Admin.Core.RealTimeService
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-        public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter)
+        public void Configure(IApplicationBuilder app,IScannerGunService scannerGun)
         {
             // ʹ�þ�̬�ļ�
             app.UseStaticFiles();
             //app.AucmaTaskMildds(aucamTaskService);
             // ����QuartzNetJob���ȷ���
-            app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
+            //app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
+            app.UseScannerGunMildd(scannerGun);
         }
 
         #region ע�����
diff --git a/Aucma.Core.ScannerGun/ScannerGunService.cs b/Aucma.Core.ScannerGun/ScannerGunService.cs
index 9b814ac5..456b960a 100644
--- a/Aucma.Core.ScannerGun/ScannerGunService.cs
+++ b/Aucma.Core.ScannerGun/ScannerGunService.cs
@@ -17,7 +17,7 @@ namespace Aucma.Core.ScannerGun
         /// </summary>
         public static void InitScanCode()
         {
-            string COM1 = "com3";
+            string COM1 = "COM4";
             InstanceSerialPort3(COM1);
         }