feat(Ocelot.Cache.CacheManager): add and configure

- Routenzuordnung für /api/{route1}/{route2}/{route3} hinzugefügt
- Ermöglicht Downstream-Routing zur Unterstützung komplexerer API-Strukturen

DigitalData.Gateway.csproj

@@ -1,19 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <AssemblyVersion>1.1.0</AssemblyVersion>
-    <FileVersion>1.0.0</FileVersion>
+    <FileVersion>1.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NLog" Version="5.4.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.4.0" />
-    <PackageReference Include="Ocelot" Version="22.0.1" />
+    <PackageReference Include="Ocelot" Version="23.4.3" />
+    <PackageReference Include="Ocelot.Cache.CacheManager" Version="23.4.3" />
   </ItemGroup>
 
 </Project>

Program.cs

@@ -2,6 +2,7 @@ using NLog;
 using NLog.Web;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
+using Ocelot.Cache.CacheManager;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized.");
@@ -9,13 +10,23 @@ logger.Info("Logging initialized.");
 try
 {
     var builder = WebApplication.CreateBuilder(args);
+        
+    builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
+
+    if (!builder.Environment.IsDevelopment())
+    {
+        builder.Logging.ClearProviders();
+        builder.Host.UseNLog();
+    }
 
     // Make sure to add the Ocelot configuration file
     var suffix = builder.Environment.IsDevelopment() ? ".Development" : "";
     builder.Configuration.AddJsonFile($"ocelot{suffix}.json");
 
     // Add Ocelot services
-    builder.Services.AddOcelot();
+    builder.Services
+        .AddOcelot()
+        .AddCacheManager(x => x.WithDictionaryHandle());
 
     var app = builder.Build();
 
@@ -24,10 +35,7 @@ try
     app.UseAuthorization();
 
     // Use Ocelot middleware in an appropriate way
-    app.UseEndpoints(endpoints =>
+    app.MapControllers();
-    {
-        endpoints.MapControllers();
-    });
 
     app.UseOcelot().Wait();
 

Properties/launchSettings.json

@@ -23,7 +23,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "swagger",
+      "launchUrl": "swagger/index.html",
       "applicationUrl": "https://localhost:7052;http://localhost:5028",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

appsettings.json

@@ -9,8 +9,8 @@
   "NLog": {
     "throwConfigExceptions": true,
     "variables": {
-      "logDirectory": "E:\\LogFiles\\Digital Data\\workFlow.Gateway",
+      "logDirectory": "E:\\LogFiles\\Digital Data\\UserManager.Gateway",
-      "logFileNamePrefix": "${shortdate}-workFlow.Gateway"
+      "logFileNamePrefix": "${shortdate}-UserManager.Gateway"
     },
     "targets": {
       "infoLogs": {

ocelot.Development.json

@@ -2,72 +2,79 @@
   "Routes": [
     {
       "DownstreamPathTemplate": "/swagger/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/swagger/{route}",
+      "UpstreamhttpsMethod": [
+        "Get"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/swagger/auth/{route}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "172.24.12.39",
           "Port": 9090
         }
       ],
       "UpstreamPathTemplate": "/swagger/auth/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
         "Get"
       ]
     },
     {
-      "DownstreamPathTemplate": "/swagger/{route}",
+      "DownstreamPathTemplate": "/api/Auth/user-manager?cookie=true",
       "DownstreamScheme": "http",
       "DownstreamHostAndPorts": [
         {
-          "Host": "localhost",
+          "Host": "172.24.12.39",
-          "Port": 8088
+          "Port": 9090
         }
       ],
-      "UpstreamPathTemplate": "/swagger/{route}",
+      "UpstreamPathTemplate": "/api/Auth/login",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [ "Post" ]
-        "Get"
-      ]
     },
     {
-      "DownstreamPathTemplate": "/api/Auth/{route}",
+      "DownstreamPathTemplate": "/api/Auth/check",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 7103
         }
       ],
-      "UpstreamPathTemplate": "/api/Auth/{route}",
+      "UpstreamPathTemplate": "/api/Auth/check",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [ "Get" ]
-        "Get",
-        "Post"
-      ]
     },
     {
-      "DownstreamPathTemplate": "/api/Auth/login/{id}",
+      "DownstreamPathTemplate": "/api/Auth/logout",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 7103
         }
       ],
