From 300c10d00d38512787dcaef84dfc8beafc150cec Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 9 Mar 2020 09:55:39 +0800
Subject: [PATCH] Rebuilding the index excludes navigation and parameter files.

---
 modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj          | 3 ++-
 modules/docs/app/VoloDocs.Web/appsettings.json             | 3 +--
 .../Volo/Docs/Admin/Documents/DocumentAdminAppService.cs   | 7 +++++++
 .../Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj
index 3cc24371b8..9eb89ff5bb 100644
--- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj
+++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\..\configureawait.props" />
 
@@ -8,6 +8,7 @@
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <UserSecretsId>5f11b41f-0025-4fe6-ab97-60ec1bd4e8c2</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/modules/docs/app/VoloDocs.Web/appsettings.json b/modules/docs/app/VoloDocs.Web/appsettings.json
index 44eb9adc30..db1d4b31f6 100644
--- a/modules/docs/app/VoloDocs.Web/appsettings.json
+++ b/modules/docs/app/VoloDocs.Web/appsettings.json
@@ -1,8 +1,7 @@
 {
   "ConnectionString": "Server=localhost;Database=VoloDocs;Trusted_Connection=True;MultipleActiveResultSets=true",
   "LogoUrl": "/assets/images/Logo.png",
-
   "ElasticSearch": {
-    "Url": "http://172.25.134.11:9200"
+    "Url": "http://localhost:9200"
   }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs
index 845062148b..4bc793f799 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs
@@ -87,8 +87,15 @@ namespace Volo.Docs.Admin.Documents
         public async Task ReindexAsync()
         {
             var docs = await _documentRepository.GetListAsync();
+            var projects = await _projectRepository.GetListAsync();
             foreach (var doc in docs)
             {
+                var project = projects.FirstOrDefault(x => x.Id == doc.ProjectId);
+                if (project != null && (doc.FileName == project.NavigationDocumentName || doc.FileName == project.ParametersDocumentName))
+                {
+                    continue;
+                }
+                
                 await _documentFullSearch.AddOrUpdateAsync(doc);
             }
         }
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json
index 9c14a84133..e8c7122ec3 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json
@@ -17,7 +17,7 @@
     "NavigationDocumentNotFound": "This version does not have a navigation document!",
     "DocumentNotFoundInSelectedLanguage": "Document in the language you wanted is not found. Document in the default language is shown.",
     "FilterTopics": "Filter topics",
-    "FullSearch": "Search document",
+    "FullSearch": "Search in documents",
     "Volo.Docs.Domain:010001": "Elastic search is not enabled.",
     "MultipleVersionDocumentInfo": "This document has multiple versions. Select the options best fit for you.",
     "New": "New",