使用 Spectre.Console.Cli，并启用本地化

niltor · web-flow · commit 675dd93bbe8d · 2025-05-12T22:58:31.000+08:00
diff --git a/scripts/PublishToLocal.ps1 b/scripts/PublishToLocal.ps1
@@ -9,7 +9,7 @@ $OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEnco
 
 $commandLinePath = Join-Path $location "../src/Command/CommandLine";
 $studioPath = Join-Path $location "../src/Studio/AterStudio";
-$dotnetVersion = "net8.0"
+$dotnetVersion = "net9.0"
 
 try {
     Set-Location $location
@@ -48,7 +48,7 @@ try {
     $xml.Save($studioProjectPath)
 
     # pack modules
-    & "./PackTemplate.ps1"
+    # & "./PackTemplate.ps1"
 
     # build web project
     if ($withStudio -eq $true) {
diff --git a/src/Command/Command.Share/Command.Share.csproj b/src/Command/Command.Share/Command.Share.csproj
@@ -6,6 +6,7 @@
     </PropertyGroup>
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
+      <PackageReference Include="Spectre.Console" Version="0.50.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Definition\Share\Share.csproj" />
diff --git a/src/Command/Command.Share/CommandRunner.cs b/src/Command/Command.Share/CommandRunner.cs
@@ -1,7 +1,7 @@
-﻿using CodeGenerator;
+using CodeGenerator;
 using CodeGenerator.Helper;
 using CodeGenerator.Models;
-using Entity;
+using Command.Share.Runners;
 using Microsoft.Extensions.Logging;
 using Share.Services;
 
@@ -25,8 +25,8 @@ public class CommandRunner(CodeGenService codeGen, CodeAnalysisService codeAnaly
     public static async Task RunStudioAsync()
     {
         using var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
-        ILogger<StudioCommand> studioLogger = loggerFactory.CreateLogger<StudioCommand>();
-        var studioCommand = new StudioCommand(studioLogger);
+        ILogger<StudioRunner> studioLogger = loggerFactory.CreateLogger<StudioRunner>();
+        var studioCommand = new StudioRunner(studioLogger);
         await studioCommand.RunStudioAsync();
     }
 
@@ -36,8 +36,8 @@ public static async Task RunStudioAsync()
     public static void UpdateStudio()
     {
         using var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
-        ILogger<StudioCommand> studioLogger = loggerFactory.CreateLogger<StudioCommand>();
-        var studioCommand = new StudioCommand(studioLogger);
+        ILogger<StudioRunner> studioLogger = loggerFactory.CreateLogger<StudioRunner>();
+        var studioCommand = new StudioRunner(studioLogger);
         studioCommand.UpdateStudio();
     }
 
@@ -52,7 +52,7 @@ public async Task GenerateNgAsync(string url = "", string output = "")
         try
         {
             _logger.LogInformation("🚀 Generating ts models and ng services...");
-            RequestCommand cmd = new(url, output, RequestLibType.NgHttp);
+            RequestRunner cmd = new(url, output, RequestLibType.NgHttp);
             await cmd.RunAsync();
         }
         catch (WebException webExp)
@@ -77,7 +77,7 @@ public async Task GenerateRequestAsync(string url = "", string output = "", Requ
         try
         {
             _logger.LogInformation($"🚀 Generating ts models and {type} request services...");
-            RequestCommand cmd = new(url, output, type);
+            RequestRunner cmd = new(url, output, type);
             await cmd.RunAsync();
         }
         catch (WebException webExp)
@@ -171,7 +171,7 @@ public async Task GenerateApiAsync(string entityPath, string sharePath = "",
     /// <returns></returns>
     public static async Task GenerateCSharpApiClientAsync(string swaggerUrl, string outputPath, LanguageType language = LanguageType.CSharp)
     {
-        ApiClientCommand cmd = new(swaggerUrl, outputPath, language);
+        ApiClientRunner cmd = new(swaggerUrl, outputPath, language);
         await cmd.RunAsync();
     }
 }
diff --git a/src/Command/Command.Share/GlobalUsings.cs b/src/Command/Command.Share/GlobalUsings.cs
@@ -4,4 +4,5 @@
 global using Command.Share.Commands;
 global using Framework.Common.Utils;
 global using Microsoft.OpenApi.Models;
-global using Microsoft.OpenApi.Readers;
+global using Microsoft.OpenApi.Readers;
+global using Spectre.Console;
diff --git a/src/Command/Command.Share/OutputHelper.cs b/src/Command/Command.Share/OutputHelper.cs
@@ -0,0 +1,48 @@
+
+namespace Command.Share;
+public class OutputHelper
+{
+    public static void ShowLogo()
+    {
+        string logo = """
+               _____    _____   __     __
+              |  __ \  |  __ \  \ \   / /
+              | |  | | | |__) |  \ \_/ / 
+              | |  | | |  _  /    \   /  
+              | |__| | | | \ \     | |   
+              |_____/  |_|  \_\    |_|
+            """;
+        string sign1 = "         —→ for freedom 🗽 ←—";
+        string sign2 = "  🌐 [link]https://dusi.dev/docs[/]";
+
+        AnsiConsole.MarkupLine($"[bold green]{logo}[/]");
+        AnsiConsole.MarkupLine($"[blue]{sign2}[/]");
+        AnsiConsole.MarkupLine("");
+        AnsiConsole.MarkupLine($"[yellow]{sign1}[/]");
+    }
+
+    public static void ShowError(string message)
+    {
+        AnsiConsole.MarkupLine($"[red]✖️ {message}[/]");
+    }
+
+    public static void ShowSuccess(string message)
+    {
+        AnsiConsole.MarkupLine($"[green]✔️ {message}[/]");
+    }
+
+    public static void ShowInfo(string message)
+    {
+        AnsiConsole.MarkupLine($"ℹ️ {message}");
+    }
+}
+
+public class SubCommand
+{
+    public const string New = "new";
+    public const string Studio = "studio";
+    public const string Update = "update";
+    public const string NewDes = "NewDes";
+    public const string StudioDes = "StudioDes";
+    public const string StudioUpdateDes = "StudioUpdateDes";
+}
diff --git a/src/Command/Command.Share/Runners/ApiClientRunner.cs b/src/Command/Command.Share/Runners/ApiClientRunner.cs
@@ -1,10 +1,10 @@
-﻿using CodeGenerator.Models;
+using CodeGenerator.Models;
 using Share.Infrastructure.Helper;
-namespace Command.Share.Commands;
+namespace Command.Share.Runners;
 /// <summary>
 /// 客户端请求生成
 /// </summary>
-public class ApiClientCommand : CommandBase
+public class ApiClientRunner : CommandBase
 {
     /// <summary>
     /// swagger文档链接
@@ -24,7 +24,7 @@ public class ApiClientCommand : CommandBase
     /// </summary>
     public string OutputPath { get; set; }
 
-    public ApiClientCommand(string docUrl, string output, LanguageType languageType)
+    public ApiClientRunner(string docUrl, string output, LanguageType languageType)
     {
         DocUrl = docUrl;
         DocName = docUrl.Split('/').Reverse().Skip(1).First();
diff --git a/src/Command/Command.Share/Runners/CommandBase.cs b/src/Command/Command.Share/Runners/CommandBase.cs
diff --git a/src/Command/Command.Share/Runners/DocRunner.cs b/src/Command/Command.Share/Runners/DocRunner.cs
@@ -1,15 +1,15 @@
-﻿using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
 
 namespace Command.Share.Commands;
-public class DocCommand : CommandBase
+public class DocRunner : CommandBase
 {
     public string DocUrl { get; set; } = default!;
     public OpenApiDocument? ApiDocument { get; set; }
 
     public string OutputPath { get; set; }
 
-    public DocCommand(string docUrl, string output)
+    public DocRunner(string docUrl, string output)
     {
         DocUrl = docUrl;
         OutputPath = Path.Combine(output);
diff --git a/src/Command/Command.Share/Runners/RequestRunner.cs b/src/Command/Command.Share/Runners/RequestRunner.cs
@@ -1,10 +1,10 @@
-﻿using CodeGenerator.Models;
-namespace Command.Share.Commands;
+using CodeGenerator.Models;
+namespace Command.Share.Runners;
 
 /// <summary>
 /// 前端ts请求生成命令
 /// </summary>
-public class RequestCommand : CommandBase
+public class RequestRunner : CommandBase
 {
     /// <summary>
     /// swagger文档链接
@@ -21,7 +21,7 @@ public class RequestCommand : CommandBase
 
     public string OutputPath { get; set; }
 
-    public RequestCommand(string docUrl, string output, RequestLibType libType)
+    public RequestRunner(string docUrl, string output, RequestLibType libType)
     {
         DocUrl = docUrl;
         OutputPath = output;
diff --git a/src/Command/Command.Share/Runners/StudioRunner.cs b/src/Command/Command.Share/Runners/StudioRunner.cs
@@ -7,10 +7,10 @@
 using Microsoft.Extensions.Logging;
 using Share.Infrastructure.Helper;
 
-namespace Command.Share.Commands;
-public class StudioCommand(ILogger<StudioCommand> logger)
+namespace Command.Share.Runners;
+public class StudioRunner(ILogger<StudioRunner> logger)
 {
-    private readonly ILogger<StudioCommand> _logger = logger;
+    private readonly ILogger<StudioRunner> _logger = logger;
 
     public async Task RunStudioAsync()
     {
@@ -112,7 +112,7 @@ public void UpdateStudio()
             "Microsoft.Extensions.Configuration.Abstractions",
             "Microsoft.Extensions.DependencyInjection.Abstractions",
             "Microsoft.Extensions.DependencyInjection",
-            "Microsoft.Extensions.Logging.Abstractions",
+            "Microsoft.Extensions.Logging.Abstractions",1
             "Microsoft.Extensions.Logging",
             "Microsoft.Extensions.Options",
             "Microsoft.Extensions.Primitives",
diff --git a/src/Command/CommandLine/CommandLine.csproj b/src/Command/CommandLine/CommandLine.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
-    <ToolCommandName>dry</ToolCommandName>
+    <ToolCommandName>ater</ToolCommandName>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <AssemblyVersion>10.0.0</AssemblyVersion>
     <PackageId>ater.dry</PackageId>
@@ -45,6 +45,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Spectre.Console.Cli" Version="0.50.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Command/CommandLine/Commands/AddCommand.cs b/src/Command/CommandLine/Commands/AddCommand.cs
@@ -0,0 +1,19 @@
+using Spectre.Console.Cli;
+
+namespace CommandLine.Commands;
+public class AddCommand : AsyncCommand<AddCommand.Settings>
+{
+    public class Settings : CommandSettings
+    {
+        [CommandArgument(0, "[name]")]
+        public string Name { get; set; } = string.Empty;
+        [CommandOption("--path")]
+        public string Path { get; set; } = string.Empty;
+    }
+
+
+    public override Task<int> ExecuteAsync(CommandContext context, Settings settings)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/src/Command/CommandLine/Commands/GenerateCommand.cs b/src/Command/CommandLine/Commands/GenerateCommand.cs
@@ -0,0 +1,17 @@
+
+namespace CommandLine.Commands;
+public class GenerateCommand : AsyncCommand<GenerateCommand.Settings>
+{
+    public class Settings : CommandSettings
+    {
+        [CommandArgument(0, "[name]")]
+        public string Name { get; set; } = string.Empty;
+        [CommandOption("--path")]
+        public string Path { get; set; } = string.Empty;
+    }
+    public override Task<int> ExecuteAsync(CommandContext context, Settings settings)
+    {
+        throw new NotImplementedException();
+    }
+}
+
diff --git a/src/Command/CommandLine/Commands/NewCommand.cs b/src/Command/CommandLine/Commands/NewCommand.cs
@@ -0,0 +1,19 @@
+using Spectre.Console.Cli;
+
+namespace CommandLine.Commands;
+public class NewCommand : AsyncCommand<NewCommand.Settings>
+{
+    public class Settings : CommandSettings
+    {
+        [CommandArgument(0, "[name]")]
+        public string Name { get; set; } = string.Empty;
+        [CommandOption("--path")]
+        public string Path { get; set; } = string.Empty;
+    }
+
+
+    public override Task<int> ExecuteAsync(CommandContext context, Settings settings)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/src/Command/CommandLine/Commands/StudioCommand.cs b/src/Command/CommandLine/Commands/StudioCommand.cs
@@ -0,0 +1,15 @@
+namespace CommandLine.Commands;
+public class StudioCommand : AsyncCommand<StudioCommand.Settings>
+{
+    public class Settings : CommandSettings
+    {
+
+    }
+
+    public override async Task<int> ExecuteAsync(CommandContext context, Settings settings)
+    {
+        await CommandRunner.RunStudioAsync();
+        return 0;
+    }
+}
+
diff --git a/src/Command/CommandLine/DITypeRegistrar.cs b/src/Command/CommandLine/DITypeRegistrar.cs
@@ -0,0 +1,53 @@
+namespace CommandLine;
+using System;
+using Spectre.Console.Cli;
+
+public sealed class DITypeRegistrar : ITypeRegistrar
+{
+    private readonly IServiceProvider _serviceProvider;
+
+    public DITypeRegistrar(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public void Register(Type service, Type implementation)
+    {
+    }
+
+    public void RegisterInstance(Type service, object implementation)
+    {
+    }
+
+    public void RegisterLazy(Type service, Func<object> factory)
+    {
+    }
+
+    public ITypeResolver Build()
+    {
+        return new DITypeResolver(_serviceProvider);
+    }
+}
+
+public sealed class DITypeResolver : ITypeResolver, IDisposable
+{
+    private readonly IServiceProvider _serviceProvider;
+
+    public DITypeResolver(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public object? Resolve(Type? type)
+    {
+        return type == null ? null : _serviceProvider.GetService(type);
+    }
+
+    public void Dispose()
+    {
+        if (_serviceProvider is IDisposable disposable)
+        {
+            disposable.Dispose();
+        }
+    }
+}
diff --git a/src/Command/CommandLine/GlobalUsings.cs b/src/Command/CommandLine/GlobalUsings.cs
@@ -1,5 +1,6 @@
-﻿global using System;
+global using System;
 global using System.Threading.Tasks;
 global using CodeGenerator.Generate;
 global using Command.Share;
-global using Command.Share.Commands;
+global using Command.Share.Runners;
+global using Spectre.Console.Cli;
diff --git a/src/Command/CommandLine/Program.cs b/src/Command/CommandLine/Program.cs
diff --git a/src/Command/CommandLine/README.md b/src/Command/CommandLine/README.md
diff --git a/src/Definition/EntityFramework/DBProvider/ContextBase.cs b/src/Definition/EntityFramework/DBProvider/ContextBase.cs
diff --git a/src/Definition/Share/Localizer.cs b/src/Definition/Share/Localizer.cs
diff --git a/src/Definition/Share/Localizer.en-US.resx b/src/Definition/Share/Localizer.en-US.resx
diff --git a/src/Definition/Share/Localizer.zh-CN.resx b/src/Definition/Share/Localizer.zh-CN.resx
diff --git a/src/Studio/AterStudio/AterStudio.csproj b/src/Studio/AterStudio/AterStudio.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using CodeGenerator;`
	`1`	`+using CodeGenerator;`
`2`	`2`	`using CodeGenerator.Helper;`
`3`	`3`	`using CodeGenerator.Models;`
`4`		`-using Entity;`
	`4`	`+using Command.Share.Runners;`
`5`	`5`	`using Microsoft.Extensions.Logging;`
`6`	`6`	`using Share.Services;`
`7`	`7`
`@@ -25,8 +25,8 @@ public class CommandRunner(CodeGenService codeGen, CodeAnalysisService codeAnaly`
`25`	`25`	`public static async Task RunStudioAsync()`
`26`	`26`	`{`
`27`	`27`	`using var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());`
`28`		`- ILogger<StudioCommand> studioLogger = loggerFactory.CreateLogger<StudioCommand>();`
`29`		`- var studioCommand = new StudioCommand(studioLogger);`
	`28`	`+ ILogger<StudioRunner> studioLogger = loggerFactory.CreateLogger<StudioRunner>();`
	`29`	`+ var studioCommand = new StudioRunner(studioLogger);`
`30`	`30`	`await studioCommand.RunStudioAsync();`
`31`	`31`	`}`
`32`	`32`
`@@ -36,8 +36,8 @@ public static async Task RunStudioAsync()`
`36`	`36`	`public static void UpdateStudio()`
`37`	`37`	`{`
`38`	`38`	`using var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());`
`39`		`- ILogger<StudioCommand> studioLogger = loggerFactory.CreateLogger<StudioCommand>();`
`40`		`- var studioCommand = new StudioCommand(studioLogger);`
	`39`	`+ ILogger<StudioRunner> studioLogger = loggerFactory.CreateLogger<StudioRunner>();`
	`40`	`+ var studioCommand = new StudioRunner(studioLogger);`
`41`	`41`	`studioCommand.UpdateStudio();`
`42`	`42`	`}`
`43`	`43`
`@@ -52,7 +52,7 @@ public async Task GenerateNgAsync(string url = "", string output = "")`
`52`	`52`	`try`
`53`	`53`	`{`
`54`	`54`	`_logger.LogInformation("🚀 Generating ts models and ng services...");`
`55`		`- RequestCommand cmd = new(url, output, RequestLibType.NgHttp);`
	`55`	`+ RequestRunner cmd = new(url, output, RequestLibType.NgHttp);`
`56`	`56`	`await cmd.RunAsync();`
`57`	`57`	`}`
`58`	`58`	`catch (WebException webExp)`
`@@ -77,7 +77,7 @@ public async Task GenerateRequestAsync(string url = "", string output = "", Requ`
`77`	`77`	`try`
`78`	`78`	`{`
`79`	`79`	`_logger.LogInformation($"🚀 Generating ts models and {type} request services...");`
`80`		`- RequestCommand cmd = new(url, output, type);`
	`80`	`+ RequestRunner cmd = new(url, output, type);`
`81`	`81`	`await cmd.RunAsync();`
`82`	`82`	`}`
`83`	`83`	`catch (WebException webExp)`
`@@ -171,7 +171,7 @@ public async Task GenerateApiAsync(string entityPath, string sharePath = "",`
`171`	`171`	`/// <returns></returns>`
`172`	`172`	`public static async Task GenerateCSharpApiClientAsync(string swaggerUrl, string outputPath, LanguageType language = LanguageType.CSharp)`
`173`	`173`	`{`
`174`		`- ApiClientCommand cmd = new(swaggerUrl, outputPath, language);`
	`174`	`+ ApiClientRunner cmd = new(swaggerUrl, outputPath, language);`
`175`	`175`	`await cmd.RunAsync();`
`176`	`176`	`}`
`177`	`177`	`}`