-      "UpstreamPathTemplate": "/api/Auth/login/{id}",
+      "UpstreamPathTemplate": "/api/Auth/logout",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [ "Post" ]
-        "Post"
-      ]
     },
     {
       "DownstreamPathTemplate": "/api/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 7103
         }
       ],
       "UpstreamPathTemplate": "/api/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
         "Get",
         "Post",
         "Put",
@@ -75,22 +82,91 @@
       ]
     },
     {
-      "DownstreamPathTemplate": "/api/{route}/{id}",
+      "DownstreamPathTemplate": "/api/{route1}/{route2}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route1}/{route2}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/",
       "DownstreamScheme": "http",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 4200
         }
       ],
-      "UpstreamPathTemplate": "/api/{route}{id}",
+      "UpstreamPathTemplate": "/",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
         "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/{route}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 4200
+        }
+      ],
+      "UpstreamPathTemplate": "/{route}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/{route1}/{route2}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 4200
+        }
+      ],
+      "UpstreamPathTemplate": "/{route1}/{route2}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
         "Delete"
       ]
     }
   ],
   "GlobalConfiguration": {
-    "BaseUrl": "https://localhost:7052"
   }
 }

ocelot.json

@@ -2,72 +2,79 @@
   "Routes": [
     {
       "DownstreamPathTemplate": "/swagger/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 9090
+          "Port": 7103
-        }
-      ],
-      "UpstreamPathTemplate": "/swagger/auth/{route}",
-      "UpstreamHttpMethod": [
-        "Get"
-      ]
-    },
-    {
-      "DownstreamPathTemplate": "/swagger/{route}",
-      "DownstreamScheme": "http",
-      "DownstreamHostAndPorts": [
-        {
-          "Host": "localhost",
-          "Port": 8088
         }
       ],
       "UpstreamPathTemplate": "/swagger/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
         "Get"
       ]
     },
     {
-      "DownstreamPathTemplate": "/api/Auth/{route}",
+      "DownstreamPathTemplate": "/swagger/auth/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 7192
         }
       ],
-      "UpstreamPathTemplate": "/api/Auth/{route}",
+      "UpstreamPathTemplate": "/swagger/auth/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
-        "Get",
+        "Get"
-        "Post"
       ]
     },
     {
-      "DownstreamPathTemplate": "/api/Auth/login/{id}",
+      "DownstreamPathTemplate": "/api/Auth/user-manager?cookie=true",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 7192
         }
       ],
-      "UpstreamPathTemplate": "/api/Auth/login/{id}",
+      "UpstreamPathTemplate": "/api/Auth/login",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [ "Post" ]
-        "Post"
+    },
-      ]
+    {
+      "DownstreamPathTemplate": "/api/Auth/check",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth/check",
+      "UpstreamhttpsMethod": [ "Get" ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/Auth/logout",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth/logout",
+      "UpstreamhttpsMethod": [ "Post" ]
     },
     {
       "DownstreamPathTemplate": "/api/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 7103
         }
       ],
       "UpstreamPathTemplate": "/api/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
         "Get",
         "Post",
         "Put",
@@ -75,22 +82,91 @@
       ]
     },
     {
-      "DownstreamPathTemplate": "/api/{route}/{id}",
+      "DownstreamPathTemplate": "/api/{route1}/{route2}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route1}/{route2}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route1}/{route2}/{route3}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/",
       "DownstreamScheme": "http",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 8088
+          "Port": 4200
         }
       ],
-      "UpstreamPathTemplate": "/api/{route}{id}",
+      "UpstreamPathTemplate": "/",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
         "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/{route}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 4200
+        }
+      ],
+      "UpstreamPathTemplate": "/{route}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/{route1}/{route2}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 4200
+        }
+      ],
+      "UpstreamPathTemplate": "/{route1}/{route2}",
+      "UpstreamhttpsMethod": [
+        "Get",
+        "Post",
+        "Put",
         "Delete"
       ]
     }
   ],
   "GlobalConfiguration": {
-    "BaseUrl": "https://localhost:7052"
   }
 }