diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/AdminServiceModule.cs b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/AdminServiceModule.cs index a751ca3fc..bd5704c52 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/AdminServiceModule.cs +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/AdminServiceModule.cs @@ -36,7 +36,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; using Volo.Abp.Caching.StackExchangeRedis; -using Volo.Abp.Http.Client; +using Volo.Abp.Http.Client.IdentityModel.Web; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.PermissionManagement.OpenIddict; @@ -93,7 +93,7 @@ namespace LINGYUN.Abp.MicroService.AdminService; typeof(AbpDataDbMigratorModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(AbpEmailingExceptionHandlingModule), - typeof(AbpHttpClientModule), + typeof(AbpHttpClientIdentityModelWebModule), typeof(AbpSmsPlatformModule), typeof(AbpEmailingPlatformModule), typeof(AbpCachingStackExchangeRedisModule), diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/LINGYUN.Abp.MicroService.AdminService.csproj b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/LINGYUN.Abp.MicroService.AdminService.csproj index a7916e170..fab5d84a2 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/LINGYUN.Abp.MicroService.AdminService.csproj +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/LINGYUN.Abp.MicroService.AdminService.csproj @@ -30,7 +30,7 @@ - + diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.Development.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.Development.json index 7901df684..16d4e2906 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.Development.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.Development.json @@ -59,9 +59,17 @@ "SwaggerClientId": "vue-oauth-client" }, "RemoteServices": { + "Default": { + "BaseUrl": "http://localhost:30000", + "UseCurrentAccessToken": true + }, + "BlobManagement": { + "BaseUrl": "http://localhost:30025", + "UseCurrentAccessToken": true + }, "Platform": { "BaseUrl": "http://localhost:30025", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true } }, "Logging": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.Development.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.Development.json index e0ab7ab27..128c684cf 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.Development.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.Development.json @@ -85,13 +85,17 @@ "ContainerName": "users" }, "RemoteServices": { + "Default": { + "BaseUrl": "http://localhost:30000", + "UseCurrentAccessToken": true + }, "BlobManagement": { "BaseUrl": "http://localhost:30025", "UseCurrentAccessToken": true }, "Platform": { "BaseUrl": "http://localhost:30025", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true } }, "AuthServer": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.Development.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.Development.json index fbc9c877b..9feb3543a 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.Development.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.Development.json @@ -71,13 +71,17 @@ "InstanceName": "LINGYUN.Abp.Application" }, "RemoteServices": { + "Default": { + "BaseUrl": "http://localhost:30000", + "UseCurrentAccessToken": true + }, "BlobManagement": { "BaseUrl": "http://localhost:30025", "UseCurrentAccessToken": true }, "Platform": { "BaseUrl": "http://localhost:30025", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true } }, "AuthServer": { diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs index 6001490f1..e3990340d 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs @@ -38,6 +38,7 @@ using Volo.Abp.Autofac; using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Http.Client; +using Volo.Abp.Http.Client.IdentityModel.Web; using Volo.Abp.Modularity; using Volo.Abp.OpenIddict.EntityFrameworkCore; using Volo.Abp.PermissionManagement.EntityFrameworkCore; @@ -75,12 +76,12 @@ namespace LY.MicroService.AuthServer; typeof(AbpEmailingExceptionHandlingModule), typeof(AbpBlobStoringBlobManagementModule), typeof(AbpCAPEventBusModule), - typeof(AbpHttpClientModule), typeof(AbpSmsPlatformModule), typeof(AbpEmailingPlatformModule), typeof(AbpCachingStackExchangeRedisModule), typeof(AbpLocalizationCultureMapModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), + typeof(AbpHttpClientIdentityModelWebModule), typeof(AbpIdentitySessionAspNetCoreModule), typeof(AbpAspNetCoreHttpOverridesModule), typeof(AbpAspNetCoreMvcWrapperModule), diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj index a513ec357..0228d65d9 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj @@ -32,7 +32,7 @@ - + diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json index bf1b51f3a..3fcc8880d 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json @@ -82,15 +82,15 @@ "RemoteServices": { "Default": { "BaseUrl": "http://localhost:30000", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true }, "BlobManagement": { "BaseUrl": "http://localhost:30025", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true }, "Platform": { "BaseUrl": "http://localhost:30025", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true } }, "AuthServer": { diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs index 1d907ed24..86093fdb6 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs @@ -37,6 +37,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; using Volo.Abp.Caching.StackExchangeRedis; +using Volo.Abp.Http.Client.IdentityModel.Web; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.Identity; @@ -74,6 +75,7 @@ namespace LY.MicroService.AuthServer; typeof(AbpAspNetCoreMultiTenancyModule), typeof(AbpAspNetCoreMvcWrapperModule), typeof(AbpAspNetCoreHttpOverridesModule), + typeof(AbpHttpClientIdentityModelWebModule), typeof(AbpTelemetryOpenTelemetryModule), typeof(AbpTelemetrySkyWalkingModule), typeof(AbpExporterMiniSoftwareModule), diff --git a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj index 8d785dcde..cdc357f83 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj +++ b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj @@ -36,6 +36,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json index 6ce89b28b..71a38fe74 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json @@ -91,9 +91,17 @@ "InstanceName": "LINGYUN.Abp.Application" }, "RemoteServices": { + "Default": { + "BaseUrl": "http://localhost:30000", + "UseCurrentAccessToken": true + }, + "BlobManagement": { + "BaseUrl": "http://localhost:30025", + "UseCurrentAccessToken": true + }, "Platform": { "BaseUrl": "http://localhost:30025", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true } }, "AuthServer": { diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json index fc5dcae85..1b19b6931 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json @@ -70,11 +70,15 @@ "RemoteServices": { "Default": { "BaseUrl": "http://localhost:30000", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true + }, + "BlobManagement": { + "BaseUrl": "http://localhost:30025", + "UseCurrentAccessToken": true }, "Platform": { "BaseUrl": "http://localhost:30025", - "UseCurrentAccessToken": false + "UseCurrentAccessToken": true } }, "Logging": { diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.Gateway/yarp.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.Gateway/yarp.json index 0b523b419..e6c6a637f 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.Gateway/yarp.json +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.Gateway/yarp.json @@ -293,6 +293,21 @@ } ] }, + "setting-management-v2-route": { + "ClusterId": "admin-service-cluster", + "Match": { + "Path": "/api/v2/setting-management/{**everything}" + }, + "Transforms": [ + { + "HeaderPrefix": "X-Forwarded-", + "X-Forwarded": "Append" + }, + { + "ResponseHeadersAllowed": "_AbpWrapResult;_AbpDontWrapResult;_AbpErrorFormat" + } + ] + }, "localization-management-route": { "ClusterId": "localization-service-cluster", "Match": {