diff --git a/etc/azure/Dockerfile.base b/etc/azure/Dockerfile.base index 5b67d38..3655948 100644 --- a/etc/azure/Dockerfile.base +++ b/etc/azure/Dockerfile.base @@ -1,3 +1,3 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /app COPY . . \ No newline at end of file diff --git a/etc/azure/azurepipelines.yml b/etc/azure/azurepipelines.yml index 5614439..fe65fa0 100644 --- a/etc/azure/azurepipelines.yml +++ b/etc/azure/azurepipelines.yml @@ -217,4 +217,4 @@ stages: inputs: targetPath: '$(Build.SourcesDirectory)/eventhub/etc/k8s/helm-chart/eventhub' artifact: helm - publishLocation: pipeline \ No newline at end of file + publishLocation: pipeline diff --git a/src/EventHub.Admin.HttpApi.Host/Dockerfile b/src/EventHub.Admin.HttpApi.Host/Dockerfile index 3ff577d..1e651c9 100644 --- a/src/EventHub.Admin.HttpApi.Host/Dockerfile +++ b/src/EventHub.Admin.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ - FROM mcr.microsoft.com/dotnet/aspnet:8.0 + FROM mcr.microsoft.com/dotnet/aspnet:9.0 COPY bin/Release/net9.0/publish/ app/ WORKDIR /app EXPOSE 80 diff --git a/src/EventHub.Admin.HttpApi.Host/Dockerfile.azure b/src/EventHub.Admin.HttpApi.Host/Dockerfile.azure index 0067a91..ee5ac5a 100644 --- a/src/EventHub.Admin.HttpApi.Host/Dockerfile.azure +++ b/src/EventHub.Admin.HttpApi.Host/Dockerfile.azure @@ -5,7 +5,7 @@ FROM ${BASE_IMAGE} AS base WORKDIR /app/eventhub/src/EventHub.Admin.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS publish +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS publish WORKDIR /app EXPOSE 80 ENV ASPNETCORE_URLS=http://+:80 diff --git a/src/EventHub.BackgroundServices/Dockerfile b/src/EventHub.BackgroundServices/Dockerfile index 4bb545b..0ecb572 100644 --- a/src/EventHub.BackgroundServices/Dockerfile +++ b/src/EventHub.BackgroundServices/Dockerfile @@ -1,4 +1,4 @@ - FROM mcr.microsoft.com/dotnet/aspnet:8.0 + FROM mcr.microsoft.com/dotnet/aspnet:9.0 COPY bin/Release/net9.0/ app/ WORKDIR /app EXPOSE 80 diff --git a/src/EventHub.BackgroundServices/Dockerfile.azure b/src/EventHub.BackgroundServices/Dockerfile.azure index 88eec18..d629a07 100644 --- a/src/EventHub.BackgroundServices/Dockerfile.azure +++ b/src/EventHub.BackgroundServices/Dockerfile.azure @@ -5,7 +5,7 @@ FROM ${BASE_IMAGE} AS base WORKDIR /app/eventhub/src/EventHub.BackgroundServices RUN dotnet publish -c Release -o bin/Release/publish -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS publish +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS publish WORKDIR /app EXPOSE 80 ENV ASPNETCORE_URLS=http://+:80 diff --git a/src/EventHub.DbMigrator/Dockerfile b/src/EventHub.DbMigrator/Dockerfile index a3a2b0c..9fc2d67 100644 --- a/src/EventHub.DbMigrator/Dockerfile +++ b/src/EventHub.DbMigrator/Dockerfile @@ -1,4 +1,4 @@ - FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy + FROM mcr.microsoft.com/dotnet/aspnet:9.0-jammy COPY bin/Release/net9.0/ app/ WORKDIR /app EXPOSE 80 diff --git a/src/EventHub.DbMigrator/Dockerfile.azure b/src/EventHub.DbMigrator/Dockerfile.azure index 883281e..786c5e8 100644 --- a/src/EventHub.DbMigrator/Dockerfile.azure +++ b/src/EventHub.DbMigrator/Dockerfile.azure @@ -5,7 +5,7 @@ FROM ${BASE_IMAGE} AS base WORKDIR /app/eventhub/src/EventHub.DbMigrator RUN dotnet publish -c Release -o bin/Release/publish -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS publish +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS publish WORKDIR /app COPY --from=base /app/eventhub/src/EventHub.DbMigrator/bin/Release/publish . ENTRYPOINT ["dotnet", "EventHub.DbMigrator.dll"] \ No newline at end of file diff --git a/src/EventHub.HttpApi.Host/Dockerfile b/src/EventHub.HttpApi.Host/Dockerfile index eec80a0..aa76c3b 100644 --- a/src/EventHub.HttpApi.Host/Dockerfile +++ b/src/EventHub.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ - FROM mcr.microsoft.com/dotnet/aspnet:8.0 + FROM mcr.microsoft.com/dotnet/aspnet:9.0 COPY bin/Release/net9.0/publish/ app/ WORKDIR /app EXPOSE 80 diff --git a/src/EventHub.HttpApi.Host/Dockerfile.azure b/src/EventHub.HttpApi.Host/Dockerfile.azure index 9c3795e..658c801 100644 --- a/src/EventHub.HttpApi.Host/Dockerfile.azure +++ b/src/EventHub.HttpApi.Host/Dockerfile.azure @@ -5,7 +5,7 @@ FROM ${BASE_IMAGE} AS base WORKDIR /app/eventhub/src/EventHub.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS publish +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS publish WORKDIR /app EXPOSE 80 ENV ASPNETCORE_URLS=http://+:80 diff --git a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs index be166b5..bea3856 100644 --- a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs +++ b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs @@ -176,7 +176,8 @@ namespace EventHub { builder .WithOrigins( - EventHubUrlOptions.GetWwwConfigValue(configuration) + EventHubUrlOptions.GetWwwConfigValue(configuration), + EventHubUrlOptions.GetAdminConfigValue(configuration) ) .WithAbpExposedHeaders() .SetIsOriginAllowedToAllowWildcardSubdomains() diff --git a/src/EventHub.IdentityServer/Dockerfile b/src/EventHub.IdentityServer/Dockerfile index 55ba98e..a97966b 100644 --- a/src/EventHub.IdentityServer/Dockerfile +++ b/src/EventHub.IdentityServer/Dockerfile @@ -1,4 +1,4 @@ - FROM mcr.microsoft.com/dotnet/aspnet:8.0 + FROM mcr.microsoft.com/dotnet/aspnet:9.0 COPY bin/Release/net9.0/publish/ app/ WORKDIR /app EXPOSE 80 diff --git a/src/EventHub.IdentityServer/Dockerfile.azure b/src/EventHub.IdentityServer/Dockerfile.azure index 97c0874..6e797c2 100644 --- a/src/EventHub.IdentityServer/Dockerfile.azure +++ b/src/EventHub.IdentityServer/Dockerfile.azure @@ -5,7 +5,7 @@ FROM ${BASE_IMAGE} AS base WORKDIR /app/eventhub/src/EventHub.IdentityServer RUN dotnet publish -c Release -o bin/Release/publish -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS publish +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS publish WORKDIR /app EXPOSE 80 ENV ASPNETCORE_URLS=http://+:80 diff --git a/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj b/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj index a686d69..2134161 100644 --- a/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj +++ b/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml b/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml index c088de1..f890a83 100644 --- a/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml +++ b/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml @@ -1,4 +1,5 @@ -page "/Account/LoggedOut" +@page "/Account/LoggedOut" + @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.Account.Localization @using Volo.Abp.Account.Web.Pages.Account @@ -18,18 +19,19 @@ page "/Account/LoggedOut" @section styles { } - - - - @L["LoggedOutTitle"] - @L["LoggedOutText"] - @if (Model.PostLogoutRedirectUri != null) - { - @L["ReturnToText"] - } - @if (Model.SignOutIframeUrl != null) - { - - } - - \ No newline at end of file +
+ + + @L["LoggedOutTitle"] + @L["LoggedOutText"] + @if (Model.PostLogoutRedirectUri != null) + { + @L["ReturnToText"] + } + @if (Model.SignOutIframeUrl != null) + { + + } + + +
\ No newline at end of file diff --git a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml index a8bb708..46dd030 100644 --- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml +++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml @@ -13,11 +13,13 @@ @inject IOptions UrlOptions @{ - var returnUrl = WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()); + var returnUrl = WebUtility.UrlEncode(Context.Request.Query.ContainsKey("returnUrl") ? Context.Request.Query["returnUrl"] : Context.Request.GetEncodedPathAndQuery()); + if (returnUrl.IsNullOrWhiteSpace()) { returnUrl = "/"; } + }