更新demo

This commit is contained in:
若汝棋茗
2024-01-20 20:41:59 +08:00
parent 28bb78b6e6
commit 6ec64f93b6
88 changed files with 444 additions and 275 deletions

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

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

View File

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

View File

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

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

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

View File

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

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.2" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.2" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.2" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

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

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Core" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -9,12 +9,12 @@
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
<ItemGroup>

View File

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

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Core" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -133,9 +133,9 @@ namespace ClientConsoleApp
})
.ConfigurePlugins(a =>
{
a.UseDmtpRpc();
a.UseDmtpRpc()
//.SetSerializationSelector(new MySerializationSelector())//自定义序列化器
//.SetCreateDmtpRpcActor((actor) => new MyDmtpRpcActor(actor, actor.r));
.SetCreateDmtpRpcActor((actor,provider) => new MyDmtpRpcActor(actor, provider,a.Resolver));
a.UseDmtpHeartbeat()
.SetTick(TimeSpan.FromSeconds(3))
@@ -170,7 +170,7 @@ namespace ClientConsoleApp
class MyDmtpRpcActor : DmtpRpcActor, IRpcClient1, IRpcClient2
{
public MyDmtpRpcActor(IDmtpActor smtpActor, IRpcServerProvider rpcServerProvider) : base(smtpActor, rpcServerProvider)
public MyDmtpRpcActor(IDmtpActor smtpActor, IRpcServerProvider rpcServerProvider,IResolver resolver) : base(smtpActor, rpcServerProvider, resolver)
{
}
}

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.AspNetCore" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.AspNetCore" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -18,14 +18,13 @@ namespace DmtpWebApplication
}
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddWebSocketDmtpService(() =>
builder.Services.AddWebSocketDmtpService(config =>
{
return new TouchSocketConfig()
config
.SetDmtpOption(new DmtpOption()
{
VerifyToken = "Dmtp"
})
.UseAspNetCoreContainer(builder.Services)
.ConfigureContainer(a =>
{
a.AddDmtpRouteService();
@@ -37,22 +36,20 @@ namespace DmtpWebApplication
});
//<2F><>ҵ<EFBFBD><EFBFBD><E6B9A6>
builder.Services.AddHttpMiddlewareDmtpService(() =>
builder.Services.AddHttpMiddlewareDmtpService(config =>
{
return new TouchSocketConfig()
.SetDmtpOption(new DmtpOption()
{
VerifyToken = "Dmtp"
})
.UseAspNetCoreContainer(builder.Services)
.ConfigureContainer(a =>
{
a.AddDmtpRouteService();
})
.ConfigurePlugins(a =>
{
//<2F><><EFBFBD>Ӳ<EFBFBD><D3B2><EFBFBD>
});
config.SetDmtpOption(new DmtpOption()
{
VerifyToken = "Dmtp"
})
.ConfigureContainer(a =>
{
a.AddDmtpRouteService();
})
.ConfigurePlugins(a =>
{
//<2F><><EFBFBD>Ӳ<EFBFBD><D3B2><EFBFBD>
});
});
var app = builder.Build();

View File

@@ -35,6 +35,6 @@
</Reference>
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
<ItemGroup>

View File

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

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -5,12 +5,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -5,12 +5,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
<ItemGroup>

View File

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

View File

@@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="MemoryPack" Version="1.10.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -262,6 +262,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModbusMasterConsoleApp", "M
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModbusObjectConsoleApp", "Modbus\ModbusObjectConsoleApp\ModbusObjectConsoleApp.csproj", "{74C98BF5-D663-4CCA-B970-D9A1258B6BB9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpServiceForCorsConsoleApp", "Http\HttpServiceForCorsConsoleApp\HttpServiceForCorsConsoleApp.csproj", "{12A8A263-EF41-4B20-97A8-3D050FF1B326}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -580,6 +582,10 @@ Global
{74C98BF5-D663-4CCA-B970-D9A1258B6BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74C98BF5-D663-4CCA-B970-D9A1258B6BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74C98BF5-D663-4CCA-B970-D9A1258B6BB9}.Release|Any CPU.Build.0 = Release|Any CPU
{12A8A263-EF41-4B20-97A8-3D050FF1B326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12A8A263-EF41-4B20-97A8-3D050FF1B326}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12A8A263-EF41-4B20-97A8-3D050FF1B326}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12A8A263-EF41-4B20-97A8-3D050FF1B326}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -693,6 +699,7 @@ Global
{3043062B-A48A-419F-8F78-9ED234383103} = {0F95EA5A-0E08-4516-89D4-C3BFC88789F9}
{B8326741-67E8-42CB-910A-E236F2C94A8F} = {0F95EA5A-0E08-4516-89D4-C3BFC88789F9}
{74C98BF5-D663-4CCA-B970-D9A1258B6BB9} = {0F95EA5A-0E08-4516-89D4-C3BFC88789F9}
{12A8A263-EF41-4B20-97A8-3D050FF1B326} = {EFB33E23-9E98-4B85-99E4-865705D5ACD2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DB787235-A13A-4A3D-B5A8-5DFEB6511EEE}

View File

@@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="TouchSocket.Hosting" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Hosting" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.267" />
</ItemGroup>
<ItemGroup>

View File

@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,45 @@
using TouchSocket.Core;
using TouchSocket.Http;
using TouchSocket.Sockets;
namespace HttpServiceForCorsConsoleApp
{
internal class Program
{
static void Main(string[] args)
{
var service = new HttpService();
service.Setup(new TouchSocketConfig()//加载配置
.SetListenIPHosts(7789)
.ConfigureContainer(a =>
{
a.AddConsoleLogger();
//添加跨域服务
a.AddCors(corsOption =>
{
//添加跨域策略后续使用policyName即可应用跨域策略。
corsOption.Add("cors", corsBuilder =>
{
corsBuilder.AllowAnyMethod()
.AllowAnyOrigin();
});
});
})
.ConfigurePlugins(a =>
{
//应用名称为cors的跨域策略。
a.UseCors("cors");
//default插件应该最后添加其作用是
//1、为找不到的路由返回404
//2、处理header为Option的探视跨域请求。
a.UseDefaultHttpServicePlugin();
}));
service.Start();
Console.WriteLine("Http服务器已启动");
Console.ReadKey();
}
}
}

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Modbus" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Modbus" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Modbus" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Modbus" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.NamedPipe" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.SerialPorts" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.SerialPorts" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.JsonRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.Rpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

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

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

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

View File

@@ -29,6 +29,18 @@ namespace WebApiServerApp
File.WriteAllText("../../../WebApiProxy.cs", codeString);
#endif
});
//添加跨域服务
//webapi中使用跨域时可以不使用插件的UseCors。直接使用RpcFilter的Aop特性完成。即
a.AddCors(corsOption =>
{
//添加跨域策略后续使用policyName即可应用跨域策略。
corsOption.Add("cors", corsBuilder =>
{
corsBuilder.AllowAnyMethod()
.AllowAnyOrigin();
});
});
})
.ConfigurePlugins(a =>
{
@@ -62,7 +74,7 @@ namespace WebApiServerApp
this.m_logger = logger;
}
[Origin(AllowOrigin = "*")]//跨域设置
[EnableCors("cors")]//使用跨域
[Router("[api]/[action]ab")]//此路由会以"/ApiServer/Sumab"实现
[Router("[api]/[action]")]//此路由会以"/ApiServer/Sum"实现
[WebApi(HttpMethodType.GET)]

View File

@@ -6,8 +6,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -6,8 +6,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.Http" Version="2.0.0-beta.267" />
<PackageReference Include="TouchSocket.WebApi" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
<Compile Include="..\XmlRpcServerApp\RpcProxy.cs" Link="RpcProxy.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.266" />
<PackageReference Include="TouchSocket.XmlRpc" Version="2.0.0-beta.267" />
</ItemGroup>
</Project>

66
handbook/docs/cors.mdx Normal file
View File

@@ -0,0 +1,66 @@
---
id: cors
title: 跨域资源共享
---
### 定义
命名空间TouchSocket.Http <br/>
程序集:[TouchSocket.Http.dll](https://www.nuget.org/packages/TouchSocket.Http)
## 一、说明
什么是跨域?简单来说当一个请求url的协议、域名、端口三者之间任意一个与当前页面url不同即为跨域。那为什么会出现跨域问题呢
出于浏览器的同源策略限制。同源策略Sameoriginpolicy是一种约定它是浏览器最核心也最基本的安全功能如果缺少了同源策略则浏览器的正常功能可能都会受到影响。可以说 Web 是构建在同源策略基础之上的浏览器只是针对同源策略的一种实现。同源策略会阻止一个域的javascript脚本和另外一个域的内容进行交互。所谓同源即指在同一个域就是两个页面具有相同的协议protocol主机host和端口号port
什么是CORS?跨源资源共享 (CORS)
- 是一种 W3C 标准,可让服务器放宽相同的源策略。
- 不是一项安全功能CORS 放宽 security。 API 不能通过允许 CORS 来更安全。 有关详细信息,请参阅 CORS 工作原理。
- 允许服务器明确允许一些跨源请求,同时拒绝其他请求。
- 比早期的技术(如 JSONP更安全且更灵活。
## 二、使用方法
### 2.1 添加Cors服务
```csharp {4} showLineNumbers
.ConfigureContainer(a =>
{
//添加跨域服务
a.AddCors(corsOption =>
{
//添加跨域策略后续使用policyName即可应用跨域策略。
corsOption.Add("cors", corsBuilder =>
{
corsBuilder.AllowAnyMethod()
.AllowAnyOrigin();
});
});
})
```
:::tip 提示
`corsBuilder`可以通过With方法添加更多的跨域设置。例如设置特定的源。
:::
### 2.2 应用跨域策略
```csharp {4} showLineNumbers
.ConfigurePlugins(a =>
{
//应用名称为cors的跨域策略。
a.UseCors("cors");
})
```
:::tip 提示
`UseCors()`的设定会应用到插件访问的之前的所有的http请求上。所以如果需要可以将`UseCors()`放置到最前项。
:::

View File

@@ -293,25 +293,5 @@ Https服务器和http服务器几乎一样只不过增加了一个Ssl的
})
```
## 八、跨域设置
跨域设置,非常简单,基本如下:
```csharp showLineNumbers
.ConfigurePlugins(a =>
{
a.UseCors()
.AllowAnyMethod()
.AllowAnyOrigin()
.AllowCredentials();
}
```
:::tip 提示
跨域设置,除了上述的允许所有配置之外,还可以设置允许指定域名,允许指定方法等。
:::
[本文示例Demo](https://gitee.com/RRQM_Home/TouchSocket/tree/master/examples/Http)

View File

@@ -471,5 +471,48 @@ class AuthenticationPlugin : PluginBase, IHttpPlugin
WebApi也属于Rpc的行列所以在执行时也可以在Rpc的Aop中实现鉴权。具体请看[Rpc服务AOP](./rpcactionfilter.mdx)
## 八、跨域
在`WebApi`中的跨域,除了[Cors跨域](./cors.mdx)全局设置之外,还支持特性设置,进行更细粒度的控制。
所以,首先添加跨域服务是必须的。
```csharp {4} showLineNumbers
.ConfigureContainer(a =>
{
//添加跨域服务
a.AddCors(corsOption =>
{
//添加跨域策略后续使用policyName即可应用跨域策略。
corsOption.Add("cors", corsBuilder =>
{
corsBuilder.AllowAnyMethod()
.AllowAnyOrigin();
});
});
})
```
然后在WebApi中使用特性进行跨域设置。
```csharp {3} showLineNumbers
public partial class ApiServer : RpcServer
{
[EnableCors("cors")]//使用跨域
[WebApi(HttpMethodType.GET)]
public int Sum(int a, int b)
{
return a + b;
}
}
```
:::tip 提示
`EnableCors`特性,不仅可以用于方法,还支持服务类,接口直接使用。
:::
[本文示例Demo](https://gitee.com/RRQM_Home/TouchSocket/tree/master/examples/WebApi)

View File

@@ -458,6 +458,11 @@ module.exports = {
type: "doc",
id: "httpstaticpageplugin",
label: "12.3 静态页面插件"
},
{
type: "doc",
id: "cors",
label: "12.4 Cors跨域"
}
]
},