From 175137b4d25bcb615e8acadc6d5387e7e8bf7c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 17 Sep 2019 19:33:09 +0300 Subject: [PATCH] Disable swagger, add routing --- .../BackendAdminAppGatewayHostModule.cs | 12 +++++++----- .../InternalGatewayHostModule.cs | 12 +++++++----- .../PublicWebSiteGatewayHostModule.cs | 12 +++++++----- .../BloggingServiceHostModule.cs | 12 +++++++----- .../Controllers/HomeController.cs | 5 ++++- .../Controllers/HomeController.cs | 5 ++++- .../IdentityServiceHostModule.cs | 12 +++++++----- .../Controllers/HomeController.cs | 5 ++++- .../ProductService.Host/ProductServiceHostModule.cs | 12 +++++++----- 9 files changed, 54 insertions(+), 33 deletions(-) diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs index 529353b18b..8c9a26406e 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs @@ -91,12 +91,14 @@ namespace BackendAdminAppGateway.Host app.UseCorrelationId(); app.UseVirtualFiles(); + app.UseRouting(); app.UseAuthentication(); - app.UseSwagger(); - app.UseSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "BackendAdminApp Gateway API"); - }); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //app.UseSwagger(); + //app.UseSwaggerUI(options => + //{ + // options.SwaggerEndpoint("/swagger/v1/swagger.json", "BackendAdminApp Gateway API"); + //}); app.MapWhen( ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") || diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs index c29d965620..687d2e26a9 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs @@ -80,12 +80,14 @@ namespace InternalGateway.Host app.UseCorrelationId(); app.UseVirtualFiles(); + app.UseRouting(); app.UseAuthentication(); - app.UseSwagger(); - app.UseSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "Internal Gateway API"); - }); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //app.UseSwagger(); + //app.UseSwaggerUI(options => + //{ + // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Internal Gateway API"); + //}); app.MapWhen( ctx => diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs index 1b77d1683a..b17e6bdbe1 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs @@ -78,12 +78,14 @@ namespace PublicWebSiteGateway.Host app.UseCorrelationId(); app.UseVirtualFiles(); + app.UseRouting(); app.UseAuthentication(); - app.UseSwagger(); - app.UseSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "PublicWebSite Gateway API"); - }); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //app.UseSwagger(); + //app.UseSwaggerUI(options => + //{ + // options.SwaggerEndpoint("/swagger/v1/swagger.json", "PublicWebSite Gateway API"); + //}); app.MapWhen( ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") || diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs index 96ac1cf874..c495ed5a26 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs @@ -110,13 +110,15 @@ namespace BloggingService.Host app.UseCorrelationId(); app.UseVirtualFiles(); + app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - app.UseSwagger(); - app.UseSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "Blogging Service API"); - }); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //app.UseSwagger(); + //app.UseSwaggerUI(options => + //{ + // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Blogging Service API"); + //}); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs index 014cf76fc3..5aa69a1e9b 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs @@ -7,7 +7,10 @@ namespace BloggingService.Host.Controllers { public ActionResult Index() { - return Redirect("/swagger"); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //return Redirect("/swagger"); + + return Content("OK: BloggingService.Host is working..."); } } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs index 690dfb972e..a2b841ab54 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs @@ -7,7 +7,10 @@ namespace IdentityService.Host.Controllers { public ActionResult Index() { - return Redirect("/swagger"); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //return Redirect("/swagger"); + + return Content("OK: IdentityService.Host is working..."); } } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs index 614e625457..3e5210dfb8 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs @@ -92,13 +92,15 @@ namespace IdentityService.Host app.UseCorrelationId(); app.UseVirtualFiles(); + app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - app.UseSwagger(); - app.UseSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "Identity Service API"); - }); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //app.UseSwagger(); + //app.UseSwaggerUI(options => + //{ + // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Identity Service API"); + //}); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs index 8d28ce4295..7830e5d6bf 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs @@ -7,7 +7,10 @@ namespace ProductService.Host.Controllers { public ActionResult Index() { - return Redirect("/swagger"); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //return Redirect("/swagger"); + + return Content("OK: ProductService.Host is working..."); } } } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs index 3ec72fc4e2..e88228feb2 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs @@ -94,13 +94,15 @@ namespace ProductService.Host app.UseCorrelationId(); app.UseVirtualFiles(); + app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - app.UseSwagger(); - app.UseSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "Product Service API"); - }); + //TODO: Enable swagger UI once it supports asp.net core 3.x + //app.UseSwagger(); + //app.UseSwaggerUI(options => + //{ + // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Product Service API"); + //}); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea();