From cefe98ba7a6ccda262058769e04d33bc96f609c5 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 5 Aug 2019 09:47:56 +0800 Subject: [PATCH] Modify templates and other connection strings. --- docs/en/Samples/Microservice-Demo.md | 2 +- docs/zh-Hans/Samples/Microservice-Demo.md | 2 +- .../App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs | 2 +- modules/blogging/app/Volo.BloggingTestApp/appsettings.json | 2 +- samples/MicroserviceDemo/docker-compose.override.yml | 2 +- samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml | 2 +- .../microservices/BloggingService.Host/appsettings.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en/Samples/Microservice-Demo.md b/docs/en/Samples/Microservice-Demo.md index bc3c8c0933..ba32878ea6 100644 --- a/docs/en/Samples/Microservice-Demo.md +++ b/docs/en/Samples/Microservice-Demo.md @@ -902,7 +902,7 @@ It has a dedicated MongoDB database (MsDemo_Blogging) to store blog and posts. I ````json "ConnectionStrings": { "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true", - "Blogging": "mongodb://localhost|MsDemo_Blogging" + "Blogging": "mongodb://localhost/MsDemo_Blogging" } ```` diff --git a/docs/zh-Hans/Samples/Microservice-Demo.md b/docs/zh-Hans/Samples/Microservice-Demo.md index fdf183d1b6..aaa780188d 100644 --- a/docs/zh-Hans/Samples/Microservice-Demo.md +++ b/docs/zh-Hans/Samples/Microservice-Demo.md @@ -903,7 +903,7 @@ Swagger UI已配置,是此服务的默认页面. 如果你导航到URL`http://lo ````json "ConnectionStrings": { "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true", - "Blogging": "mongodb://localhost|MsDemo_Blogging" + "Blogging": "mongodb://localhost/MsDemo_Blogging" } ```` diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs index 5198dbb2c8..e4ccec6a43 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs @@ -184,7 +184,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App { if (lines[i].Contains("Default") && lines[i].Contains("Database")) { - lines[i] = " \"Default\": \"mongodb://localhost:27017|MyProjectName\""; + lines[i] = " \"Default\": \"mongodb://localhost:27017/MyProjectName\""; file.SetLines(lines); return; } diff --git a/modules/blogging/app/Volo.BloggingTestApp/appsettings.json b/modules/blogging/app/Volo.BloggingTestApp/appsettings.json index fd337e2c3a..c85ffe9489 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/appsettings.json +++ b/modules/blogging/app/Volo.BloggingTestApp/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { "SqlServer": "Server=localhost;Database=BloggingTestApp;Trusted_Connection=True;MultipleActiveResultSets=true", - "MongoDb": "mongodb://localhost:27017|BloggingTestApp" + "MongoDb": "mongodb://localhost:27017/BloggingTestApp" } } \ No newline at end of file diff --git a/samples/MicroserviceDemo/docker-compose.override.yml b/samples/MicroserviceDemo/docker-compose.override.yml index c0fdaf0bf6..c91366ac1c 100644 --- a/samples/MicroserviceDemo/docker-compose.override.yml +++ b/samples/MicroserviceDemo/docker-compose.override.yml @@ -102,7 +102,7 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 - AuthServer__Authority=http://auth-server:51511 - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - - ConnectionStrings__Blogging=mongodb://mongodb|MsDemo_Blogging + - ConnectionStrings__Blogging=mongodb://mongodb/MsDemo_Blogging - Redis__Configuration=redis - RabbitMQ__Connections__Default__HostName=rabbitmq - RemoteServices__Default__BaseUrl=http://internal-gateway/ diff --git a/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml b/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml index 5fa5c5542d..dcfbdbb604 100644 --- a/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml +++ b/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml @@ -23,7 +23,7 @@ spec: - name: AuthServer__Authority value: http://auth-server:51511 - name: ConnectionStrings__Blogging - value: mongodb://mongodb|MsDemo_Blogging + value: mongodb://mongodb/MsDemo_Blogging - name: ConnectionStrings__Default value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false - name: RabbitMQ__Connections__Default__HostName diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json b/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json index edcaf2127f..00fbbba14c 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json @@ -5,7 +5,7 @@ }, "ConnectionStrings": { "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true", - "Blogging": "mongodb://localhost|MsDemo_Blogging" + "Blogging": "mongodb://localhost/MsDemo_Blogging" }, "RemoteServices": { "Default": {