Compare commits
5 Commits
feat/envel
...
97a20fdb8f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
97a20fdb8f | ||
|
|
4da1bc7617 | ||
|
|
78a58568fc | ||
|
|
9844cd16e8 | ||
|
|
896eee35bd |
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 1,
|
|
||||||
"isRoot": true,
|
|
||||||
"tools": {
|
|
||||||
"dotnet-ef": {
|
|
||||||
"version": "9.0.3",
|
|
||||||
"commands": [
|
|
||||||
"dotnet-ef"
|
|
||||||
],
|
|
||||||
"rollForward": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +1,19 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Version>1.2.0</Version>
|
<Version>1.0.0</Version>
|
||||||
<AssemblyVersion>1.2.0</AssemblyVersion>
|
<AssemblyVersion>1.0.0</AssemblyVersion>
|
||||||
<FileVersion>1.2.0</FileVersion>
|
<FileVersion>1.0.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="23.4.3" />
|
<PackageReference Include="Ocelot" Version="22.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -10,14 +10,6 @@ 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");
|
||||||
|
|||||||
@@ -11,12 +11,9 @@ 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\EnvelopeGeneratorGen\Net9Win64\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
|
<DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\UserManager\$(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>
|
||||||
@@ -6,87 +6,16 @@
|
|||||||
"DownstreamHostAndPorts": [
|
"DownstreamHostAndPorts": [
|
||||||
{
|
{
|
||||||
"Host": "localhost",
|
"Host": "localhost",
|
||||||
"Port": 8088
|
"Port": 7103
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/swagger/{route}",
|
"UpstreamPathTemplate": "/swagger/{route}",
|
||||||
"UpstreamHttpMethod": [
|
"UpstreamhttpsMethod": [
|
||||||
"Get",
|
"Get"
|
||||||
"Post",
|
|
||||||
"Put",
|
|
||||||
"Delete"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"DownstreamPathTemplate": "/swagger/{route1}/{route2}",
|
"DownstreamPathTemplate": "/swagger/{route}",
|
||||||
"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": [
|
||||||
{
|
{
|
||||||
@@ -94,11 +23,13 @@
|
|||||||
"Port": 7192
|
"Port": 7192
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/api/Auth?cookie={cookie}",
|
"UpstreamPathTemplate": "/swagger/auth/{route}",
|
||||||
"UpstreamHttpMethod": [ "Post" ]
|
"UpstreamhttpsMethod": [
|
||||||
|
"Get"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen?cookie=false",
|
"DownstreamPathTemplate": "/api/Auth/user-manager?cookie=true",
|
||||||
"DownstreamScheme": "https",
|
"DownstreamScheme": "https",
|
||||||
"DownstreamHostAndPorts": [
|
"DownstreamHostAndPorts": [
|
||||||
{
|
{
|
||||||
@@ -106,20 +37,44 @@
|
|||||||
"Port": 7192
|
"Port": 7192
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/api/Auth",
|
"UpstreamPathTemplate": "/api/Auth/login",
|
||||||
"UpstreamHttpMethod": [ "Post" ]
|
"UpstreamhttpsMethod": [ "Post" ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"DownstreamPathTemplate": "/api/Auth/sign-flow-gen/login",
|
"DownstreamPathTemplate": "/api/Auth/check",
|
||||||
"DownstreamScheme": "https",
|
"DownstreamScheme": "https",
|
||||||
"DownstreamHostAndPorts": [
|
"DownstreamHostAndPorts": [
|
||||||
{
|
{
|
||||||
"Host": "localhost",
|
"Host": "localhost",
|
||||||
"Port": 7192
|
"Port": 7103
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/api/Auth/form",
|
"UpstreamPathTemplate": "/api/Auth/check",
|
||||||
"UpstreamHttpMethod": [ "Post" ]
|
"UpstreamhttpsMethod": [ "Get" ]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"DownstreamPathTemplate": "/api/Auth/logout",
|
||||||
|
"DownstreamScheme": "https",
|
||||||
|
"DownstreamHostAndPorts": [
|
||||||
|
{
|
||||||
|
"Host": "localhost",
|
||||||
|
"Port": 7103
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"UpstreamPathTemplate": "/api/Auth/logout",
|
||||||
|
"UpstreamhttpsMethod": [ "Post" ]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"DownstreamPathTemplate": "/api/Auth/user",
|
||||||
|
"DownstreamScheme": "https",
|
||||||
|
"DownstreamHostAndPorts": [
|
||||||
|
{
|
||||||
|
"Host": "localhost",
|
||||||
|
"Port": 7103
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"UpstreamPathTemplate": "/api/Auth/user",
|
||||||
|
"UpstreamhttpsMethod": [ "Get" ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"DownstreamPathTemplate": "/api/{route}",
|
"DownstreamPathTemplate": "/api/{route}",
|
||||||
@@ -127,11 +82,11 @@
|
|||||||
"DownstreamHostAndPorts": [
|
"DownstreamHostAndPorts": [
|
||||||
{
|
{
|
||||||
"Host": "localhost",
|
"Host": "localhost",
|
||||||
"Port": 8088
|
"Port": 7103
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/api/{route}",
|
"UpstreamPathTemplate": "/api/{route}",
|
||||||
"UpstreamHttpMethod": [
|
"UpstreamhttpsMethod": [
|
||||||
"Get",
|
"Get",
|
||||||
"Post",
|
"Post",
|
||||||
"Put",
|
"Put",
|
||||||
@@ -144,11 +99,11 @@
|
|||||||
"DownstreamHostAndPorts": [
|
"DownstreamHostAndPorts": [
|
||||||
{
|
{
|
||||||
"Host": "localhost",
|
"Host": "localhost",
|
||||||
"Port": 8088
|
"Port": 7103
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/api/{route}{id}",
|
"UpstreamPathTemplate": "/api/{route}{id}",
|
||||||
"UpstreamHttpMethod": [
|
"UpstreamhttpsMethod": [
|
||||||
"Get",
|
"Get",
|
||||||
"Delete"
|
"Delete"
|
||||||
]
|
]
|
||||||
|
|||||||
70
ocelot.json
70
ocelot.json
@@ -11,78 +11,21 @@
|
|||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/swagger/{route}",
|
"UpstreamPathTemplate": "/swagger/{route}",
|
||||||
"UpstreamHttpMethod": [
|
"UpstreamHttpMethod": [
|
||||||
"Get",
|
"Get"
|
||||||
"Post",
|
|
||||||
"Put",
|
|
||||||
"Delete"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"DownstreamPathTemplate": "/swagger/{route1}/{route2}",
|
"DownstreamPathTemplate": "/swagger/{route}",
|
||||||
"DownstreamScheme": "http",
|
"DownstreamScheme": "http",
|
||||||
"DownstreamHostAndPorts": [
|
"DownstreamHostAndPorts": [
|
||||||
{
|
{
|
||||||
"Host": "localhost",
|
"Host": "localhost",
|
||||||
"Port": 8088
|
"Port": 9090
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/swagger/{route1}/{route2}",
|
"UpstreamPathTemplate": "/swagger/auth/{route}",
|
||||||
"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"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -91,7 +34,7 @@
|
|||||||
"DownstreamHostAndPorts": [
|
"DownstreamHostAndPorts": [
|
||||||
{
|
{
|
||||||
"Host": "localhost",
|
"Host": "localhost",
|
||||||
"Port": 8088
|
"Port": 9090
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"UpstreamPathTemplate": "/api/Auth",
|
"UpstreamPathTemplate": "/api/Auth",
|
||||||
@@ -143,5 +86,6 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"GlobalConfiguration": {
|
"GlobalConfiguration": {
|
||||||
|
"BaseUrl": "https://localhost:8443"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user