From 14812bceb72d516430595029f5193c600b490a5f Mon Sep 17 00:00:00 2001 From: real-zony Date: Fri, 28 Jun 2024 12:29:31 +0800 Subject: [PATCH] refactor: Removed the local server project. --- ZonyLrcTools.sln | 7 -- .../Contract/Dtos/PagedListRequestDto.cs | 7 -- .../Contract/Dtos/PagedListResultDto.cs | 9 --- .../Controllers/MusicInfoController.cs | 24 ------- .../EventBus/SuperSocketListener.cs | 15 ----- src/ZonyLrcTools.LocalServer/Program.cs | 66 ------------------- .../Properties/launchSettings.json | 14 ---- .../MusicInfo/Dtos/MusicInfoListItemDto.cs | 16 ----- .../Services/MusicInfo/IMusicInfoService.cs | 9 --- .../Services/MusicInfo/MusicInfoService.cs | 38 ----------- .../ZonyLrcTools.LocalServer.csproj | 36 ---------- .../appsettings.Development.json | 8 --- src/ZonyLrcTools.LocalServer/appsettings.json | 18 ----- 13 files changed, 267 deletions(-) delete mode 100644 src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListRequestDto.cs delete mode 100644 src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListResultDto.cs delete mode 100644 src/ZonyLrcTools.LocalServer/Controllers/MusicInfoController.cs delete mode 100644 src/ZonyLrcTools.LocalServer/EventBus/SuperSocketListener.cs delete mode 100644 src/ZonyLrcTools.LocalServer/Program.cs delete mode 100644 src/ZonyLrcTools.LocalServer/Properties/launchSettings.json delete mode 100644 src/ZonyLrcTools.LocalServer/Services/MusicInfo/Dtos/MusicInfoListItemDto.cs delete mode 100644 src/ZonyLrcTools.LocalServer/Services/MusicInfo/IMusicInfoService.cs delete mode 100644 src/ZonyLrcTools.LocalServer/Services/MusicInfo/MusicInfoService.cs delete mode 100644 src/ZonyLrcTools.LocalServer/ZonyLrcTools.LocalServer.csproj delete mode 100644 src/ZonyLrcTools.LocalServer/appsettings.Development.json delete mode 100644 src/ZonyLrcTools.LocalServer/appsettings.json diff --git a/ZonyLrcTools.sln b/ZonyLrcTools.sln index 40da903..2afb3fa 100644 --- a/ZonyLrcTools.sln +++ b/ZonyLrcTools.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZonyLrcTools.Cli", "src\Zon EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZonyLrcTools.Tests", "tests\ZonyLrcTools.Tests\ZonyLrcTools.Tests.csproj", "{FFBD3200-568F-455B-8390-5E76C51D522C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZonyLrcTools.LocalServer", "src\ZonyLrcTools.LocalServer\ZonyLrcTools.LocalServer.csproj", "{2875A08A-FFD6-4863-B815-5384DCFE88FC}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZonyLrcTools.Common", "src\ZonyLrcTools.Common\ZonyLrcTools.Common.csproj", "{9B42E4CA-61AA-4798-8D2B-2D8A7035EB67}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZonyLrcTools.Desktop", "src\ZonyLrcTools.Desktop\ZonyLrcTools.Desktop.csproj", "{DC92902B-4303-4E43-AFB3-3F93FD3986AD}" @@ -31,10 +29,6 @@ Global {FFBD3200-568F-455B-8390-5E76C51D522C}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFBD3200-568F-455B-8390-5E76C51D522C}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFBD3200-568F-455B-8390-5E76C51D522C}.Release|Any CPU.Build.0 = Release|Any CPU - {2875A08A-FFD6-4863-B815-5384DCFE88FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2875A08A-FFD6-4863-B815-5384DCFE88FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2875A08A-FFD6-4863-B815-5384DCFE88FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2875A08A-FFD6-4863-B815-5384DCFE88FC}.Release|Any CPU.Build.0 = Release|Any CPU {9B42E4CA-61AA-4798-8D2B-2D8A7035EB67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B42E4CA-61AA-4798-8D2B-2D8A7035EB67}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B42E4CA-61AA-4798-8D2B-2D8A7035EB67}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -53,7 +47,6 @@ Global GlobalSection(NestedProjects) = preSolution {55D74323-ABFA-4A73-A3BF-F3E8D5DE6DE8} = {C29FB05C-54B1-4020-94D2-87E192EB2F98} {FFBD3200-568F-455B-8390-5E76C51D522C} = {AF8ADB2F-E46C-4DEE-8316-652D9FE1A69B} - {2875A08A-FFD6-4863-B815-5384DCFE88FC} = {C29FB05C-54B1-4020-94D2-87E192EB2F98} {9B42E4CA-61AA-4798-8D2B-2D8A7035EB67} = {C29FB05C-54B1-4020-94D2-87E192EB2F98} {DC92902B-4303-4E43-AFB3-3F93FD3986AD} = {C29FB05C-54B1-4020-94D2-87E192EB2F98} EndGlobalSection diff --git a/src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListRequestDto.cs b/src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListRequestDto.cs deleted file mode 100644 index 77c07ac..0000000 --- a/src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListRequestDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace ZonyLrcTools.LocalServer.Contract.Dtos; - -public class PagedListRequestDto -{ - public int PageIndex { get; set; } - public int PageSize { get; set; } -} \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListResultDto.cs b/src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListResultDto.cs deleted file mode 100644 index 2689077..0000000 --- a/src/ZonyLrcTools.LocalServer/Contract/Dtos/PagedListResultDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ZonyLrcTools.LocalServer.Contract.Dtos; - -public class PagedListResultDto -{ - public int TotalCount { get; set; } - public int PageIndex { get; set; } - public int PageSize { get; set; } - public List Items { get; set; } = new List(); -} \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/Controllers/MusicInfoController.cs b/src/ZonyLrcTools.LocalServer/Controllers/MusicInfoController.cs deleted file mode 100644 index bff56cc..0000000 --- a/src/ZonyLrcTools.LocalServer/Controllers/MusicInfoController.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using ZonyLrcTools.Common.Infrastructure.DependencyInject; -using ZonyLrcTools.LocalServer.Contract.Dtos; -using ZonyLrcTools.LocalServer.Services.MusicInfo; -using ZonyLrcTools.LocalServer.Services.MusicInfo.Dtos; - -namespace ZonyLrcTools.LocalServer.Controllers; - -[Route("api/music-infos")] -public class MusicInfoController : Controller, IMusicInfoService, ITransientDependency -{ - private readonly IMusicInfoService _musicInfoService; - - public MusicInfoController(IMusicInfoService musicInfoService) - { - _musicInfoService = musicInfoService; - } - - [HttpGet] - public Task> GetMusicInfoListAsync(MusicInfoListInput input) - { - return _musicInfoService.GetMusicInfoListAsync(input); - } -} \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/EventBus/SuperSocketListener.cs b/src/ZonyLrcTools.LocalServer/EventBus/SuperSocketListener.cs deleted file mode 100644 index 74e4f7b..0000000 --- a/src/ZonyLrcTools.LocalServer/EventBus/SuperSocketListener.cs +++ /dev/null @@ -1,15 +0,0 @@ -using SuperSocket.WebSocket.Server; - -namespace ZonyLrcTools.LocalServer.EventBus; - -public class SuperSocketListener -{ - public async Task ListenAsync() - { - var host = WebSocketHostBuilder.Create() - .UseWebSocketMessageHandler(async (session, message) => { await session.SendAsync(message); }) - .Build(); - - await host.StartAsync(); - } -} \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/Program.cs b/src/ZonyLrcTools.LocalServer/Program.cs deleted file mode 100644 index bb97489..0000000 --- a/src/ZonyLrcTools.LocalServer/Program.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Diagnostics; -using System.Reflection; -using ZonyLrcTools.Common.Infrastructure.DependencyInject; -using ZonyLrcTools.LocalServer.EventBus; - -#region Main Flow - -var app = RegisterAndConfigureServices(); -await ListenServices(); - -#endregion - -#region Configure Services - -async Task ListenServices() -{ - await new SuperSocketListener().ListenAsync(); - await app?.RunAsync()!; -} - -WebApplication? RegisterAndConfigureServices() -{ - var builder = WebApplication.CreateBuilder(args); - builder.WebHost.ConfigureKestrel(k => k.ListenAnyIP(50002)); - - builder.Services.AddControllers(); - builder.Services.AddEndpointsApiExplorer(); - builder.Services.BeginAutoDependencyInject(); - - var insideApp = builder.Build(); - insideApp.UseSpaStaticFiles(new StaticFileOptions - { - RequestPath = "", - FileProvider = new Microsoft.Extensions.FileProviders - .ManifestEmbeddedFileProvider( - Assembly.GetExecutingAssembly(), "UiStaticResources" - ) - }); - - insideApp.MapControllers(); -#if !DEBUG - insideApp.Lifetime.ApplicationStarted.Register(OpenBrowser); -#endif - - return insideApp; -} - -void OpenBrowser() -{ - const string url = "http://localhost:50002/index.html"; - - if (OperatingSystem.IsWindows()) - { - Process.Start("explorer.exe", url); - } - else if (OperatingSystem.IsMacOS()) - { - Process.Start("open", url); - } - else if (OperatingSystem.IsLinux()) - { - Process.Start("xdg-open", url); - } -} - -#endregion \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/Properties/launchSettings.json b/src/ZonyLrcTools.LocalServer/Properties/launchSettings.json deleted file mode 100644 index 1b34c0f..0000000 --- a/src/ZonyLrcTools.LocalServer/Properties/launchSettings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "profiles": { - "ZonyLrcTools.LocalServer": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "http://localhost:50002", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/src/ZonyLrcTools.LocalServer/Services/MusicInfo/Dtos/MusicInfoListItemDto.cs b/src/ZonyLrcTools.LocalServer/Services/MusicInfo/Dtos/MusicInfoListItemDto.cs deleted file mode 100644 index 9556899..0000000 --- a/src/ZonyLrcTools.LocalServer/Services/MusicInfo/Dtos/MusicInfoListItemDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -using ZonyLrcTools.LocalServer.Contract.Dtos; - -namespace ZonyLrcTools.LocalServer.Services.MusicInfo.Dtos; - -public class MusicInfoListItemDto -{ - public string Name { get; set; } - - public int Size { get; set; } - - public int Status { get; set; } -} - -public class MusicInfoListInput : PagedListRequestDto -{ -} \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/Services/MusicInfo/IMusicInfoService.cs b/src/ZonyLrcTools.LocalServer/Services/MusicInfo/IMusicInfoService.cs deleted file mode 100644 index ee17aa1..0000000 --- a/src/ZonyLrcTools.LocalServer/Services/MusicInfo/IMusicInfoService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ZonyLrcTools.LocalServer.Contract.Dtos; -using ZonyLrcTools.LocalServer.Services.MusicInfo.Dtos; - -namespace ZonyLrcTools.LocalServer.Services.MusicInfo; - -public interface IMusicInfoService -{ - Task> GetMusicInfoListAsync(MusicInfoListInput input); -} \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/Services/MusicInfo/MusicInfoService.cs b/src/ZonyLrcTools.LocalServer/Services/MusicInfo/MusicInfoService.cs deleted file mode 100644 index 87cc527..0000000 --- a/src/ZonyLrcTools.LocalServer/Services/MusicInfo/MusicInfoService.cs +++ /dev/null @@ -1,38 +0,0 @@ -using ZonyLrcTools.Common.Infrastructure.DependencyInject; -using ZonyLrcTools.LocalServer.Contract.Dtos; -using ZonyLrcTools.LocalServer.Services.MusicInfo.Dtos; - -namespace ZonyLrcTools.LocalServer.Services.MusicInfo; - -public class MusicInfoService : ITransientDependency, IMusicInfoService -{ - public async Task> GetMusicInfoListAsync(MusicInfoListInput input) - { - await Task.CompletedTask; - - return new PagedListResultDto - { - Items = new List - { - new MusicInfoListItemDto - { - Name = "测试歌曲", - Size = 1024, - Status = 1 - }, - new MusicInfoListItemDto - { - Name = "测试歌曲2", - Size = 1024, - Status = 1 - }, - new MusicInfoListItemDto - { - Name = "测试歌曲3", - Size = 1024, - Status = 1 - }, - } - }; - } -} \ No newline at end of file diff --git a/src/ZonyLrcTools.LocalServer/ZonyLrcTools.LocalServer.csproj b/src/ZonyLrcTools.LocalServer/ZonyLrcTools.LocalServer.csproj deleted file mode 100644 index aa3508c..0000000 --- a/src/ZonyLrcTools.LocalServer/ZonyLrcTools.LocalServer.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - net8.0 - enable - enable - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ZonyLrcTools.LocalServer/appsettings.Development.json b/src/ZonyLrcTools.LocalServer/appsettings.Development.json deleted file mode 100644 index a6e86ac..0000000 --- a/src/ZonyLrcTools.LocalServer/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/src/ZonyLrcTools.LocalServer/appsettings.json b/src/ZonyLrcTools.LocalServer/appsettings.json deleted file mode 100644 index 7de5527..0000000 --- a/src/ZonyLrcTools.LocalServer/appsettings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*", - "serverOptions": { - "name": "ZonyLRcToolsServer", - "listeners": [ - { - "ip": "Any", - "port": 50001 - } - ] - } -}