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 2020-04-02 00:30:04 +08:00
parent f54de4bda7
commit 7e298f7d17
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FastTunnel.Client/Program.cs
View File

@ -52,7 +52,6 @@ namespace FastTunnel.Client
{
var client = servicesProvider.GetRequiredService<FastTunnelClient>();
var config = servicesProvider.GetRequiredService<ClientConfig>();
client.SetConfig(config);
client.Login(() =>
{
@ -82,7 +81,7 @@ namespace FastTunnel.Client
});
return _client;
});
}, config.Common);
while (true)
{

15
FastTunnel.Core/Core/SuiDaoClient.cs
View File

@ -17,7 +17,7 @@ namespace FastTunnel.Core.Core
{
public class FastTunnelClient
{
ClientConfig _clientConfig;
SuiDaoServer _serverConfig;
Connecter _client;
@ -86,8 +86,10 @@ namespace FastTunnel.Core.Core
}
}
public void Login(Func<Connecter> fun)
public void Login(Func<Connecter> fun, SuiDaoServer serverConfig)
{
_serverConfig = serverConfig;
login = fun;
_client = login.Invoke();
LogSuccess(_client.Socket);
@ -116,11 +118,6 @@ namespace FastTunnel.Core.Core
}
}
public void SetConfig(ClientConfig config)
{
_clientConfig = config;
}
private void LogSuccess(Socket socket)
{
_logger.LogDebug("通信已建立");
@ -205,7 +202,7 @@ namespace FastTunnel.Core.Core
break;
case MessageType.S_NewCustomer:
var request = (Msg.Content as JObject).ToObject<NewCustomerRequest>();
var connecter = new Connecter(_clientConfig.Common.ServerAddr, _clientConfig.Common.ServerPort);
var connecter = new Connecter(_serverConfig.ServerAddr, _serverConfig.ServerPort);
connecter.Connect();
connecter.Send(new Message<string> { MessageType = MessageType.C_SwapMsg, Content = request.MsgId });
@ -216,7 +213,7 @@ namespace FastTunnel.Core.Core
break;
case MessageType.S_NewSSH:
var request_ssh = (Msg.Content as JObject).ToObject<NewSSHRequest>();
var connecter_ssh = new Connecter(_clientConfig.Common.ServerAddr, _clientConfig.Common.ServerPort);
var connecter_ssh = new Connecter(_serverConfig.ServerAddr, _serverConfig.ServerPort);
connecter_ssh.Connect();
connecter_ssh.Send(new Message<string> { MessageType = MessageType.C_SwapMsg, Content = request_ssh.MsgId });

13
SuiDao.Client/Program.cs
View File

@ -30,11 +30,7 @@ namespace SuiDao.Client
while (true)
{
Console.Write("请输入登录密钥：");
#if DEBUG
key = "87e931d242884ecaa9c51a5a09a00eef";
#else
key = Console.ReadLine();
#endif
key = Console.ReadLine();
if (string.IsNullOrEmpty(key))
{
@ -76,10 +72,13 @@ namespace SuiDao.Client
var jobj = JObject.Parse(res);
if ((bool)jobj["success"] == true)
{
var server = jobj["data"].ToObject<SuiDaoServerConfig>();
var client = servicesProvider.GetRequiredService<FastTunnelClient>();
client.Login(() =>
{
var server = jobj["data"].ToObject<SuiDaoServerConfig>();
Connecter _client = null;
try
@ -99,7 +98,7 @@ namespace SuiDao.Client
_client.Send(new Message<LogInByKeyRequest> { MessageType = MessageType.C_LogIn, Content = new LogInByKeyRequest { key = key } });
return _client;
});
}, new SuiDaoServer { ServerAddr = server.ip, ServerPort = server.bind_port });
}

2
publish.cmd
View File

@ -1,6 +1,6 @@
@echo off
for /d %%p in (FastTunnel.Client,FastTunnel.Server) do (
for /d %%p in (FastTunnel.Client,FastTunnel.Server,SuiDao.Client) do (
CD ./%%p
for %%I in (win-x64,osx-x64,linux-x64) do (
dotnet publish -o=../publish/%%p.%%I -c=release -f=netcoreapp3.1 -r=%%I --self-contained & 7z a -tzip ../publish/%%p.%%I.zip ../publish/%%p.%%I