Browse Source

Use local urls on debug, real urls on release.

pull/1156/head
Halil ibrahim Kalkan 7 years ago
parent
commit
598e80c683
  1. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs
  2. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs
  3. 13
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUrls.cs
  4. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs
  5. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs
  6. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs
  7. 11
      framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs

@ -21,7 +21,7 @@ namespace Volo.Abp.Cli.Auth
{
var accessToken = await AuthenticationService.GetAccessTokenAsync(
new IdentityClientConfiguration(
"https://localhost:44333", //TODO: Configure
CliUrls.AccountAbpIo,
"role email abpio_www abpio_commercial",
"abp-cli",
"1q2w3e*",

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs

@ -7,10 +7,6 @@ namespace Volo.Abp.Cli
{
public Dictionary<string, Type> Commands { get; }
public string AbpIoWwwUrlRoot { get; set; } = "https://abp.io/";
public string AbpIoAccountUrlRoot { get; set; } = "https://account.abp.io/";
public CliOptions()
{
Commands = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);

13
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUrls.cs

@ -0,0 +1,13 @@
namespace Volo.Abp.Cli
{
public static class CliUrls
{
#if DEBUG
public const string WwwAbpIo = "https://localhost:44328/";
public const string AccountAbpIo = "https://localhost:44333/";
#else
public const string WwwAbpIo = "https://abp.io/";
public const string AccountAbpIo = "https://account.abp.io/";
#endif
}
}

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs

@ -83,7 +83,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
AddAuthentication(client);
var responseMessage = await client.PostAsync(
Options.AbpIoWwwUrlRoot + "api/download/template/get-version/",
$"{CliUrls.WwwAbpIo}api/download/template/get-version/",
new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json),
CancellationTokenProvider.Token
);
@ -109,7 +109,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
AddAuthentication(client);
var responseMessage = await client.PostAsync(
Options.AbpIoWwwUrlRoot + "api/download/template/",
$"{CliUrls.WwwAbpIo}api/download/template/",
new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json),
CancellationTokenProvider.Token
);

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs

@ -73,7 +73,7 @@ namespace Volo.Abp.Cli.ProjectModification
{
using (var client = new HttpClient())
{
var url = "https://localhost:44328/api/app/nugetPackage/byName/?name=" + moduleName;
var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/byName/?name=" + moduleName;
var response = await client.GetAsync(url);

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@ -125,7 +125,7 @@ namespace Volo.Abp.Cli.ProjectModification
{
using (var client = new HttpClient())
{
var url = "https://localhost:44328/api/app/module/byName/?name=" + moduleName;
var url = $"{CliUrls.WwwAbpIo}api/app/module/byName/?name=" + moduleName;
var response = await client.GetAsync(url);

11
framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs

@ -9,15 +9,6 @@ namespace Volo.Abp.Cli
)]
public class AbpCliModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
#if DEBUG
Configure<CliOptions>(options =>
{
options.AbpIoWwwUrlRoot = "https://localhost:44328/";
options.AbpIoAccountUrlRoot = "https://localhost:44333/";
});
#endif
}
}
}
Loading…
Cancel
Save