v2.6 使用v11核心库的IPacket

NewLife.RocketMQ/ClusterClient.cs

@@ -307,12 +307,12 @@ private Command CreateCommand(RequestCode request, Object body, Object extFields
         };
 
         // 主体
-        if (body is Packet pk)
+        if (body is IPacket pk)
             cmd.Payload = pk;
         else if (body is Byte[] buf)
-            cmd.Payload = buf;
+            cmd.Payload = (ArrayPacket)buf;
         else if (body != null)
-            cmd.Payload = Config.JsonHost.Write(body, false, false, false).GetBytes();
+            cmd.Payload = (ArrayPacket)Config.JsonHost.Write(body, false, false, false).GetBytes();
 
         if (extFields != null)
         {

NewLife.RocketMQ/Consumer.cs

@@ -789,7 +789,7 @@ private async Task InitOffsetAsync(CancellationToken cancellationToken = default
     /// </summary>
     /// <param name="payload">负载数据</param>
     /// <returns></returns>
-    private ConsumerStatesModel ConsumerStatesSpecialJsonHandler(Packet payload)
+    private ConsumerStatesModel ConsumerStatesSpecialJsonHandler(IPacket payload)
     {
         #region <cmd formate/>
 
@@ -960,7 +960,7 @@ private Command GetConsumerRunningInfo(Command cmd)
 
         var rs = cmd.CreateReply() as Command;
         rs.Header.Language = "DOTNET";
-        rs.Payload = sb.ToString().GetBytes();
+        rs.Payload = (ArrayPacket)sb.ToString().GetBytes();
 
         return rs;
     }

NewLife.RocketMQ/NameClient.cs

@@ -1,4 +1,5 @@
-using NewLife.Log;
+using NewLife.Data;
+using NewLife.Log;
 using NewLife.Net;
 using NewLife.RocketMQ.Client;
 using NewLife.RocketMQ.Protocol;

NewLife.RocketMQ/NewLife.RocketMQ.csproj

@@ -5,7 +5,7 @@
     <Description>纯托管轻量级RocketMQ客户端，支持发布消息、消费消息、负载均衡等核心功能！</Description>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2024 新生命开发团队</Copyright>
-    <VersionPrefix>2.5</VersionPrefix>
+    <VersionPrefix>2.6</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
     <Version>$(VersionPrefix).$(VersionSuffix)</Version>
     <FileVersion>$(Version)</FileVersion>
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.803" />
+    <PackageReference Include="NewLife.Core" Version="11.0.2024.917-beta0004" />
   </ItemGroup>
 
 </Project>

NewLife.RocketMQ/Protocol/Command.cs

@@ -17,7 +17,7 @@ public class Command : IAccessor, IMessage
 
     /// <summary>主体</summary>
     [XmlIgnore, IgnoreDataMember]
-    public Packet Payload { get; set; }
+    public IPacket Payload { get; set; }
     #endregion
 
     #region 扩展属性
@@ -31,6 +31,13 @@ public class Command : IAccessor, IMessage
     Boolean IMessage.Error { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
     #endregion
 
+    #region 构造
+
+    /// <summary>销毁。回收内存</summary>
+    public void Dispose() => Payload.TryDispose();
+
+    #endregion
+
     #region 读写
     /// <summary>从数据流中读取</summary>
     /// <param name="stream"></param>
@@ -69,7 +76,7 @@ public Boolean Read(Stream stream, Object context = null)
                 //  读取主体
                 if (len > 4 + headerLen)
                 {
-                    Payload = bn.ReadBytes(len - 4 - headerLen);
+                    Payload = (ArrayPacket)bn.ReadBytes(len - 4 - headerLen);
                 }
             }
             else if (type == SerializeType.ROCKETMQ)
@@ -247,7 +254,7 @@ public Boolean Write(Stream stream, Object context = null)
 
     /// <summary>命令转字节数组</summary>
     /// <returns></returns>
-    public Packet ToPacket()
+    public IPacket ToPacket()
     {
         var ms = new MemoryStream();
         Write(ms, null);
@@ -277,7 +284,7 @@ public IMessage CreateReply()
         return cmd;
     }
 
-    Boolean IMessage.Read(Packet pk) => Read(pk.GetStream());
+    Boolean IMessage.Read(IPacket pk) => Read(pk.GetStream());
     #endregion
 
     #region 辅助

NewLife.RocketMQ/Protocol/Message.cs

@@ -51,7 +51,7 @@ public class Message
     public void SetBody(Object body)
     {
         _BodyString = null;
-        if (body is Packet pk)
+        if (body is IPacket pk)
             Body = pk.ReadBytes();
         else if (body is Byte[] buf)
             Body = buf;
@@ -88,7 +88,7 @@ public IDictionary<String, String> ParseProperties(String properties)
     {
         if (properties.IsNullOrEmpty()) return null;
 
-        var dic = properties.SplitAsDictionaryT('\u0001', '\u0002');
+        var dic = properties.SplitAsDictionary("\u0001", "\u0002");
 
         if (TryGetAndRemove(dic, nameof(Tags), out var str)) Tags = str;
         if (TryGetAndRemove(dic, nameof(Keys), out str)) Keys = str;

NewLife.RocketMQ/Protocol/MessageExt.cs

@@ -129,7 +129,7 @@ public Boolean Read(Stream stream, Object context = null)
     /// <summary>读取所有消息</summary>
     /// <param name="body"></param>
     /// <returns></returns>
-    public static IList<MessageExt> ReadAll(Packet body)
+    public static IList<MessageExt> ReadAll(IPacket body)
     {
         //var ms = new MemoryStream(body);
         var ms = body.GetStream();

NewLife.RocketMQ/Protocol/MqCodec.cs

@@ -35,7 +35,7 @@ protected override void AddToQueue(IHandlerContext context, Command msg)
     /// <param name="context"></param>
     /// <param name="pk"></param>
     /// <returns></returns>
-    protected override IList<Command> Decode(IHandlerContext context, Packet pk)
+    protected override IList<Command> Decode(IHandlerContext context, IPacket pk)
     {
         var ss = context.Owner as IExtend;
         if (ss["Codec"] is not PacketCodec pc)

XUnitTestRocketMQ/CommandTests.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using NewLife;
+using NewLife.Data;
 using NewLife.RocketMQ.Protocol;
 using NewLife.Serialization;
 using Xunit;

XUnitTestRocketMQ/XUnitTestRocketMQ.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>