diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs index ec66947dd7..9404233493 100644 --- a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs +++ b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs @@ -20,7 +20,7 @@ namespace VoloDocs.Web.Pages //TODO: Create HomeController & Index instead of Page. Otherwise, we have an empty Index.cshtml file. if (!_urlOptions.RoutePrefix.IsNullOrWhiteSpace()) { - return Redirect("." + _urlOptions.GetFormattedRoutePrefix()); + return Redirect("." + _urlOptions.RoutePrefix); } return Page(); diff --git a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs index edc7bfb24d..00189be260 100644 --- a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs +++ b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs @@ -142,7 +142,7 @@ namespace Volo.Docs.Areas.Documents.TagHelpers return "javascript:;"; } - var prefix = _urlOptions.GetFormattedRoutePrefix(); + var prefix = _urlOptions.RoutePrefix; return prefix + LanguageCode + "/" + ProjectName + "/" + Version + "/" + pathWithoutFileExtension; } diff --git a/modules/docs/src/Volo.Docs.Web/DocsUrlOptions.cs b/modules/docs/src/Volo.Docs.Web/DocsUrlOptions.cs index 4c72a7bcbb..67c11864ff 100644 --- a/modules/docs/src/Volo.Docs.Web/DocsUrlOptions.cs +++ b/modules/docs/src/Volo.Docs.Web/DocsUrlOptions.cs @@ -4,19 +4,25 @@ namespace Volo.Docs { public class DocsUrlOptions { + private string _routePrefix = "documents"; + /// /// Default value: "documents"; /// - public string RoutePrefix { get; set; } = "documents"; + public string RoutePrefix + { + get => GetFormattedRoutePrefix(); + set => _routePrefix = value; + } - public string GetFormattedRoutePrefix() + private string GetFormattedRoutePrefix() { - if (string.IsNullOrWhiteSpace(RoutePrefix)) - { - return "/"; - } + if (string.IsNullOrWhiteSpace(_routePrefix)) + { + return "/"; + } - return RoutePrefix.EnsureEndsWith('/').EnsureStartsWith('/'); + return _routePrefix.EnsureEndsWith('/').EnsureStartsWith('/'); } } } diff --git a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs index e16d36f6cb..ea2c3447e6 100644 --- a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs +++ b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs @@ -43,9 +43,9 @@ namespace Volo.Docs { var urlOptions = context.Services .GetRequiredServiceLazy>() - .Value; + .Value.Value; - var routePrefix = urlOptions.Value.GetFormattedRoutePrefix(); + var routePrefix = urlOptions.RoutePrefix; options.Conventions.AddPageRoute("/Documents/Project/Index", routePrefix + "{projectName}"); options.Conventions.AddPageRoute("/Documents/Project/Index", routePrefix + "{languageCode}/{projectName}"); diff --git a/modules/docs/src/Volo.Docs.Web/Markdown/MarkdownDocumentToHtmlConverter.cs b/modules/docs/src/Volo.Docs.Web/Markdown/MarkdownDocumentToHtmlConverter.cs index 426a42d59d..ed3f2802e2 100644 --- a/modules/docs/src/Volo.Docs.Web/Markdown/MarkdownDocumentToHtmlConverter.cs +++ b/modules/docs/src/Volo.Docs.Web/Markdown/MarkdownDocumentToHtmlConverter.cs @@ -73,7 +73,7 @@ namespace Volo.Docs.Markdown return string.Format( MdLinkFormat, displayText, - _urlOptions.GetFormattedRoutePrefix(), + _urlOptions.RoutePrefix, languageCode, projectShortName, version, @@ -101,7 +101,7 @@ namespace Volo.Docs.Markdown return string.Format( MdLinkFormat, displayText, - _urlOptions.GetFormattedRoutePrefix(), + _urlOptions.RoutePrefix, languageCode, projectShortName, version, diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs index 25083571b4..15697f466c 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs @@ -27,7 +27,7 @@ namespace Volo.Docs.Pages.Documents public async Task OnGetAsync() { - DocumentsUrlPrefix = _urlOptions.GetFormattedRoutePrefix(); + DocumentsUrlPrefix = _urlOptions.RoutePrefix; var listResult = await _projectAppService.GetListAsync(); diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs index 94fec82c09..be7ae0ad95 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs @@ -73,7 +73,7 @@ namespace Volo.Docs.Pages.Documents.Project public async Task OnGetAsync() { - DocumentsUrlPrefix = _options.GetFormattedRoutePrefix(); + DocumentsUrlPrefix = _options.RoutePrefix; if (IsDocumentCultureDifferentThanCurrent()) {