Merge pull request #248 from abpframework/aspire

Introduce .Net Aspire

EShopOnAbp.sln

@@ -1,47 +1,52 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.0.31717.71
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{866DB6CC-FEA8-4CC2-A2E4-143537D197B6}"
+VisualStudioVersion = 17.8.0.0
+MinimumVisualStudioVersion = 17.8.0.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnAbp.AppHost", "aspire\AppHost\eShopOnAbp.AppHost.csproj", "{83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{1484E912-DCF3-4568-A72C-4C7622104DB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnAbp.ServiceDefaults", "aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj", "{25F596CB-734B-4D22-BB9B-BF3FE4ED645C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{224361D2-3869-4F9A-A882-2554036A98AF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{B8B59303-2178-459B-91A8-DF353044E090}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.Shared.Hosting", "shared\EShopOnAbp.Shared.Hosting\EShopOnAbp.Shared.Hosting.csproj", "{B473B411-0B14-47A9-B4BB-9F0F4E884C87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.PublicWeb", "apps\public-web\src\EShopOnAbp.PublicWeb\EShopOnAbp.PublicWeb.csproj", "{FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.Shared.Hosting.AspNetCore", "shared\EShopOnAbp.Shared.Hosting.AspNetCore\EShopOnAbp.Shared.Hosting.AspNetCore.csproj", "{6FCB66AF-6044-478D-B2A0-90F7E555C152}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.AdministrationService.HttpApi.Host", "services\administration\src\EShopOnAbp.AdministrationService.HttpApi.Host\EShopOnAbp.AdministrationService.HttpApi.Host.csproj", "{A630417B-1C25-4BAB-B1D3-22C627DF0008}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.Shared.Localization", "shared\EShopOnAbp.Shared.Localization\EShopOnAbp.Shared.Localization.csproj", "{2B608875-8226-44E4-B93A-D475E11A7B80}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.IdentityService.HttpApi.Host", "services\identity\src\EShopOnAbp.IdentityService.HttpApi.Host\EShopOnAbp.IdentityService.HttpApi.Host.csproj", "{582CE0DB-2B91-4978-9AF8-B18C732D08B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.Shared.Hosting.Microservices", "shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj", "{49DDB3F1-6200-445E-9A0D-0339E31D5D77}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.BasketService", "services\basket\src\EShopOnAbp.BasketService\EShopOnAbp.BasketService.csproj", "{C6516D98-035B-4742-B3C8-B031455546DE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.AdministrationService.HttpApi.Host", "services\administration\src\EShopOnAbp.AdministrationService.HttpApi.Host\EShopOnAbp.AdministrationService.HttpApi.Host.csproj", "{0FA9667E-6A08-4EFF-8CAF-D2A3C3C1FBBD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.CatalogService.HttpApi.Host", "services\catalog\src\EShopOnAbp.CatalogService.HttpApi.Host\EShopOnAbp.CatalogService.HttpApi.Host.csproj", "{E41F937A-0FE1-4E55-B449-CABF5D42A093}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.IdentityService.HttpApi.Host", "services\identity\src\EShopOnAbp.IdentityService.HttpApi.Host\EShopOnAbp.IdentityService.HttpApi.Host.csproj", "{FDFCA1B4-FD9D-445C-8655-3DF3F2D57CEA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.CmskitService.HttpApi.Host", "services\cmskit\src\EShopOnAbp.CmskitService.HttpApi.Host\EShopOnAbp.CmskitService.HttpApi.Host.csproj", "{C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.Shared.Hosting.Gateways", "shared\EShopOnAbp.Shared.Hosting.Gateways\EShopOnAbp.Shared.Hosting.Gateways.csproj", "{590B609C-5887-4896-9FC5-5E54A2658B18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.OrderingService.HttpApi.Host", "services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Host\EShopOnAbp.OrderingService.HttpApi.Host.csproj", "{89A65776-2367-4855-8956-53322C2BF70B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.WebGateway", "gateways\web\src\EShopOnAbp.WebGateway\EShopOnAbp.WebGateway.csproj", "{5D653BE4-7653-4684-B9F0-9A9B955093E5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.PaymentService.HttpApi.Host", "services\payment\src\EShopOnAbp.PaymentService.HttpApi.Host\EShopOnAbp.PaymentService.HttpApi.Host.csproj", "{2C55D527-4E09-4FD6-B4C6-7EFDD457358F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.WebPublicGateway", "gateways\web-public\src\EShopOnAbp.WebPublicGateway\EShopOnAbp.WebPublicGateway.csproj", "{2E0B715C-3AAD-47B3-B2EB-D34CB24CBEFA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspire", "aspire", "{B7619466-6A0F-4981-9483-FA935275583B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.PublicWeb", "apps\public-web\src\EShopOnAbp.PublicWeb\EShopOnAbp.PublicWeb.csproj", "{969029FC-CFCF-4F95-9778-E5C69117711E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{FDF81F68-085D-4C5E-964A-1FD8A1D96277}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.CatalogService.HttpApi.Host", "services\catalog\src\EShopOnAbp.CatalogService.HttpApi.Host\EShopOnAbp.CatalogService.HttpApi.Host.csproj", "{3381E059-A2B5-4660-AFDA-5063DEE64154}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.WebGateway", "gateways\web\src\EShopOnAbp.WebGateway\EShopOnAbp.WebGateway.csproj", "{91B60054-9B37-476D-8894-2F91046CC53A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.OrderingService.HttpApi.Host", "services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Host\EShopOnAbp.OrderingService.HttpApi.Host.csproj", "{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.WebPublicGateway", "gateways\web-public\src\EShopOnAbp.WebPublicGateway\EShopOnAbp.WebPublicGateway.csproj", "{B9DC001F-BEE2-4E85-8E7E-B6B84298F0D5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.PaymentService.HttpApi.Host", "services\payment\src\EShopOnAbp.PaymentService.HttpApi.Host\EShopOnAbp.PaymentService.HttpApi.Host.csproj", "{7AE4C613-780E-4DA5-9B57-76F0D40D5146}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{7F683C4A-7D91-44EE-AF90-A5901BE6F90E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService", "services\basket\src\EShopOnAbp.BasketService\EShopOnAbp.BasketService.csproj", "{E373DD66-3247-4D95-B325-064BBBC337B1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.Keycloak.DbMigrator", "shared\EShopOnAbp.Keycloak.DbMigrator\EShopOnAbp.Keycloak.DbMigrator.csproj", "{A0ECB336-8E44-46F4-B551-0595AF5B4D62}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.CmskitService.HttpApi.Host", "services\cmskit\src\EShopOnAbp.CmskitService.HttpApi.Host\EShopOnAbp.CmskitService.HttpApi.Host.csproj", "{D5B9D5A5-44AA-42F8-867C-95B54780C9DC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.Shared.Hosting", "shared\EShopOnAbp.Shared.Hosting\EShopOnAbp.Shared.Hosting.csproj", "{C51FAFAE-59FE-470D-BE49-B4CDB9DF934B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.Keycloak.DbMigrator", "shared\EShopOnAbp.Keycloak.DbMigrator\EShopOnAbp.Keycloak.DbMigrator.csproj", "{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.Shared.Hosting.AspNetCore", "shared\EShopOnAbp.Shared.Hosting.AspNetCore\EShopOnAbp.Shared.Hosting.AspNetCore.csproj", "{A6CE17C4-6991-45CC-9AD6-D0F5DA11CE64}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.Shared.Hosting.Gateways", "shared\EShopOnAbp.Shared.Hosting.Gateways\EShopOnAbp.Shared.Hosting.Gateways.csproj", "{9C5BB7A5-63EB-4D63-9632-BEF22D22F780}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.Shared.Hosting.Microservices", "shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj", "{D3CD271A-F0C2-48A6-BD57-40D500B26645}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.Shared.Localization", "shared\EShopOnAbp.Shared.Localization\EShopOnAbp.Shared.Localization.csproj", "{3A7CC445-7D7D-41E6-A115-EFFE3A225506}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,93 +54,103 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B473B411-0B14-47A9-B4BB-9F0F4E884C87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B473B411-0B14-47A9-B4BB-9F0F4E884C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B473B411-0B14-47A9-B4BB-9F0F4E884C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B473B411-0B14-47A9-B4BB-9F0F4E884C87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FCB66AF-6044-478D-B2A0-90F7E555C152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FCB66AF-6044-478D-B2A0-90F7E555C152}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FCB66AF-6044-478D-B2A0-90F7E555C152}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6FCB66AF-6044-478D-B2A0-90F7E555C152}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B608875-8226-44E4-B93A-D475E11A7B80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B608875-8226-44E4-B93A-D475E11A7B80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B608875-8226-44E4-B93A-D475E11A7B80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B608875-8226-44E4-B93A-D475E11A7B80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49DDB3F1-6200-445E-9A0D-0339E31D5D77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49DDB3F1-6200-445E-9A0D-0339E31D5D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49DDB3F1-6200-445E-9A0D-0339E31D5D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49DDB3F1-6200-445E-9A0D-0339E31D5D77}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0FA9667E-6A08-4EFF-8CAF-D2A3C3C1FBBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FA9667E-6A08-4EFF-8CAF-D2A3C3C1FBBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FA9667E-6A08-4EFF-8CAF-D2A3C3C1FBBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0FA9667E-6A08-4EFF-8CAF-D2A3C3C1FBBD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FDFCA1B4-FD9D-445C-8655-3DF3F2D57CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDFCA1B4-FD9D-445C-8655-3DF3F2D57CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDFCA1B4-FD9D-445C-8655-3DF3F2D57CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDFCA1B4-FD9D-445C-8655-3DF3F2D57CEA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{590B609C-5887-4896-9FC5-5E54A2658B18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{590B609C-5887-4896-9FC5-5E54A2658B18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{590B609C-5887-4896-9FC5-5E54A2658B18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{590B609C-5887-4896-9FC5-5E54A2658B18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D653BE4-7653-4684-B9F0-9A9B955093E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D653BE4-7653-4684-B9F0-9A9B955093E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D653BE4-7653-4684-B9F0-9A9B955093E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D653BE4-7653-4684-B9F0-9A9B955093E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E0B715C-3AAD-47B3-B2EB-D34CB24CBEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E0B715C-3AAD-47B3-B2EB-D34CB24CBEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E0B715C-3AAD-47B3-B2EB-D34CB24CBEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E0B715C-3AAD-47B3-B2EB-D34CB24CBEFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{969029FC-CFCF-4F95-9778-E5C69117711E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{969029FC-CFCF-4F95-9778-E5C69117711E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{969029FC-CFCF-4F95-9778-E5C69117711E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{969029FC-CFCF-4F95-9778-E5C69117711E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3381E059-A2B5-4660-AFDA-5063DEE64154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3381E059-A2B5-4660-AFDA-5063DEE64154}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3381E059-A2B5-4660-AFDA-5063DEE64154}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3381E059-A2B5-4660-AFDA-5063DEE64154}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AE4C613-780E-4DA5-9B57-76F0D40D5146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AE4C613-780E-4DA5-9B57-76F0D40D5146}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AE4C613-780E-4DA5-9B57-76F0D40D5146}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AE4C613-780E-4DA5-9B57-76F0D40D5146}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E373DD66-3247-4D95-B325-064BBBC337B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E373DD66-3247-4D95-B325-064BBBC337B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E373DD66-3247-4D95-B325-064BBBC337B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E373DD66-3247-4D95-B325-064BBBC337B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5B9D5A5-44AA-42F8-867C-95B54780C9DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5B9D5A5-44AA-42F8-867C-95B54780C9DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5B9D5A5-44AA-42F8-867C-95B54780C9DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5B9D5A5-44AA-42F8-867C-95B54780C9DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A630417B-1C25-4BAB-B1D3-22C627DF0008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A630417B-1C25-4BAB-B1D3-22C627DF0008}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A630417B-1C25-4BAB-B1D3-22C627DF0008}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A630417B-1C25-4BAB-B1D3-22C627DF0008}.Release|Any CPU.Build.0 = Release|Any CPU
+		{582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6516D98-035B-4742-B3C8-B031455546DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6516D98-035B-4742-B3C8-B031455546DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6516D98-035B-4742-B3C8-B031455546DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6516D98-035B-4742-B3C8-B031455546DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E41F937A-0FE1-4E55-B449-CABF5D42A093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E41F937A-0FE1-4E55-B449-CABF5D42A093}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E41F937A-0FE1-4E55-B449-CABF5D42A093}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E41F937A-0FE1-4E55-B449-CABF5D42A093}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89A65776-2367-4855-8956-53322C2BF70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89A65776-2367-4855-8956-53322C2BF70B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89A65776-2367-4855-8956-53322C2BF70B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89A65776-2367-4855-8956-53322C2BF70B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91B60054-9B37-476D-8894-2F91046CC53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91B60054-9B37-476D-8894-2F91046CC53A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91B60054-9B37-476D-8894-2F91046CC53A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91B60054-9B37-476D-8894-2F91046CC53A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9DC001F-BEE2-4E85-8E7E-B6B84298F0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9DC001F-BEE2-4E85-8E7E-B6B84298F0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9DC001F-BEE2-4E85-8E7E-B6B84298F0D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9DC001F-BEE2-4E85-8E7E-B6B84298F0D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0ECB336-8E44-46F4-B551-0595AF5B4D62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0ECB336-8E44-46F4-B551-0595AF5B4D62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0ECB336-8E44-46F4-B551-0595AF5B4D62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0ECB336-8E44-46F4-B551-0595AF5B4D62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C51FAFAE-59FE-470D-BE49-B4CDB9DF934B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C51FAFAE-59FE-470D-BE49-B4CDB9DF934B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C51FAFAE-59FE-470D-BE49-B4CDB9DF934B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C51FAFAE-59FE-470D-BE49-B4CDB9DF934B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6CE17C4-6991-45CC-9AD6-D0F5DA11CE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6CE17C4-6991-45CC-9AD6-D0F5DA11CE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6CE17C4-6991-45CC-9AD6-D0F5DA11CE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6CE17C4-6991-45CC-9AD6-D0F5DA11CE64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C5BB7A5-63EB-4D63-9632-BEF22D22F780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C5BB7A5-63EB-4D63-9632-BEF22D22F780}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C5BB7A5-63EB-4D63-9632-BEF22D22F780}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C5BB7A5-63EB-4D63-9632-BEF22D22F780}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3CD271A-F0C2-48A6-BD57-40D500B26645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3CD271A-F0C2-48A6-BD57-40D500B26645}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3CD271A-F0C2-48A6-BD57-40D500B26645}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3CD271A-F0C2-48A6-BD57-40D500B26645}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A7CC445-7D7D-41E6-A115-EFFE3A225506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A7CC445-7D7D-41E6-A115-EFFE3A225506}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A7CC445-7D7D-41E6-A115-EFFE3A225506}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A7CC445-7D7D-41E6-A115-EFFE3A225506}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B473B411-0B14-47A9-B4BB-9F0F4E884C87} = {B8B59303-2178-459B-91A8-DF353044E090}
-		{6FCB66AF-6044-478D-B2A0-90F7E555C152} = {B8B59303-2178-459B-91A8-DF353044E090}
-		{2B608875-8226-44E4-B93A-D475E11A7B80} = {B8B59303-2178-459B-91A8-DF353044E090}
-		{49DDB3F1-6200-445E-9A0D-0339E31D5D77} = {B8B59303-2178-459B-91A8-DF353044E090}
-		{0FA9667E-6A08-4EFF-8CAF-D2A3C3C1FBBD} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{FDFCA1B4-FD9D-445C-8655-3DF3F2D57CEA} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{590B609C-5887-4896-9FC5-5E54A2658B18} = {B8B59303-2178-459B-91A8-DF353044E090}
-		{5D653BE4-7653-4684-B9F0-9A9B955093E5} = {1484E912-DCF3-4568-A72C-4C7622104DB8}
-		{2E0B715C-3AAD-47B3-B2EB-D34CB24CBEFA} = {1484E912-DCF3-4568-A72C-4C7622104DB8}
-		{969029FC-CFCF-4F95-9778-E5C69117711E} = {866DB6CC-FEA8-4CC2-A2E4-143537D197B6}
-		{3381E059-A2B5-4660-AFDA-5063DEE64154} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{7AE4C613-780E-4DA5-9B57-76F0D40D5146} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{E373DD66-3247-4D95-B325-064BBBC337B1} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{D5B9D5A5-44AA-42F8-867C-95B54780C9DC} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{774C6ADF-BDD0-431C-A9F3-8BAFD5A49C8C} = {B8B59303-2178-459B-91A8-DF353044E090}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {26F82565-C6A4-439D-93A4-3251E3E7D5B0}
+		SolutionGuid = {9E214FFD-834E-4F69-ADAA-F97C7C74B243}
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{FD9ECE3E-487B-4961-BEE9-3C26F866EAB2} = {224361D2-3869-4F9A-A882-2554036A98AF}
+		{A630417B-1C25-4BAB-B1D3-22C627DF0008} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}
+		{582CE0DB-2B91-4978-9AF8-B18C732D08B5} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}
+		{C6516D98-035B-4742-B3C8-B031455546DE} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}
+		{E41F937A-0FE1-4E55-B449-CABF5D42A093} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}
+		{C08FF8C8-354D-40EC-A80C-AFCE36A88DF9} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}
+		{89A65776-2367-4855-8956-53322C2BF70B} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}
+		{2C55D527-4E09-4FD6-B4C6-7EFDD457358F} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}
+		{83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF} = {B7619466-6A0F-4981-9483-FA935275583B}
+		{25F596CB-734B-4D22-BB9B-BF3FE4ED645C} = {B7619466-6A0F-4981-9483-FA935275583B}
+		{91B60054-9B37-476D-8894-2F91046CC53A} = {FDF81F68-085D-4C5E-964A-1FD8A1D96277}
+		{B9DC001F-BEE2-4E85-8E7E-B6B84298F0D5} = {FDF81F68-085D-4C5E-964A-1FD8A1D96277}
+		{A0ECB336-8E44-46F4-B551-0595AF5B4D62} = {7F683C4A-7D91-44EE-AF90-A5901BE6F90E}
+		{C51FAFAE-59FE-470D-BE49-B4CDB9DF934B} = {7F683C4A-7D91-44EE-AF90-A5901BE6F90E}
+		{A6CE17C4-6991-45CC-9AD6-D0F5DA11CE64} = {7F683C4A-7D91-44EE-AF90-A5901BE6F90E}
+		{9C5BB7A5-63EB-4D63-9632-BEF22D22F780} = {7F683C4A-7D91-44EE-AF90-A5901BE6F90E}
+		{D3CD271A-F0C2-48A6-BD57-40D500B26645} = {7F683C4A-7D91-44EE-AF90-A5901BE6F90E}
+		{3A7CC445-7D7D-41E6-A115-EFFE3A225506} = {7F683C4A-7D91-44EE-AF90-A5901BE6F90E}
 	EndGlobalSection
 EndGlobal

apps/angular/package.json

@@ -12,16 +12,16 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~8.0.0",
-    "@abp/ng.components": "~8.0.0",
-    "@abp/ng.core": "~8.0.0",
-    "@abp/ng.identity": "~8.0.0",
-    "@abp/ng.oauth": "~8.0.0",
-    "@abp/ng.setting-management": "~8.0.0",
-    "@abp/ng.tenant-management": "~8.0.0",
-    "@abp/ng.theme.basic": "~8.0.0",
+    "@abp/ng.account": "^8.1.3",
+    "@abp/ng.components": "^8.1.3",
+    "@abp/ng.core": "^8.1.3",
+    "@abp/ng.identity": "^8.1.3",
+    "@abp/ng.oauth": "^8.1.3",
+    "@abp/ng.setting-management": "^8.1.3",
+    "@abp/ng.tenant-management": "^8.1.3",
+    "@abp/ng.theme.basic": "^8.1.3",
     "@abp/ng.theme.lepton-x": "~3.0.0",
-    "@abp/ng.theme.shared": "~8.0.0",
+    "@abp/ng.theme.shared": "^8.1.3",
     "@angular/animations": "~17.0.0",
     "@angular/common": "~17.0.0",
     "@angular/compiler": "~17.0.0",
@@ -36,7 +36,7 @@
     "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~8.0.0",
+    "@abp/ng.schematics": "^8.1.3",
     "@angular-devkit/build-angular": "~17.0.0",
     "@angular/cli": "~17.0.0",
     "@angular/compiler-cli": "~17.0.0",

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml

@@ -1,11 +1,8 @@
 @using EShopOnAbp.Localization
 @using EShopOnAbp.PublicWeb.Components.Purchase
 @using Microsoft.Extensions.Localization
-@using Microsoft.Extensions.Options
-@using Volo.Abp.Http.Client
 @model EShopOnAbp.BasketService.Services.BasketDto
 @inject IStringLocalizer<EShopOnAbpResource> L
-@inject IOptions<AbpRemoteServiceOptions> options
 
 <div>
     @if (!Model.Items.Any())
@@ -34,7 +31,7 @@
                 <div class="basket-list flex-container vertical">
                     @foreach (var item in Model.Items)
                     {
-                        string imageName = item.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/noimage.jpg" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.ImageName}";
+                        string imageName = item.ImageName.IsNullOrEmpty() ? $"product-images/noimage.jpg" : $"product-images/{item.ImageName}";
                         var price = item.TotalPrice.ToString("0.00");
                         <div class="card basket-list-item" data-product-id="@item.ProductId">
                             <div class="card-body">

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml

@@ -38,7 +38,7 @@
 				{
 					foreach (var item in Model.Items)
 					{
-						string imageName = item.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/noimage.jpg" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.ImageName}";
+						string imageName = item.ImageName.IsNullOrEmpty() ? $"product-images/noimage.jpg" : $"product-images/{item.ImageName}";
 						var price = item.TotalPrice.ToString("0.00");
 						<div class="dropdown-item">
 

apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml

@@ -56,7 +56,7 @@
                             <abp-column size="_2">
                                 <a href="/products/@item.ProductId.ToString()">
                                     @{
-                                        string imageUrl = $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.PictureUrl}";
+                                        string imageUrl = $"product-images/{item.PictureUrl}";
                                         <img class="img-size" src="@imageUrl" />
                                     }
                                 </a>

apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj

@@ -5,22 +5,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.5" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.0.0" />
-    <PackageReference Include="Volo.CmsKit.Public.Web" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.1.3" />
+    <PackageReference Include="Volo.CmsKit.Public.Web" Version="8.1.3" />
     <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.0.0-*" />
-    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.1.0-*" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="8.1.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj" />
   </ItemGroup>
 
   <ItemGroup>

apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs

@@ -5,7 +5,6 @@ using EShopOnAbp.Localization;
 using EShopOnAbp.OrderingService;
 using EShopOnAbp.PaymentService;
 using EShopOnAbp.PaymentService.PaymentMethods;
-using EShopOnAbp.PublicWeb.AnonymousUser;
 using EShopOnAbp.PublicWeb.Components.Toolbar.Cart;
 using EShopOnAbp.PublicWeb.Menus;
 using EShopOnAbp.PublicWeb.PaymentMethods;
@@ -22,7 +21,6 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Polly;
 using StackExchange.Redis;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Headers;
 using System.Security.Claims;
@@ -56,7 +54,6 @@ using Volo.Abp.Ui.LayoutHooks;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.UI.Navigation.Urls;
 using Volo.Abp.VirtualFileSystem;
-using Volo.CmsKit;
 using Volo.CmsKit.Public.Web;
 using Yarp.ReverseProxy.Transforms;
 
@@ -113,6 +110,8 @@ public class EShopOnAbpPublicWebModule : AbpModule
     {
         Microsoft.IdentityModel.Logging.IdentityModelEventSource.ShowPII = true;
         var configuration = context.Services.GetConfiguration();
+        
+        context.Services.AddHttpForwarderWithServiceDiscovery();
 
         ConfigureBasketHttpClient(context);
 
@@ -312,15 +311,14 @@ public class EShopOnAbpPublicWebModule : AbpModule
         app.UseCorrelationId();
         app.UseStaticFiles();
         app.UseRouting();
-        // app.UseHttpMetrics();
         app.UseAuthentication();
         app.UseAbpSerilogEnrichers();
         app.UseAuthorization();
-        // app.UseAnonymousUser();
         app.UseConfiguredEndpoints(endpoints =>
         {
             endpoints.MapReverseProxy();
-            // endpoints.MapMetrics();
+            endpoints.MapForwarder("*/product-images/{name}", "http://_http.catalogService/product-images", "/{name}");
+            endpoints.MapForwarder("/products/product-images/{name}", "http://_http.catalogService/product-images", "/{name}");
         });
     }
 

apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml

@@ -2,12 +2,8 @@
 @using EShopOnAbp.Localization
 @using Microsoft.Extensions.Localization
 @using System.Globalization
-@using Microsoft.Extensions.Options
-@using Volo.Abp.Http.Client
-@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 @model EShopOnAbp.PublicWeb.Pages.IndexModel
 @inject IStringLocalizer<EShopOnAbpResource> L
-@inject IOptions<AbpRemoteServiceOptions> options
 
 @{
     string pageHeader = L["OurProducts"];
@@ -34,7 +30,7 @@
             @foreach (var product in Model.Products)
             {
                 var productPrice = product.Price.ToString("C", new CultureInfo("en-US"));
-                string productImage = !product.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{product.ImageName}" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/@product.ImageName";
+                string productImage = !product.ImageName.IsNullOrEmpty() ? $"product-images/{product.ImageName}" : $"product-images/@product.ImageName";
                 string buyText = L["Index:AddToBasket"];
                 <div class="product-container">
                     <div class="product-list-item" data-product-id="@product.Id.ToString()">

apps/public-web/src/EShopOnAbp.PublicWeb/Pages/ProductDetail.cshtml

@@ -2,15 +2,12 @@
 @using EShopOnAbp.Localization
 @using Microsoft.Extensions.Localization
 @using System.Globalization
-@using Microsoft.Extensions.Options
 @using Volo.Abp.GlobalFeatures
-@using Volo.Abp.Http.Client
 @using Volo.CmsKit.GlobalFeatures
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 
 @inject IStringLocalizer<EShopOnAbpResource> L
-@inject IOptions<AbpRemoteServiceOptions> options
 
 @model EShopOnAbp.PublicWeb.Pages.ProductDetailModel
 
@@ -32,7 +29,7 @@
                 @{
                     var product = Model.Product;
                     var productPrice = product.Price.ToString("C", new CultureInfo("en-US"));
-                    string productImage = !product.ImageName.IsNullOrEmpty() ? $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{product.ImageName}" : $"{options.Value.RemoteServices.Default.BaseUrl}product-images/@product.ImageName";
+                    string productImage = !product.ImageName.IsNullOrEmpty() ? $"product-images/{product.ImageName}" : $"product-images/@product.ImageName";
                     string buyText = L["Index:AddToBasket"];
                     <div class="product-list-item" data-product-id="@product.Id.ToString()">
                         <a href="/products/@product.Id.ToString()">
@@ -74,14 +71,14 @@
                 <abp-column size-md="_6">
                     @if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>() && Model.IsPurschased)
                     {
-                        @await Component.InvokeAsync(typeof(RatingViewComponent), new { entityType = "quote", entityId = @product.Id.ToString() })
+                        @await Component.InvokeAsync(typeof(RatingViewComponent), new { entityType = "quote", entityId = @product.Id.ToString(), isReadOnly = false })
                     }
                 </abp-column>
                 <abp-column size-md="_12">
                     @* Need read-only commenting system *@
                     @if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>() && Model.IsPurschased)
                     {
-                        @await Component.InvokeAsync(typeof(CommentingViewComponent), new { entityType = "quote", entityId = @product.Id.ToString() })
+                        @await Component.InvokeAsync(typeof(CommentingViewComponent), new { entityType = "quote", entityId = @product.Id.ToString(), isReadOnly = true })
                     }
                 </abp-column>
             </abp-row>

apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs

@@ -2,6 +2,8 @@ using System;
 using System.Threading.Tasks;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 
 namespace EShopOnAbp.PublicWeb;
@@ -17,7 +19,15 @@ public class Program
         try
         {
             Log.Information($"Starting {assemblyName}.");
-            var app = await ApplicationBuilderHelper.BuildApplicationAsync<EShopOnAbpPublicWebModule>(args);
+            var builder = WebApplication.CreateBuilder(args);
+            builder.Host
+                .UseAutofac()
+                .UseSerilog();
+            
+            builder.AddServiceDefaults();
+
+            await builder.AddApplicationAsync<EShopOnAbpPublicWebModule>();
+            var app = builder.Build();
             await app.InitializeApplicationAsync();
             await app.RunAsync();
 
@@ -30,7 +40,7 @@ public class Program
         }
         finally
         {
-            Log.CloseAndFlush();
+            await Log.CloseAndFlushAsync();
         }
     }
 }

apps/public-web/src/EShopOnAbp.PublicWeb/Properties/launchSettings.json

@@ -1,25 +1,20 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44335",
-      "sslPort": 44335
-    }
-  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",  
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:5035",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "EShopOnAbp.PublicWeb": {
+    "https": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44335",
+      "applicationUrl": "http://localhost:5035;https://localhost:44335",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

apps/public-web/src/EShopOnAbp.PublicWeb/appsettings.json

@@ -12,7 +12,7 @@
   "AllowedHosts": "*",
   "RemoteServices": {
     "Default": {
-      "BaseUrl": "https://localhost:44373/",
+      "BaseUrl": "http://webPublicGateway/",
       "UseCurrentAccessToken": "false"
     }
   },
@@ -56,7 +56,7 @@
       "cluster1": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44373/"
+            "Address": "http://webPublicGateway"
           }
         }
       }

