Merge branch 'master' of https://github.com/liaozb/APIJSON.NET

# Conflicts: # APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj # APIJSON.NET/APIJSONCommon/SelectTable.cs

Author: haptear

APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj

@@ -1,7 +1,7 @@
 <ProjectSdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
  </PropertyGroup>
 
  <ItemGroup>
@@ -19,18 +19,15 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReferenceInclude="AspectCore.Extensions.Reflection"Version="1.2.0" />
- <PackageReferenceInclude="Microsoft.AspNetCore.App" />
- <PackageReferenceInclude="Microsoft.AspNetCore.Authentication.JwtBearer"Version="2.2.0" />
+ <PackageReferenceInclude="Microsoft.AspNetCore.Authentication.JwtBearer"Version="3.1.4" />
  <PackageReferenceInclude="Microsoft.AspNetCore.Cors"Version="2.2.0" />
  <PackageReferenceInclude="Microsoft.AspNetCore.Rewrite"Version="2.2.0" />
  <PackageReferenceInclude="Microsoft.AspNetCore.Server.Kestrel.Https"Version="2.2.0" />
- <PackageReferenceInclude="Microsoft.VisualStudio.Web.CodeGeneration.Design"Version="2.2.3" />
- <PackageReferenceInclude="MySql.Data"Version="8.0.15" />
- <PackageReferenceInclude="Oracle.ManagedDataAccess.Core"Version="2.18.6" />
- <PackageReferenceInclude="Swashbuckle.AspNetCore"Version="4.0.1" />
- <PackageReferenceInclude="Swashbuckle.AspNetCore.Annotations"Version="4.0.1" />
- <PackageReferenceInclude="Swashbuckle.AspNetCore.Swagger"Version="4.0.1" />
+ <PackageReferenceInclude="Microsoft.VisualStudio.Web.CodeGeneration.Design"Version="3.1.3" />
+
+ <PackageReferenceInclude="Swashbuckle.AspNetCore"Version="5.4.1" />
+ <PackageReferenceInclude="Swashbuckle.AspNetCore.Annotations"Version="5.4.1" />
+ <PackageReferenceInclude="Swashbuckle.AspNetCore.Swagger"Version="5.4.1" />
  </ItemGroup>
 
  <ItemGroup>

APIJSON.NET/APIJSON.NET/Startup.cs

@@ -12,6 +12,7 @@
 usingMicrosoft.Extensions.Configuration;
 usingMicrosoft.Extensions.DependencyInjection;
 usingMicrosoft.IdentityModel.Tokens;
+usingMicrosoft.OpenApi.Models;
 usingSwashbuckle.AspNetCore.Swagger;
 
 publicclassStartup
@@ -46,10 +47,10 @@ public void ConfigureServices(IServiceCollection services)
 .AllowAnyHeader()
 .AllowAnyMethod().AllowCredentials()
 ));
-services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+services.AddControllers();
 services.AddSwaggerGen(c =>
 {
-c.SwaggerDoc("v1",newInfo{Title="APIJSON.NET",Version="v1"});
+c.SwaggerDoc("v1",newOpenApiInfo{Title="APIJSON.NET",Version="v1"});
 });
 services.AddSingleton<DbContext>();
 services.AddSingleton<SelectTable>();
@@ -61,17 +62,12 @@ public void ConfigureServices(IServiceCollection services)
 }
 
 // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-publicvoidConfigure(IApplicationBuilderapp,IHostingEnvironmentenv)
+publicvoidConfigure(IApplicationBuilderapp,IWebHostEnvironmentenv)
 {
 
 app.UseAuthentication();
 
-app.UseMvc(routes =>
-{
-routes.MapRoute(
-name:"default",
-template:"{controller=Home}/{action=Index}/{id?}");
-});
+app.UseRouting();
 app.UseStaticFiles();
 app.UseCors(_defaultCorsPolicyName);
 app.UseSwagger();
@@ -80,7 +76,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 c.SwaggerEndpoint("/swagger/v1/swagger.json","My API V1");
 
 });
-
+app.UseEndpoints(endpoints =>
+{
+endpoints.MapControllers();
+});
 app.UseJwtTokenMiddleware();
 DbInit.Initialize(app);
 }

APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj

@@ -18,9 +18,9 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReferenceInclude="AspectCore.Extensions.Reflection"Version="1.1.0" />
- <PackageReferenceInclude="Microsoft.Extensions.Options"Version="2.1.1" />
- <PackageReferenceInclude="sqlSugarCore"Version="5.0.0.9" />
+ <PackageReferenceInclude="AspectCore.Extensions.Reflection"Version="2.1.0" />
+ <PackageReferenceInclude="Microsoft.Extensions.Options"Version="3.1.4" />
+ <PackageReferenceInclude="sqlSugarCore"Version="5.0.0.15" />
  </ItemGroup>
 
  <ItemGroup>