Merge branch 'master' into net7.0

anjoy8 · Nov 1, 2023 · 0c6ea28 · 0c6ea28
2 parents 57555d1 + bea5332
commit 0c6ea28
Show file tree

Hide file tree

Showing 207 changed files with 8,778 additions and 4,051 deletions.
diff --git a/.gitignore b/.gitignore
@@ -355,4 +355,6 @@ Blog.Core/WMBlog.db
 Blog.Core/Blog.Core*.xml
 Blog.Core.Api/WMBlog.db
 Blog.Core.Api/wwwroot/ui/
+Blog.Core.Api/Logs
 *.db
+/Blog.Core.Api/WMBlog.db-journal
diff --git a/Blog.Core.Api/Blog.Core.Api.csproj b/Blog.Core.Api/Blog.Core.Api.csproj
@@ -7,6 +7,7 @@
     <!--<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>-->
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
+
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -24,28 +25,37 @@
   <ItemGroup>
     <Compile Remove="Extensions\**" />
     <Compile Remove="Hubs\**" />
+    <Compile Remove="Logs\**" />
     <Compile Remove="Log\**" />
     <Compile Remove="Middlewares\**" />
     <Compile Remove="wwwroot\ui\**" />
     <Content Remove="Extensions\**" />
     <Content Remove="Hubs\**" />
+    <Content Remove="Logs\**" />
     <Content Remove="Log\**" />
     <Content Remove="Middlewares\**" />
     <Content Remove="wwwroot\ui\**" />
     <EmbeddedResource Remove="Extensions\**" />
     <EmbeddedResource Remove="Hubs\**" />
+    <EmbeddedResource Remove="Logs\**" />
     <EmbeddedResource Remove="Log\**" />
     <EmbeddedResource Remove="Middlewares\**" />
     <EmbeddedResource Remove="wwwroot\ui\**" />
     <None Remove="Extensions\**" />
     <None Remove="Hubs\**" />
+    <None Remove="Logs\**" />
     <None Remove="Log\**" />
     <None Remove="Middlewares\**" />
     <None Remove="wwwroot\ui\**" />
   </ItemGroup>
 
   <ItemGroup>
     <None Remove="index.html" />
+    <None Remove="WangWu.db" />
+    <None Remove="WMBlog.db" />
+    <None Remove="WMBlogLog.db" />
+    <None Remove="WMBlogLog.db-journal" />
+    <None Remove="ZhaoLiu.db" />
   </ItemGroup>
 
   <ItemGroup>
@@ -105,4 +115,4 @@
     </VisualStudio>
   </ProjectExtensions>
 
-</Project>
+</Project>
diff --git a/Blog.Core.Api/Blog.Core.Model.xml b/Blog.Core.Api/Blog.Core.Model.xml