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

refactor(oceleot): update auth endpoint to use 172.24.12.39
Merge from master
2025-08-08 13:53:29 +02:00 · 2025-07-28 11:25:52 +02:00 · 2025-07-22 18:11:55 +02:00 · 2025-07-22 18:08:52 +02:00 · 2025-07-22 18:02:44 +02:00 · 2025-07-22 15:57:39 +02:00
6 changed files with 222 additions and 67 deletions
--- a/DigitalData.Gateway.csproj
+++ b/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>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
-    <FileVersion>1.0.0</FileVersion>
+    <Version>1.1.0</Version>
+    <AssemblyVersion>1.1.0</AssemblyVersion>
+    <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>
--- a/Program.cs
+++ b/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();

--- a/Properties/PublishProfiles/IISProfile.pubxml
+++ b/Properties/PublishProfiles/IISProfile.pubxml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project>
-  <PropertyGroup>
-    <WebPublishMethod>Package</WebPublishMethod>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <ProjectGuid>329f45bf-4c79-4a7b-9086-d6205617aa42</ProjectGuid>
-    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\WorkFlow\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
-    <PackageAsSingleFile>true</PackageAsSingleFile>
-    <DeployIisAppPath>Gateway</DeployIisAppPath>
-    <_TargetId>IISWebDeployPackage</_TargetId>
-  </PropertyGroup>
-</Project>
--- a/appsettings.json
+++ b/appsettings.json
@@ -9,8 +9,8 @@
  "NLog": {
    "throwConfigExceptions": true,
    "variables": {
-      "logDirectory": "E:\\LogFiles\\Digital Data\\workFlow.Gateway",
-      "logFileNamePrefix": "${shortdate}-workFlow.Gateway"
+      "logDirectory": "E:\\LogFiles\\Digital Data\\UserManager.Gateway",
+      "logFileNamePrefix": "${shortdate}-UserManager.Gateway"
    },
    "targets": {
      "infoLogs": {
--- a/ocelot.Development.json
+++ b/ocelot.Development.json
@@ -6,7 +6,7 @@
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 7120
+          "Port": 7103
        }
      ],
      "UpstreamPathTemplate": "/swagger/{route}",
@@ -15,12 +15,12 @@
      ]
    },
    {
-      "DownstreamPathTemplate": "/swagger/{route}",
-      "DownstreamScheme": "https",
+      "DownstreamPathTemplate": "/swagger/auth/{route}",
+      "DownstreamScheme": "http",
      "DownstreamHostAndPorts": [
        {
-          "Host": "localhost",
-          "Port": 7192
+          "Host": "172.24.12.39",
+          "Port": 9090
        }
      ],
      "UpstreamPathTemplate": "/swagger/auth/{route}",
@@ -29,15 +29,15 @@
      ]
    },
    {
-      "DownstreamPathTemplate": "/api/Auth/work-flow?cookie=false",
-      "DownstreamScheme": "https",
+      "DownstreamPathTemplate": "/api/Auth/user-manager?cookie=true",
+      "DownstreamScheme": "http",
      "DownstreamHostAndPorts": [
        {
-          "Host": "localhost",
-          "Port": 7192
+          "Host": "172.24.12.39",
+          "Port": 9090
        }
      ],
-      "UpstreamPathTemplate": "/api/Auth",
+      "UpstreamPathTemplate": "/api/Auth/login",
      "UpstreamhttpsMethod": [ "Post" ]
    },
    {
@@ -46,10 +46,22 @@
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 7120
+          "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" ]
    },
    {
@@ -58,7 +70,7 @@
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 7120
+          "Port": 7103
        }
      ],
      "UpstreamPathTemplate": "/api/{route}",
@@ -70,22 +82,91 @@
      ]
    },
    {
-      "DownstreamPathTemplate": "/api/{route}/{id}",
+      "DownstreamPathTemplate": "/api/{route1}/{route2}",
      "DownstreamScheme": "https",
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 7120
+          "Port": 7103
        }
      ],
-      "UpstreamPathTemplate": "/api/{route}{id}",
+      "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": 4200
+        }
+      ],
+      "UpstreamPathTemplate": "/",
+      "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"
  }
 }
--- a/ocelot.json
+++ b/ocelot.json
@@ -2,67 +2,79 @@
  "Routes": [
    {
      "DownstreamPathTemplate": "/swagger/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 8088
+          "Port": 7103
        }
      ],
      "UpstreamPathTemplate": "/swagger/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
        "Get"
      ]
    },
    {
-      "DownstreamPathTemplate": "/swagger/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamPathTemplate": "/swagger/auth/{route}",
+      "DownstreamScheme": "https",
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 9090
+          "Port": 7192
        }
      ],
      "UpstreamPathTemplate": "/swagger/auth/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
        "Get"
      ]
    },
    {
-      "DownstreamPathTemplate": "/api/Auth/work-flow?cookie=false",
-      "DownstreamScheme": "http",
+      "DownstreamPathTemplate": "/api/Auth/user-manager?cookie=true",
+      "DownstreamScheme": "https",
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 9090
+          "Port": 7192
        }
      ],
