diff --git a/LuskiServer/Controllers/v1/SocketServerController.cs b/LuskiServer/Controllers/v1/SocketServerController.cs index dbfcdcd..e8de48b 100644 --- a/LuskiServer/Controllers/v1/SocketServerController.cs +++ b/LuskiServer/Controllers/v1/SocketServerController.cs @@ -23,18 +23,21 @@ public class SocketServerController : ControllerBase public IActionResult Get() { ServerRow sr = Tables.Server.ReadRow(Server.ID.CreateParameter(0)); - return this.ResponseToResult(new ServerInfoJson() + ServerInfoJson si = new ServerInfoJson() { - wssv4 = (Luski.Config.IPv4_Overode_WSS is null ? $"{(Luski.Config.IPv4SecureWSS ? "wss" : "ws" )}://{Luski.Config.IPv4WSS}:{Luski.Config.IPv4PortWSS}{Luski.Config.IPv4_URL_WSS}/v1" : Luski.Config.IPv4_Overode_WSS + "v1"), + wssv4 = (Luski.Config.IPv4_Overode_WSS is null + ? $"{(Luski.Config.IPv4SecureWSS ? "wss" : "ws")}://{Luski.Config.IPv4WSS}:{Luski.Config.IPv4PortWSS}{Luski.Config.IPv4_URL_WSS}v1" + : Luski.Config.IPv4_Overode_WSS + "v1"), name = sr.Name, description = sr.Description, owner = sr.Owner - }); + }; + return this.ResponseToResult(si); } [HttpGet] [Produces(MediaTypeNames.Application.Json)] - [Route(Luski.Info.Routes.Default.Base)] + [Route(Luski.Info.Routes.Default.Base + "/servercom")] public IActionResult ServerConnect([FromHeader(Name = "key")]string Key) { byte[] data = Convert.FromBase64String(Key); diff --git a/LuskiServer/LuskiServer.csproj b/LuskiServer/LuskiServer.csproj index 82aaf99..c9b3706 100644 --- a/LuskiServer/LuskiServer.csproj +++ b/LuskiServer/LuskiServer.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable true