AppStd/DigitalData.Gateway
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: AppStd:feat/work-flow
Branches Tags
AppStd:master AppStd:feat/user-manager AppStd:feat/envelope-generator.gen.api AppStd:feat/work-flow
...
pull from: AppStd:feat/envelope-generator.gen.api
Branches Tags
AppStd:feat/user-manager AppStd:master AppStd:feat/envelope-generator.gen.api AppStd:feat/work-flow

16 Commits
feat/work- ... feat/envel

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
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
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
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
84a25752b5 Merge branch 'master' into feat/envelope-generator.gen.api 2025-04-08 11:07:33 +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
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
6 changed files with 181 additions and 33 deletions
Expand all files Collapse all files

13
.config/dotnet-tools.json Normal file
View File

@@ -0,0 +1,13 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "9.0.3",
"commands": [
"dotnet-ef"
],
"rollForward": false
}
}
}

12
DigitalData.Gateway.csproj
View File

@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Version>1.0.0</Version> <Version>1.2.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion> <AssemblyVersion>1.2.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion> <FileVersion>1.2.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NLog" Version="5.4.0" /> <PackageReference Include="NLog" Version="5.4.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" /> <PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
<PackageReference Include="NLog.Web.AspNetCore" 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" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
Program.cs
View File

@@ -10,6 +10,14 @@ try
{ {
var builder = WebApplication.CreateBuilder(args); 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 // Make sure to add the Ocelot configuration file
var suffix = builder.Environment.IsDevelopment() ? ".Development" : ""; var suffix = builder.Environment.IsDevelopment() ? ".Development" : "";
builder.Configuration.AddJsonFile($"ocelot{suffix}.json"); builder.Configuration.AddJsonFile($"ocelot{suffix}.json");

5
Properties/PublishProfiles/IISProfile.pubxml → Properties/PublishProfiles/IISProfileNet9Win64.pubxml
View File

@@ -11,9 +11,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish> <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data> <ExcludeApp_Data>false</ExcludeApp_Data>
<ProjectGuid>329f45bf-4c79-4a7b-9086-d6205617aa42</ProjectGuid> <ProjectGuid>329f45bf-4c79-4a7b-9086-d6205617aa42</ProjectGuid>
<DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\WorkFlow\$(Version)\$(Version).zip</DesktopBuildPackageLocation> <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\EnvelopeGeneratorGen\Net9Win64\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
<PackageAsSingleFile>true</PackageAsSingleFile> <PackageAsSingleFile>true</PackageAsSingleFile>
<DeployIisAppPath>Gateway</DeployIisAppPath> <DeployIisAppPath>Gateway</DeployIisAppPath>
<_TargetId>IISWebDeployPackage</_TargetId> <_TargetId>IISWebDeployPackage</_TargetId>
<TargetFramework>net9.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

106
ocelot.Development.json
View File

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

70
ocelot.json
View File

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