1.11.0

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
 		<VersionMajor>1</VersionMajor>
-		<VersionMinor>10</VersionMinor>
+		<VersionMinor>11</VersionMinor>
 		<VersionPatch>0</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix Condition="'$(Configuration)'=='DEBUG'">develop</VersionSuffix>

Directory.Packages.props

@@ -0,0 +1,19 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Condition="'$(TargetFramework)'=='net6.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.33" />
+    <PackageVersion Condition="'$(TargetFramework)'=='net7.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.20" />
+    <PackageVersion Condition="'$(TargetFramework)'=='net8.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
+    <PackageVersion Condition="'$(TargetFramework)'=='net9.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0-*" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.2" />
+    <PackageVersion Include="WeihanLi.Common" Version="1.0.69" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+  </ItemGroup>
+</Project>

build/build.cs

@@ -1,7 +1,7 @@
-var target = CommandLineParser.Val("target", "Default", args);
-var apiKey = CommandLineParser.Val("apiKey", "", args);
-var stable = CommandLineParser.Val("stable", null, args).ToBoolean();
-var noPush = CommandLineParser.Val("noPush", null, args).ToBoolean();
+var target = CommandLineParser.Val("target", args, "Default");
+var apiKey = CommandLineParser.Val("apiKey", args);
+var stable = CommandLineParser.BooleanVal("stable", args);
+var noPush = CommandLineParser.BooleanVal("noPush", args);
 var branchName = EnvHelper.Val("BUILD_SOURCEBRANCHNAME", "local");
 
 var solutionPath = "./WeihanLi.Web.Extensions.sln";
@@ -114,4 +114,4 @@ async Task ExecuteCommandAsync(string commandText, KeyValuePair<string, string>[
     var result = await CommandExecutor.ExecuteCommandAndOutputAsync(commandText);
     result.EnsureSuccessExitCode();
     Console.WriteLine();
-}
+}

docfx.json

@@ -3,60 +3,43 @@
     {
       "src": [
         {
+          "src": "./src",
           "files": [
-            "src/**.csproj",
-            "src/WeihanLi.Web.Extensions/*.cs",
-            "src/**/*.cs"
-          ],
-          "exclude": [ "**/bin/**", "**/obj/**" ]
+            "**/*.csproj"
+          ]
         }
       ],
-      "dest": "docs/api",
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false
+      "dest": "docs/api"
     }
   ],
   "build": {
-    "content": [    
+    "content": [
       {
         "files": [
-          "docs/api/**.md",
-          "docs/api/**.yml",
-          "docs/api/**/toc.yml",
-          "toc.yml",
-          "*.md"
+          "**/*.{md,yml}"
+        ],
+        "exclude": [
+          "_site/**"
         ]
       }
     ],
     "resource": [
       {
         "files": [
-          "docs/images"
-        ]
-      }
-    ],
-    "overwrite": [
-      {
-        "files": [
-          "docs/api/**.md"
-        ],
-        "exclude": [
-          "obj/**",
-          "_site/**"
+          "images/**"
         ]
       }
     ],
-    "dest": "_site",
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
+    "output": "_site",
     "template": [
-      "default"
+      "default",
+      "modern"
     ],
-    "postProcessors": [],
-    "markdownEngineName": "markdig",
-    "noLangKeyword": false,
-    "keepFileLink": false,
-    "cleanupCacheHistory": false,
-    "disableGitFeatures": false
+    "globalMetadata": {
+      "_appName": "WeihanLi.Web.Extensions",
+      "_appTitle": "WeihanLi.Web.Extensions",
+      "_enableSearch": true,
+      "pdf": false
+    }
   }
 }

samples/WeihanLi.Web.Extensions.Samples/Program.cs

@@ -4,6 +4,7 @@
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using System.Reflection;
+using System.Text;
 using System.Text.Json.Serialization;
 using WeihanLi.Common.Aspect;
 using WeihanLi.Common.Models;
@@ -41,7 +42,7 @@
         options.KeyLocation = KeyLocation.HeaderOrQuery;
     })
     ;
-builder.Services.AddJwtTokenServiceWithJwtBearerAuth(options =>
+builder.Services.AddJwtServiceWithJwtBearerAuth(options =>
 {
     options.SecretKey = Guid.NewGuid().ToString();
     options.Issuer = "https://id.weihanli.xyz";
@@ -137,10 +138,55 @@
     options.SwaggerEndpoint("/swagger/v1/swagger.json", "v1");
 });
 
-app.MapConfigInspector().ShortCircuit();
-
 app.UseAuthentication();
 app.UseAuthorization();
+
+// app.MapConfigInspector(optionsConfigure: options =>
+// {
+//     options.ConfigRenderer = async (context, configs) =>
+//     {
+//         var htmlStart = """
+//                         <html>
+//                           <head>
+//                             <title>Config Inspector</title>
+//                           </head>
+//                           <body>
+//                             <table style="font-size:1.2em;line-height:1.6em">
+//                               <thead>
+//                               <tr>
+//                                 <th>Provider</th>
+//                                 <th>Key</th>
+//                                 <th>Value</th>
+//                                 <th>Active</th>
+//                               </tr>
+//                               </thead>
+//                               <tbody>
+//                         """;
+//         var htmlEnd = "</tbody></table></body></html>";
+//         var tbody = new StringBuilder();
+//         foreach (var config in configs)
+//         {
+//             tbody.Append($"<tr><td>{config.Provider}</td>");
+//             foreach (var item in config.Items)
+//             {
+//                 tbody.Append(
+//                     $$"""<td>{{item.Key}}</td><td>{{item.Value}}</td><td><input type="checkbox" {{(item.Active ? "checked" : "")}} /></td>""");
+//             }
+//
+//             tbody.AppendLine("</tr>");
+//         }
+//
+//         var responseText = $"{htmlStart}{tbody}{htmlEnd}";
+//         await context.Response.WriteAsync(responseText);
+//     };
+// });
+
+app.MapConfigInspector()
+    // .RequireAuthorization(x => x
+    //     .AddAuthenticationSchemes("ApiKey")
+    //     .RequireAuthenticatedUser()
+    // )
+    ;
 app.MapControllers();
 
 await app.RunAsync();

samples/WeihanLi.Web.Extensions.Samples/WeihanLi.Web.Extensions.Samples.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -11,6 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 </Project>

src/Directory.Build.props

@@ -1,7 +1,8 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="../build/sign.props" />
-  <PropertyGroup>        
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <PackageReadmeFile>README.md</PackageReadmeFile>