diff --git a/Waste.SocketService.cs/MyPackageFilter.cs b/Waste.SocketService.cs/MyPackageFilter.cs
index 1c2b65f..6b60551 100644
--- a/Waste.SocketService.cs/MyPackageFilter.cs
+++ b/Waste.SocketService.cs/MyPackageFilter.cs
@@ -194,7 +194,7 @@ namespace Waste.SocketService
 
                 package.Str = _reader.ReadString(GB2312);
 
-                #region 解析头部，头部固定为A9
+                #region 解析头部
                 if (reader.Length >= 2)
                 {
                     keylen = 2;
@@ -213,21 +213,7 @@ namespace Waste.SocketService
                     key = keys.BytesToString(GB2312);
                 }
                 #endregion
-                if (key != "A9" && key != "A8" && key != "A7")
-                {
-                    //var len = reader.Length;
-                    //string msg = "";
-                    reader.Rewind(keylen);
-                    //for (var i = 0; i < len; i++)
-                    //{
-                    //    reader.TryRead(out byte msgByte);
-                    //    msg += msgByte.ByteToHexStr();
-                    //}
-                    //package.IsChecked = false;
-                    //package.Body = msg;
-                    //return package;
 
-                }
                 if (key == "A7")
                 {
                     key = "A8";//全部GB2312的A8
@@ -303,29 +289,6 @@ namespace Waste.SocketService
                             Read(package, measurearr);
                             package.IsWeight = true;
                         }
-                        //uuid@datetime@垃圾类型@子类@重量@单价@金额@操作员@物品编码@垃圾桶@毛重@皮重@净重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n 
-                        else if (measurearr.Length == 21)
-                        {
-
-                            Read(package, measurearr);
-
-                            package.DeviceFacEcode = measurearr[8];
-                            package.Registration = measurearr[9];
-                            package.GrossWeight = measurearr[10];
-                            package.Tare = measurearr[11];
-                            package.NetWeight = measurearr[12];
-
-                            package.ID1 = measurearr[13];
-                            package.ID2 = measurearr[14];
-                            package.ID3 = measurearr[15];
-                            package.ID4 = measurearr[16];
-                            package.ID5 = measurearr[17];
-                            package.ID6 = measurearr[18];
-                            package.ID7 = measurearr[19];
-                            package.ID8 = measurearr[20];
-
-                            package.IsWeight = true;
-                        }
                         else
                         {
                             package.size = arr[6];
@@ -450,9 +413,19 @@ namespace Waste.SocketService
                 }
                 else
                 {
-                    key = "A8";//全部GB2312的A8
-                    return ReadA7(reader, package, key, GB2312);
+                    var len = reader.Length;
+                    string msg = "";
+                    reader.Rewind(keylen);
+                    for (var i = 0; i < len; i++)
+                    {
+                        reader.TryRead(out byte msgByte);
+                        msg += msgByte.ByteToHexStr();
+                    }
+                    package.IsChecked = false;
+                    package.Body = msg;
+                    return package;
                 }
+
             }
             catch (Exception ex)
             {
@@ -527,31 +500,29 @@ namespace Waste.SocketService
                 package.Time = $"{arr[4]}{arr[5]}".Replace("-", "").Replace(":", "");
                 //uuid@datetime@垃圾类型@子类@重量@价格@金额@操作员
                 var measurearr = arr[6].Split('@');
-                if (measurearr.Length == 8)
-                {
-                    Read(package, measurearr);
-                    package.IsWeight = true;
-                }
-                //uuid@datetime@垃圾类型@子类@重量@单价@金额@操作员@物品编码@垃圾桶@毛重@皮重@净重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n 
-                else if (measurearr.Length == 21)
+
+                //uuid@垃圾类型@子类@重量@单价@金额@操作员@物品编码@毛重@皮重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n 
+                if (measurearr.Length == 18)
                 {
 
-                    Read(package, measurearr);
-
-                    package.DeviceFacEcode = measurearr[8];
-                    package.Registration = measurearr[9];
-                    package.GrossWeight = measurearr[10];
-                    package.Tare = measurearr[11];
-                    package.NetWeight = measurearr[12];
-
-                    package.ID1 = measurearr[13];
-                    package.ID2 = measurearr[14];
-                    package.ID3 = measurearr[15];
-                    package.ID4 = measurearr[16];
-                    package.ID5 = measurearr[17];
-                    package.ID6 = measurearr[18];
-                    package.ID7 = measurearr[19];
-                    package.ID8 = measurearr[20];
+                    package.UUID = measurearr[0];
+                    package.WasteType = measurearr[1];
+                    package.WasteSType = measurearr[2];
+                    package.Weight = measurearr[3];
+                    package.Price = measurearr[4];
+                    package.Amount = measurearr[5];
+                    package.OpUser = measurearr[6];
+                    package.DeviceFacEcode = measurearr[7];
+                    package.GrossWeight = measurearr[8];
+                    package.Tare = measurearr[9];
+                    package.ID1 = measurearr[10];
+                    package.ID2 = measurearr[11];
+                    package.ID3 = measurearr[12];
+                    package.ID4 = measurearr[13];
+                    package.ID5 = measurearr[14];
+                    package.ID6 = measurearr[15];
+                    package.ID7 = measurearr[16];
+                    package.ID8 = measurearr[17];
 
                     package.IsWeight = true;
                 }
diff --git a/Waste.SocketService.cs/Program.cs b/Waste.SocketService.cs/Program.cs
index 3f4c0c2..ec72507 100644
--- a/Waste.SocketService.cs/Program.cs
+++ b/Waste.SocketService.cs/Program.cs
@@ -103,7 +103,11 @@ namespace Waste.SocketService
                           opt.Password = configuration["RabbitmqSetting:Password"];//����Miami
                       });
                       //����sqlserver֧��
-                      x.UseSqlServer(configuration["RabbitmqSetting:DBConnection"]);
+                      x.UseSqlServer(x =>
+                      {
+                          x.ConnectionString = configuration["RabbitmqSetting:DBConnection"];
+                          x.Schema = "cap_s";
+                      });
                       x.SucceedMessageExpiredAfter = 3600;
                   });
              })