Browse Source

fix #1335 Port replacement for migration and unit test projects.

pull/1337/head
maliming 7 years ago
parent
commit
3fb5e90824
  1. 21
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs
  2. 2
      templates/mvc/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
  3. 4
      templates/mvc/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json

21
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using Volo.Abp.Cli.ProjectBuilding.Building;
using Volo.Abp.Cli.ProjectBuilding.Templates.Mvc;
namespace Volo.Abp.Cli.ProjectBuilding.Templates
{
@ -33,6 +34,26 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates
!x.IsDirectory && x.Name.EndsWith("appSettings.json", StringComparison.InvariantCultureIgnoreCase))
.ToList();
if (context.Template.Name == MvcTemplate.TemplateName)
{
// no tiered
if (launchSettings.Count == 1&& launchSettings.First().Name.Equals("/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json", StringComparison.InvariantCultureIgnoreCase))
{
var dbMigrator = appSettings.FirstOrDefault(x =>
x.Name.Equals("/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
dbMigrator?.SetContent(dbMigrator.Content.Replace("https://localhost:44302", "https://localhost:44303"));
var web = appSettings.FirstOrDefault(x =>
x.Name.Equals("/src/MyCompanyName.MyProjectName.Web/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
web?.SetContent(web.Content.Replace("https://localhost:44301", "https://localhost:44303"));
var consoleTestApp = appSettings.FirstOrDefault(x =>
x.Name.Equals("/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
consoleTestApp?.SetContent(consoleTestApp.Content.Replace("https://localhost:44302", "https://localhost:44303"));
consoleTestApp?.SetContent(consoleTestApp.Content.Replace("https://localhost:44301", "https://localhost:44303"));
}
}
var excludePorts = new List<string>();
excludePorts.AddRange(_buildInSslUrls.Select(GetUrlPort).ToList());

2
templates/mvc/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json

@ -6,7 +6,7 @@
"Clients": {
"MyProjectName_Web": {
"ClientId": "MyProjectName_Web",
"RootUrl": "https://localhost:44314/"
"RootUrl": "https://localhost:44302"
},
"MyProjectName_ConsoleTestApp": {
"ClientId": "MyProjectName_ConsoleTestApp"

4
templates/mvc/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json

@ -1,7 +1,7 @@
{
"RemoteServices": {
"Default": {
"BaseUrl": "https://localhost:44395/"
"BaseUrl": "https://localhost:44302"
}
},
"IdentityClients": {
@ -11,7 +11,7 @@
"ClientSecret": "1q2w3e*",
"UserName": "admin",
"UserPassword": "1q2w3E*",
"Authority": "https://localhost:44348",
"Authority": "https://localhost:44301",
"Scope": "MyProjectName"
}
}

Loading…
Cancel
Save