ZLIB格式RFC1950，要去掉头部两个字节

NewLifeX · Mar 19, 2021 · c68d9ac · c68d9ac
1 parent 5c4c9ab
commit c68d9ac
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/NewLife.RocketMQ/Protocol/MessageExt.cs b/NewLife.RocketMQ/Protocol/MessageExt.cs
@@ -103,9 +103,10 @@ public Boolean Read(Stream stream, Object context = null)
             if ((SysFlag & 1) == 1)
             {
                 /*uncompress*/
-                //Body = Body.Decompress();
-                var gs = new MemoryStream(Body);
-                Body = gs.DecompressGZip().ReadBytes();
+                // ZLIB格式RFC1950，要去掉头部两个字节
+                Body = Body.ReadBytes(2).Decompress();
+                //var gs = new MemoryStream(Body);
+                //Body = gs.DecompressGZip().ReadBytes();
             }
 
             // 主题

diff --git a/Test/Program.cs b/Test/Program.cs
@@ -4,6 +4,8 @@
 using NewLife.RocketMQ.Common;
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Threading;
 
@@ -15,7 +17,7 @@ static void Main(String[] args)
         {
             XTrace.UseConsole();
 
-            Test1();
+            Test4();
 
             Console.WriteLine("OK!");
             Console.ReadKey();
@@ -150,5 +152,23 @@ static void Test3()
                 Console.WriteLine("{0} {1} {2}", i, bk.Name, times - 1);
             }
         }
+
+        static void Test4()
+        {
+            var a1 = File.ReadAllBytes("a1".GetFullPath());
+            var a2 = File.ReadAllBytes("a2".GetFullPath());
+
+            //var ms = new MemoryStream(a1);
+            //ms.Position += 2;
+            //var ds = new DeflateStream(ms, CompressionMode.Decompress);
+            //var buf = ds.ReadBytes();
+
+            var buf = a1.ReadBytes(2).Decompress();
+
+            var rs = a2.ToBase64() == buf.ToBase64();
+            Console.WriteLine(rs);
+
+            Console.WriteLine(buf.ToStr());
+        }
     }
 }