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

Revert "Merge branch 'feature/issue#1088'"

Browse Source 
This reverts commit 914a386b0e79612a832a0ddc4c1b7fda7e8cf4a2.
This commit is contained in:
EL Aisati Ahmed 2020-02-04 18:11:38 +01:00
parent 914a386b0e
commit 157737ef01
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
samples/AdministrationApi/AdministrationApi.csproj
View File

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

11
samples/AdministrationApi/Program.cs
View File

@ -1,10 +1,15 @@
using Microsoft.AspNetCore.Hosting; 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.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 System.IO; using Ocelot.Administration;
namespace AdministrationApi namespace AdministrationApi
{ {

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

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