From bb9d9deadba56577ef30c8c0265e46853e99485b Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Wed, 22 May 2024 15:43:43 -0400 Subject: [PATCH] fixed product images with direct forwarding --- .../EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml | 5 +---- .../Components/Toolbar/Cart/Default.cshtml | 2 +- .../Components/UserOrders/Default.cshtml | 2 +- .../src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj | 2 +- .../src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs | 8 ++------ .../src/EShopOnAbp.PublicWeb/Pages/Index.cshtml | 6 +----- .../src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml | 5 +---- .../web-public/src/EShopOnAbp.WebPublicGateway/yarp.json | 7 ------- 8 files changed, 8 insertions(+), 29 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml index e4dad097..e067bd59 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml @@ -1,11 +1,8 @@ @using EShopOnAbp.Localization @using EShopOnAbp.PublicWeb.Components.Purchase @using Microsoft.Extensions.Localization -@using Microsoft.Extensions.Options -@using Volo.Abp.Http.Client @model EShopOnAbp.BasketService.Services.BasketDto @inject IStringLocalizer L -@inject IOptions options
@if (!Model.Items.Any()) @@ -34,7 +31,7 @@
@foreach (var item in Model.Items) { - string imageName = item.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/noimage.jpg" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.ImageName}"; + string imageName = item.ImageName.IsNullOrEmpty() ? $"product-images/noimage.jpg" : $"product-images/{item.ImageName}"; var price = item.TotalPrice.ToString("0.00");
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml index 9a1f82ac..c188dadb 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml @@ -38,7 +38,7 @@ { foreach (var item in Model.Items) { - string imageName = item.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/noimage.jpg" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.ImageName}"; + string imageName = item.ImageName.IsNullOrEmpty() ? $"product-images/noimage.jpg" : $"product-images/{item.ImageName}"; var price = item.TotalPrice.ToString("0.00");
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml index e3e084fa..dbc5b4ba 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml @@ -56,7 +56,7 @@ @{ - string imageUrl = $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.PictureUrl}"; + string imageUrl = $"product-images/{item.PictureUrl}"; } diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj index 76d632eb..10b72932 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj @@ -10,7 +10,7 @@ - + diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs index 5a3b4f6e..bafce43b 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs @@ -5,7 +5,6 @@ using EShopOnAbp.Localization; using EShopOnAbp.OrderingService; using EShopOnAbp.PaymentService; using EShopOnAbp.PaymentService.PaymentMethods; -using EShopOnAbp.PublicWeb.AnonymousUser; using EShopOnAbp.PublicWeb.Components.Toolbar.Cart; using EShopOnAbp.PublicWeb.Menus; using EShopOnAbp.PublicWeb.PaymentMethods; @@ -22,7 +21,6 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Polly; using StackExchange.Redis; using System; -using System.Collections.Generic; using System.Linq; using System.Net.Http.Headers; using System.Security.Claims; @@ -56,7 +54,6 @@ using Volo.Abp.Ui.LayoutHooks; using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation.Urls; using Volo.Abp.VirtualFileSystem; -using Volo.CmsKit; using Volo.CmsKit.Public.Web; using Yarp.ReverseProxy.Transforms; @@ -314,15 +311,14 @@ public class EShopOnAbpPublicWebModule : AbpModule app.UseCorrelationId(); app.UseStaticFiles(); app.UseRouting(); - // app.UseHttpMetrics(); app.UseAuthentication(); app.UseAbpSerilogEnrichers(); app.UseAuthorization(); - // app.UseAnonymousUser(); app.UseConfiguredEndpoints(endpoints => { endpoints.MapReverseProxy(); - // endpoints.MapMetrics(); + endpoints.MapForwarder("*/product-images/{name}", "http://_http.catalogService/product-images", "/{name}"); + endpoints.MapForwarder("/products/product-images/{name}", "http://_http.catalogService/product-images", "/{name}"); }); } diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml index 52e4a829..123c86a6 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml @@ -2,12 +2,8 @@ @using EShopOnAbp.Localization @using Microsoft.Extensions.Localization @using System.Globalization -@using Microsoft.Extensions.Options -@using Volo.Abp.Http.Client -@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating @model EShopOnAbp.PublicWeb.Pages.IndexModel @inject IStringLocalizer L -@inject IOptions options @{ string pageHeader = L["OurProducts"]; @@ -34,7 +30,7 @@ @foreach (var product in Model.Products) { var productPrice = product.Price.ToString("C", new CultureInfo("en-US")); - string productImage = !product.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{product.ImageName}" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/@product.ImageName"; + string productImage = !product.ImageName.IsNullOrEmpty() ? $"product-images/{product.ImageName}" : $"product-images/@product.ImageName"; string buyText = L["Index:AddToBasket"];
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml index d1f52f02..b7e4fe6d 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml @@ -2,15 +2,12 @@ @using EShopOnAbp.Localization @using Microsoft.Extensions.Localization @using System.Globalization -@using Microsoft.Extensions.Options @using Volo.Abp.GlobalFeatures -@using Volo.Abp.Http.Client @using Volo.CmsKit.GlobalFeatures @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating @inject IStringLocalizer L -@inject IOptions options @model EShopOnAbp.PublicWeb.Pages.ProductDetailModel @@ -32,7 +29,7 @@ @{ var product = Model.Product; var productPrice = product.Price.ToString("C", new CultureInfo("en-US")); - string productImage = !product.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{product.ImageName}" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/@product.ImageName"; + string productImage = !product.ImageName.IsNullOrEmpty() ? $"product-images/{product.ImageName}" : $"product-images/@product.ImageName"; string buyText = L["Index:AddToBasket"];
diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json index c3c8ae25..334f36d3 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json @@ -64,13 +64,6 @@ { "PathRemovePrefix": "/swagger-json/Catalog" } ] }, - "ProductPictures": { - "ClusterId": "catalogCluster", - "Match": { - "Path": "/product-images/{**everything}", - "Methods": [ "GET" ] - } - }, "Basket Service": { "ClusterId": "Basket", "Match": {