From 429a08930f71b30cd0962863f42dc1ce2bca4040 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Fri, 14 Nov 2025 23:49:38 +0800 Subject: [PATCH] :recycle: Refactored the server-side versioning by move that logic to Gateway only --- DysonNetwork.Drive/Storage/FileService.cs | 2 +- DysonNetwork.Drive/VersionController.cs | 20 ------------------- .../DysonNetwork.Gateway.csproj | 4 ++++ .../VersionController.cs | 6 +++--- .../version.json | 0 DysonNetwork.Pass/version.json | 7 ------- .../DysonNetwork.Shared.csproj | 5 ----- DysonNetwork.Shared/Http/SwaggerGen.cs | 16 +-------------- DysonNetwork.Sphere/VersionController.cs | 20 ------------------- DysonNetwork.Sphere/version.json | 7 ------- 10 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 DysonNetwork.Drive/VersionController.cs rename {DysonNetwork.Pass => DysonNetwork.Gateway}/VersionController.cs (88%) rename {DysonNetwork.Drive => DysonNetwork.Gateway}/version.json (100%) delete mode 100644 DysonNetwork.Pass/version.json delete mode 100644 DysonNetwork.Sphere/VersionController.cs delete mode 100644 DysonNetwork.Sphere/version.json diff --git a/DysonNetwork.Drive/Storage/FileService.cs b/DysonNetwork.Drive/Storage/FileService.cs index b9acb51..9885646 100644 --- a/DysonNetwork.Drive/Storage/FileService.cs +++ b/DysonNetwork.Drive/Storage/FileService.cs @@ -771,7 +771,7 @@ file class UpdatableCloudFile(SnCloudFile file) public Dictionary? UserMeta { get; set; } = file.UserMeta; public bool IsMarkedRecycle { get; set; } = file.IsMarkedRecycle; - public Expression, SetPropertyCalls>> ToSetPropertyCalls() + public Action> ToSetPropertyCalls() { var userMeta = UserMeta ?? []; return setter => setter diff --git a/DysonNetwork.Drive/VersionController.cs b/DysonNetwork.Drive/VersionController.cs deleted file mode 100644 index f9f5251..0000000 --- a/DysonNetwork.Drive/VersionController.cs +++ /dev/null @@ -1,20 +0,0 @@ -using DysonNetwork.Shared.Data; -using Microsoft.AspNetCore.Mvc; - -namespace DysonNetwork.Drive; - -[ApiController] -[Route("/api/version")] -public class VersionController : ControllerBase -{ - [HttpGet] - public IActionResult Get() - { - return Ok(new AppVersion - { - Version = ThisAssembly.AssemblyVersion, - Commit = ThisAssembly.GitCommitId, - UpdateDate = ThisAssembly.GitCommitDate - }); - } -} diff --git a/DysonNetwork.Gateway/DysonNetwork.Gateway.csproj b/DysonNetwork.Gateway/DysonNetwork.Gateway.csproj index 08a77b5..821abf5 100644 --- a/DysonNetwork.Gateway/DysonNetwork.Gateway.csproj +++ b/DysonNetwork.Gateway/DysonNetwork.Gateway.csproj @@ -8,6 +8,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/DysonNetwork.Pass/VersionController.cs b/DysonNetwork.Gateway/VersionController.cs similarity index 88% rename from DysonNetwork.Pass/VersionController.cs rename to DysonNetwork.Gateway/VersionController.cs index 3beaed5..9f985b8 100644 --- a/DysonNetwork.Pass/VersionController.cs +++ b/DysonNetwork.Gateway/VersionController.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; using DysonNetwork.Shared.Data; +using Microsoft.AspNetCore.Mvc; -namespace DysonNetwork.Pass; +namespace DysonNetwork.Gateway; [ApiController] -[Route("/api/version")] +[Route("/version")] public class VersionController : ControllerBase { [HttpGet] diff --git a/DysonNetwork.Drive/version.json b/DysonNetwork.Gateway/version.json similarity index 100% rename from DysonNetwork.Drive/version.json rename to DysonNetwork.Gateway/version.json diff --git a/DysonNetwork.Pass/version.json b/DysonNetwork.Pass/version.json deleted file mode 100644 index 9fbf8d3..0000000 --- a/DysonNetwork.Pass/version.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "1.0", - "publicReleaseRefSpec": ["^refs/heads/main$"], - "cloudBuild": { - "setVersionVariables": true - } -} diff --git a/DysonNetwork.Shared/DysonNetwork.Shared.csproj b/DysonNetwork.Shared/DysonNetwork.Shared.csproj index 27c66b0..af86259 100644 --- a/DysonNetwork.Shared/DysonNetwork.Shared.csproj +++ b/DysonNetwork.Shared/DysonNetwork.Shared.csproj @@ -48,11 +48,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/DysonNetwork.Shared/Http/SwaggerGen.cs b/DysonNetwork.Shared/Http/SwaggerGen.cs index a726e81..16515a4 100644 --- a/DysonNetwork.Shared/Http/SwaggerGen.cs +++ b/DysonNetwork.Shared/Http/SwaggerGen.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; namespace DysonNetwork.Shared.Http; @@ -36,20 +36,6 @@ public static class SwaggerGen BearerFormat = "JWT", Scheme = "Bearer" }); - options.AddSecurityRequirement(new OpenApiSecurityRequirement - { - { - new OpenApiSecurityScheme - { - Reference = new OpenApiReference - { - Type = ReferenceType.SecurityScheme, - Id = "Bearer" - } - }, - [] - } - }); }); builder.Services.AddOpenApi(); diff --git a/DysonNetwork.Sphere/VersionController.cs b/DysonNetwork.Sphere/VersionController.cs deleted file mode 100644 index c406ab2..0000000 --- a/DysonNetwork.Sphere/VersionController.cs +++ /dev/null @@ -1,20 +0,0 @@ -using DysonNetwork.Shared.Data; -using Microsoft.AspNetCore.Mvc; - -namespace DysonNetwork.Sphere; - -[ApiController] -[Route("/api/version")] -public class VersionController : ControllerBase -{ - [HttpGet] - public IActionResult Get() - { - return Ok(new AppVersion - { - Version = ThisAssembly.AssemblyVersion, - Commit = ThisAssembly.GitCommitId, - UpdateDate = ThisAssembly.GitCommitDate - }); - } -} diff --git a/DysonNetwork.Sphere/version.json b/DysonNetwork.Sphere/version.json deleted file mode 100644 index 9fbf8d3..0000000 --- a/DysonNetwork.Sphere/version.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "version": "1.0", - "publicReleaseRefSpec": ["^refs/heads/main$"], - "cloudBuild": { - "setVersionVariables": true - } -}