打包最新的前端,升级.NET7.0

This commit is contained in:
igeekfan 2022-11-11 00:01:00 +08:00
parent 6bfc2dd266
commit 6fd0364356
20 changed files with 84 additions and 213 deletions

View File

@ -23,8 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OAuth2Integration", "test\W
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Swagger.Knife4jUI", "test\WebSites\NSwag.Swagger.Knife4jUI\NSwag.Swagger.Knife4jUI.csproj", "{42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Swagger.Knife4jUI", "test\WebSites\NSwag.Swagger.Knife4jUI\NSwag.Swagger.Knife4jUI.csproj", "{42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCore6Api", "samples\AspNetCore6Api\AspNetCore6Api.csproj", "{43B995C5-145B-4D46-B4C3-6340F31A1572}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A08844CF-E477-4104-98CB-EB6417CB1B0C}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A08844CF-E477-4104-98CB-EB6417CB1B0C}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes .gitattributes = .gitattributes
@ -33,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md README.md = README.md
EndProjectSection EndProjectSection
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore7Api", "samples\AspNetCoreApi\AspNetCore7Api.csproj", "{F576D6A1-D21C-4BBB-9461-8D7C6DBE5B61}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -63,10 +63,10 @@ Global
{42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}.Debug|Any CPU.Build.0 = Debug|Any CPU {42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}.Release|Any CPU.ActiveCfg = Release|Any CPU {42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}.Release|Any CPU.Build.0 = Release|Any CPU {42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB}.Release|Any CPU.Build.0 = Release|Any CPU
{43B995C5-145B-4D46-B4C3-6340F31A1572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F576D6A1-D21C-4BBB-9461-8D7C6DBE5B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43B995C5-145B-4D46-B4C3-6340F31A1572}.Debug|Any CPU.Build.0 = Debug|Any CPU {F576D6A1-D21C-4BBB-9461-8D7C6DBE5B61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43B995C5-145B-4D46-B4C3-6340F31A1572}.Release|Any CPU.ActiveCfg = Release|Any CPU {F576D6A1-D21C-4BBB-9461-8D7C6DBE5B61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43B995C5-145B-4D46-B4C3-6340F31A1572}.Release|Any CPU.Build.0 = Release|Any CPU {F576D6A1-D21C-4BBB-9461-8D7C6DBE5B61}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -79,7 +79,7 @@ Global
{86851B6C-3504-4879-8464-1DB422D46BA0} = {75C51574-4CBD-403B-8182-8BF2A6DCFD43} {86851B6C-3504-4879-8464-1DB422D46BA0} = {75C51574-4CBD-403B-8182-8BF2A6DCFD43}
{9E8D8F42-33F0-4F2D-9B56-1AB1B33DE1FA} = {86851B6C-3504-4879-8464-1DB422D46BA0} {9E8D8F42-33F0-4F2D-9B56-1AB1B33DE1FA} = {86851B6C-3504-4879-8464-1DB422D46BA0}
{42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB} = {86851B6C-3504-4879-8464-1DB422D46BA0} {42B4C1C3-AE38-47C7-AAAA-FE0FDA7DADEB} = {86851B6C-3504-4879-8464-1DB422D46BA0}
{43B995C5-145B-4D46-B4C3-6340F31A1572} = {C146A419-15E0-4475-9623-706C5E2DCE0B} {F576D6A1-D21C-4BBB-9461-8D7C6DBE5B61} = {C146A419-15E0-4475-9623-706C5E2DCE0B}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9D77CCB4-F597-421B-9EF9-52D4B0AC382D} SolutionGuid = {9D77CCB4-F597-421B-9EF9-52D4B0AC382D}

View File

@ -1,20 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>AspNetCore6Api.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\IGeekFan.AspNetCore.Knife4jUI\IGeekFan.AspNetCore.Knife4jUI.csproj" />
</ItemGroup>
</Project>

View File