apps/public-web/src/EShopOnAbp.PublicWeb/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0",
-    "@abp/signalr": "^8.0.0",
-    "@abp/cms-kit": "^8.0.0"
+    "@abp/signalr": "^8.1.3",
+    "@abp/cms-kit": "^8.1.3"
   }
 }

apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/uppy/README.md

@@ -1,76 +1,98 @@
 # Uppy
 
-Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can use
-this from a CDN (e.g. `<script src="https://releases.transloadit.com/uppy/v1.31.1/uppy.min.js"></script>`) or bundle it with your webapp. 
+Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can
+use this from a CDN
+(`<script src="https://releases.transloadit.com/uppy/v3.25.3/uppy.min.js"></script>`)
+or bundle it with your webapp.
 
-Note that the recommended way to use Uppy is to install it with yarn/npm and use a 
-bundler like Webpack so that you can create a smaller custom build with just the
-things that you need. More info on <https://uppy.io/docs/#With-a-module-bundler>.
+Note that the recommended way to use Uppy is to install it with yarn/npm and use
+a bundler like Webpack so that you can create a smaller custom build with only
+the things that you need. More info on
+<https://uppy.io/docs/#With-a-module-bundler>.
 
 ## How to use this bundle
 
-You can extract the contents of this zip to e.g. `./js/uppy`
+You can extract the contents of this zip to a directory, such as `./js/uppy`.
 
