tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 23:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/#1088' of https://github.com/ussamoo/Ocelot into ussamoo-feature/#1088

Browse Source
This commit is contained in:
TomPallister
2020-02-04 18:25:32 +00:00
parent b5dc618780 f4eb93b66c
commit 0babcaea08
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/AdministrationApi/AdministrationApi.csproj
View File

@@ -1,13 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
<ItemGroup> <PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Ocelot" Version="14.0.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Ocelot" Version="12.0.1"/>
<PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
<ProjectReference Include="..\..\src\Ocelot.Administration\Ocelot.Administration.csproj" />
</ItemGroup>
</Project>

11
samples/AdministrationApi/Program.cs
View File

@@ -1,15 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Ocelot.Administration;
using Ocelot.DependencyInjection;
using Ocelot.Middleware;
using Ocelot.Administration;
using System.IO;
namespace AdministrationApi
{

8
src/Ocelot.Administration/IdentityServerMiddlewareConfigurationProvider.cs
View File

@@ -27,7 +27,13 @@
}
app.UseAuthentication();
app.UseMvc();
app.UseRouting();
app.UseAuthorization();
app.UseEndpoints(endpoints =>
{
endpoints.MapDefaultControllerRoute();
endpoints.MapControllers();
});
});
}