qinqi 1 год назад
Родитель
Сommit
e5a3ba71cf

+ 6 - 2
wwwroot/Global.asax

@@ -12,12 +12,15 @@
         DataAccess.DefaultParameterType = SQLParameterType.CDA;
         DataAccess.DefaultDataBaseType = Curtain.DataAccess.DataBaseType.Oracle;
         DataAccess.DefaultConnectionString = connStr;
+         //记录日志
+        Logger.Info("应用程序启动");
     }
 
     void Application_End(object sender, EventArgs e)
     {
         //  在应用程序关闭时运行的代码
-
+        //记录日志
+        Logger.Info("应用程序关闭");
     }
 
     void Application_Error(object sender, EventArgs e)
@@ -37,7 +40,8 @@
     void Session_Start(object sender, EventArgs e)
     {
         // 在新会话启动时运行的代码
-
+        //记录日志
+        Logger.Info("应用程序启动2");
     }
 
     void Session_End(object sender, EventArgs e)

+ 13 - 4
wwwroot/main/Assemble/api/GetBarcodeByScan.ashx

@@ -39,7 +39,7 @@ public class GetBarcodeByScan : IHttpHandler, IReadOnlySessionState
             string barcodeip = context.Request["barcodeip"].ToString();
             string name = context.Request["name"].ToString();
 
-            if (allScokets == null )
+            if (allScokets == null)
             {
                 start(barcodeip);
                 context.Response.Write("服务启动成功!");
@@ -54,6 +54,15 @@ public class GetBarcodeByScan : IHttpHandler, IReadOnlySessionState
                 }
                 Logger.Info("已启动;工位:"  + name + "; Scokets:" +allScokets.Count);
             }
+
+        }
+
+        //终极启动服务
+        if (context.Request["startfinal"] is object)
+        { 
+            start("ws://172.18.32.32:9102");
+            context.Response.Write("服务终极启动成功!");
+            Logger.Info("服务终极启动成功; Scokets:" + allScokets.Count);
             
         }
 
@@ -222,11 +231,11 @@ public class GetBarcodeByScan : IHttpHandler, IReadOnlySessionState
             server = new WebSocketServer(ip);
             server.Start(scoket =>
             {
-                scoket.OnOpen = () => { allScokets.Add(scoket); };
-                scoket.OnClose = () => { allScokets.Remove(scoket); };
+                scoket.OnOpen = () => { allScokets.Add(scoket); Logger.Info("新增scoket连接"); };
+                scoket.OnClose = () => { allScokets.Remove(scoket); Logger.Info("关闭scoket连接"); };
                 scoket.OnMessage = message => { allScokets.ToList().ForEach(s => s.Send(message)); };
             });
-                }
+        }
         catch (Exception ex)
         {
             throw ex;

+ 3 - 1
wwwroot/main/Assemble/index.html

@@ -826,7 +826,7 @@
         var checkprocedureId = "";  //校验工序ID
         var checkworkstationname = "";  //校验工位名称
 
-        const socketbarcode = new WebSocket('ws://172.18.32.32:9102');
+        var socketbarcode = new WebSocket('ws://172.18.32.32:9102');
 
         /*
 
@@ -912,6 +912,8 @@
             //console.log('socket1', socket1)
 
             var result = $.ajax({ url: 'api/GetBarcodeByScan.ashx?start=1&barcodeip=ws://172.18.32.32:9102&name=' + request('NAME').toString(), dataType: "json", type: "get" });
+
+            socketbarcode = new WebSocket('ws://172.18.32.32:9102');
             console.log('socketbarcode', socketbarcode)
 
             loadProductionPlanData();