NetinaShop
/
Api
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix (SiteMapWhiteSpace) VER 1.5.18.27

subProduct
Amir Hossein Khademi 2024-10-04 20:36:14 +03:30
parent cfb293c135
commit 738a4d523c
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
1.5.17.26 1.5.18.27

2
Netina.Api/Controllers/HealthController.cs
View File

@ -15,7 +15,7 @@ public class HealthController : ICarterModule
public async Task<IResult> GetHealth([FromServices]ISiteMapService siteMapService) public async Task<IResult> GetHealth([FromServices]ISiteMapService siteMapService)
{ {
//await siteMapService.CreateSiteMapAsync(); await siteMapService.CreateSiteMapAsync();
var version = typeof(Program)?.Assembly.GetName()?.Version?.ToString(); var version = typeof(Program)?.Assembly.GetName()?.Version?.ToString();
var check = new HealthCheck var check = new HealthCheck
{ {

2
Netina.Api/WebFramework/Configurations/ServiceExtensions.cs
View File

@ -72,7 +72,7 @@ public static class ServiceExtensions
serviceCollection.AddDbContextFactory<ApplicationContext>(options => serviceCollection.AddDbContextFactory<ApplicationContext>(options =>
{ {
options.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking); options.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking);
options.UseNpgsql(Configuration.GetConnectionString("Postgres"), b => b.MigrationsAssembly("Netina.Repository")) options.UseNpgsql(Configuration.GetConnectionString("PostgresServer"), b => b.MigrationsAssembly("Netina.Repository"))
.UseProjectAssembly(typeof(ApplicationUser).Assembly); .UseProjectAssembly(typeof(ApplicationUser).Assembly);
//options.EnableServiceProviderCaching(true); //options.EnableServiceProviderCaching(true);

31
Netina.Core/BaseServices/SiteMapService.cs
View File

@ -1,7 +1,11 @@
using System.IO.Compression; using System.IO.Compression;
using System.Net;
using System.Web;
using System.Xml; using System.Xml;
using Netina.Core.Models; using Netina.Core.Models;
using Netina.Domain.Entities.Brands;
using Netina.Domain.Entities.ProductCategories; using Netina.Domain.Entities.ProductCategories;
using Netina.Domain.Entities.Products;
namespace Netina.Core.BaseServices; namespace Netina.Core.BaseServices;
@ -125,7 +129,10 @@ public class SiteMapService(
foreach (var page in pages) foreach (var page in pages)
{ {
var productUrl = $"{_siteSetting.WebSiteUrl}/{page.Slug}"; string slugHtml = page.Slug;
if (slugHtml.Contains(' '))
slugHtml = WebUtility.UrlEncode(slugHtml.Replace(' ', '-'));
var productUrl = $"{_siteSetting.WebSiteUrl}/{slugHtml}";
XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI); XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI);
root.AppendChild(urlElement); root.AppendChild(urlElement);
@ -193,7 +200,10 @@ public class SiteMapService(
foreach (var brand in brands) foreach (var brand in brands)
{ {
var productUrl = $"{_siteSetting.WebSiteUrl}/brands/{brand.Id}/{brand.Slug}"; string slugHtml = brand.Slug;
if (slugHtml.Contains(' '))
slugHtml = WebUtility.UrlEncode(slugHtml.Replace(' ', '-'));
var productUrl = $"{_siteSetting.WebSiteUrl}/brands/{brand.Id}/{slugHtml}";
XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI); XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI);
root.AppendChild(urlElement); root.AppendChild(urlElement);
@ -262,7 +272,10 @@ public class SiteMapService(
foreach (var productCategory in categories) foreach (var productCategory in categories)
{ {
var productUrl = $"{_siteSetting.WebSiteUrl}/categories/{productCategory.Id}/{productCategory.Slug}"; string slugHtml = productCategory.Slug;
if (slugHtml.Contains(' '))
slugHtml = WebUtility.UrlEncode(slugHtml.Replace(' ', '-'));
var productUrl = $"{_siteSetting.WebSiteUrl}/categories/{productCategory.Id}/{slugHtml}";
XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI); XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI);
root.AppendChild(urlElement); root.AppendChild(urlElement);
@ -335,8 +348,10 @@ public class SiteMapService(
foreach (var product in group) foreach (var product in group)
{ {
string slugHtml = product.Slug;
var productUrl = $"{_siteSetting.WebSiteUrl}/products/{product.Id}/{product.Slug}"; if (slugHtml.Contains(' '))
slugHtml = WebUtility.UrlEncode(slugHtml.Replace(' ', '-'));
var productUrl = $"{_siteSetting.WebSiteUrl}/products/{product.Id}/{slugHtml}";
XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI); XmlElement urlElement = doc.CreateElement("url", doc.DocumentElement?.NamespaceURI);
root.AppendChild(urlElement); root.AppendChild(urlElement);
@ -436,7 +451,11 @@ public class SiteMapService(
root.AppendChild(urlElement); root.AppendChild(urlElement);
XmlElement loc = doc.CreateElement("loc", doc.DocumentElement?.NamespaceURI); XmlElement loc = doc.CreateElement("loc", doc.DocumentElement?.NamespaceURI);
loc.InnerText = Path.Combine($"{_siteSetting.WebSiteUrl}/blogs/{blog.Id}/{blog.Slug}");
string slugHtml = blog.Slug;
if (slugHtml.Contains(' '))
slugHtml = WebUtility.UrlEncode(slugHtml.Replace(' ', '-'));
loc.InnerText = Path.Combine($"{_siteSetting.WebSiteUrl}/blogs/{blog.Id}/{slugHtml}");
urlElement.AppendChild(loc); urlElement.AppendChild(loc);
XmlElement lastmod = doc.CreateElement("lastmod", doc.DocumentElement?.NamespaceURI); XmlElement lastmod = doc.CreateElement("lastmod", doc.DocumentElement?.NamespaceURI);