Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into Rate_linit_counting_interval_fix__issue_#…
…1590
- Loading branch information
Showing
516 changed files
with
5,623 additions
and
4,332 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| # syntax=docker/dockerfile:1 | ||
| FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine | ||
| FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine | ||
|
|
||
| RUN apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib | ||
| RUN apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib git openssh-client | ||
|
|
||
| RUN curl -L --output ./dotnet-install.sh https://dot.net/v1/dotnet-install.sh | ||
|
|
||
| RUN chmod u+x ./dotnet-install.sh | ||
|
|
||
| RUN ./dotnet-install.sh -c 5.0 -i /usr/share/dotnet | ||
| RUN ./dotnet-install.sh -c 6.0 -i /usr/share/dotnet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Folder Include="wwwroot\" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Ocelot" Version="17.0.1" /> | ||
| <PackageReference Include="Ocelot.Administration" Version="17.0.1" /> | ||
| <PackageReference Include="Ocelot" Version="18.0.0" /> | ||
| <PackageReference Include="Ocelot.Administration" Version="18.0.0" /> | ||
|
|
||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,48 @@ | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using System.IO; | ||
|
|
||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.Logging; | ||
|
|
||
| using Ocelot.Administration; | ||
| using Ocelot.DependencyInjection; | ||
| using Ocelot.Middleware; | ||
| using System.IO; | ||
|
|
||
| namespace AdministrationApi | ||
| { | ||
| public class Program | ||
| { | ||
| public static void Main(string[] args) | ||
| { | ||
| new WebHostBuilder() | ||
| .UseKestrel() | ||
| .UseUrls("http://localhost:5000") | ||
| .UseContentRoot(Directory.GetCurrentDirectory()) | ||
| .ConfigureAppConfiguration((hostingContext, config) => | ||
| { | ||
| config | ||
| .SetBasePath(hostingContext.HostingEnvironment.ContentRootPath) | ||
| .AddJsonFile("appsettings.json", true, true) | ||
| .AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true) | ||
| .AddJsonFile("ocelot.json") | ||
| .AddEnvironmentVariables(); | ||
| }) | ||
| .ConfigureServices(s => { | ||
| s.AddOcelot() | ||
| .AddAdministration("/administration", "secret"); | ||
| }) | ||
| .ConfigureLogging((hostingContext, logging) => | ||
| { | ||
| logging.AddConsole(); | ||
| }) | ||
| .UseIISIntegration() | ||
| .Configure(app => | ||
| { | ||
| app.UseOcelot().Wait(); | ||
| }) | ||
| .Build() | ||
| .Run(); | ||
| public static void Main(string[] args) | ||
| { | ||
| new WebHostBuilder() | ||
| .UseKestrel() | ||
| .UseUrls("http://localhost:5000") | ||
| .UseContentRoot(Directory.GetCurrentDirectory()) | ||
| .ConfigureAppConfiguration((hostingContext, config) => | ||
| { | ||
| config | ||
| .SetBasePath(hostingContext.HostingEnvironment.ContentRootPath) | ||
| .AddJsonFile("appsettings.json", true, true) | ||
| .AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true) | ||
| .AddJsonFile("ocelot.json") | ||
| .AddEnvironmentVariables(); | ||
| }) | ||
| .ConfigureServices(s => | ||
| { | ||
| s.AddOcelot() | ||
| .AddAdministration("/administration", "secret"); | ||
| }) | ||
| .ConfigureLogging((hostingContext, logging) => | ||
| { | ||
| logging.AddConsole(); | ||
| }) | ||
| .UseIISIntegration() | ||
| .Configure(app => | ||
| { | ||
| app.UseOcelot().Wait(); | ||
| }) | ||
| .Build() | ||
| .Run(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.