-Now you can create an HTML file, e.g.: `./upload.html` with the following contents:
+Now you can create an HTML file, for example `./upload.html`, with the following
+contents:
 
 ```html
 <html>
-<head>
-  <link rel="stylesheet" href="./js/uppy/uppy.min.css">
-</head>
-
-<body>
-  <div class="DashboardContainer"></div>
-  <button class="UppyModalOpenerBtn">Upload</button>
-  <div class="uploaded-files">
-    <h5>Uploaded files:</h5>
-    <ol></ol>
-  </div>
-</body>
-
-<script src="./js/uppy/uppy.min.js"></script>
-<script>
-  var uppy = Uppy.Core({
-    debug      : true,
-    autoProceed: false,
-  })
-    .use(Uppy.Dashboard, {
-      browserBackButtonClose: false,
-      height                : 470,
-      inline                : false,
-      replaceTargetContent  : true,
-      showProgressDetails   : true,
-      target                : '.DashboardContainer',
-      trigger               : '.UppyModalOpenerBtn',
-      metaFields            : [
-        { id: 'name', name: 'Name', placeholder: 'file name' },
-        { id: 'caption', name: 'Caption', placeholder: 'describe what the image is about' }
-      ]
+  <head>
+    <link rel="stylesheet" href="./js/uppy/uppy.min.css" />
+  </head>
+
+  <body>
+    <div class="DashboardContainer"></div>
+    <button class="UppyModalOpenerBtn">Upload</button>
+    <div class="uploaded-files">
+      <h5>Uploaded files:</h5>
+      <ol></ol>
+    </div>
+  </body>
+
+  <script type="module">
+    import { Uppy, Dashboard, Tus } from './js/uppy/uppy.min.mjs'
+    var uppy = new Uppy({
+      debug: true,
+      autoProceed: false,
     })
-    .use(Uppy.Tus, { endpoint: 'https://tusd.tusdemo.net/files/' })
-    .on('upload-success', function (file, response) {
-      var url      = response.uploadURL
-      var fileName = file.name
-
-      document.querySelector('.uploaded-files ol').innerHTML +=
-        '<li><a href="' + url + '" target="_blank">' + fileName + '</a></li>'
-    })
-</script>
+      .use(Dashboard, {
+        browserBackButtonClose: false,
+        height: 470,
+        inline: false,
+        replaceTargetContent: true,
+        showProgressDetails: true,
+        target: '.DashboardContainer',
+        trigger: '.UppyModalOpenerBtn',
+        metaFields: [
+          { id: 'name', name: 'Name', placeholder: 'file name' },
+          {
+            id: 'caption',
+            name: 'Caption',
+            placeholder: 'describe what the image is about',
+          },
+        ],
+      })
+      .use(Tus, { endpoint: 'https://tusd.tusdemo.net/files/' })
+      .on('upload-success', function (file, response) {
+        var url = response.uploadURL
+        var fileName = file.name
+
+        document.querySelector('.uploaded-files ol').innerHTML +=
+          '<li><a href="' + url + '" target="_blank">' + fileName + '</a></li>'
+      })
+  </script>
+</html>
 ```
 
 Now open `upload.html` in your browser, and the Uppy Dashboard will appear.
 
 ## Next steps
 
