Merge pull request #20961 from abpframework/issue-vs-4918

Fix version null exception for FileSystemDocumentSource and Update document
abpframework · Oct 4, 2024 · 21662e6 · 21662e6
2 parents 500c483 + 371e6ac
commit 21662e6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 39 deletions.
diff --git a/docs/en/modules/docs.md b/docs/en/modules/docs.md
@@ -367,7 +367,7 @@ You can use [ABP](https://github.com/abpframework/abp/) GitHub documents to conf
 For `SQL` databases, you can use the below `T-SQL` command to insert the specified sample into your `DocsProjects` table:
 
 ```mssql
-INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName], [ConcurrencyStamp]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP (FileSystem)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'FileSystem', N'{"Path":"C:\\Github\\abp\\docs"}', N'/', NULL, N'', N'12f21123e08e4f15bedbae0b2d939659')
+INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName], [ConcurrencyStamp]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP (GitHub)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'GitHub', N'{"GitHubRootUrl":"https://github.com/abpframework/abp/tree/{version}/docs","GitHubAccessToken":"","GitHubUserAgent":""}', N'/', N'dev', N'', N'12f21123e08e4f15bedbae0b2d939659')
 ```
 
 Be aware that `GitHubAccessToken` is masked. It's a private token and you must get your own token and replace the `***` string.
@@ -407,7 +407,7 @@ You can use [ABP](https://github.com/abpframework/abp/) GitHub documents to conf
 For `SQL` databases, you can use the below `T-SQL` command to insert the specified sample into your `DocsProjects` table:
 
 ```mssql
-INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP (FileSystem)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'FileSystem', N'{"Path":"C:\\Github\\abp\\docs"}', N'/', NULL, N'')
+INSERT [dbo].[DocsProjects] ([Id], [Name], [ShortName], [Format], [DefaultDocumentName], [NavigationDocumentName], [MinimumVersion], [DocumentStoreType], [ExtraProperties], [MainWebsiteUrl], [LatestVersionBranchName], [ParametersDocumentName], [ConcurrencyStamp]) VALUES (N'12f21123-e08e-4f15-bedb-ae0b2d939659', N'ABP (FileSystem)', N'abp', N'md', N'Index', N'docs-nav.json', NULL, N'FileSystem', N'{"Path":"C:\\Github\\abp\\docs"}', N'/', NULL, N'', N'12f21123e08e4f15bedbae0b2d939659')
 ```
 
 Add one of the sample projects above and run the application. In the menu you will see `Documents` link, click the menu link to open the documents page. 

diff --git a/modules/docs/app/VoloDocs.Web/Program.cs b/modules/docs/app/VoloDocs.Web/Program.cs
@@ -1,6 +1,9 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
@@ -9,7 +12,7 @@ namespace VoloDocs.Web
 {
  public class Program
  {
- public static int Main(string[] args)
+ public async static Task<int> Main(string[] args)
  {
  Log.Logger = new LoggerConfiguration()
  .MinimumLevel.Debug() //TODO: Should be configurable!
@@ -22,7 +25,14 @@ public static int Main(string[] args)
  try
  {
  Log.Information("Starting web host.");
- CreateHostBuilder(args).Build().Run();
+ var builder = WebApplication.CreateBuilder(args);
+ builder.Host
+ .UseAutofac()
+ .UseSerilog();
+ await builder.AddApplicationAsync<VoloDocsWebModule>();
+ var app = builder.Build();
+ await app.InitializeApplicationAsync();
+ await app.RunAsync();
  return 0;
  }
  catch (Exception ex)
@@ -32,17 +42,8 @@ public static int Main(string[] args)
  }
  finally
  {
- Log.CloseAndFlush();
+ await Log.CloseAndFlushAsync();
  }
  }
-
- internal static IHostBuilder CreateHostBuilder(string[] args) =>
- Host.CreateDefaultBuilder(args)
- .ConfigureWebHostDefaults(webBuilder =>
- {
- webBuilder.UseStartup<Startup>();
- })
- .UseAutofac()
- .UseSerilog();
  }
 }
diff --git a/modules/docs/app/VoloDocs.Web/Properties/launchSettings.json b/modules/docs/app/VoloDocs.Web/Properties/launchSettings.json
@@ -3,8 +3,8 @@
  "windowsAuthentication": false,
  "anonymousAuthentication": true,
  "iisExpress": {
- "applicationUrl": "https://localhost:44333/",
- "sslPort": 0
+ "applicationUrl": "https://localhost:5001/",
+ "sslPort": 5001
  }
  },
  "profiles": {
@@ -21,7 +21,7 @@
  "environmentVariables": {
  "ASPNETCORE_ENVIRONMENT": "Development"
  },
- "applicationUrl": "https://localhost:44333/"
+ "applicationUrl": "https://localhost:5001/"
  }
  }
 }
diff --git a/modules/docs/app/VoloDocs.Web/Startup.cs b/modules/docs/app/VoloDocs.Web/Startup.cs
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs
@@ -32,6 +32,8 @@ public async Task<Document> GetDocumentAsync(Project project, string documentNam
  localDirectory = documentName.Substring(0, documentName.LastIndexOf('/'));
  }
 
+ version = File.GetLastWriteTime(path).ToString("yyyyMMddHHmmss");
+
  return new Document(GuidGenerator.Create(),
  project.Id,
  documentName,