Compare commits

...

9 Commits

7 changed files with 267 additions and 27 deletions

View File

@ -10,6 +10,9 @@
</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" />
</ItemGroup>

View File

@ -1,26 +1,38 @@
using NLog;
using NLog.Web;
using Ocelot.DependencyInjection;
using Ocelot.Middleware;
var builder = WebApplication.CreateBuilder(args);
var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
logger.Info("Logging initialized.");
// Make sure to add the Ocelot configuration file
builder.Configuration.AddJsonFile("ocelot.json");
// Add Ocelot services
builder.Services.AddOcelot();
var app = builder.Build();
app.UseHttpsRedirection();
app.UseRouting();
app.UseAuthorization();
// Use Ocelot middleware in an appropriate way
app.UseEndpoints(endpoints =>
try
{
endpoints.MapControllers();
});
var builder = WebApplication.CreateBuilder(args);
app.UseOcelot().Wait();
// Make sure to add the Ocelot configuration file
var suffix = builder.Environment.IsDevelopment() ? ".Development" : "";
builder.Configuration.AddJsonFile($"ocelot{suffix}.json");
app.Run();
// Add Ocelot services
builder.Services.AddOcelot();
var app = builder.Build();
app.UseHttpsRedirection();
app.UseRouting();
app.UseAuthorization();
// Use Ocelot middleware in an appropriate way
app.MapControllers();
app.UseOcelot().Wait();
app.Run();
}
catch(Exception ex)
{
logger.Error(ex, "Stopped program because of exception.");
throw;
}

View File

@ -0,0 +1,19 @@
<?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>

View File

@ -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"

View File

@ -5,5 +5,48 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
"AllowedHosts": "*",
"NLog": {
"throwConfigExceptions": true,
"variables": {
"logDirectory": "E:\\LogFiles\\Digital Data\\workFlow.Gateway",
"logFileNamePrefix": "${shortdate}-workFlow.Gateway"
},
"targets": {
"infoLogs": {
"type": "File",
"fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
"maxArchiveDays": 30
},
"errorLogs": {
"type": "File",
"fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
"maxArchiveDays": 30
},
"criticalLogs": {
"type": "File",
"fileName": "${logDirectory}\\${logFileNamePrefix}-Critical.log",
"maxArchiveDays": 30
}
},
// Trace, Debug, Info, Warn, Error and *Fatal*
"rules": [
{
"logger": "*",
"minLevel": "Info",
"maxLevel": "Warn",
"writeTo": "infoLogs"
},
{
"logger": "*",
"level": "Error",
"writeTo": "errorLogs"
},
{
"logger": "*",
"level": "Fatal",
"writeTo": "criticalLogs"
}
]
}
}

91
ocelot.Development.json Normal file
View File

@ -0,0 +1,91 @@
{
"Routes": [
{
"DownstreamPathTemplate": "/swagger/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
}
],
"UpstreamPathTemplate": "/swagger/{route}",
"UpstreamhttpsMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/swagger/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7192
}
],
"UpstreamPathTemplate": "/swagger/auth/{route}",
"UpstreamhttpsMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/api/Auth/work-flow?cookie=false",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7192
}
],
"UpstreamPathTemplate": "/api/Auth",
"UpstreamhttpsMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/Auth/check",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
}
],
"UpstreamPathTemplate": "/api/Auth/check",
"UpstreamhttpsMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/{route}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
}
],
"UpstreamPathTemplate": "/api/{route}",
"UpstreamhttpsMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/api/{route}/{id}",
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7120
}
],
"UpstreamPathTemplate": "/api/{route}{id}",
"UpstreamhttpsMethod": [
"Get",
"Delete"
]
}
],
"GlobalConfiguration": {
"BaseUrl": "https://localhost:7052"
}
}

View File

@ -1,19 +1,91 @@
{
"Routes": [
{
"DownstreamPathTemplate": "/swagger/index.html",
"DownstreamScheme": "https",
"DownstreamPathTemplate": "/swagger/{route}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 7192
"Port": 8088
}
],
"UpstreamPathTemplate": "/auth-swagger",
"UpstreamHttpMethod": [ "Get" ]
"UpstreamPathTemplate": "/swagger/{route}",
"UpstreamHttpMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/swagger/{route}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 9090
}
],
"UpstreamPathTemplate": "/swagger/auth/{route}",
"UpstreamHttpMethod": [
"Get"
]
},
{
"DownstreamPathTemplate": "/api/Auth/work-flow?cookie=false",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 9090
}
],
"UpstreamPathTemplate": "/api/Auth",
"UpstreamHttpMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/Auth/check",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/api/Auth/check",
"UpstreamHttpMethod": [ "Post" ]
},
{
"DownstreamPathTemplate": "/api/{route}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/api/{route}",
"UpstreamHttpMethod": [
"Get",
"Post",
"Put",
"Delete"
]
},
{
"DownstreamPathTemplate": "/api/{route}/{id}",
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 8088
}
],
"UpstreamPathTemplate": "/api/{route}{id}",
"UpstreamHttpMethod": [
"Get",
"Delete"
]
}
],
"GlobalConfiguration": {
"BaseUrl": "https://localhost:7052"
"BaseUrl": "https://localhost:8443"
}
}