-In the example you just built, Uppy uploads to a demo server where files will be deleted
-shortly after uploading. You'll want to target your own tusd server, S3 bucket, or Nginx/Apache server. For the latter, use the Xhr plugin: <https://uppy.io/docs/xhr-upload/> which uploads using regular multipart form posts, that you'll existing Ruby or PHP backend will be able to make sense of, just as if a `<input type="file">` had been used.
+In the example you built, Uppy uploads to a demo server where files will be
+deleted shortly after uploading. You’ll want to target your own tusd server, S3
+bucket, or Nginx/Apache server. For the latter, use the Xhr plugin:
+<https://uppy.io/docs/xhr-upload/> which uploads using regular multipart form
+posts, that you’ll existing Ruby or PHP backend will be able to make sense of,
+as if a `<input type="file">` had been used.
 
-The Dashboard currently opens when clicking the button, but you can also draw it inline into the page. This, and many more configuration options can be found here: <https://uppy.io/docs/dashboard/>.
+The Dashboard now opens when clicking the button, but you can also draw it
+inline into the page. This, and many more configuration options can be found
+here: <https://uppy.io/docs/dashboard/>.
 
-Uppy has many more Plugins besides Xhr and the Dashboard. For example, you can enable Webcam, Instagram, or video encoding support. For a full list of Plugins check here: <https://uppy.io/docs/plugins/>.
+Uppy has many more Plugins besides Xhr and the Dashboard. For example, you can
+enable Webcam, Instagram, or video encoding support. For a full list of Plugins
+check here: <https://uppy.io/docs/plugins/>.
 
-Note that for some Plugins, you will need to run a server side component called: Companion. Those plugins are marked with a (c) symbol. Alternatively, you can sign up for a free Transloadit account. Transloadit runs Companion for you, tusd servers to handle resumable file uploads, and can post-process files to scan for viruses, recognize faces, etc. Check: <https://transloadit.com>.
+Note that for some Plugins, you will need to run a server side component called:
+Companion. Those plugins are marked with a (c) symbol. Alternatively, you can
+sign up for a free Transloadit account. Transloadit runs Companion for you, tusd
+servers to handle resumable file uploads, and can post-process files to scan for
+viruses, recognize faces, etc. Check: <https://transloadit.com>.
 
 ## Getting help
 
-Stuck with anything? We're welcoming all your questions and feedback over at <https://community.transloadit.com/c/uppy/5>.
+Stuck with anything? We’re welcoming all your questions and feedback over at
+<https://community.transloadit.com/c/uppy/5>.

aspire/AppHost/Extensions.cs

@@ -0,0 +1,31 @@
+using Aspire.Hosting.Lifecycle;
+
+namespace eShopOnAbp.AppHost;
+
+internal static class Extensions
+{
+    /// <summary>
+    /// Adds a hook to set the ASPNETCORE_FORWARDEDHEADERS_ENABLED environment variable to true for all projects in the application.
+    /// </summary>
+    public static IDistributedApplicationBuilder AddForwardedHeaders(this IDistributedApplicationBuilder builder)
+    {
+        builder.Services.TryAddLifecycleHook<AddForwardHeadersHook>();
+        return builder;
+    }
+
+    private class AddForwardHeadersHook : IDistributedApplicationLifecycleHook
+    {
+        public Task BeforeStartAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default)
+        {
+            foreach (var p in appModel.GetProjectResources())
+            {
+                p.Annotations.Add(new EnvironmentCallbackAnnotation(context =>
+                {
+                    context.EnvironmentVariables["ASPNETCORE_FORWARDEDHEADERS_ENABLED"] = "true";
+                }));
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

aspire/AppHost/Program.cs

@@ -0,0 +1,48 @@
+using eShopOnAbp.AppHost;
+
+var builder = DistributedApplication.CreateBuilder(args);
+
+builder.AddForwardedHeaders();
+
+var profile = "http";
+
+// Microservices
+var administrationService =
+    builder.AddProject<Projects.EShopOnAbp_AdministrationService_HttpApi_Host>("administrationService", profile);
+var identityService = builder.AddProject<Projects.EShopOnAbp_IdentityService_HttpApi_Host>("identityService", profile);
+var catalogService = builder.AddProject<Projects.EShopOnAbp_CatalogService_HttpApi_Host>("catalogService", null)
+    .WithHttpEndpoint(name: "http", port: 5054, isProxied: false)
+    .WithEndpoint(
+        endpointName: "grpc",
+        callback: static endpoint =>
+        {
+            endpoint.Port = 8181;
+            endpoint.UriScheme = "http";
+            endpoint.Transport = "http2";
+            endpoint.IsProxied = false;
+        }
+    );
+var basketService = builder.AddProject<Projects.EShopOnAbp_BasketService>("basketService", profile)
+    .WithReference(catalogService);
+var cmsKitService = builder.AddProject<Projects.EShopOnAbp_CmskitService_HttpApi_Host>("cmsKitService", profile);
+var orderingService = builder.AddProject<Projects.EShopOnAbp_OrderingService_HttpApi_Host>("orderingService", profile);
+var paymentService = builder.AddProject<Projects.EShopOnAbp_PaymentService_HttpApi_Host>("paymentService", profile);
+
+// Gateways
+var webGateway = builder.AddProject<Projects.EShopOnAbp_WebGateway>("webGateway");
+var webPublicGateway = builder.AddProject<Projects.EShopOnAbp_WebPublicGateway>("webPublicGateway")
+    .WithReference(administrationService)
+    .WithReference(identityService)
+    .WithReference(catalogService)
+    .WithReference(basketService)
+    .WithReference(cmsKitService)
+    .WithReference(orderingService)
+    .WithReference(paymentService);
+
+// Apps
+var publicWebApp = builder.AddProject<Projects.EShopOnAbp_PublicWeb>("public-web", "https")
+    .WithExternalHttpEndpoints()
+    .WithReference(catalogService)
+    .WithReference(webPublicGateway);
+
+builder.Build().Run();

aspire/AppHost/Properties/launchSettings.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17286;http://localhost:15011",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21296",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22033"
+      }
+    },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:15011",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19089",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20048",
+        "ASPIRE_ALLOW_UNSECURED_TRANSPORT": "true"
+      }
+    }
+  }
+}

