🌜🌜🌜

This commit is contained in:
SpringHgui 2021-08-13 00:55:55 +08:00
parent ae12ef8104
commit cbc6fedcaf
4 changed files with 12 additions and 28 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ publish
/FastTunnel.Core/*.user /FastTunnel.Core/*.user
/build /build
/FastTunnel.Server/.config /FastTunnel.Server/.config
/FastTunnel.Server/logs

View File

@ -1,17 +1,16 @@
{ {
//"Logging": { "Logging": {
// "LogLevel": { "LogLevel": {
// // Trace Debug Information Warning Error // Trace Debug Information Warning Error
// "Default": "Information", "Default": "Information",
// "Microsoft": "Warning", "Microsoft": "Warning",
// "Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
// } }
//}, },
"EnableFileLog": false, "EnableFileLog": false,
"ClientSettings": { "ClientSettings": {
"Server": { "Server": {
// ip/ // ip/
//"ServerAddr": "my.com",
"ServerAddr": "127.0.0.1", "ServerAddr": "127.0.0.1",
// //
"ServerPort": 1270 "ServerPort": 1270
@ -27,7 +26,6 @@
{ {
// ip // ip
"LocalIp": "127.0.0.1", "LocalIp": "127.0.0.1",
// //
"LocalPort": 8090, "LocalPort": 8090,
@ -36,11 +34,6 @@
// Aip // Aip
// "WWW": [ "www.abc.com", "test111.test.cc" ] // "WWW": [ "www.abc.com", "test111.test.cc" ]
},
{
"LocalIp": "127.0.0.1",
"LocalPort": 8091,
"SubDomain": "test1"
} }
], ],
@ -53,16 +46,6 @@
"Forwards": [ "Forwards": [
{ {
"LocalIp": "127.0.0.1", "LocalIp": "127.0.0.1",
"LocalPort": 8090,
"RemotePort": 7090
},
{
"LocalIp": "127.0.0.1",
"LocalPort": 8091,
"RemotePort": 7091
},
{
"LocalIp": "10.70.250.17",
"LocalPort": 3389, // windows3389 "LocalPort": 3389, // windows3389
"RemotePort": 1274 // 访 ip:1274 window "RemotePort": 1274 // 访 ip:1274 window
} }

View File

@ -75,7 +75,7 @@ namespace FastTunnel.Core.Client
{ {
try try
{ {
var logMsg = GetLoginMsg(); var logMsg = GetLoginMsg(cancellationToken);
// 连接到的目标IP // 连接到的目标IP
socket = new ClientWebSocket(); socket = new ClientWebSocket();
@ -98,7 +98,7 @@ namespace FastTunnel.Core.Client
} }
} }
public virtual string GetLoginMsg() public virtual string GetLoginMsg(CancellationToken cancellationToken)
{ {
Server = ClientConfig.Server; Server = ClientConfig.Server;
return new LogInMassage return new LogInMassage

View File

@ -23,4 +23,4 @@
// Token, // Token,
"Token": "TOKEN_FOR_CLIENT_AUTHENTICATION" "Token": "TOKEN_FOR_CLIENT_AUTHENTICATION"
} }
} }