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

Merge branch 'ussamoo-feature/#1088'

Browse Source
This commit is contained in:
TomPallister 2020-02-04 20:07:51 +00:00
commit 55073ac3ad
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/AdministrationApi/AdministrationApi.csproj
View File

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

13
samples/AdministrationApi/Program.cs
View File

@ -1,19 +1,14 @@
using System; using Microsoft.AspNetCore.Hosting;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Ocelot.Administration;
using Ocelot.DependencyInjection; using Ocelot.DependencyInjection;
using Ocelot.Middleware; using Ocelot.Middleware;
using Ocelot.Administration; using System.IO;
namespace AdministrationApi namespace AdministrationApi
{ {
public class Program public class Program
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {

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

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