aspire/AppHost/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

aspire/AppHost/appsettings.json

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

aspire/AppHost/eShopOnAbp.AppHost.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireHost>true</IsAspireHost>
+    <UserSecretsId>40d1d3f9-6593-4f5a-9d74-ff6ea82eb14e</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.0-preview.7.24251.11" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\apps\public-web\src\EShopOnAbp.PublicWeb\EShopOnAbp.PublicWeb.csproj" />
+    <ProjectReference Include="..\..\gateways\web-public\src\EShopOnAbp.WebPublicGateway\EShopOnAbp.WebPublicGateway.csproj" />
+    <ProjectReference Include="..\..\gateways\web\src\EShopOnAbp.WebGateway\EShopOnAbp.WebGateway.csproj" />
+    <ProjectReference Include="..\..\services\administration\src\EShopOnAbp.AdministrationService.HttpApi.Host\EShopOnAbp.AdministrationService.HttpApi.Host.csproj" />
+    <ProjectReference Include="..\..\services\basket\src\EShopOnAbp.BasketService\EShopOnAbp.BasketService.csproj" />
+    <ProjectReference Include="..\..\services\catalog\src\EShopOnAbp.CatalogService.HttpApi.Host\EShopOnAbp.CatalogService.HttpApi.Host.csproj" />
+    <ProjectReference Include="..\..\services\cmskit\src\EShopOnAbp.CmskitService.HttpApi.Host\EShopOnAbp.CmskitService.HttpApi.Host.csproj" />
+    <ProjectReference Include="..\..\services\identity\src\EShopOnAbp.IdentityService.HttpApi.Host\EShopOnAbp.IdentityService.HttpApi.Host.csproj" />
+    <ProjectReference Include="..\..\services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Host\EShopOnAbp.OrderingService.HttpApi.Host.csproj" />
+    <ProjectReference Include="..\..\services\payment\src\EShopOnAbp.PaymentService.HttpApi.Host\EShopOnAbp.PaymentService.HttpApi.Host.csproj" />
+    <ProjectReference Include="..\..\shared\EShopOnAbp.Keycloak.DbMigrator\EShopOnAbp.Keycloak.DbMigrator.csproj" />
+  </ItemGroup>
+
+</Project>

aspire/ServiceDefaults/Extensions.cs

@@ -0,0 +1,115 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Microsoft.Extensions.Logging;
+using OpenTelemetry;
+using OpenTelemetry.Metrics;
+using OpenTelemetry.Trace;
+
+namespace Microsoft.Extensions.Hosting;
+
+public static class Extensions
+{
+    public static IHostApplicationBuilder AddServiceDefaults(this IHostApplicationBuilder builder)
+    {
+        builder.ConfigureOpenTelemetry();
+
+        builder.AddDefaultHealthChecks();
+
+        builder.Services.AddServiceDiscovery();
+
+        builder.Services.ConfigureHttpClientDefaults(http =>
+        {
+            // Turn on resilience by default
+            http.AddStandardResilienceHandler();
+
+            // Turn on service discovery by default
+            http.AddServiceDiscovery();
+        });
+
+        return builder;
+    }
+
+    public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicationBuilder builder)
+    {
+        builder.Logging.AddOpenTelemetry(logging =>
+        {
+            logging.IncludeFormattedMessage = true;
+            logging.IncludeScopes = true;
+        });
+
+        builder.Services.AddOpenTelemetry()
+            .WithMetrics(metrics =>
+            {
+                metrics.AddAspNetCoreInstrumentation()
+                    .AddHttpClientInstrumentation()
+                    .AddRuntimeInstrumentation();
+            })
+            .WithTracing(tracing =>
+            {
+                tracing.AddAspNetCoreInstrumentation()
+                    // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package)
+                    //.AddGrpcClientInstrumentation()
+                    .AddHttpClientInstrumentation();
+            });
+
+        builder.AddOpenTelemetryExporters();
+
+        return builder;
+    }
+
+    private static IHostApplicationBuilder AddOpenTelemetryExporters(this IHostApplicationBuilder builder)
+    {
+        var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]);
+
+        if (useOtlpExporter)
+        {
+            builder.Services.AddOpenTelemetry().UseOtlpExporter();
+        }
+
+        // Uncomment the following lines to enable the Prometheus exporter (requires the OpenTelemetry.Exporter.Prometheus.AspNetCore package)
+        // builder.Services.AddOpenTelemetry()
+        //    .WithMetrics(metrics => metrics.AddPrometheusExporter());
+
+        // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package)
+        //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"]))
+        //{
+        //    builder.Services.AddOpenTelemetry()
+        //       .UseAzureMonitor();
+        //}
+
+        return builder;
+    }
+
+    public static IHostApplicationBuilder AddDefaultHealthChecks(this IHostApplicationBuilder builder)
+    {
+        builder.Services.AddHealthChecks()
+            // Add a default liveness check to ensure app is responsive
+            .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]);
+
+        return builder;
+    }
+
+    public static WebApplication MapDefaultEndpoints(this WebApplication app)
+    {
+        // Adding health checks endpoints to applications in non-development environments has security implications.
+        // See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments.
+        if (app.Environment.IsDevelopment())
+        {
+            // All health checks must pass for app to be considered ready to accept traffic after starting
+            app.MapHealthChecks("/health");
+
+            // Only health checks tagged with the "live" tag must pass for app to be considered alive
+            app.MapHealthChecks("/alive", new HealthCheckOptions
+            {
+                Predicate = r => r.Tags.Contains("live")
+            });
+
+            // Uncomment the following line to enable the Prometheus endpoint (requires the OpenTelemetry.Exporter.Prometheus.AspNetCore package)
+            // app.MapPrometheusScrapingEndpoint();
+        }
+
+        return app;
+    }
+}

aspire/ServiceDefaults/eShopOnAbp.ServiceDefaults.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireSharedProject>true</IsAspireSharedProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.5.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
+  </ItemGroup>
+
+</Project>

etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml

@@ -107,10 +107,16 @@ data:
               { "PathRemovePrefix": "/swagger-json/Ordering" }
             ]
           },
-          "Cmskit Service": {
+          "Cmskit Public Service": {
             "ClusterId": "CmsKit",
             "Match": {
-              "Path": "/api/cmskit/{**everything}"
+              "Path": "/api/cms-kit-public/{**everything}"
+            }
+          },
+          "Cmskit Admin Service": {
+            "ClusterId": "CmsKit",
+            "Match": {
+              "Path": "/api/cms-kit-admin/{**everything}"
             }
           },
           "Cmskit Service Swagger": {

gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbp.WebPublicGateway.csproj

@@ -4,6 +4,10 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Gateways\EShopOnAbp.Shared.Hosting.Gateways.csproj" />
   </ItemGroup>

gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs

@@ -22,10 +22,11 @@ public class Program
             
             var builder = WebApplication.CreateBuilder(args);
             builder.Host
-                .AddAppSettingsSecretsJson()
                 .AddYarpJson()
                 .UseAutofac()
                 .UseSerilog();
+            
+            builder.AddServiceDefaults();
 
             await builder.AddApplicationAsync<EShopOnAbpWebPublicGatewayModule>();
             var app = builder.Build();
@@ -41,7 +42,7 @@ public class Program
         }
         finally
         {
-            Log.CloseAndFlush();
+            await Log.CloseAndFlushAsync();
         }
     }
 }

gateways/web-public/src/EShopOnAbp.WebPublicGateway/Properties/launchSettings.json

@@ -1,26 +1,18 @@
 {
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44373",
-      "sslPort": 0
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "HTTP": {
+      "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:5073",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "EShopOnAbp.PublicWebGateway": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44373",
+      "applicationUrl": "http://localhost:5073;https://localhost:44373",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json

@@ -64,13 +64,6 @@
           { "PathRemovePrefix": "/swagger-json/Catalog" }
         ]
       },
-      "ProductPictures": {
-        "ClusterId": "catalogCluster",
-        "Match": {
-          "Path": "/product-images/{**everything}",
-          "Methods": [ "GET" ]
-        }
-      },
       "Basket Service": {
         "ClusterId": "Basket",
         "Match": {
@@ -101,10 +94,16 @@
           { "PathRemovePrefix": "/swagger-json/Ordering" }
         ]
       },
-      "Cmskit Service": {
+      "Cmskit Public Service": {
+        "ClusterId": "CmsKit",
+        "Match": {
+          "Path": "/api/cms-kit-public/{**everything}"
+        }
+      },
+      "Cmskit Admin Service": {
         "ClusterId": "CmsKit",
         "Match": {
-          "Path": "/api/cmskit/{**everything}"
+          "Path": "/api/cms-kit-admin/{**everything}"
         }
       },
       "Cmskit Service Swagger": {
@@ -136,7 +135,7 @@
       "Identity": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44351",
+            "Address": "http://identityService",
             "MetaData": {
               "PublicAddress": "https://identity.eshoponabp.dev"
             }
@@ -146,7 +145,7 @@
       "Administration": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44353",
+            "Address": "http://administrationService",
             "MetaData": {
               "PublicAddress": "https://admininstration.eshop.dev"
             }
@@ -156,9 +155,9 @@
       "catalogCluster": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44354",
+            "Address": "http://catalogService",
             "MetaData": {
-              "PublicAddress": "https://admininstration.eshoponabp.dev"
+              "PublicAddress": "https://catalog.eshoponabp.dev"
             }
           }
         }
