Skip to content

Commit f3ae313

Browse files
WeihanLiWeihanLi
authored
Merge pull request #40 from WeihanLi/dev
1.11.0
2 parents dca590e + 2d86811 commit f3ae313

24 files changed

+190
-295
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<VersionMajor>1</VersionMajor>
4-
<VersionMinor>10</VersionMinor>
4+
<VersionMinor>11</VersionMinor>
55
<VersionPatch>0</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
<VersionSuffix Condition="'$(Configuration)'=='DEBUG'">develop</VersionSuffix>

‎Directory.Packages.props

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Condition="'$(TargetFramework)'=='net6.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.33" />
8+
<PackageVersion Condition="'$(TargetFramework)'=='net7.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.20" />
9+
<PackageVersion Condition="'$(TargetFramework)'=='net8.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
10+
<PackageVersion Condition="'$(TargetFramework)'=='net9.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0-*" />
11+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.2" />
12+
<PackageVersion Include="WeihanLi.Common" Version="1.0.69" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
16+
<PackageVersion Include="xunit" Version="2.9.0" />
17+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
18+
</ItemGroup>
19+
</Project>

‎build.cake

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎build/build.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
var target = CommandLineParser.Val("target", "Default", args);
2-
var apiKey = CommandLineParser.Val("apiKey", "", args);
3-
var stable = CommandLineParser.Val("stable", null, args).ToBoolean();
4-
var noPush = CommandLineParser.Val("noPush", null, args).ToBoolean();
1+
var target = CommandLineParser.Val("target", args, "Default");
2+
var apiKey = CommandLineParser.Val("apiKey", args);
3+
var stable = CommandLineParser.BooleanVal("stable", args);
4+
var noPush = CommandLineParser.BooleanVal("noPush", args);
55
var branchName = EnvHelper.Val("BUILD_SOURCEBRANCHNAME", "local");
66

77
var solutionPath = "./WeihanLi.Web.Extensions.sln";
@@ -114,4 +114,4 @@ async Task ExecuteCommandAsync(string commandText, KeyValuePair<string, string>[
114114
var result = await CommandExecutor.ExecuteCommandAndOutputAsync(commandText);
115115
result.EnsureSuccessExitCode();
116116
Console.WriteLine();
117-
}
117+
}

‎docfx.json

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,43 @@
33
{
44
"src": [
55
{
6+
"src": "./src",
67
"files": [
7-
"src/**.csproj",
8-
"src/WeihanLi.Web.Extensions/*.cs",
9-
"src/**/*.cs"
10-
],
11-
"exclude": [ "**/bin/**", "**/obj/**" ]
8+
"**/*.csproj"
9+
]
1210
}
1311
],
14-
"dest": "docs/api",
15-
"disableGitFeatures": false,
16-
"disableDefaultFilter": false
12+
"dest": "docs/api"
1713
}
1814
],
1915
"build": {
20-
"content": [
16+
"content": [
2117
{
2218
"files": [
23-
"docs/api/**.md",
24-
"docs/api/**.yml",
25-
"docs/api/**/toc.yml",
26-
"toc.yml",
27-
"*.md"
19+
"**/*.{md,yml}"
20+
],
21+
"exclude": [
22+
"_site/**"
2823
]
2924
}
3025
],
3126
"resource": [
3227
{
3328
"files": [
34-
"docs/images"
35-
]
36-
}
37-
],
38-
"overwrite": [
39-
{
40-
"files": [
41-
"docs/api/**.md"
42-
],
43-
"exclude": [
44-
"obj/**",
45-
"_site/**"
29+
"images/**"
4630
]
4731
}
4832
],
49-
"dest": "_site",
50-
"globalMetadataFiles": [],
51-
"fileMetadataFiles": [],
33+
"output": "_site",
5234
"template": [
53-
"default"
35+
"default",
36+
"modern"
5437
],
55-
"postProcessors": [],
56-
"markdownEngineName": "markdig",
57-
"noLangKeyword": false,
58-
"keepFileLink": false,
59-
"cleanupCacheHistory": false,
60-
"disableGitFeatures": false
38+
"globalMetadata": {
39+
"_appName": "WeihanLi.Web.Extensions",
40+
"_appTitle": "WeihanLi.Web.Extensions",
41+
"_enableSearch": true,
42+
"pdf": false
43+
}
6144
}
6245
}

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

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.IdentityModel.Tokens;
55
using Microsoft.OpenApi.Models;
66
using System.Reflection;
7+
using System.Text;
78
using System.Text.Json.Serialization;
89
using WeihanLi.Common.Aspect;
910
using WeihanLi.Common.Models;
@@ -41,7 +42,7 @@
4142
options.KeyLocation = KeyLocation.HeaderOrQuery;
4243
})
4344
;
44-
builder.Services.AddJwtTokenServiceWithJwtBearerAuth(options =>
45+
builder.Services.AddJwtServiceWithJwtBearerAuth(options =>
4546
{
4647
options.SecretKey = Guid.NewGuid().ToString();
4748
options.Issuer = "https://id.weihanli.xyz";
@@ -137,10 +138,55 @@
137138
options.SwaggerEndpoint("/swagger/v1/swagger.json", "v1");
138139
});
139140

140-
app.MapConfigInspector().ShortCircuit();
141-
142141
app.UseAuthentication();
143142
app.UseAuthorization();
143+
144+
// app.MapConfigInspector(optionsConfigure: options =>
145+
// {
146+
// options.ConfigRenderer = async (context, configs) =>
147+
// {
148+
// var htmlStart = """
149+
// <html>
150+
// <head>
151+
// <title>Config Inspector</title>
152+
// </head>
153+
// <body>
154+
// <table style="font-size:1.2em;line-height:1.6em">
155+
// <thead>
156+
// <tr>
157+
// <th>Provider</th>
158+
// <th>Key</th>
159+
// <th>Value</th>
160+
// <th>Active</th>
161+
// </tr>
162+
// </thead>
163+
// <tbody>
164+
// """;
165+
// var htmlEnd = "</tbody></table></body></html>";
166+
// var tbody = new StringBuilder();
167+
// foreach (var config in configs)
168+
// {
169+
// tbody.Append($"<tr><td>{config.Provider}</td>");
170+
// foreach (var item in config.Items)
171+
// {
172+
// tbody.Append(
173+
// $$"""<td>{{item.Key}}</td><td>{{item.Value}}</td><td><input type="checkbox" {{(item.Active ? "checked" : "")}} /></td>""");
174+
// }
175+
//
176+
// tbody.AppendLine("</tr>");
177+
// }
178+
//
179+
// var responseText = $"{htmlStart}{tbody}{htmlEnd}";
180+
// await context.Response.WriteAsync(responseText);
181+
// };
182+
// });
183+
184+
app.MapConfigInspector()
185+
// .RequireAuthorization(x => x
186+
// .AddAuthenticationSchemes("ApiKey")
187+
// .RequireAuthenticatedUser()
188+
// )
189+
;
144190
app.MapControllers();
145191

146192
await app.RunAsync();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -11,6 +11,6 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
14+
<PackageReference Include="Swashbuckle.AspNetCore" />
1515
</ItemGroup>
1616
</Project>

‎src/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project>
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
33
<Import Project="../build/sign.props" />
4-
<PropertyGroup>
4+
<PropertyGroup>
5+
<Nullable>enable</Nullable>
56
<GenerateDocumentationFile>true</GenerateDocumentationFile>
67
<NoWarn>$(NoWarn);1591</NoWarn>
78
<PackageReadmeFile>README.md</PackageReadmeFile>

0 commit comments

Comments
 (0)