From b87e89e53a6a41c7be48c18a8cd37aadb69c54db Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Tue, 9 May 2017 13:05:48 -0400 Subject: [PATCH] Get the correct config running and finish final tests --- src/Web/Catalog.WebForms/.env | 8 ++++++++ .../Catalog.WebForms/Services/CatalogService.cs | 9 ++++++++- src/Web/Catalog.WebForms/docker-compose.override.yml | 6 +++--- src/Web/Catalog.WebForms/docker-compose.yml | 5 +---- 4 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 src/Web/Catalog.WebForms/.env diff --git a/src/Web/Catalog.WebForms/.env b/src/Web/Catalog.WebForms/.env new file mode 100644 index 000000000..8e6cac177 --- /dev/null +++ b/src/Web/Catalog.WebForms/.env @@ -0,0 +1,8 @@ +# Compose supports declaring default environment variables in an environment file named .env placed in the folder docker-compose command is executed from (current working directory). +# Compose expects each line in an env file to be in VAR=VAL format. Lines beginning with # (i.e. comments) are ignored, as are blank lines. +# Note: Values present in the environment at runtime will always override those defined inside the .env file. Similarly, values passed via command-line arguments take precedence as well. + +# The IP below should be swapped to your real IP or DNS name, like 192.168.88.248, etc. if testing from remote browsers or mobile devices + +ESHOP_EXTERNAL_DNS_NAME_OR_IP=192.168.1.103 +ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92 \ No newline at end of file diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs index cc22a37c4..83da5c2c7 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs @@ -75,7 +75,14 @@ namespace eShopOnContainers.Core.Services.Catalog public Task GetCatalogItemAsync(string id) { - throw new NotImplementedException(); + var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"]; + UriBuilder builder = new UriBuilder(baseURl); + + builder.Path = $"api/v1/catalog/items/{id}"; + + string uri = builder.ToString(); + + return _requestProvider.GetAsync(uri); } public async Task> GetCatalogBrandAsync() diff --git a/src/Web/Catalog.WebForms/docker-compose.override.yml b/src/Web/Catalog.WebForms/docker-compose.override.yml index 088052b6e..c505e9b5a 100644 --- a/src/Web/Catalog.WebForms/docker-compose.override.yml +++ b/src/Web/Catalog.WebForms/docker-compose.override.yml @@ -13,9 +13,9 @@ services: - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:5101 - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word - - ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - #- ExternalCatalogBaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - - EventBusConnection=172.24.176.5 # rabbitmq + #- ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - ExternalCatalogBaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. + - EventBusConnection=rabbitmq ports: - "5101:5101" diff --git a/src/Web/Catalog.WebForms/docker-compose.yml b/src/Web/Catalog.WebForms/docker-compose.yml index 273f79595..d440ee54e 100644 --- a/src/Web/Catalog.WebForms/docker-compose.yml +++ b/src/Web/Catalog.WebForms/docker-compose.yml @@ -22,10 +22,7 @@ services: image: eshop/rabbitmq-win ports: - "5672:5672" - networks: - default: - ipv4_address: 172.24.176.5 - + sql.data: image: microsoft/mssql-server-windows