Browse Source

feat(cli): update cli to 9.1.1

pull/1180/head
colin 1 year ago
parent
commit
e639523166
  1. 3
      aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj
  2. 22
      aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateCommand.cs
  3. 6
      aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateOptions.cs
  4. 2
      aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs
  5. 6
      aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/ProjectCreateArgs.cs

3
aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj

@ -5,7 +5,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<Version>9.0.4</Version>
<Version>9.1.1</Version>
<Copyright>colin</Copyright>
<Description>Use LINGYUN.MicroService.Templates command line</Description>
<PackAsTool>true</PackAsTool>
@ -15,7 +15,6 @@
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
<PackReadmeFile>README.md</PackReadmeFile>
<RootNamespace />
<Configurations>Debug;Release;PostgreSQL</Configurations>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>

22
aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateCommand.cs

@ -114,10 +114,10 @@ namespace LINGYUN.Abp.Cli.Commands
Logger.LogInformation("DBMS: " + databaseManagementSystem);
}
var authenticationScheme = GetAuthenticationScheme(commandLineArgs);
if (!authenticationScheme.IsNullOrWhiteSpace())
var telemetryProvider = GetTelemetryProvider(commandLineArgs);
if (!telemetryProvider.IsNullOrWhiteSpace())
{
Logger.LogInformation("Authentication Scheme: " + authenticationScheme);
Logger.LogInformation("Telemetry provider: " + telemetryProvider);
}
var randomPort = string.IsNullOrWhiteSpace(
@ -173,7 +173,7 @@ namespace LINGYUN.Abp.Cli.Commands
connectionString,
applicationPort,
daprPort,
authenticationScheme
telemetryProvider
);
await CreateProjectService.CreateAsync(projectArgs);
@ -204,7 +204,7 @@ namespace LINGYUN.Abp.Cli.Commands
sb.AppendLine("-csf|--create-solution-folder (default: true)");
sb.AppendLine("-cs|--connection-string <connection-string> (your database connection string)");
sb.AppendLine("--dbms <database-management-system> (your database management system)");
sb.AppendLine("--as <authentication-scheme> (your identity authentication provider, optional: IdentityServer4、OpenIddict, default: IdentityServer4)");
sb.AppendLine("--tm <telemetry> (your telemetry provider, optional: SkyWalking、OpenTelemetry, default: OpenTelemetry)");
sb.AppendLine("--no-random-port (Use template's default ports)");
sb.AppendLine("");
sb.AppendLine("Examples:");
@ -217,7 +217,7 @@ namespace LINGYUN.Abp.Cli.Commands
sb.AppendLine(" labp create Acme.BookStore -csf false");
sb.AppendLine(" labp create Acme.BookStore --local-framework-ref --abp-path \"D:\\github\\abp\"");
sb.AppendLine(" labp create Acme.BookStore --dbms mysql");
sb.AppendLine(" labp create Acme.BookStore --as openiddict");
sb.AppendLine(" labp create Acme.BookStore --tm SkyWalking");
sb.AppendLine(" labp create Acme.BookStore --connection-string \"Server=myServerName\\myInstanceName;Database=myDatabase;User Id=myUsername;Password=myPassword\"");
sb.AppendLine("");
// TODO: 文档
@ -232,12 +232,12 @@ namespace LINGYUN.Abp.Cli.Commands
|| commandLineArgs.Options.ContainsKey(NewCommand.Options.CreateSolutionFolder.Short);
}
protected virtual string GetAuthenticationScheme(CommandLineArgs commandLineArgs)
protected virtual string GetTelemetryProvider(CommandLineArgs commandLineArgs)
{
var authScheme = commandLineArgs.Options.GetOrNull(
CreateOptions.AuthenticationScheme.Short,
CreateOptions.AuthenticationScheme.Long);
return string.IsNullOrWhiteSpace(authScheme) ? "IdentityServer4" : authScheme;
var provider = commandLineArgs.Options.GetOrNull(
CreateOptions.Telemetry.Short,
CreateOptions.Telemetry.Long);
return string.IsNullOrWhiteSpace(provider) ? "OpenTelemetry" : provider;
}
protected virtual DatabaseProvider GetDatabaseProvider(CommandLineArgs commandLineArgs)

6
aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateOptions.cs

@ -22,10 +22,10 @@
public const string Long = "no-random-port";
}
public static class AuthenticationScheme
public static class Telemetry
{
public const string Short = "as";
public const string Long = "auth-scheme";
public const string Short = "tm";
public const string Long = "telemetry";
}
}
}

2
aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs

@ -63,7 +63,7 @@ namespace LINGYUN.Abp.Cli.Commands
commandBuilder.AppendFormat(" -n {0}", createArgs.SolutionName.ProjectName);
commandBuilder.AppendFormat(" -o {0}", createArgs.OutputFolder);
commandBuilder.AppendFormat(" --DatabaseManagement {0}", dbm);
commandBuilder.AppendFormat(" --AuthenticationScheme {0}", createArgs.AuthenticationScheme);
commandBuilder.AppendFormat(" --Telemetry {0}", createArgs.TelemetryProvider);
Logger.LogInformation("Execute command: " + commandBuilder.ToString());

6
aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/ProjectCreateArgs.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.Cli.Commands
public string PackageName { get; }
public string ApplicationPort { get; }
public string DaprPort { get; }
public string AuthenticationScheme { get; }
public string TelemetryProvider { get; }
public ProjectCreateArgs(
string packageName,
SolutionName solutionName,
@ -28,7 +28,7 @@ namespace LINGYUN.Abp.Cli.Commands
string connectionString = null,
string applicationPort = "5000",
string daprPort = "3500",
string authenticationScheme = "IdentityServer4")
string telemetryProvider = "OpenTelemetry")
: base(
solutionName,
templateName,
@ -48,7 +48,7 @@ namespace LINGYUN.Abp.Cli.Commands
PackageName = packageName;
ApplicationPort = applicationPort;
DaprPort = daprPort;
AuthenticationScheme = authenticationScheme;
TelemetryProvider = telemetryProvider;
}
}
}

Loading…
Cancel
Save