-      "UpstreamPathTemplate": "/api/Auth",
-      "UpstreamHttpMethod": [ "Post" ]
+      "UpstreamPathTemplate": "/api/Auth/login",
+      "UpstreamhttpsMethod": [ "Post" ]
    },
    {
      "DownstreamPathTemplate": "/api/Auth/check",
-      "DownstreamScheme": "http",
+      "DownstreamScheme": "https",
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 8088
+          "Port": 7103
        }
      ],
      "UpstreamPathTemplate": "/api/Auth/check",
-      "UpstreamHttpMethod": [ "Post" ]
+      "UpstreamhttpsMethod": [ "Get" ]
    },
    {
-      "DownstreamPathTemplate": "/api/{route}",
-      "DownstreamScheme": "http",
+      "DownstreamPathTemplate": "/api/Auth/logout",
+      "DownstreamScheme": "https",
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 8088
+          "Port": 7103
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth/logout",
+      "UpstreamhttpsMethod": [ "Post" ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/{route}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7103
        }
      ],
      "UpstreamPathTemplate": "/api/{route}",
-      "UpstreamHttpMethod": [
+      "UpstreamhttpsMethod": [
        "Get",
        "Post",
        "Put",
@@ -70,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}",
-      "UpstreamHttpMethod": [
+      "UpstreamPathTemplate": "/",
+      "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:8443"
  }
 }
Author	SHA1	Message	Date
TekH	f60bb79920	feat(Ocelot.Cache.CacheManager): add and configure	2025-08-08 13:53:29 +02:00
TekH	d113d4fcdd	refactor(oceleot): update auth endpoint to use 172.24.12.39	2025-07-28 11:25:52 +02:00
TekH	59963d7d4c	Merge from master	2025-07-22 18:11:55 +02:00
TekH	5843e9efa8	feat(logging): enable NLog only in non-development environments	2025-07-22 18:08:52 +02:00
TekH	5c4dec8e7c	chore: Name der Protokolldatei ändern	2025-07-22 18:02:44 +02:00
TekH	90a0751d09	chore: Upgrade auf 1.1.0	2025-07-22 15:57:39 +02:00
TekH	d2793f476a	feat(gateway): Unterstützung für 3-stufig verschachtelte API-Routen hinzugefügt - Routenzuordnung für /api/{route1}/{route2}/{route3} hinzugefügt - Ermöglicht Downstream-Routing zur Unterstützung komplexerer API-Strukturen	2025-07-22 15:55:48 +02:00
TekH	a6140cab92	feat(ocelot.json): Aktualisierung der ocelot.json-Routen für verbesserte Weiterleitung und Frontend-Integration - Aktualisierte bestehende Routen für Swagger und API-Endpunkte - Ersetzte /swagger/{route} durch /swagger/auth/{route} für den Auth-Dienst - Modifizierter Routenabgleich zur Unterstützung verschachtelter Routen (z. B. /api/{route1}/{route2}) - Hinzufügen von Routen für die Frontend-Angular-Anwendung, die auf Port 4200 läuft	2025-07-22 10:16:30 +02:00
Developer 02	6ade388cd7	Enhance logging configuration in Program.cs Initialized logging by clearing providers, setting minimum level to Trace, and configuring NLog as the logging provider.	2025-05-09 23:20:27 +02:00
Developer 02	23e73aae19	IISProfile aktualisieren	2025-04-08 15:30:21 +02:00
Developer 02	23d73e0671	gitignore aktualisiert	2025-04-08 15:29:26 +02:00
Developer 02	72b1c58b72	chore: Aktualisierung der Ziel-Frameworks in der Projektdatei Geänderte `DigitalData.Gateway.csproj` zur Unterstützung mehrerer Ziel-Frameworks: `net7.0`, `net8.0` und `net9.0`. Diese verbessert die Kompatibilität und Flexibilität des Projekts.	2025-04-08 10:53:23 +02:00
Developer 02	4173c3d96a	Aktualisierung der Ocelot-Paketversion in der Projektdatei Die Projektdatei `DigitalData.Gateway.csproj` wurde geändert, um das `Ocelot`-Paket von Version `22.0.1` auf `23.4.3` zu aktualisieren. Außerdem wurde eine kleine Formatierungsänderung am `<Project>`-Tag vorgenommen, der nun ein nicht sichtbares Zeichen am Anfang der Zeile enthält.	2025-04-08 10:50:49 +02:00
Developer 02	97a20fdb8f	feat(IISProfile): Konfiguration eines bestimmten IIS-Verzeichnisses für UserManager	2025-03-25 15:44:55 +01:00
Developer 02	4da1bc7617	feat(ocelet): Add Auth/user endpoint	2025-03-25 14:14:30 +01:00
Developer 02	78a58568fc	feat(ocelot): add logout endpoint	2025-03-25 13:53:58 +01:00
Developer 02	9844cd16e8	fix(ocelot): Update DownstreamPathTemplate for authentication	2025-03-25 13:51:21 +01:00
Developer 02	896eee35bd	refactor(ocelot.Development.json): Port 7120 auf 7103 aktualisiert	2025-03-24 15:26:58 +01:00