更新:demo引用

This commit is contained in:
若汝棋茗
2025-04-26 12:19:17 +08:00
parent 6abe83efcf
commit 4d27b447a1
145 changed files with 351 additions and 382 deletions

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -9,6 +9,6 @@
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -9,12 +9,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -141,7 +141,7 @@ internal class MyRequestInfo : IFixedHeaderRequestInfo
public byte[] PackageAsBytes()
{
using var byteBlock = new ByteBlock();
using var byteBlock = new ByteBlock(1024*64);
this.Package(byteBlock);
return byteBlock.ToArray();
}

View File

@@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.7" />
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -108,7 +108,7 @@ internal class Program
}
}
internal partial class MyServer : RpcServer
internal partial class MyServer : SingletonRpcServer
{
[WebApi(Method = HttpMethodType.Get)]
[XmlRpc]

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.7" />
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.7" />
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -13,6 +13,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.26" />
<PackageReference Include="TouchSocket.Core" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.26" />
<PackageReference Include="TouchSocket.Core" Version="3.1.0" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.26" />
<PackageReference Include="TouchSocket.Core" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -9,11 +9,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -5,11 +5,11 @@
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -20,7 +20,6 @@ internal class Program
{
private static void Main(string[] args)
{
NewBytePool();
BaseWriteRead();
BufferWriterWriteRead();
PrimitiveWriteRead();
@@ -45,7 +44,7 @@ internal class Program
private static void IPackageWriteRead()
{
using (var byteBlock = new ByteBlock())
using (var byteBlock = new ByteBlock(1024*64))
{
byteBlock.WritePackage(new MyPackage()
{
@@ -59,7 +58,7 @@ internal class Program
private static void BytesPackageWriteRead()
{
using (var byteBlock = new ByteBlock())
using (var byteBlock = new ByteBlock(1024*64))
{
byteBlock.WriteBytesPackage(Encoding.UTF8.GetBytes("TouchSocket"));
@@ -77,7 +76,7 @@ internal class Program
private static void PrimitiveWriteRead()
{
using (var byteBlock = new ByteBlock())
using (var byteBlock = new ByteBlock(1024*64))
{
byteBlock.WriteByte(byte.MaxValue);//写入byte类型
byteBlock.WriteInt32(int.MaxValue);//写入int类型
@@ -95,7 +94,7 @@ internal class Program
private static void BufferWriterWriteRead()
{
using (var byteBlock = new ByteBlock())
using (var byteBlock = new ByteBlock(1024*64))
{
var span = byteBlock.GetSpan(4);
span[0] = 0;
@@ -117,7 +116,7 @@ internal class Program
private static void BaseWriteRead()
{
using (var byteBlock = new ByteBlock())
using (var byteBlock = new ByteBlock(1024*64))
{
byteBlock.Write(new byte[] { 0, 1, 2, 3 });//将字节数组写入
@@ -128,17 +127,6 @@ internal class Program
}
}
private static void NewBytePool()
{
var bytePool = new BytePool(maxArrayLength: 1024 * 1024, maxArraysPerBucket: 50)
{
AutoZero = false,//在回收内存时,是否清空内存
MaxBucketsToTry = 5//最大梯度跨度
};
Console.WriteLine($"内存池容量={bytePool.Capacity}");
Console.WriteLine($"内存池实际尺寸={bytePool.GetPoolSize()}");
}
private static void Performance()
{
var count = 1000000;

View File

@@ -17,6 +17,6 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.26" />
<PackageReference Include="TouchSocket.Core" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.26" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="3.0.26" />
<PackageReference Include="TouchSocket.Core" Version="3.1.0" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,13 +8,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="3.0.5-preview.2" />
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="log4net" Version="3.0.4" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -6,11 +6,11 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -37,7 +37,7 @@ internal class Program
{ 2,new MyClassModel(){ P1=DateTime.Now} }
};
var byteBlock = new ByteBlock();
var byteBlock = new ByteBlock(1024*64);
try
{
myClass.Package(ref byteBlock);//打包,相当于序列化
@@ -69,7 +69,7 @@ internal class Program
{ 2,new MyClassModel(){ P1=DateTime.Now} }
};
var byteBlock = new ByteBlock();
var byteBlock = new ByteBlock(1024*64);
try
{

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.26" />
<PackageReference Include="TouchSocket.Core" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -9,6 +9,6 @@
<!--<PublishTrimmed>false</PublishTrimmed>-->
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
<PublishAot>true</PublishAot>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -1,4 +1,4 @@
using System.Text;
using System.Text;
using TouchSocket.Core;
using TouchSocket.Dmtp;
using TouchSocket.Dmtp.Rpc;
@@ -140,7 +140,7 @@ namespace RpcPerformanceConsoleApp
}
[AutoInjectForSingleton]
public partial class TestController : RpcServer
public partial class TestController : SingletonRpcServer
{
[DmtpRpc(MethodInvoke =true)]
public int Sum(int a, int b) => a + b;

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -15,7 +15,7 @@ using TouchSocket.Dmtp;
namespace CustomDmtpActorConsoleApp.SimpleDmtpRpc;
internal class SimpleDmtpRpcActor : ISimpleDmtpRpcActor
internal class SimpleDmtpRpcActor :DisposableObject, ISimpleDmtpRpcActor
{
private readonly ushort m_invoke_Request = 1000;
private readonly ushort m_invoke_Response = 1001;
@@ -109,7 +109,7 @@ internal class SimpleDmtpRpcActor : ISimpleDmtpRpcActor
var methodModel = this.TryFindMethod.Invoke(package.MethodName);
if (methodModel == null)
{
var byteBlock = new ByteBlock();
var byteBlock = new ByteBlock(1024*64);
try
{
package.Status = 4;
@@ -127,7 +127,7 @@ internal class SimpleDmtpRpcActor : ISimpleDmtpRpcActor
try
{
methodModel.Method.Invoke(methodModel.Target, default);
var byteBlock = new ByteBlock();
var byteBlock = new ByteBlock(1024*64);
try
{
package.Status = 1;
@@ -143,7 +143,7 @@ internal class SimpleDmtpRpcActor : ISimpleDmtpRpcActor
}
catch (Exception ex)
{
var byteBlock = new ByteBlock();
var byteBlock = new ByteBlock(1024*64);
try
{
package.Status = 5;
@@ -215,7 +215,7 @@ internal class SimpleDmtpRpcActor : ISimpleDmtpRpcActor
try
{
var byteBlock = new ByteBlock();
var byteBlock = new ByteBlock(1024*64);
try
{
package.Package(ref byteBlock);

View File

@@ -17,16 +17,6 @@ namespace CustomDmtpActorConsoleApp.SimpleDmtpRpc;
internal static class SimpleDmtpRpcExtension
{
#region DependencyProperty
/// <summary>
/// SimpleDmtpRpcActor
/// </summary>
public static readonly DependencyProperty<ISimpleDmtpRpcActor> SimpleDmtpRpcActorProperty =
new("SimpleDmtpRpcActor", default);
#endregion DependencyProperty
#region
/// <summary>
@@ -48,7 +38,7 @@ internal static class SimpleDmtpRpcExtension
/// <returns></returns>
public static ISimpleDmtpRpcActor GetSimpleDmtpRpcActor(this IDmtpActor smtpActor)
{
return smtpActor.GetValue(SimpleDmtpRpcActorProperty);
return smtpActor.GetActor<SimpleDmtpRpcActor>();
}
/// <summary>
@@ -66,14 +56,4 @@ internal static class SimpleDmtpRpcExtension
}
return smtpRpcActor;
}
/// <summary>
/// 向<see cref="DmtpActor"/>中设置<see cref="ISimpleDmtpRpcActor"/>
/// </summary>
/// <param name="smtpActor"></param>
/// <param name="smtpRpcActor"></param>
internal static void SetSimpleDmtpRpcActor(this IDmtpActor smtpActor, ISimpleDmtpRpcActor smtpRpcActor)
{
smtpActor.SetValue(SimpleDmtpRpcActorProperty, smtpRpcActor);
}
}

View File

@@ -26,7 +26,7 @@ internal class SimpleDmtpRpcFeature : PluginBase, IDmtpHandshakingPlugin, IDmtpR
{
TryFindMethod = this.TryFindMethod
};
client.DmtpActor.SetSimpleDmtpRpcActor(actor);
client.DmtpActor.AddActor(actor);
await e.InvokeNext();
}

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -26,7 +26,7 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -133,7 +133,7 @@ internal class Program
//将json转为utf-8编码。
var jsonBytes = Encoding.UTF8.GetBytes(json);
using (var byteBlock = new ByteBlock())
using (var byteBlock = new ByteBlock(1024*64))
{
//按照Head+Flags+Length+Data的格式。
byteBlock.Write(Encoding.ASCII.GetBytes("dm"));
@@ -151,7 +151,7 @@ internal class Program
json = "{\"Sign\":2,\"Route\":false,\"SourceId\":null,\"TargetId\":null}";
jsonBytes = Encoding.UTF8.GetBytes(json);
using (var byteBlock = new ByteBlock())
using (var byteBlock = new ByteBlock(1024*64))
{
//按照Head+Flags+Length+Data的格式。
byteBlock.Write(Encoding.ASCII.GetBytes("dm"));

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -221,7 +221,7 @@ internal class MyDmtpRpcActor : DmtpRpcActor, IRpcClient1, IRpcClient2
}
}
internal partial class MyClientRpcServer : RpcServer
internal partial class MyClientRpcServer : SingletonRpcServer
{
private readonly ILog m_logger;

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -1,4 +1,4 @@
using System.ComponentModel;
using System.ComponentModel;
using System.Diagnostics;
using TouchSocket.Core;
using TouchSocket.Dmtp;
@@ -35,7 +35,6 @@ namespace RpcDelayPerConsoleApp
{
Console.ReadKey();
tasks.Clear();
BytePool.Default.Clear();
GC.Collect();
}
@@ -89,7 +88,7 @@ namespace RpcDelayPerConsoleApp
}
}
public partial class MyRpcServer : RpcServer
public partial class MyRpcServer : SingletonRpcServer
{
Timer m_timer;
public MyRpcServer()

View File

@@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
<PackageReference Include="TouchSocket.Hosting" Version="3.1.0" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -1,10 +1,10 @@
using System.Text;
using System.Text;
using TouchSocket.Dmtp.Rpc;
using TouchSocket.Rpc;
namespace RpcPerformanceConsoleApp
{
public partial class TestController : RpcServer
public partial class TestController : SingletonRpcServer
{
[DmtpRpc(MethodInvoke = true)]

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -76,7 +76,7 @@ internal class Program
[MyRpcActionFilter]
public partial class MyRpcServer : RpcServer
public partial class MyRpcServer : SingletonRpcServer
{
private readonly ILog m_logger;
private readonly IRpcCallContextAccessor m_rpcCallContextAccessor;
@@ -183,7 +183,7 @@ public partial class MyRpcServer : RpcServer
public async Task TestGetCallContextFromCallContextAccessor()
{
//通过CallContextAccessor获取当前关联的CallContext
//此处即使m_rpcCallContextAccessor与当前RpcServer均为单例也能获取到正确的CallContext
//此处即使m_rpcCallContextAccessor与当前SingletonRpcServer均为单例也能获取到正确的CallContext
var callContext = this.m_rpcCallContextAccessor.CallContext;
await Task.CompletedTask;
}

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.AspNetCore" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.0.26" />
<PackageReference Include="TouchSocket.AspNetCore" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -35,6 +35,6 @@
</Reference>
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -571,7 +571,7 @@ internal class Program
////然后在重新发起请求传输值前先对fileOperator.ResourceInfo做有效赋值。即可尝试断点传输。
//byte[] cacheBytes;//这就是持久化后的数据。你可以将此数据写入到文件或数据库。
//using (var byteBlock=new ByteBlock())
//using (var byteBlock=new ByteBlock(1024*64))
//{
// fileOperator.ResourceInfo.Save(byteBlock);

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -70,7 +70,7 @@ internal class Program
}
}
public partial class MyRpcServer : RpcServer
public partial class MyRpcServer : SingletonRpcServer
{
[DmtpRpc]
public bool Login(string account, string password)

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -10,11 +10,11 @@
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -90,7 +90,7 @@ internal class Program
}
}
public partial class ReverseCallbackServer : RpcServer
public partial class ReverseCallbackServer : SingletonRpcServer
{
[DmtpRpc(MethodInvoke = true)]
public string SayHello(string name)

View File

@@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -130,7 +130,7 @@ internal class Program
Console.WriteLine($"状态:{channel.Status}result={result}");
}
public class MyRpcServer : RpcServer
public class MyRpcServer : SingletonRpcServer
{
/// <summary>
/// "测试ServiceToClient创建通道从而实现流数据的传输"

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket" Version="3.1.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="MemoryPack" Version="1.21.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -98,7 +98,7 @@ internal class Program
}
}
public partial class MyRpcServer : RpcServer
public partial class MyRpcServer : SingletonRpcServer
{
/// <summary>
/// 登录

View File

@@ -7,12 +7,12 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.26" />
<PackageReference Include="TouchSocketPro" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.Rpc" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.1.0" />
<PackageReference Include="TouchSocketPro" Version="3.1.0" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SerializationSelectorClassLibrary\SerializationSelectorClassLibrary.csproj" />

View File

@@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.26" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.26" />
<PackageReference Include="TouchSocket.Hosting" Version="3.1.0" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="3.0.26" />
<PackageReference Include="TouchSocket.Http" Version="3.1.0" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -1,9 +1,9 @@
using TouchSocket.Rpc;
using TouchSocket.Rpc;
using TouchSocket.WebApi;
namespace HttpPerformanceConsoleApp.Controllers
{
public partial class ApiServer : RpcServer
public partial class ApiServer : SingletonRpcServer
{
[WebApi(Method = HttpMethodType.Get)]
public int Add(int a, int b)

View File

@@ -13,11 +13,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FastEndpoints" Version="6.1.0-beta.5" />
<PackageReference Include="FastEndpoints" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.26" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.26" />
<PackageReference Include="TouchSocket.Hosting" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi" Version="3.1.0" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.0" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -21,7 +21,7 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="3.0.26" />
<PackageReference Include="TouchSocket.Http" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="3.0.26" />
<PackageReference Include="TouchSocket.Http" Version="3.1.0" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -1,4 +1,4 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
@@ -255,7 +255,7 @@ public interface IJsonRpcServer : IRpcServer
string TestJsonRpc(MyClass myClass);
}
public partial class JsonRpcServer : RpcServer, IJsonRpcServer
public partial class JsonRpcServer : SingletonRpcServer, IJsonRpcServer
{
public string TestGetContext(ICallContext callContext, string str)

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -10,6 +10,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -126,7 +126,7 @@ internal class Program
}
}
public partial class JsonRpcServer : RpcServer
public partial class JsonRpcServer : SingletonRpcServer
{
/// <summary>
/// 使用调用上下文。

View File

@@ -108,7 +108,7 @@ internal class MyPluginClass : PluginBase, IWebSocketHandshakedPlugin
}
}
public partial class ReverseJsonRpcServer : RpcServer
public partial class ReverseJsonRpcServer : SingletonRpcServer
{
[JsonRpc(MethodInvoke = true)]
public int Add(int a, int b)

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.26" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Modbus" Version="3.0.26" />
<PackageReference Include="TouchSocket.Modbus" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Modbus" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.26" />
<PackageReference Include="TouchSocketPro.Modbus" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.26" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.26" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.1.0" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.26" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.1.0" />
</ItemGroup>
</Project>

Some files were not shown because too many files have changed in this diff Show More