更新:尝试更新示例Demo引用

This commit is contained in:
若汝棋茗
2024-11-13 20:20:49 +08:00
parent b1c7451517
commit 57e0a3da3b
106 changed files with 285 additions and 291 deletions

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -9,6 +9,6 @@
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

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

View File

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

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

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

View File

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

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.4" />
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -110,7 +110,7 @@ namespace ServiceConsoleApp
internal partial class MyServer : RpcServer
{
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
[XmlRpc]
[JsonRpc]
[DmtpRpc]
@@ -124,7 +124,7 @@ namespace ServiceConsoleApp
/// </summary>
/// <returns></returns>
[Router("/api/health")]
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public string Health()
{
return "ok";

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.4" />
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.4" />
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -5,11 +5,11 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -17,6 +17,6 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="2.1.10" />
<PackageReference Include="TouchSocket.Core" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="2.1.10" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="2.1.10" />
<PackageReference Include="TouchSocket.Core" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -9,12 +9,12 @@
<ItemGroup>
<PackageReference Include="log4net" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
<ItemGroup>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="2.1.10" />
<PackageReference Include="TouchSocket.Core" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -81,6 +81,7 @@ namespace PluginConsoleApp
/// <summary>
/// 定义一个插件接口,使其继承<see cref="IPlugin"/>
/// </summary>
[DynamicMethod]
public interface ISayPlugin : IPlugin
{
/// <summary>
@@ -171,24 +172,14 @@ namespace PluginConsoleApp
}
}
public partial class SayHelloGenerator : PluginBase
public partial class SayHelloGenerator : PluginBase, ISayPlugin
{
//如果在代码里继承了PluginBase并且没有显示重写Loaded
//则在源生成时,会自己生成重写代码。
//如果显示重写了Loaded。就需要自己手动调用RegisterPlugins。不然插件不会生效的。
//protected override void Loaded(pluginManager pluginManager)
//{
// base.Loaded(pluginManager);
// this.RegisterPlugins(pluginManager);
//}
/// <summary>
/// 使用源生成插件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// <returns></returns>
[GeneratorPlugin(typeof(ISayPlugin))]
public async Task Say(object sender, MyPluginEventArgs e)
{
Console.WriteLine($"{this.GetType().Name}------Enter");

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -81,7 +81,7 @@ namespace DispatchProxyDmtpRpcConsoleApp
/// <param name="a"></param>
/// <param name="b"></param>
/// <returns></returns>
[DmtpRpc(true)]//使用函数名直接调用
[DmtpRpc(MethodInvoke =true)]//使用函数名直接调用
int Add(int a, int b);
}
}

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -26,7 +26,7 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -128,24 +128,27 @@ namespace DmtpClientApp
public int Id { get; set; }
}
public class MyDmtpAttribute : DmtpRpcAttribute
{
private readonly string m_route;
/// <summary>
/// 3.1版本中已经不需要了
/// </summary>
//public class MyDmtpAttribute : DmtpRpcAttribute
//{
// private readonly string m_route;
public MyDmtpAttribute(string route = default)
{
this.m_route = route;
}
// public MyDmtpAttribute(string route = default)
// {
// this.m_route = route;
// }
public override string GetInvokeKey(RpcMethod methodInstance)
{
if (this.m_route.IsNullOrEmpty())
{
return base.GetInvokeKey(methodInstance);
}
return this.m_route;
}
}
// public override string GetInvokeKey(RpcMethod methodInstance)
// {
// if (this.m_route.IsNullOrEmpty())
// {
// return base.GetInvokeKey(methodInstance);
// }
// return this.m_route;
// }
//}
public class MyRpcActionFilterAttribute : RpcActionFilterAttribute
{

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -214,7 +214,7 @@ namespace ClientConsoleApp
this.m_logger = logger;
}
[DmtpRpc(true)]//使用函数名直接调用
[DmtpRpc(MethodInvoke = true)]//使用函数名直接调用
public bool Notice(string msg)
{
this.m_logger.Info(msg);

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -89,7 +89,7 @@ namespace ConsoleApp2
/// <param name="a"></param>
/// <param name="b"></param>
/// <returns></returns>
[DmtpRpc(true)]//使用函数名直接调用
[DmtpRpc(MethodInvoke = true)]//使用函数名直接调用
[Description("将两个数相加")]//其作用是生成代理时,作为注释。
[MyRpcActionFilter]
public int Add(int a, int b)

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.AspNetCore" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="2.1.10" />
<PackageReference Include="TouchSocket.AspNetCore" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -35,6 +35,6 @@
</Reference>
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -84,7 +84,7 @@ namespace RealityProxyDmtpRpcConsoleApp
/// <param name="a"></param>
/// <param name="b"></param>
/// <returns></returns>
[DmtpRpc(true)]//使用函数名直接调用
[DmtpRpc(MethodInvoke = true)]//使用函数名直接调用
int Add(int a, int b);
}
}

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
<ItemGroup>

