JacobTech.com
/
LuskiServer
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Framework Update 

A few changes, mostly to update the .NET framework version.
This commit is contained in:
JacobTech 2023-12-22 11:12:54 -05:00
parent 073deb3b00
commit e4bb89c957
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
LuskiServer/Controllers/v1/SocketServerController.cs
View File

@ -23,18 +23,21 @@ public class SocketServerController : ControllerBase
public IActionResult Get() public IActionResult Get()
{ {
ServerRow sr = Tables.Server.ReadRow(Server.ID.CreateParameter(0)); 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, name = sr.Name,
description = sr.Description, description = sr.Description,
owner = sr.Owner owner = sr.Owner
}); };
return this.ResponseToResult(si);
} }
[HttpGet] [HttpGet]
[Produces(MediaTypeNames.Application.Json)] [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) public IActionResult ServerConnect([FromHeader(Name = "key")]string Key)
{ {
byte[] data = Convert.FromBase64String(Key); byte[] data = Convert.FromBase64String(Key);

2
LuskiServer/LuskiServer.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<IncludeBuildOutput>true</IncludeBuildOutput> <IncludeBuildOutput>true</IncludeBuildOutput>