@@ -166,7 +165,7 @@
       "Basket": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44355",
+            "Address": "http://basketService",
             "MetaData": {
               "PublicAddress": "https://basket.eshoponabp.dev"
             }
@@ -176,7 +175,7 @@
       "Ordering": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44356",
+            "Address": "http://orderingService",
             "MetaData": {
               "PublicAddress": "https://ordering.eshoponabp.dev"
             }
@@ -186,7 +185,7 @@
       "CmsKit": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44358",
+            "Address": "http://cmsKitService",
             "MetaData": {
               "PublicAddress": "https://cmskit.eshoponabp.dev"
             }
@@ -196,7 +195,7 @@
       "Payment": {
         "Destinations": {
           "destination1": {
-            "Address": "https://localhost:44357",
+            "Address": "http://paymentService",
             "MetaData": {
               "PublicAddress": "https://payment.eshoponabp.dev"
             }

gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbp.WebGateway.csproj

@@ -5,6 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>    
     <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Gateways\EShopOnAbp.Shared.Hosting.Gateways.csproj" />
   </ItemGroup>
 

gateways/web/src/EShopOnAbp.WebGateway/Program.cs

@@ -26,6 +26,8 @@ public class Program
                 .UseAutofac()
                 .UseSerilog();
 
+            builder.AddServiceDefaults();
+
             await builder.AddApplicationAsync<EShopOnAbpWebGatewayModule>();
             var app = builder.Build();
             await app.InitializeApplicationAsync();

gateways/web/src/EShopOnAbp.WebGateway/Properties/launchSettings.json

@@ -1,26 +1,17 @@
 {
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44372",
-      "sslPort": 0
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "HTTP": {
+      "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:5072",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "EShopOnAbp.WebGateway": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44372",
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5072;https://localhost:44372",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj

@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.1.3" />
     
   </ItemGroup>
 

services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj

@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj

@@ -7,13 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj

@@ -10,10 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj

@@ -6,18 +6,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj

@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj

@@ -7,16 +7,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>    
     <ProjectReference Include="..\EShopOnAbp.AdministrationService.EntityFrameworkCore\EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\EShopOnAbp.AdministrationService.Application\EShopOnAbp.AdministrationService.Application.csproj" />
     <ProjectReference Include="..\EShopOnAbp.AdministrationService.HttpApi\EShopOnAbp.AdministrationService.HttpApi.csproj" />

services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Properties/launchSettings.json

@@ -1,24 +1,18 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44353",
-      "sslPort": 44353
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "http": {
+      "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:5053",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "EShopOnAbp.AdministrationService.HttpApi.Host": {
+    "https": {
       "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44353",
+      "applicationUrl": "http://localhost:5053;https://localhost:44353",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj

@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.EntityFrameworkCore\EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\EShopOnAbp.AdministrationService.TestBase\EShopOnAbp.AdministrationService.TestBase.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj

@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.TestBase" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="8.1.3" />
     <ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
   </ItemGroup>
 

services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj

@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.0.0" />
-        <PackageReference Include="Volo.Abp.Authorization" Version="8.0.0" />
-        <PackageReference Include="Volo.Abp.Validation" Version="8.0.0" />
+        <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.1.3" />
+        <PackageReference Include="Volo.Abp.Authorization" Version="8.1.3" />
+        <PackageReference Include="Volo.Abp.Validation" Version="8.1.3" />
     </ItemGroup>
 
     <ItemGroup>

services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs

@@ -154,13 +154,10 @@ public class BasketServiceModule : AbpModule
 
     private void ConfigureGrpc(ServiceConfigurationContext context)
     {
+        // context.Services.AddHttpForwarderWithServiceDiscovery();
         context.Services.AddGrpcClient<ProductPublic.ProductPublicClient>((services, options) =>
         {
-            var remoteServiceOptions = services.GetRequiredService<IOptionsMonitor<AbpRemoteServiceOptions>>().CurrentValue;
-            var catalogServiceConfiguration = remoteServiceOptions.RemoteServices.GetConfigurationOrDefault("Catalog");
-            var catalogGrpcUrl = catalogServiceConfiguration.GetOrDefault("GrpcUrl");
-
-            if (catalogGrpcUrl != null) options.Address = new Uri(catalogGrpcUrl);
+            options.Address = new Uri("http://_grpc.catalogService");
         });
     }
 

services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj

@@ -9,21 +9,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.19.3" />
-    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.42.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.42.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
-
-    <PackageReference Include="Volo.Abp.Http.Client" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Caching" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="8.0.0" />
+    <PackageReference Include="Google.Protobuf" Version="3.26.1" />
+    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.62.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.62.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.5" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.1" />
+
+    <PackageReference Include="Volo.Abp.Http.Client" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Caching" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>    
     <ProjectReference Include="..\EShopOnAbp.BasketService.Contracts\EShopOnAbp.BasketService.Contracts.csproj" />
     <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj" />
   </ItemGroup>

services/basket/src/EShopOnAbp.BasketService/Program.cs

@@ -12,10 +12,16 @@ public class Program
         SerilogConfigurationHelper.Configure(assemblyName);
 
         try
-        {
-            Log.Information($"Starting {assemblyName}.");
-            var app = await ApplicationBuilderHelper
-                .BuildApplicationAsync<BasketServiceModule>(args);
+        {Log.Information($"Starting {assemblyName}.");
+            var builder = WebApplication.CreateBuilder(args);
+            builder.Host
+                .UseAutofac()
+                .UseSerilog();
+            
+            builder.AddServiceDefaults();
+
+            await builder.AddApplicationAsync<BasketServiceModule>();
+            var app = builder.Build();
             await app.InitializeApplicationAsync();
             await app.RunAsync();
 
@@ -28,7 +34,7 @@ public class Program
         }
         finally
         {
-            Log.CloseAndFlush();
+            await Log.CloseAndFlushAsync();
         }
     }
 }

services/basket/src/EShopOnAbp.BasketService/Properties/launchSettings.json

@@ -1,24 +1,18 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44355"
-    }
-  },
   "profiles": {
-    "EShopOnAbp.BasketService": {
+    "http": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44355",
+      "applicationUrl": "http://localhost:5055",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:5055;https://localhost:44355",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

services/basket/src/EShopOnAbp.BasketService/appsettings.json

@@ -9,12 +9,6 @@
     "MetadataAddress": "http://localhost:8080/realms/master",
     "SwaggerClientId": "SwaggerClient"
   },
-  "RemoteServices": {
-    "Catalog": {
-      "BaseUrl": "https://localhost:44354/",
-      "GrpcUrl": "http://localhost:81"
-    }
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj

@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="Google.Protobuf" Version="3.19.3" />
     <PackageReference Include="Grpc.Core" Version="2.42.0" />
     <PackageReference Include="Grpc.Tools" Version="2.42.0" PrivateAssets="All" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj

@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Validation" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj

@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj

@@ -9,6 +9,10 @@
     <UserSecretsId>EShopOnAbp.CatalogService-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\EShopOnAbp.CatalogService.Application\EShopOnAbp.CatalogService.Application.csproj" />
     <ProjectReference Include="..\EShopOnAbp.CatalogService.MongoDB\EShopOnAbp.CatalogService.MongoDB.csproj" />
@@ -20,7 +24,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.42.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.62.0" />
   </ItemGroup>
 
   <ItemGroup>

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Program.cs

@@ -2,6 +2,10 @@
 using System.Threading.Tasks;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 
 namespace EShopOnAbp.CatalogService;
@@ -17,8 +21,26 @@ public class Program
         try
         {
             Log.Information($"Starting {assemblyName}.");
+            var builder = WebApplication.CreateBuilder(args);
+            builder.Host
+                .UseAutofac()
+                .UseSerilog();
+            
+            builder.AddServiceDefaults();
+            builder.WebHost.ConfigureKestrel(options =>
+            {
+                options.ListenAnyIP(5054, listenOptions =>
+                {
+                    listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
+                });
+                options.ListenAnyIP(8181, listenOptions =>
+                {
+                    listenOptions.Protocols = HttpProtocols.Http2;
+                });
+            });
 
-            var app = await ApplicationBuilderHelper.BuildApplicationAsync<CatalogServiceHttpApiHostModule>(args);
+            await builder.AddApplicationAsync<CatalogServiceHttpApiHostModule>();
+            var app = builder.Build();
             await app.InitializeApplicationAsync();
             await app.RunAsync();
 
@@ -31,7 +53,7 @@ public class Program
         }
         finally
         {
-            Log.CloseAndFlush();
+            await Log.CloseAndFlushAsync();
         }
     }
 }

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Properties/launchSettings.json

@@ -1,24 +1,18 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44354",
-      "sslPort": 44354
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "http": {
+      "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:5054",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "EShopOnAbp.CatalogService.HttpApi.Host": {
+    "https": {
       "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44354",
+      "applicationUrl": "http://localhost:5054;https://localhost:44354",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.Development.json

@@ -1,18 +1,18 @@
 {
-  "Kestrel": {
-    "Endpoints": {
-      "Http": {
-        "Url": "http://localhost:5000",
-        "Protocols": "Http1AndHttp2"
-      },
-      "Https": {
-        "Url": "https://localhost:44354",
-        "Protocols": "Http1AndHttp2"
-      },
-      "gRPC": {
-        "Url": "http://localhost:81",
-        "Protocols": "Http2"
-      }
-    }
-  }
+//  "Kestrel": {
+//    "Endpoints": {
+//      "Http": {
+//        "Url": "http://localhost:5000",
+//        "Protocols": "Http1AndHttp2"
+//      },
+//      "Https": {
+//        "Url": "https://localhost:44354",
+//        "Protocols": "Http1AndHttp2"
+//      },
+//      "gRPC": {
+//        "Url": "http://localhost:81",
+//        "Protocols": "Http2"
+//      }
+//    }
+//  }
 }

services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

services/catalog/src/EShopOnAbp.CatalogService.MongoDB/EShopOnAbp.CatalogService.MongoDB.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.MongoDB" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.MongoDB" Version="8.1.3" />
     <ProjectReference Include="..\EShopOnAbp.CatalogService.Domain\EShopOnAbp.CatalogService.Domain.csproj" />
   </ItemGroup>
 

services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="8.1.3" />
     <ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
   </ItemGroup>
 

services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj

@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.TestBase" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="8.1.3" />
     <ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.Domain\EShopOnAbp.CatalogService.Domain.csproj" />
   </ItemGroup>
 

services/cmskit/src/EShopOnAbp.CmskitService.Application.Contracts/EShopOnAbp.CmskitService.Application.Contracts.csproj

@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="8.0.0" />
-    <PackageReference Include="Volo.CmsKit.Application.Contracts" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="8.1.3" />
+    <PackageReference Include="Volo.CmsKit.Application.Contracts" Version="8.1.3" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.Domain.Shared\EShopOnAbp.CmskitService.Domain.Shared.csproj" />
   </ItemGroup>
 

services/cmskit/src/EShopOnAbp.CmskitService.Application/EShopOnAbp.CmskitService.Application.csproj

@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.0.0" />
-    <PackageReference Include="Volo.CmsKit.Application" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="8.1.3" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.1.3" />
+    <PackageReference Include="Volo.CmsKit.Application" Version="8.1.3" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.Domain\EShopOnAbp.CmskitService.Domain.csproj" />
   </ItemGroup>

services/cmskit/src/EShopOnAbp.CmskitService.Application/Samples/SampleAppService.cs

@@ -1,28 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-
-namespace EShopOnAbp.CmskitService.Samples;
-
-public class SampleAppService : CmskitServiceAppService, ISampleAppService
-{
-    public Task<SampleDto> GetAsync()
-    {
-        return Task.FromResult(
-            new SampleDto
-            {
-                Value = 42
-            }
-        );
-    }
-
-    [Authorize]
-    public Task<SampleDto> GetAuthorizedAsync()
-    {
-        return Task.FromResult(
-            new SampleDto
-            {
-                Value = 42
-            }
-        );
-    }
-}

services/cmskit/src/EShopOnAbp.CmskitService.Domain.Shared/EShopOnAbp.CmskitService.Domain.Shared.csproj

@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
-    <PackageReference Include="Volo.CmsKit.Domain.Shared" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
+    <PackageReference Include="Volo.CmsKit.Domain.Shared" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Validation" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/cmskit/src/EShopOnAbp.CmskitService.Domain/EShopOnAbp.CmskitService.Domain.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.0" />
-    <PackageReference Include="Volo.CmsKit.Domain" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.1.3" />
+    <PackageReference Include="Volo.CmsKit.Domain" Version="8.1.3" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.Domain.Shared\EShopOnAbp.CmskitService.Domain.Shared.csproj" />
   </ItemGroup>
 

services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/EShopOnAbp.CmskitService.EntityFrameworkCore.csproj

@@ -8,14 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/20240520210718_Abp_8_0_Update.Designer.cs

@@ -0,0 +1,205 @@
+// <auto-generated />
+using System;
+using EShopOnAbp.CmskitService.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace EShopOnAbp.CmskitService.Migrations
+{
+    [DbContext(typeof(CmskitServiceDbContext))]
+    [Migration("20240520210718_Abp_8_0_Update")]
+    partial class Abp_8_0_Update
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdempotencyToken")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<Guid?>("RepliedCommentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("Url")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "RepliedCommentId");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
+                    b.ToTable("CmsComments", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<short>("StarCount")
+                        .HasColumnType("smallint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId");
+
+                    b.ToTable("CmsRatings", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Email");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("EmailConfirmed");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsActive");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Name");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("PhoneNumberConfirmed");
+
+                    b.Property<string>("Surname")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Surname");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Email");
+
+                    b.HasIndex("TenantId", "UserName");
+
+                    b.ToTable("CmsUsers", (string)null);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/20240520210718_Abp_8_0_Update.cs

@@ -0,0 +1,120 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace EShopOnAbp.CmskitService.Migrations
+{
+    /// <inheritdoc />
+    public partial class Abp_8_0_Update : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "ExtraProperties",
+                table: "CmsUsers",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "CmsUsers",
+                type: "character varying(40)",
+                maxLength: 40,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(40)",
+                oldMaxLength: 40,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExtraProperties",
+                table: "CmsComments",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "CmsComments",
+                type: "character varying(40)",
+                maxLength: 40,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(40)",
+                oldMaxLength: 40,
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "IdempotencyToken",
+                table: "CmsComments",
+                type: "character varying(32)",
+                maxLength: 32,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Url",
+                table: "CmsComments",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IdempotencyToken",
+                table: "CmsComments");
+
+            migrationBuilder.DropColumn(
+                name: "Url",
+                table: "CmsComments");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExtraProperties",
+                table: "CmsUsers",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "CmsUsers",
+                type: "character varying(40)",
+                maxLength: 40,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(40)",
+                oldMaxLength: 40);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExtraProperties",
+                table: "CmsComments",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "CmsComments",
+                type: "character varying(40)",
+                maxLength: 40,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(40)",
+                oldMaxLength: 40);
+        }
+    }
+}

services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/Migrations/CmskitServiceDbContextModelSnapshot.cs

@@ -19,7 +19,7 @@ namespace EShopOnAbp.CmskitService.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
-                .HasAnnotation("ProductVersion", "6.0.5")
+                .HasAnnotation("ProductVersion", "8.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -31,6 +31,7 @@ namespace EShopOnAbp.CmskitService.Migrations
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
+                        .IsRequired()
                         .HasMaxLength(40)
                         .HasColumnType("character varying(40)")
                         .HasColumnName("ConcurrencyStamp");
@@ -54,9 +55,14 @@ namespace EShopOnAbp.CmskitService.Migrations
                         .HasColumnType("character varying(64)");
 
                     b.Property<string>("ExtraProperties")
+                        .IsRequired()
                         .HasColumnType("text")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<string>("IdempotencyToken")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
                     b.Property<Guid?>("RepliedCommentId")
                         .HasColumnType("uuid");
 
@@ -69,6 +75,10 @@ namespace EShopOnAbp.CmskitService.Migrations
                         .HasMaxLength(512)
                         .HasColumnType("character varying(512)");
 
+                    b.Property<string>("Url")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
                     b.HasKey("Id");
 
                     b.HasIndex("TenantId", "RepliedCommentId");
@@ -121,6 +131,7 @@ namespace EShopOnAbp.CmskitService.Migrations
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
+                        .IsRequired()
                         .HasMaxLength(40)
                         .HasColumnType("character varying(40)")
                         .HasColumnName("ConcurrencyStamp");
@@ -138,6 +149,7 @@ namespace EShopOnAbp.CmskitService.Migrations
                         .HasColumnName("EmailConfirmed");
 
                     b.Property<string>("ExtraProperties")
+                        .IsRequired()
                         .HasColumnType("text")
                         .HasColumnName("ExtraProperties");
 

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/CommentPublicClientProxy.Generated.cs → services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Comments/CommentPublicClientProxy.Generated.cs

@@ -1,15 +1,17 @@
 // This file is automatically generated by ABP framework to use MVC Controllers from CSharp
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using Volo.Abp;
 using Volo.Abp.Application.Dtos;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client;
 using Volo.Abp.Http.Client.ClientProxying;
+using Volo.Abp.Http.Modeling;
 using Volo.CmsKit.Public.Comments;
 
 // ReSharper disable once CheckNamespace
-namespace Volo.CmsKit.Public.Comments.ClientProxies;
+namespace Volo.CmsKit.Public.Comments;
 
 [Dependency(ReplaceServices = true)]
 [ExposeServices(typeof(ICommentPublicAppService), typeof(CommentPublicClientProxy))]

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/CommentPublicClientProxy.cs → services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Comments/CommentPublicClientProxy.cs

@@ -1,6 +1,6 @@
 // This file is part of CommentPublicClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
-namespace Volo.CmsKit.Public.Comments.ClientProxies;
+namespace Volo.CmsKit.Public.Comments;
 
 public partial class CommentPublicClientProxy
 {

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/RatingPublicClientProxy.Generated.cs → services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Ratings/RatingPublicClientProxy.Generated.cs

@@ -1,16 +1,17 @@
 // This file is automatically generated by ABP framework to use MVC Controllers from CSharp
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using Volo.Abp;
 using Volo.Abp.Application.Dtos;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client;
 using Volo.Abp.Http.Client.ClientProxying;
+using Volo.Abp.Http.Modeling;
 using Volo.CmsKit.Public.Ratings;
-using System.Collections.Generic;
 
 // ReSharper disable once CheckNamespace
-namespace Volo.CmsKit.Public.Ratings.ClientProxies;
+namespace Volo.CmsKit.Public.Ratings;
 
 [Dependency(ReplaceServices = true)]
 [ExposeServices(typeof(IRatingPublicAppService), typeof(RatingPublicClientProxy))]

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/RatingPublicClientProxy.cs → services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/Volo/CmsKit/Public/Ratings/RatingPublicClientProxy.cs

@@ -1,6 +1,6 @@
 // This file is part of RatingPublicClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
-namespace Volo.CmsKit.Public.Ratings.ClientProxies;
+namespace Volo.CmsKit.Public.Ratings;
 
 public partial class RatingPublicClientProxy
 {

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json

@@ -7,12 +7,99 @@
         "Volo.CmsKit.Public.Ratings.RatingPublicController": {
           "controllerName": "RatingPublic",
           "controllerGroupName": "RatingPublic",
-          "isRemoteService": false,
+          "isRemoteService": true,
+          "isIntegrationService": false,
           "apiVersion": null,
           "type": "Volo.CmsKit.Public.Ratings.RatingPublicController",
           "interfaces": [
             {
-              "type": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService"
+              "type": "Volo.CmsKit.Public.Ratings.IRatingPublicAppService",
+              "name": "IRatingPublicAppService",
+              "methods": [
+                {
+                  "name": "CreateAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "entityType",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "entityId",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "input",
+                      "typeAsString": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput, Volo.CmsKit.Public.Application.Contracts",
+                      "type": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput",
+                      "typeSimple": "Volo.CmsKit.Public.Ratings.CreateUpdateRatingInput",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.CmsKit.Public.Ratings.RatingDto",
+                    "typeSimple": "Volo.CmsKit.Public.Ratings.RatingDto"
+                  }
+                },
+                {
+                  "name": "DeleteAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "entityType",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "entityId",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "System.Void",
+                    "typeSimple": "System.Void"
+                  }
+                },
+                {
+                  "name": "GetGroupedStarCountsAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "entityType",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "entityId",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "System.Collections.Generic.List<Volo.CmsKit.Public.Ratings.RatingWithStarCountDto>",
+                    "typeSimple": "[Volo.CmsKit.Public.Ratings.RatingWithStarCountDto]"
+                  }
+                }
+              ]
             }
           ],
           "actions": {
@@ -212,12 +299,116 @@
         "Volo.CmsKit.Public.Comments.CommentPublicController": {
           "controllerName": "CommentPublic",
           "controllerGroupName": "CommentPublic",
-          "isRemoteService": false,
+          "isRemoteService": true,
+          "isIntegrationService": false,
           "apiVersion": null,
           "type": "Volo.CmsKit.Public.Comments.CommentPublicController",
           "interfaces": [
             {
-              "type": "Volo.CmsKit.Public.Comments.ICommentPublicAppService"
+              "type": "Volo.CmsKit.Public.Comments.ICommentPublicAppService",
+              "name": "ICommentPublicAppService",
+              "methods": [
+                {
+                  "name": "GetListAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "entityType",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "entityId",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.CmsKit.Public.Comments.CommentWithDetailsDto>",
+                    "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.CmsKit.Public.Comments.CommentWithDetailsDto>"
+                  }
+                },
+                {
+                  "name": "CreateAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "entityType",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "entityId",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "input",
+                      "typeAsString": "Volo.CmsKit.Public.Comments.CreateCommentInput, Volo.CmsKit.Public.Application.Contracts",
+                      "type": "Volo.CmsKit.Public.Comments.CreateCommentInput",
+                      "typeSimple": "Volo.CmsKit.Public.Comments.CreateCommentInput",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.CmsKit.Public.Comments.CommentDto",
+                    "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto"
+                  }
+                },
+                {
+                  "name": "UpdateAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "id",
+                      "typeAsString": "System.Guid, System.Private.CoreLib",
+                      "type": "System.Guid",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    },
+                    {
+                      "name": "input",
+                      "typeAsString": "Volo.CmsKit.Public.Comments.UpdateCommentInput, Volo.CmsKit.Public.Application.Contracts",
+                      "type": "Volo.CmsKit.Public.Comments.UpdateCommentInput",
+                      "typeSimple": "Volo.CmsKit.Public.Comments.UpdateCommentInput",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.CmsKit.Public.Comments.CommentDto",
+                    "typeSimple": "Volo.CmsKit.Public.Comments.CommentDto"
+                  }
+                },
+                {
+                  "name": "DeleteAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "id",
+                      "typeAsString": "System.Guid, System.Private.CoreLib",
+                      "type": "System.Guid",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "System.Void",
+                    "typeSimple": "System.Void"
+                  }
+                }
+              ]
             }
           ],
           "actions": {

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/EShopOnAbp.CmskitService.HttpApi.Client.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="8.0.0" />
-    <PackageReference Include="Volo.CmsKit.HttpApi.Client" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="8.1.3" />
+    <PackageReference Include="Volo.CmsKit.HttpApi.Client" Version="8.1.3" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
   </ItemGroup>
 

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.abppkg.json

@@ -1 +0,0 @@
-{}

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj

@@ -1,19 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\..\..\common.props" />
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>EShopOnAbp.CmskitService</RootNamespace>
+    <PreserveCompilationReferences>true</PreserveCompilationReferences>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj" />
   </ItemGroup>
@@ -22,7 +25,7 @@
     <ProjectReference Include="..\EShopOnAbp.CmskitService.Application\EShopOnAbp.CmskitService.Application.csproj" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.EntityFrameworkCore\EShopOnAbp.CmskitService.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.HttpApi\EShopOnAbp.CmskitService.HttpApi.csproj" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json

@@ -1,25 +1,18 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44358",
-      "sslPort": 44358
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "http": {
+      "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:5058",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "EShopOnAbp.CmskitService.HttpApi.Host": {
+    "https": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44358",
+      "applicationUrl": "http://localhost:5058;https://localhost:44358",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi/EShopOnAbp.CmskitService.HttpApi.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.0.0" />
-    <PackageReference Include="Volo.CmsKit.HttpApi" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.1.3" />
+    <PackageReference Include="Volo.CmsKit.HttpApi" Version="8.1.3" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
   </ItemGroup>
 

services/cmskit/src/EShopOnAbp.CmskitService.HttpApi/Samples/SampleController.cs

@@ -1,34 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp;
-
-namespace EShopOnAbp.CmskitService.Samples;
-
-[RemoteService(Name = CmskitServiceRemoteServiceConsts.RemoteServiceName)]
-[Area("CmskitService")]
-[ControllerName("CmskitService")]
-[Route("api/CmskitService/sample")]
-public class SampleController : CmskitServiceController, ISampleAppService
-{
-    private readonly ISampleAppService _sampleAppService;
-
-    public SampleController(ISampleAppService sampleAppService)
-    {
-        _sampleAppService = sampleAppService;
-    }
-
-    [HttpGet]
-    public async Task<SampleDto> GetAsync()
-    {
-        return await _sampleAppService.GetAsync();
-    }
-
-    [HttpGet]
-    [Route("authorized")]
-    [Authorize]
-    public async Task<SampleDto> GetAuthorizedAsync()
-    {
-        return await _sampleAppService.GetAsync();
-    }
-}

services/cmskit/test/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.1.3" />
     <ProjectReference Include="..\EShopOnAbp.CmskitService.TestBase\EShopOnAbp.CmskitService.TestBase.csproj" />
   </ItemGroup>
 

services/cmskit/test/EShopOnAbp.CmskitService.TestBase/EShopOnAbp.CmskitService.TestBase.csproj

@@ -12,9 +12,9 @@
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-        <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
-        <PackageReference Include="Volo.Abp.Authorization" Version="8.0.0" />
-        <PackageReference Include="Volo.Abp.TestBase" Version="8.0.0" />
+        <PackageReference Include="Volo.Abp.Autofac" Version="8.1.3" />
+        <PackageReference Include="Volo.Abp.Authorization" Version="8.1.3" />
+        <PackageReference Include="Volo.Abp.TestBase" Version="8.1.3" />
     </ItemGroup>
 
     <ItemGroup>

services/identity/src/EShopOnAbp.IdentityService.Application.Contracts/EShopOnAbp.IdentityService.Application.Contracts.csproj

@@ -10,7 +10,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="8.0.0" />
+        <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="8.1.3" />
     </ItemGroup>
 
 </Project>

services/identity/src/EShopOnAbp.IdentityService.Application/EShopOnAbp.IdentityService.Application.csproj

@@ -11,8 +11,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.BackgroundJobs" Version="8.0.0" />
-        <PackageReference Include="Volo.Abp.Identity.Application" Version="8.0.0" />
+        <PackageReference Include="Volo.Abp.BackgroundJobs" Version="8.1.3" />
+        <PackageReference Include="Volo.Abp.Identity.Application" Version="8.1.3" />
         <PackageReference Include="Keycloak.Net.Core" Version="1.0.20" />
     </ItemGroup>
 

services/identity/src/EShopOnAbp.IdentityService.Application/Identity/EShopIdentityUserAppService.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using EShopOnAbp.IdentityService.BackgroundJobs.Users;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
@@ -22,10 +23,12 @@ public class EShopIdentityUserAppService : IdentityUserAppService
         IIdentityUserRepository userRepository,
         IIdentityRoleRepository roleRepository,
         IOptions<IdentityOptions> identityOptions,
+        IPermissionChecker permissionChecker,
         IBackgroundJobManager backgroundJobManager) : base(userManager,
         userRepository,
         roleRepository,
-        identityOptions)
+        identityOptions,
+        permissionChecker)
     {
         _userRepository = userRepository;
         _roleRepository = roleRepository;

services/identity/src/EShopOnAbp.IdentityService.Domain.Shared/EShopOnAbp.IdentityService.Domain.Shared.csproj

@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="8.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup>

services/identity/src/EShopOnAbp.IdentityService.Domain/EShopOnAbp.IdentityService.Domain.csproj

@@ -10,7 +10,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Identity.Domain" Version="8.0.0" />
+        <PackageReference Include="Volo.Abp.Identity.Domain" Version="8.1.3" />
     </ItemGroup>
 
 </Project>

services/identity/src/EShopOnAbp.IdentityService.EntityFrameworkCore/EShopOnAbp.IdentityService.EntityFrameworkCore.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
@@ -16,8 +16,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.0.0" />
-        <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="8.0.0" />
+        <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.1.3" />
+        <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="8.1.3" />
     </ItemGroup>
 
 </Project>

services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/EShopOnAbp.IdentityService.HttpApi.Client.csproj

@@ -10,7 +10,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.0.0" />
+        <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.1.3" />
     </ItemGroup>
 
 </Project>