View File

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

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
<ItemGroup>

View File

@@ -138,7 +138,7 @@ namespace RpcStreamConsoleApp
/// <param name="callContext"></param>
/// <param name="channelID"></param>
[Description("测试ServiceToClient创建通道从而实现流数据的传输")]
[DmtpRpc(true)]//此处设置直接使用方法名调用
[DmtpRpc(MethodInvoke = true)]//此处设置直接使用方法名调用
public async Task<int> RpcPullChannel(ICallContext callContext, int channelID)
{
var size = 0;
@@ -164,7 +164,7 @@ namespace RpcStreamConsoleApp
/// <param name="callContext"></param>
/// <param name="channelID"></param>
[Description("测试ServiceToClient创建通道从而实现流数据的传输")]
[DmtpRpc(true)]//此处设置直接使用方法名调用
[DmtpRpc(MethodInvoke = true)]//此处设置直接使用方法名调用
public int RpcPushChannel(ICallContext callContext, int channelID)
{
var size = 0;

View File

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

View File

@@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="MemoryPack" Version="1.21.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Include="TouchSocket.Hosting" Version="2.1.10" />
<PackageReference Include="TouchSocket.NamedPipe" Version="2.1.10" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.1.10" />
<PackageReference Include="TouchSocket.Http" Version="3.0.0-beta.17" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -48,7 +48,7 @@ namespace ClientConsoleApp
using (var stream=File.OpenRead("TouchSocket.dll"))
{
//创建一个请求
var request = new HttpRequest(client);
var request = new HttpRequest();
request.SetContent(new StreamHttpContent(stream));//设置流内容
request.InitHeaders()
.SetUrl("/bigwrite")
@@ -68,7 +68,7 @@ namespace ClientConsoleApp
var client = await GetHttpClient();
//创建一个请求
var request = new HttpRequest(client);
var request = new HttpRequest();
request.SetContent(new BigDataHttpContent());
request.InitHeaders()
.SetUrl("/bigwrite")
@@ -86,7 +86,7 @@ namespace ClientConsoleApp
{
var client = await GetHttpClient();
//创建一个请求
var request = new HttpRequest(client);
var request = new HttpRequest();
request.InitHeaders()
.SetUrl("/WeatherForecast")
.SetHost(client.RemoteIPHost.Host)

View File

@@ -21,7 +21,7 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.1.10" />
<PackageReference Include="TouchSocket.Http" Version="3.0.0-beta.17" />
</ItemGroup>
<ItemGroup>

View File

@@ -210,7 +210,7 @@ namespace ConsoleApp
//此操作会先接收全部数据,然后再分割数据。
//所以上传文件不宜过大,不然会内存溢出。
var multifileCollection = e.Context.Request.GetMultifileCollection();
var multifileCollection =await e.Context.Request.GetFormCollectionAsync();
//foreach (var item in multifileCollection)
//{
@@ -220,12 +220,12 @@ namespace ConsoleApp
// client.Logger.Info(stringBuilder.ToString());
//}
//一般强烈建议使用此处的异步迭代器一般net5以上的都支持
await foreach (var item in multifileCollection)
foreach (var file in multifileCollection.Files)
{
var stringBuilder = new StringBuilder();
stringBuilder.Append($"文件名={item.FileName}\t");
stringBuilder.Append($"数据长度={item.Length}");
stringBuilder.Append($"文件名={file.FileName}\t");
stringBuilder.Append($"数据长度={file.Length}");
client.Logger.Info(stringBuilder.ToString());
}

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.1.10" />
<PackageReference Include="TouchSocket.Http" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -10,6 +10,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Modbus" Version="2.1.10" />
<PackageReference Include="TouchSocket.Modbus" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="2.1.10" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="2.1.10" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,8 +8,8 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageReference Include="TouchSocket.Hosting" Version="2.1.10" />
<PackageReference Include="TouchSocket.NamedPipe" Version="2.1.10" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.0-beta.17" />
</ItemGroup>
<!--<ItemGroup>

View File

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

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -96,7 +96,7 @@ namespace RpcRateLimitingConsoleApp
{
[EnableRateLimiting("FixedWindow")]
[Description("登录")]//服务描述,在生成代理时,会变成注释。
[DmtpRpc("Login")]//服务注册的函数键,此处为显式指定。默认不传参的时候,为该函数类全名+方法名的全小写。
[DmtpRpc(InvokeKey = "Login")]//服务注册的函数键,此处为显式指定。默认不传参的时候,为该函数类全名+方法名的全小写。
public bool Login(string account, string password)
{
if (account == "123" && password == "abc")

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc.RateLimiting" Version="2.1.10" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc.RateLimiting" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.SerialPorts" Version="2.1.10" />
<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

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

View File

@@ -7,11 +7,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.1.10" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.Rpc" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocket" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -161,7 +161,7 @@ namespace UnityServerConsoleApp
private readonly ILog m_logger;
[Description("登录")]
[DmtpRpc(true)]
[DmtpRpc(MethodInvoke = true)]
public MyLoginModelResult Login(ICallContext callContext, MyLoginModel model)
{
if (model.Account == "123" && model.Password == "abc")
@@ -173,7 +173,7 @@ namespace UnityServerConsoleApp
}
[Description("性能测试")]
[DmtpRpc(true)]
[DmtpRpc(MethodInvoke = true)]
public int Performance(int i)
{
Interlocked.Increment(ref this.count);

View File

@@ -5,6 +5,6 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.1.10" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -76,7 +76,7 @@ namespace DispatchProxyWebApiConsoleApp
{
[Router("ApiServer/[action]ab")]
[Router("ApiServer/[action]")]
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
int Sum(int a, int b);
}
}

View File

@@ -7,6 +7,6 @@
<Compile Include="..\WebApiServer\WebApiProxy.cs" Link="WebApiProxy.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -131,13 +131,13 @@ namespace WebApiServerApp
[EnableCors("cors")]//使用跨域
[Router("[api]/[action]ab")]//此路由会以"/ApiServer/Sumab"实现
[Router("[api]/[action]")]//此路由会以"/ApiServer/Sum"实现
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public int Sum(int a, int b)
{
return a + b;
}
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public int SumCallContext(IWebApiCallContext callContext, int a, int b)
{
if (callContext.Caller is IHttpSessionClient httpSessionClient)
@@ -157,7 +157,7 @@ namespace WebApiServerApp
return a + b;
}
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public MyClass GetMyClass()
{
return new MyClass()
@@ -167,7 +167,7 @@ namespace WebApiServerApp
};
}
[WebApi(HttpMethodType.POST)]
[WebApi(Method = HttpMethodType.Post)]
public int TestPost(MyClass myClass)
{
return myClass.A + myClass.B;
@@ -177,7 +177,7 @@ namespace WebApiServerApp
/// 使用调用上下文,响应文件下载。
/// </summary>
/// <param name="callContext"></param>
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public async Task<string> DownloadFile(IWebApiCallContext callContext, string id)
{
if (id == "rrqm")
@@ -192,7 +192,7 @@ namespace WebApiServerApp
/// 使用调用上下文,获取实际请求体。
/// </summary>
/// <param name="callContext"></param>
[WebApi(HttpMethodType.POST)]
[WebApi(Method = HttpMethodType.Post)]
[Router("[api]/[action]")]
public async Task<string> PostContent(IWebApiCallContext callContext)
{
@@ -211,13 +211,13 @@ namespace WebApiServerApp
/// 使用调用上下文,上传多个小文件。
/// </summary>
/// <param name="callContext"></param>
[WebApi(HttpMethodType.POST)]
public Task<string> UploadMultiFile(IWebApiCallContext callContext, string id)
[WebApi(Method = HttpMethodType.Post)]
public async Task<string> UploadMultiFile(IWebApiCallContext callContext, string id)
{
var formFiles = callContext.HttpContext.Request.GetMultifileCollection();
var formFiles =await callContext.HttpContext.Request.GetFormCollectionAsync();
if (formFiles != null)
{
foreach (var item in formFiles)
foreach (var item in formFiles.Files)
{
Console.WriteLine($"fileName={item.FileName},name={item.Name}");
@@ -225,14 +225,14 @@ namespace WebApiServerApp
File.WriteAllBytes(item.FileName, item.Data.ToArray());
}
}
return Task.FromResult("ok");
return "ok";
}
/// <summary>
/// 使用调用上下文,上传大文件。
/// </summary>
/// <param name="callContext"></param>
[WebApi(HttpMethodType.POST)]
[WebApi(Method = HttpMethodType.Post)]
public async Task<string> UploadBigFile(IWebApiCallContext callContext)
{
using (var stream = File.Create("text.file"))
@@ -243,7 +243,7 @@ namespace WebApiServerApp
return "ok";
}
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public string GetString()
{
Console.WriteLine("GetString");
@@ -261,7 +261,7 @@ namespace WebApiServerApp
}
[Router("/[api]/[action]")]
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public async Task ConnectWS(IWebApiCallContext callContext)
{
if (callContext.Caller is HttpSessionClient sessionClient)

View File

@@ -6,8 +6,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="2.1.10" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.0-beta.17" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.0-beta.17" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -7,6 +7,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.1.10" />
<PackageReference Include="TouchSocket.Http" Version="3.0.0-beta.17" />
</ItemGroup>
</Project>

View File

@@ -605,7 +605,7 @@ namespace WebSocketConsoleApp
[Router("/[api]/ws")]
[Router("/[api]/[action]")]
[WebApi(HttpMethodType.GET)]
[WebApi(Method = HttpMethodType.Get)]
public async Task ConnectWS(IWebApiCallContext callContext)
{
if (callContext.Caller is HttpSessionClient socketClient)

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