From ce52a67a9feac136bc3b2ae727762885a319b40c Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 13 Sep 2022 14:12:31 +0300 Subject: [PATCH] Configured the port as 44358 for cmskit --- apps/angular/src/environments/environment.ts | 4 ++++ .../src/EShopOnAbp.AuthServer/appsettings.json | 2 +- .../src/EShopOnAbp.WebPublicGateway/yarp.json | 7 +++++++ gateways/web/src/EShopOnAbp.WebGateway/yarp.json | 7 +++++++ .../Properties/launchSettings.json | 6 +++--- .../appsettings.json | 6 +++--- .../appsettings.Docker.json | 3 +++ .../appsettings.json | 3 +++ tye.yaml | 11 +++++++++++ 9 files changed, 42 insertions(+), 7 deletions(-) diff --git a/apps/angular/src/environments/environment.ts b/apps/angular/src/environments/environment.ts index a5f81a2f..9c3c768d 100644 --- a/apps/angular/src/environments/environment.ts +++ b/apps/angular/src/environments/environment.ts @@ -28,6 +28,10 @@ export const environment = { Ordering: { url: "https://localhost:44356", rootNamespace: 'EShopOnAbp.OrderingService', + }, + Cmskit: { + url: "https://localhost:44358", + rootNamespace: 'EShopOnAbp.CmskitService', } }, mediaServerUrl:'https://localhost:44335' diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.json b/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.json index 2f998642..7d637ec1 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.json +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.json @@ -1,7 +1,7 @@ { "App": { "SelfUrl": "https://localhost:44330", - "CorsOrigins": "http://localhost:4200,https://localhost:44351,https://localhost:44353,https://localhost:44354,https://localhost:44355,https://localhost:44356,https://localhost:44357,https://localhost:44372,https://localhost:44373", + "CorsOrigins": "http://localhost:4200,https://localhost:44351,https://localhost:44353,https://localhost:44354,https://localhost:44355,https://localhost:44356,https://localhost:44357,https://localhost:44358,https://localhost:44372,https://localhost:44373", "RedirectAllowedUrls": "http://localhost:4200" }, "Logging": { diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json index ffbfd570..235c049b 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json @@ -88,6 +88,13 @@ } } }, + "cmskitCluster": { + "Destinations": { + "destination1": { + "Address": "https://localhost:44358" + } + } + }, "productPictureCluster": { "Destinations": { "destination1": { diff --git a/gateways/web/src/EShopOnAbp.WebGateway/yarp.json b/gateways/web/src/EShopOnAbp.WebGateway/yarp.json index d14ce8ee..595ca639 100644 --- a/gateways/web/src/EShopOnAbp.WebGateway/yarp.json +++ b/gateways/web/src/EShopOnAbp.WebGateway/yarp.json @@ -106,6 +106,13 @@ "Address": "https://localhost:44356" } } + }, + "cmskitCluster": { + "Destinations": { + "destination1": { + "Address": "https://localhost:44358" + } + } } } } diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json index 8b708b98..78cec03e 100644 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json @@ -3,8 +3,8 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "https://localhost:44711", - "sslPort": 44711 + "applicationUrl": "https://localhost:44358", + "sslPort": 44358 } }, "profiles": { @@ -19,7 +19,7 @@ "commandName": "Project", "dotnetRunMessages": "true", "launchBrowser": true, - "applicationUrl": "https://localhost:44711", + "applicationUrl": "https://localhost:44358", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json index 7a1a7d9a..4788a2cc 100644 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json @@ -1,10 +1,10 @@ { "App": { - "SelfUrl": "https://localhost:44711", - "CorsOrigins": "http://localhost:4200" //https://localhost:44372,https://localhost:44373, + "SelfUrl": "https://localhost:44358", + "CorsOrigins": "https://localhost:44372,https://localhost:44373,http://localhost:4200" }, "AuthServer": { - "Authority": "https://localhost:44322", + "Authority": "https://localhost:44330", "RequireHttpsMetadata": "true", "SwaggerClientId": "WebGateway_Swagger", "SwaggerClientSecret": "1q2w3e*" diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.Docker.json b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.Docker.json index 0f625175..9888347c 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.Docker.json +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.Docker.json @@ -60,6 +60,9 @@ }, "PaymentService": { "RootUrl": "https://localhost:44357" + }, + "CmskitService": { + "RootUrl": "https://localhost:44358" } } } diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json index 8f53f8ad..b218bdf1 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json @@ -74,6 +74,9 @@ }, "PaymentService": { "RootUrl": "https://localhost:44357" + }, + "CmskitService": { + "RootUrl": "https://localhost:44358" } } } diff --git a/tye.yaml b/tye.yaml index efcd5f22..dfdd4447 100644 --- a/tye.yaml +++ b/tye.yaml @@ -64,6 +64,17 @@ services: - Kestrel__Certificates__Default__Password=8b6039b6-c67a-448b-977b-0ce6d3fcfd49 env_file: - ./.env + +- name: cmskit-service + project: services/payment/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj + bindings: + - protocol: https + port: 44358 + env: + - Kestrel__Certificates__Default__Path=../../../../etc/dev-cert/localhost.pfx + - Kestrel__Certificates__Default__Password=8b6039b6-c67a-448b-977b-0ce6d3fcfd49 + env_file: + - ./.env - name: web-gateway project: gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbp.WebGateway.csproj