diff --git a/WCS.BLL/Tool/Helper.cs b/WCS.BLL/Tool/Helper.cs
index 71437b5..65984bb 100644
--- a/WCS.BLL/Tool/Helper.cs
+++ b/WCS.BLL/Tool/Helper.cs
@@ -1,5 +1,6 @@
 锘縰sing System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -185,15 +186,21 @@ namespace WCS.BLL.Tool
                     color = 0x00;
                     break;
             }
-            byte[] data1 = new byte[8];
+            byte[] data1 = new byte[8 + 3 * 6];
             data1[0] = 0xff;
             data1[1] = 0x02;
             data1[2] = 0x00;
             data1[3] = 0x0a;
-            data1[4] = (byte)lightid;
-            data1[5] = (byte)status;
-            data1[6] = color;
-            data1[7] = (byte)beestatus;
+            for (int i = 0; i < 7;i++)
+            {
+                data1[4 + i * 3] = (byte)(lightid + i);
+                data1[5 + i * 3] = (byte)status;
+                data1[6 + i * 3] = color;
+            }
+            //data1[4] = (byte)lightid;
+            //data1[5] = (byte)status;
+            //data1[6] = color;
+            data1[25] = (byte)beestatus;
             byte[] data2 = Crc16(data1, data1.Length, true);
             return data2;
         }
@@ -218,6 +225,7 @@ namespace WCS.BLL.Tool
         public static byte[] InstoreWarnLight(int lightid)
         {
             byte[] data1 = new byte[8];
+            byte[] data1 = new byte[8 + 3 * 6];
             data1[0] = 0xff;
             data1[1] = 0x02;
             data1[2] = 0x00;
@@ -225,6 +233,15 @@ namespace WCS.BLL.Tool
             data1[4] = (byte)lightid;
             data1[5] = 0x03;
             data1[6] = 0x02;
+            for (int i = 0; i < 7; i++)
+            {
+                data1[4 + i * 3] = (byte)(lightid + i);
+                data1[5 + i * 3] = 0x03;
+                data1[6 + i * 3] = 0x02;
+            }
+            //data1[4] = (byte)lightid;
+            //data1[5] = 0x03;
+            //data1[6] = 0x02;
             //data1[7] = 0x02;
             data1[7] = 0x00;
             byte[] senddata1 = Tool.Helper.Crc16(data1, data1.Length, true);
diff --git a/WCS.WebApi/Program.cs b/WCS.WebApi/Program.cs
index bd72eca..114e893 100644
--- a/WCS.WebApi/Program.cs
+++ b/WCS.WebApi/Program.cs
@@ -20,6 +20,9 @@ namespace WebApi
     {
         public static void Main(string[] args)
         {
+<<<<<<< HEAD
+            WebSoceketManager.InitWebSocket();
+=======
             try
             {
                 //初始化websocket
@@ -27,6 +30,7 @@ namespace WebApi
 
                 //初始化数据库
                 DbInit.InitDb();
+>>>>>>> 7f35077c07959e9571515ee1a1f88123f9e20bd5
 
                 //初始化配置文件
                 LocalFile.SaveConfig();