@ -1,121 +0,0 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>AspNetCore6Api</name>
</assembly>
<members>
<member name="T:AspNetCore6Api.Controllers.WeatherForecastController">
<summary>
中文这是一个Get请求这是一个Get请求
</summary>
</member>
<member name="M:AspNetCore6Api.Controllers.WeatherForecastController.GetErrorCode">
<summary>
得到一个ErrorCode
</summary>
<returns></returns>
</member>
<member name="M:AspNetCore6Api.Controllers.WeatherForecastController.PostErrorCode(AspNetCore6Api.Controllers.PostErrorCodeDto)">
<summary>
发送一个Post
</summary>
<returns></returns>
</member>
<member name="M:AspNetCore6Api.Controllers.WeatherForecastController.Get">
<summary>
这是一个Get请求
</summary>
<returns></returns>
</member>
<member name="T:AspNetCore6Api.Controllers.PostErrorCodeDto">
<summary>
请求实体
</summary>
</member>
<member name="P:AspNetCore6Api.Controllers.PostErrorCodeDto.Message">
<summary>
异常信息
</summary>
</member>
<member name="P:AspNetCore6Api.Controllers.PostErrorCodeDto.ErrorCode">
<summary>
状态码
</summary>
</member>
<member name="T:Knife4jUIDemo.ErrorCode">
<summary>
注释ErrorCode
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.Success">
<summary>
操作成功
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.UnknownError">
<summary>
未知错误
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.ServerUnknownError">
<summary>
服务器未知错误
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.Error">
<summary>
失败
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.AuthenticationFailed">
<summary>
认证失败
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.NoPermission">
<summary>
无权限
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.Fail">
<summary>
失败
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.RefreshTokenError">
<summary>
refreshToken异常
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.NotFound">
<summary>
资源不存在
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.ParameterError">
<summary>
参数错误
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.TokenInvalidation">
<summary>
令牌失效
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.TokenExpired">
<summary>
令牌过期
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.RepeatField">
<summary>
字段重复
</summary>
</member>
<member name="F:Knife4jUIDemo.ErrorCode.Inoperable">
<summary>
禁止操作
</summary>
</member>
</members>
</doc>

View File

@ -1,31 +0,0 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:7480",
"sslPort": 44309
}
},
"profiles": {
"AspNetCore6Api": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7030;http://localhost:5030",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

View File

@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\IGeekFan.AspNetCore.Knife4jUI\IGeekFan.AspNetCore.Knife4jUI.csproj" />
</ItemGroup>
</Project>

View File

@ -12,7 +12,7 @@ builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen(c => builder.Services.AddSwaggerGen(c =>
{ {
c.SwaggerDoc("v1", new OpenApiInfo { Title = "API V1", Version = "v1" }); c.SwaggerDoc("v1", new OpenApiInfo { Title = "API V1", Version = "v1" });
var filePath = Path.Combine(System.AppContext.BaseDirectory, "AspNetCore6Api.xml"); var filePath = Path.Combine(System.AppContext.BaseDirectory, "AspNetCore7Api.xml");
c.IncludeXmlComments(filePath, true); c.IncludeXmlComments(filePath, true);
}); });
@ -24,17 +24,16 @@ if (app.Environment.IsDevelopment())
app.UseSwagger(); app.UseSwagger();
app.UseKnife4UI(c => app.UseKnife4UI(c =>
{ {
c.RoutePrefix = "k4"; // serve the UI at root c.RoutePrefix = "swagger"; // serve the UI at root
c.SwaggerEndpoint("/v1/swagger.json", "V1 Docs"); c.SwaggerEndpoint("/v1/swagger.json", "V1 Docs");
}); });
} }
app.UseHttpsRedirection(); app.UseHttpsRedirection();
app.UseRouting();
app.UseAuthorization(); app.UseAuthorization();
app.UseRouting();
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapControllers(); endpoints.MapControllers();

View File

@ -0,0 +1,15 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"AspNetCore7Api": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7030;http://localhost:5030",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

