diff --git a/projects/ApiGatewayOcelot/.gitignore b/projects/ApiGatewayOcelot/.gitignore deleted file mode 100644 index cd5894bd..00000000 --- a/projects/ApiGatewayOcelot/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -*.bak -*.suo -*.db -*.db-shm -*.db-wal -*.user -.vs -obj -Obj -bin -Bin -debug -Debug -release -Release -Logs -logs -node_modules \ No newline at end of file diff --git a/projects/ApiGatewayOcelot/ApiGatewayOcelot.csproj b/projects/ApiGatewayOcelot/ApiGatewayOcelot.csproj deleted file mode 100644 index b34a39e2..00000000 --- a/projects/ApiGatewayOcelot/ApiGatewayOcelot.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.1 - - - - - - - diff --git a/projects/ApiGatewayOcelot/Program.cs b/projects/ApiGatewayOcelot/Program.cs deleted file mode 100644 index a7dd2e48..00000000 --- a/projects/ApiGatewayOcelot/Program.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; - -namespace ApiGateway -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseConfiguration(new ConfigurationBuilder() - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("gateway.json") - .Build()) - .UseStartup(); - }); - } -} diff --git a/projects/ApiGatewayOcelot/Properties/launchSettings.json b/projects/ApiGatewayOcelot/Properties/launchSettings.json deleted file mode 100644 index 2594f8e8..00000000 --- a/projects/ApiGatewayOcelot/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:80", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "ApiGateway": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "http://localhost:80", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/projects/ApiGatewayOcelot/Startup.cs b/projects/ApiGatewayOcelot/Startup.cs deleted file mode 100644 index af92a773..00000000 --- a/projects/ApiGatewayOcelot/Startup.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Ocelot.DependencyInjection; -using Ocelot.Middleware; - -namespace ApiGateway -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - public void ConfigureServices(IServiceCollection services) - { - services.AddOcelot(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - app.UseOcelot(); - } - } -} diff --git a/projects/ApiGatewayOcelot/appsettings.Development.json b/projects/ApiGatewayOcelot/appsettings.Development.json deleted file mode 100644 index 8983e0fc..00000000 --- a/projects/ApiGatewayOcelot/appsettings.Development.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - } -} diff --git a/projects/ApiGatewayOcelot/appsettings.json b/projects/ApiGatewayOcelot/appsettings.json deleted file mode 100644 index f511f472..00000000 --- a/projects/ApiGatewayOcelot/appsettings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - "server.urls": "http://*:80" -} diff --git a/projects/ApiGatewayOcelot/gateway.json b/projects/ApiGatewayOcelot/gateway.json deleted file mode 100644 index 86c6ecc2..00000000 --- a/projects/ApiGatewayOcelot/gateway.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "ReRoutes": [ - { - "DownstreamPathTemplate": "/UserCenter", - "UpstreamPathTemplate": "/UserCenter", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8010 - } - ] - }, - { - "DownstreamPathTemplate": "/UserCenter{everything}", - "UpstreamPathTemplate": "/UserCenter{everything}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8010 - } - ] - }, - { - "DownstreamPathTemplate": "/IoTCenter", - "UpstreamPathTemplate": "/IoTCenter", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8011 - } - ], - "UpstreamHttpMethod": [ "Get", "Post", "Head", "Options", "Put", "Delete", "Patch", "Trace" ] - }, - { - "DownstreamPathTemplate": "/IoTCenter{everything}", - "UpstreamPathTemplate": "/IoTCenter{everything}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8011 - } - ], - "UpstreamHttpMethod": [ "Get", "Post", "Head", "Options", "Put", "Delete", "Patch", "Trace" ] - }, - { - "DownstreamPathTemplate": "/StudyCenter", - "UpstreamPathTemplate": "/StudyCenter", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8012 - } - ], - "UpstreamHttpMethod": [ "Get", "Post", "Head", "Options", "Put", "Delete", "Patch", "Trace" ] - }, - { - "DownstreamPathTemplate": "/StudyCenter{everything}", - "UpstreamPathTemplate": "/StudyCenter{everything}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8012 - } - ], - "UpstreamHttpMethod": [ "Get", "Post", "Head", "Options", "Put", "Delete", "Patch", "Trace" ] - }, - { - "DownstreamPathTemplate": "/ManagementCenter", - "UpstreamPathTemplate": "/ManagementCenter", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8013 - } - ], - "UpstreamHttpMethod": [ "Get", "Post", "Head", "Options", "Put", "Delete", "Patch", "Trace" ] - }, - { - "DownstreamPathTemplate": "/ManagementCenter{everything}", - "UpstreamPathTemplate": "/ManagementCenter{everything}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8013 - } - ], - "UpstreamHttpMethod": [ "Get", "Post", "Head", "Options", "Put", "Delete", "Patch", "Trace" ] - }, - - { - "Priority": 0, - "DownstreamPathTemplate": "/", - "UpstreamPathTemplate": "/", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 8020 - } - ], - "UpstreamHttpMethod": [ "Get", "Post", "Head", "Options", "Put", "Delete", "Patch", "Trace" ] - } - ], - "GlobalConfiguration": { - "BaseUrl": "https://localhost" - } -} \ No newline at end of file diff --git a/projects/ApiGatewayOcelot/tempkey.rsa b/projects/ApiGatewayOcelot/tempkey.rsa deleted file mode 100644 index 7f36840d..00000000 --- a/projects/ApiGatewayOcelot/tempkey.rsa +++ /dev/null @@ -1 +0,0 @@ -{"KeyId":"3OnZo9GfomdZ5D9bQTL70A","Parameters":{"D":"kwKiKiyVzv6J2zT4iDmUgSxXmiBUb3SwS+lE5v/j7LhZfmTnyS5+hpCZ/jOpIbj4nxPTzv2ZfUb1C86oYegHcEPUUFxNqdyP0zqVY+akuC+oh8cF+kXfilc+sc3wvUvJ73g/WRzMgqYrb5tWDMW0xfBRBjOwOikwh9u9PlIg+MHAFoI3Hykaa7QkUtvIGyGsFzJo+cuj9pA+rjO+GYCxV3WCHrvV5YGzd4jPauOJBwa+hO2V75jJ8KUmZ6KUWxXklzsXgCBFW+g0ci3F1C4YPRCsSG1m8RUzCWyYxBkXhHRXhXwpx8tp3OsltP3oqqJLfVLni6gA81nT47hh4Qm7IQ==","DP":"U8rgXluYiuOvpjM68i+gHBN5RilWsrxkDTNcmCSX5NNdJK3tGpo+5Gks9bNLbIiW1kfOcO14MabDxO5V+F9Nzyq+UVp73maK3Pk7J286mLHsd5lYtUd82T5HuW4TQs8/wigQq3cYrBVklMQsRh0GkjSMC5jmrZ3oWS69R8jORF0=","DQ":"jkFsQe16ygI1QnasoyX8FylOAUm845NmLcCbu3jH9oaYgfbcKG9yAMgl0ubupekkIDbuk8+gjo0YOzCYxw8hhB4wdfTt2DCNJrgpzCUiQ4XAJP1HOdu156d7K0xCi53cqWPuLdKRN4r9ifjY6ZrKpqiE89w36hJMxltu1W1+tBc=","Exponent":"AQAB","InverseQ":"52OxuVjju8oJDN4SDQ6GYtFL/slrMzO4/GifkxPKUOt9Q2G+sTvAc0e2EkvYECXZlT8s3YxPebmBEFAd+D8RjOBIJZ3NJIoKDsY5PnMep892XDOccd3uKKUoaTESXO9wYIk/GD9FcWN9vhqA82MarJEOLD+9iITJz6cot17aeiw=","Modulus":"xft7asME/BvoECd+s6C0GBOoVHaWKAc8uyhyji/IAoFmgt/Wfp+KcUlwvPJx/j5W551I8n+PhfUR/BBEQ5cBmctACFYCpER6+ETlRLP/qDwZte3OxJjRf2zrjW2kvFoZT1c8JVnLumgF1opRxU/XqP78CUiLoANBMcQuxEdfIEzNOOC6KOJcyH57J3uQ6Ss9j6k5aCN+7gGg/kxwaYskw3xZulRg5tYz9GNEhyW6N2CUV5VluzE9ja0r1AcwVGfowkOtHMdu4IhT3cycc6gJCqTG1QpS3wEiQ4x5SFUa96LfidlBx/IM3PMdOKkh2TfWbyOCdlx8+NKqdSyPl0B/FQ==","P":"602kWsfvZdzh5jAlRF3Vhhr0i0tHwvUKFlOxaTU+vNaUb6gXFccbplD3zfurI96aTYQC/d75FGnNicZVagrnyPwAZV1RVeph7ZKdvrGBJqOseZpXKxx6P8maa/T+lW2y1fxjo64rx7qBl6ACOAuMEZXBNrP223qXf0FLQTO7Qfc=","Q":"12V6q4tee2tNtyTfOfLadIl2GX2AjIgdxNXbDuDPJcSNjPVBA73XoOgURP3u42PYDJqxs5XG0a5WGxr86p5J9ov6Om6pCHFCjWCtNDCPnAUz7aZND8eY6tD6alQgt/gNbvdzbtxuGCT7907RGCK1SjeJEn1sQYXVdFvA9LL/xFM="}} \ No newline at end of file diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj index eceb11b1..f6fd819f 100644 --- a/projects/Infrastructure/Infrastructure.csproj +++ b/projects/Infrastructure/Infrastructure.csproj @@ -31,7 +31,7 @@ - + diff --git a/projects/Infrastructure/Web/BaseStartup.cs b/projects/Infrastructure/Web/BaseStartup.cs index 4fde99c6..59b13f23 100644 --- a/projects/Infrastructure/Web/BaseStartup.cs +++ b/projects/Infrastructure/Web/BaseStartup.cs @@ -342,7 +342,7 @@ namespace Infrastructure.Web app.UseSwagger(); app.UseSwaggerUI(c => { - c.SwaggerEndpoint("/swagger/v1/swagger.json", "API V1"); + c.SwaggerEndpoint("v1/swagger.json", "API V1"); }); }