update

Former-commit-id: e57e5b092319336963eb77c4a5c5ff55063e73e3

projects/ApiGatewayOcelot/.gitignore

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

projects/ApiGatewayOcelot/ApiGatewayOcelot.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Ocelot" Version="13.8.0" />
-  </ItemGroup>
-
-</Project>

projects/ApiGatewayOcelot/Program.cs

@@ -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<Startup>();
-                });
-    }
-}

projects/ApiGatewayOcelot/Properties/launchSettings.json

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

projects/ApiGatewayOcelot/Startup.cs

@@ -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();
-        }
-    }
-}

projects/ApiGatewayOcelot/appsettings.Development.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  }
-}

projects/ApiGatewayOcelot/appsettings.json

@@ -1,11 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "AllowedHosts": "*",
-  "server.urls": "http://*:80"
-}

projects/ApiGatewayOcelot/gateway.json

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

projects/ApiGatewayOcelot/tempkey.rsa

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

projects/Infrastructure/Infrastructure.csproj

@@ -31,7 +31,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc5" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-rc4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-rc5" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Management" Version="4.7.0" />
     <PackageReference Include="ValueInjecter" Version="3.2.0" />

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");
             });
         }