Compare commits

...

11 Commits

Author SHA1 Message Date
Developer 02
941e47ba3e Update logging configuration in Program.cs
Modified logging setup to use NLog only in non-development environments, while maintaining trace-level logging for development.
2025-05-11 11:14:19 +02:00
Developer 02
a76afdda34 Bump version to 1.2.0 in project file
Updated the `DigitalData.Gateway.csproj` to reflect
new versioning information, changing `Version`,
`AssemblyVersion`, and `FileVersion` from `1.1.0` to `1.2.0`.
2025-05-11 10:51:16 +02:00
Developer 02
0d0e4675ad Merge branch 'master' into feat/envelope-generator.gen.api 2025-05-09 23:21:28 +02:00
Developer 02
5f21002e4f Update port configuration in ocelot.Development.json
Changed the `Port` number for `DownstreamHostAndPorts` from `7174` to `8088` across multiple route definitions. Updated `DownstreamPathTemplate` and `UpstreamPathTemplate` for paths including `/swagger/{route}`, `/scalar`, and `/api/{route}`. Corrected the `UpstreamPathTemplate` for `/api/{route}/{id}` by removing an unnecessary slash before `{id}`.
2025-05-09 23:19:23 +02:00
Developer 02
6be3d5373a Update API routing and port configuration
- Changed `DownstreamPathTemplate` from `/api/Auth/check` to `/api/Auth/sign-flow-gen/login`.
- Updated `DownstreamHostAndPorts` port from `7174` to `7192`.
- Modified `UpstreamPathTemplate` from `/api/Auth/check` to `/api/Auth/form`.
2025-05-05 10:16:27 +02:00
Developer 02
d34ba75deb refactor(ocelot.json): DownstreamPathTemplate des Authentifizierungsdienstes konfiguriert, um sign-flow-gen als Verbraucher hinzuzufügen und den Parameter cookie-query optional zu machen.
- Ent-Punkt hinzufügen, um den Standard-Cookie-Parameter falsch zu machen.
2025-04-29 11:17:10 +02:00
Developer 02
dccaaf2feb chore(IISProfile): DesktopBuildPackageLocation-Pfad aktualisieren 2025-04-08 15:39:29 +02:00
Developer 02
1957626ef2 Bump version to 1.1.0 in project file
Updated the `DigitalData.Gateway.csproj` to reflect the new versioning information, changing `Version`, `AssemblyVersion`, and `FileVersion` from `1.0.0` to `1.1.0`. This release may include new features or fixes.
2025-04-08 15:34:24 +02:00
Developer 02
7069938d34 merge 2025-04-08 15:31:49 +02:00
Developer 02
84a25752b5 Merge branch 'master' into feat/envelope-generator.gen.api 2025-04-08 11:07:33 +02:00
Developer 02
693a835191 Update routing and configuration for EnvelopeGeneratorGenApi
- Changed `DesktopBuildPackageLocation` in `IISProfile.pubxml` to point to the new `EnvelopeGeneratorGenApi` project directory.
- Updated routing in `ocelot.Development.json` and `ocelot.json`:
  - Changed `DownstreamScheme` from `https` to `http` for multiple routes.
  - Updated `Port` for `DownstreamHostAndPorts` from `7120` and `7192` to `8088`.
  - Expanded `UpstreamHttpMethod` to include `Post`, `Put`, and `Delete`.
  - Added new routes for `/scalar`, `/scalar/{route}`, and `/scalar/{route1}/{route2}`.
- Modified `GlobalConfiguration` `BaseUrl` from `https://localhost:7052` to `http://localhost:8443`.
2025-04-08 10:44:46 +02:00
5 changed files with 160 additions and 32 deletions

View File

@ -4,9 +4,9 @@
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.0.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<Version>1.2.0</Version>
<AssemblyVersion>1.2.0</AssemblyVersion>
<FileVersion>1.2.0</FileVersion>
</PropertyGroup>
<ItemGroup>

View File

@ -10,9 +10,13 @@ try
{
var builder = WebApplication.CreateBuilder(args);
builder.Logging.ClearProviders();
builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
builder.Host.UseNLog();
if (!builder.Environment.IsDevelopment())
{
builder.Logging.ClearProviders();
builder.Host.UseNLog();
}
// Make sure to add the Ocelot configuration file
var suffix = builder.Environment.IsDevelopment() ? ".Development" : "";

View File

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<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\\.zip</DesktopBuildPackageLocation>
<DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\EnvelopeGeneratorGen\Net9Win64\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
<PackageAsSingleFile>true</PackageAsSingleFile>
<DeployIisAppPath>Gateway</DeployIisAppPath>
<_TargetId>IISWebDeployPackage</_TargetId>

View File

@ -6,16 +6,87 @@
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
"Port": 8088
}
],
"UpstreamPathTemplate": "/swagger/{route}",
"UpstreamhttpsMethod": [
"Get"
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/swagger/{route}",
"DownstreamPathTemplate": "/swagger/{route1}/{route2}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/swagger/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route1}/{route2}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen?cookie={cookie}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
@ -23,13 +94,11 @@
"Port": 7192
}
],
"UpstreamPathTemplate": "/swagger/auth/{route}",
"UpstreamhttpsMethod": [
"Get"
]
"UpstreamPathTemplate": "/api/Auth?cookie={cookie}",
"UpstreamHttpMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/Auth/work-flow?cookie=false",
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen?cookie=false",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
@ -38,19 +107,19 @@
}
],
"UpstreamPathTemplate": "/api/Auth",
"UpstreamhttpsMethod": [ "Post" ]
"UpstreamHttpMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/Auth/check",
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen/login",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
"Port": 7192
}
],
"UpstreamPathTemplate": "/api/Auth/check",
"UpstreamhttpsMethod": [ "Post" ]
"UpstreamPathTemplate": "/api/Auth/form",
"UpstreamHttpMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/{route}",
@ -58,11 +127,11 @@
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
"Port": 8088
}
],
"UpstreamPathTemplate": "/api/{route}",
"UpstreamhttpsMethod": [
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
@ -75,17 +144,16 @@
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
"Port": 8088
}
],
"UpstreamPathTemplate": "/api/{route}{id}",
"UpstreamhttpsMethod": [
"UpstreamHttpMethod": [
"Get",
"Delete"
]
}
],
"GlobalConfiguration": {
"BaseUrl": "https://localhost:7052"
}
}

View File

@ -11,21 +11,78 @@
],
"UpstreamPathTemplate": "/swagger/{route}",
"UpstreamHttpMethod": [
"Get"
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/swagger/{route}",
"DownstreamPathTemplate": "/swagger/{route1}/{route2}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 9090
"Port": 8088
}
],
"UpstreamPathTemplate": "/swagger/auth/{route}",
"UpstreamPathTemplate": "/swagger/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get"
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/scalar/{route1}/{route2}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/scalar/{route1}/{route2}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
@ -34,7 +91,7 @@
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 9090
"Port": 8088
}
],
"UpstreamPathTemplate": "/api/Auth",
@ -86,6 +143,5 @@
}
],
"GlobalConfiguration": {
"BaseUrl": "https://localhost:8443"
}
}