View File

@ -7,10 +7,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.4.0" />
</ItemGroup> </ItemGroup>

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<Description>Middleware to expose an embedded version of the knife4j-vue from an ASP.NET Core application</Description> <Description>Middleware to expose an embedded version of the knife4j-vue from an ASP.NET Core application</Description>
<NoWarn>$(NoWarn);1591</NoWarn> <NoWarn>$(NoWarn);1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
@ -11,14 +11,14 @@
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/luoyunchong/IGeekFan.AspNetCore.Knife4jUI.git</RepositoryUrl> <RepositoryUrl>https://github.com/luoyunchong/IGeekFan.AspNetCore.Knife4jUI.git</RepositoryUrl>
<RootNamespace>IGeekFan.AspNetCore.Knife4jUI</RootNamespace> <RootNamespace>IGeekFan.AspNetCore.Knife4jUI</RootNamespace>
<Version>0.0.11</Version> <Version>0.0.13</Version>
<Company /> <Company />
<Authors>igeekfan;xiaoym;</Authors> <Authors>igeekfan;xiaoym;</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Copyright>Apache License 2.0</Copyright> <Copyright>Apache License 2.0</Copyright>
<PackageLicenseExpression></PackageLicenseExpression> <PackageLicenseExpression></PackageLicenseExpression>
<AssemblyVersion>0.0.11.0</AssemblyVersion> <AssemblyVersion>0.0.13.0</AssemblyVersion>
<FileVersion>0.0.11.0</FileVersion> <FileVersion>0.0.13.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<!-- Using SourceLink --> <!-- Using SourceLink -->
@ -31,13 +31,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All" /> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' "> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.0" /> <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.0" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
<PackageReference Include="System.Text.Json" Version="4.6.0" /> <PackageReference Include="System.Text.Json" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' "> <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' ">

View File

@ -7,9 +7,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.11" /> <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.12" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -4,7 +4,7 @@
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "", "launchUrl": "",
"applicationUrl": "http://localhost:5000", "applicationUrl": "http://localhost:5000;https://localhost:5001",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }

View File

@ -27,6 +27,15 @@ namespace Basic
public void ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
services.AddControllers(); services.AddControllers();
services.AddCors(options =>
{
options.AddPolicy("CorsPolicy",
builder => builder
.SetIsOriginAllowed((host) => true)
.AllowAnyMethod()
.AllowAnyHeader()
.AllowCredentials());
});
services.AddSwaggerGen(c => services.AddSwaggerGen(c =>
{ {
@ -53,11 +62,11 @@ namespace Basic
c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "Basic.xml"),true); c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "Basic.xml"),true);
//c.EnableAnnotations(); //c.EnableAnnotations();
c.AddServer(new OpenApiServer() //c.AddServer(new OpenApiServer()
{ //{
Url = "http://localhost:81/admin/", // Url = "http://localhost:81/admin/",
Description = "vvv" // Description = "vvv"
}); //});
c.CustomOperationIds(apiDesc => c.CustomOperationIds(apiDesc =>
{ {
var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor; var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor;
@ -75,7 +84,9 @@ namespace Basic
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
} }
app.UseCors(policyName: "CorsPolicy");
app.UseHsts();
app.UseHttpsRedirection();
app.UseStaticFiles(); app.UseStaticFiles();
app.UseRouting(); app.UseRouting();

View File

@ -12,8 +12,8 @@
<ItemGroup> <ItemGroup>
<!--<PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.9" />--> <!--<PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.9" />-->
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NSwag.AspNetCore" Version="13.8.2" /> <PackageReference Include="NSwag.AspNetCore" Version="13.17.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -5,12 +5,12 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityServer4" Version="3.0.2" /> <PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" /> <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="NCaptcha.AspNetCore.SessionImages" Version="0.1.0" /> <PackageReference Include="NCaptcha.AspNetCore.SessionImages" Version="0.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.4" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>