King_Tech/FastTunnel
King_Tech/FastTunnel
1
0
Fork 0
mirror of https://github.com/FastTunnel/FastTunnel.git synced 2025-02-08 02:39:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
SpringHgui 2019-12-18 18:27:26 +08:00
parent d2b90c9d46
commit bced66d9d9
5 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
FastTunnel.Core/Client/SuiDaoClient.cs
View File

@ -70,16 +70,16 @@ namespace FastTunnel.Core.Client
{
foreach (var item in msgs)
{
if (!string.IsNullOrEmpty(item))
if (string.IsNullOrEmpty(item))
continue;
if (item.EndsWith("}"))
{
if (item.EndsWith("}"))
{
HandleServerRequest(item);
}
else
{
lastBuffer = item;
}
HandleServerRequest(item);
}
else
{
lastBuffer = item;
}
}
}
@ -98,33 +98,33 @@ namespace FastTunnel.Core.Client
try
{
Msg = JsonConvert.DeserializeObject<Message<object>>(words);
_logger.Info($"收到服务端指令 {Msg.MessageType}");
switch (Msg.MessageType)
{
case MessageType.C_Heart:
break;
case MessageType.S_NewCustomer:
var request = (Msg.Content as JObject).ToObject<NewCustomerRequest>();
var connecter = new Connecter(_clientConfig.Common.ServerAddr, _clientConfig.Common.ServerPort);
connecter.Connect();
connecter.Send(new Message<string> { MessageType = MessageType.C_NewRequest, Content = request.MsgId });
var localConnecter = new Connecter(request.WebConfig.LocalIp, request.WebConfig.LocalPort);
localConnecter.Connect();
new SocketSwap(connecter.Client, localConnecter.Client).StartSwap();
break;
case MessageType.C_NewRequest:
case MessageType.C_LogIn:
default:
throw new Exception("参数异常");
}
}
catch (Exception ex)
{
throw;
}
_logger.Info($"收到服务端指令 {Msg.MessageType}");
switch (Msg.MessageType)
{
case MessageType.C_Heart:
break;
case MessageType.S_NewCustomer:
var request = (Msg.Content as JObject).ToObject<NewCustomerRequest>();
var connecter = new Connecter(_clientConfig.Common.ServerAddr, _clientConfig.Common.ServerPort);
connecter.Connect();
connecter.Send(new Message<string> { MessageType = MessageType.C_NewRequest, Content = request.MsgId });
var localConnecter = new Connecter(request.WebConfig.LocalIp, request.WebConfig.LocalPort);
localConnecter.Connect();
new SocketSwap(connecter.Client, localConnecter.Client).StartSwap();
break;
case MessageType.C_NewRequest:
case MessageType.C_LogIn:
default:
throw new Exception("参数异常");
_logger.Error(ex);
_logger.Error(words);
}
}
}

1
FastTunnel.Core/Listener.cs
View File

@ -14,7 +14,6 @@ namespace FastTunnel.Core
Action<Socket> handler;
Socket socket;
public Listener(string ip, int port, Action<Socket> acceptCustomerHandler)
{
this._ip = ip;

5
FastTunnel.Core/Logger/ConsoleLogger.cs
View File

@ -6,6 +6,11 @@ namespace FastTunnel.Core.Logger
{
public class ConsoleLogger : ILogger
{
public void Error(object msg)
{
Console.WriteLine(string.Format("Erro - {0}", msg?.ToString()));
}
public void Debug(string msg)
{
Console.WriteLine(string.Format("Debu - {0}", msg));

2
FastTunnel.Core/Logger/ILogger.cs
View File

@ -6,6 +6,8 @@ namespace FastTunnel.Core.Logger
{
public interface ILogger
{
void Error(object msg);
void Error(string msg);
void Warning(string msg);

4
FastTunnel.Core/Server/SuiDaoServer.cs
View File

@ -91,8 +91,8 @@ namespace FastTunnel.Core.Server
var collection = Regex.Matches(words, pattern);
if (collection.Count == 0)
{
// TODO:
throw new Exception("不支持使用ip直接访问");
_logger.Error($"Host异常：{words}");
return;
}
else
{