administraton 几乎完成

Author: wangnima

Hei.OcelotOnK8s/Hei.OcelotOnK8s/Hei.OcelotOnK8s.csproj

@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ocelot" Version="16.0.1" />
+    <PackageReference Include="Ocelot.Administration" Version="16.0.1" />
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties ocelot_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

Hei.OcelotOnK8s/Hei.OcelotOnK8s/Program.cs

@@ -14,37 +14,6 @@ namespace Hei.OcelotOnK8s
 {
     public class Program
     {
-        public static void Main2(string[] args)
-        {
-            new WebHostBuilder()
-            .UseKestrel()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .ConfigureAppConfiguration((hostingContext, config) =>
-            {
-                config
-                    .SetBasePath(hostingContext.HostingEnvironment.ContentRootPath)
-                    .AddJsonFile("appsettings.json", true, true)
-                    .AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true)
-                    .AddJsonFile("ocelot.json")
-                    .AddEnvironmentVariables();
-            })
-            .ConfigureServices(s =>
-            {
-                s.AddOcelot();
-            })
-            .ConfigureLogging((hostingContext, logging) =>
-            {
-                //add your logging
-            })
-            //.UseIISIntegration()
-            .Configure(app =>
-            {
-                app.UseOcelot().Wait();
-            })
-            .Build()
-            .Run();
-        }
-
         public static void Main(string[] args)
         {
             CreateHostBuilder(args).Build().Run();

Hei.OcelotOnK8s/Hei.OcelotOnK8s/Startup.cs

@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using IdentityServer4.AccessTokenValidation;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Ocelot.Administration;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
 
@@ -23,21 +25,28 @@ public Startup(IConfiguration configuration, IWebHostEnvironment env)
                 .SetBasePath(env.ContentRootPath)
                 .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true)
-                .AddJsonFile("ocelot.json");
+                .AddJsonFile("ocelot.json")
+                .AddJsonFile($"ocelot.{env.EnvironmentName}.json", optional: true, reloadOnChange: true);
             Configuration = builder.Build();
         }
 
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddOcelot(Configuration);
+            services.AddOcelot(Configuration).AddAdministration("/administration", options=> 
+            {
+                options.Authority = "http://passport-test.39.net";///connect/token
+                options.ApiName = "api1";
+                options.RequireHttpsMetadata = false;
+                options.SupportedTokens = SupportedTokens.Both;
+                options.ApiSecret = "secret";
+            }); 
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-            app.UseRouting();
             app.UseOcelot().Wait();
         }
     }

Hei.OcelotOnK8s/Hei.OcelotOnK8s/ocelot.Development.json

@@ -0,0 +1,20 @@
+{
+  "Routes": [
+    {     
+      "UpstreamPathTemplate": "/api/{url}",
+      "DownstreamPathTemplate": "/{url}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 5003
+        }
+      ],
+
+      "UpstreamHttpMethod": [ "Get" ]
+    }
+  ],
+  "GlobalConfiguration": {
+    "BaseUrl": "http://localhost:5000"
+  }
+}

Hei.OcelotOnK8s/Hei.OcelotOnK8s/ocelot.json

@@ -1,8 +1,8 @@
 {
   "Routes": [
     {     
-      "UpstreamPathTemplate": "/{id}",
-      "DownstreamPathTemplate": "/{id}",
+      "UpstreamPathTemplate": "/{url}",
+      "DownstreamPathTemplate": "/{url}",
       "DownstreamScheme": "http",
       "DownstreamHostAndPorts": [
         {