diff --git a/FastTunnel.Api/Controllers/AccountController.cs b/FastTunnel.Api/Controllers/AccountController.cs index a86cdad..3b09867 100644 --- a/FastTunnel.Api/Controllers/AccountController.cs +++ b/FastTunnel.Api/Controllers/AccountController.cs @@ -39,8 +39,8 @@ namespace FastTunnel.Api.Controllers { if ((serverOptionsMonitor.CurrentValue?.Api?.Accounts?.Length ?? 0) == 0) { - ApiResponse.errorCode = ErrorCodeEnum.NoAccount; - ApiResponse.errorMessage = "账号或密码错误"; + ApiResponse.Success = false; + ApiResponse.Message = "账号或密码错误"; return ApiResponse; } @@ -51,8 +51,8 @@ namespace FastTunnel.Api.Controllers if (account == null) { - ApiResponse.errorCode = ErrorCodeEnum.NoAccount; - ApiResponse.errorMessage = "账号或密码错误"; + ApiResponse.Success = false; + ApiResponse.Message = "账号或密码错误"; return ApiResponse; } @@ -61,7 +61,7 @@ namespace FastTunnel.Api.Controllers new Claim("Name", account.Name) }; - ApiResponse.data = GenerateToken( + ApiResponse.Data = GenerateToken( claims, serverOptionsMonitor.CurrentValue.Api.JWT.IssuerSigningKey, serverOptionsMonitor.CurrentValue.Api.JWT.Expires, diff --git a/FastTunnel.Api/Controllers/SystemController.cs b/FastTunnel.Api/Controllers/SystemController.cs index 0f6c9f5..2224dff 100644 --- a/FastTunnel.Api/Controllers/SystemController.cs +++ b/FastTunnel.Api/Controllers/SystemController.cs @@ -31,7 +31,7 @@ public class SystemController : BaseController [HttpGet] public ApiResponse GetResponseTempList() { - ApiResponse.data = new + ApiResponse.Data = new { Count = fastTunnelServer.ResponseTasks.Count, Rows = fastTunnelServer.ResponseTasks.Select(x => new @@ -50,7 +50,7 @@ public class SystemController : BaseController [HttpGet] public ApiResponse GetAllWebList() { - ApiResponse.data = new + ApiResponse.Data = new { Count = fastTunnelServer.WebList.Count, Rows = fastTunnelServer.WebList.Select(x => new { x.Key, x.Value.WebConfig.LocalIp, x.Value.WebConfig.LocalPort }) @@ -66,7 +66,7 @@ public class SystemController : BaseController [HttpGet] public ApiResponse GetServerOption() { - ApiResponse.data = fastTunnelServer.ServerOption; + ApiResponse.Data = fastTunnelServer.ServerOption; return ApiResponse; } @@ -77,7 +77,7 @@ public class SystemController : BaseController [HttpGet] public ApiResponse GetAllForwardList() { - ApiResponse.data = new + ApiResponse.Data = new { Count = fastTunnelServer.ForwardList.Count, Rows = fastTunnelServer.ForwardList.Select(x => new { x.Key, x.Value.SSHConfig.LocalIp, x.Value.SSHConfig.LocalPort, x.Value.SSHConfig.RemotePort }) @@ -94,7 +94,7 @@ public class SystemController : BaseController [HttpGet] public ApiResponse GetOnlineClientCount() { - ApiResponse.data = fastTunnelServer.ConnectedClientCount; + ApiResponse.Data = fastTunnelServer.ConnectedClientCount; return ApiResponse; } } diff --git a/FastTunnel.Api/Filters/CustomExceptionFilterAttribute.cs b/FastTunnel.Api/Filters/CustomExceptionFilterAttribute.cs index 14262d8..b6d2423 100644 --- a/FastTunnel.Api/Filters/CustomExceptionFilterAttribute.cs +++ b/FastTunnel.Api/Filters/CustomExceptionFilterAttribute.cs @@ -25,9 +25,9 @@ namespace FastTunnel.Api.Filters _logger.LogError(context.Exception, "【全局异常捕获】"); var res = new ApiResponse() { - errorCode = ErrorCodeEnum.Exception, - data = null, - errorMessage = context.Exception.Message, + Success = false, + Data = null, + Message = context.Exception.Message, }; var result = new JsonResult(res) { StatusCode = 200 }; diff --git a/FastTunnel.Api/Models/ApiResponse.cs b/FastTunnel.Api/Models/ApiResponse.cs index 8062309..fffad4f 100644 --- a/FastTunnel.Api/Models/ApiResponse.cs +++ b/FastTunnel.Api/Models/ApiResponse.cs @@ -12,21 +12,12 @@ namespace FastTunnel.Server.Models /// 错误码 /// 0 成功,其他为失败 /// - public ErrorCodeEnum errorCode { get; set; } + public bool Success { get; set; } - public string errorMessage { get; set; } + public string Message { get; set; } - public object data { get; set; } - } + public string Code { get; set; } - public enum ErrorCodeEnum - { - NONE = 0, - - AuthError = 1, - - Exception = 2, - - NoAccount = 3, + public object Data { get; set; } } } diff --git a/FastTunnel.Client/appsettings.json b/FastTunnel.Client/appsettings.json index 4a8ca03..9f0c826 100644 --- a/FastTunnel.Client/appsettings.json +++ b/FastTunnel.Client/appsettings.json @@ -21,7 +21,7 @@ "FastTunnel": { "Server": { // [必选] 服务端ip/域名(来自服务端配置文件的urls参数) - "ServerAddr": "127.0.0.1", + "ServerAddr": "suidao.bx.com.cn", // [必选] 服务端监听的通信端口(来自服务端配置文件的urls参数) "ServerPort": 1270 }, diff --git a/FastTunnel.Core.Client/FastTunnelClient.cs b/FastTunnel.Core.Client/FastTunnelClient.cs index 0f94b99..aab6a37 100644 --- a/FastTunnel.Core.Client/FastTunnelClient.cs +++ b/FastTunnel.Core.Client/FastTunnelClient.cs @@ -67,8 +67,9 @@ public class FastTunnelClient : IFastTunnelClient catch (Exception ex) { _logger.LogError(ex.Message); - await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken); } + + await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken); } _logger.LogInformation("===== FastTunnel Client End ====="); diff --git a/FastTunnel.Server/Startup.cs b/FastTunnel.Server/Startup.cs index 0a8d789..63e9d39 100644 --- a/FastTunnel.Server/Startup.cs +++ b/FastTunnel.Server/Startup.cs @@ -69,7 +69,7 @@ public class Startup app.UseFastTunnelServer(); // -------------------FastTunnel STEP2 END------------------- - app.UseStaticFiles(); + // app.UseStaticFiles(); app.UseAuthentication(); app.UseAuthorization();