diff --git a/Directory.Build.props b/Directory.Build.props index 46818a04..449f7e16 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,8 @@ - 1.2.0-preview.5 - 1.2.1-preview.9 - 6.0.8 + net6.0 + 1.2.0-preview.* + 1.2.1-preview.* + 6.* diff --git a/src/ApiGateways/Caller/Masa.Alert.ApiGateways.Caller/Masa.Alert.ApiGateways.Caller.csproj b/src/ApiGateways/Caller/Masa.Alert.ApiGateways.Caller/Masa.Alert.ApiGateways.Caller.csproj index 2da48f44..d2bf161f 100644 --- a/src/ApiGateways/Caller/Masa.Alert.ApiGateways.Caller/Masa.Alert.ApiGateways.Caller.csproj +++ b/src/ApiGateways/Caller/Masa.Alert.ApiGateways.Caller/Masa.Alert.ApiGateways.Caller.csproj @@ -1,17 +1,16 @@  - - net6.0 - enable - enable - + + enable + enable + - - - - + + + + - + diff --git a/src/Application/Masa.Alert.Application.Contracts/Masa.Alert.Application.Contracts.csproj b/src/Application/Masa.Alert.Application.Contracts/Masa.Alert.Application.Contracts.csproj index 87f8bc90..ebfe5469 100644 --- a/src/Application/Masa.Alert.Application.Contracts/Masa.Alert.Application.Contracts.csproj +++ b/src/Application/Masa.Alert.Application.Contracts/Masa.Alert.Application.Contracts.csproj @@ -1,7 +1,6 @@  - net6.0 enable enable diff --git a/src/Application/Masa.Alert.Application/Masa.Alert.Application.csproj b/src/Application/Masa.Alert.Application/Masa.Alert.Application.csproj index 15ac87b1..f551bee0 100644 --- a/src/Application/Masa.Alert.Application/Masa.Alert.Application.csproj +++ b/src/Application/Masa.Alert.Application/Masa.Alert.Application.csproj @@ -1,36 +1,35 @@  - - net6.0 - enable - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + enable + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Contracts/Masa.Alert.Contracts.Admin/Masa.Alert.Contracts.Admin.csproj b/src/Contracts/Masa.Alert.Contracts.Admin/Masa.Alert.Contracts.Admin.csproj index c6aa7c68..b7d5d13a 100644 --- a/src/Contracts/Masa.Alert.Contracts.Admin/Masa.Alert.Contracts.Admin.csproj +++ b/src/Contracts/Masa.Alert.Contracts.Admin/Masa.Alert.Contracts.Admin.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Domain/Masa.Alert.Domain.Shared/Masa.Alert.Domain.Shared.csproj b/src/Domain/Masa.Alert.Domain.Shared/Masa.Alert.Domain.Shared.csproj index a626dcef..142b50fd 100644 --- a/src/Domain/Masa.Alert.Domain.Shared/Masa.Alert.Domain.Shared.csproj +++ b/src/Domain/Masa.Alert.Domain.Shared/Masa.Alert.Domain.Shared.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Domain/Masa.Alert.Domain/Masa.Alert.Domain.csproj b/src/Domain/Masa.Alert.Domain/Masa.Alert.Domain.csproj index 346bcf20..a71f72e1 100644 --- a/src/Domain/Masa.Alert.Domain/Masa.Alert.Domain.csproj +++ b/src/Domain/Masa.Alert.Domain/Masa.Alert.Domain.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Infrastructure/Masa.Alert.EntityFrameworkCore.PostgreSql/Masa.Alert.EntityFrameworkCore.PostgreSql.csproj b/src/Infrastructure/Masa.Alert.EntityFrameworkCore.PostgreSql/Masa.Alert.EntityFrameworkCore.PostgreSql.csproj index 35df1965..983fc4a2 100644 --- a/src/Infrastructure/Masa.Alert.EntityFrameworkCore.PostgreSql/Masa.Alert.EntityFrameworkCore.PostgreSql.csproj +++ b/src/Infrastructure/Masa.Alert.EntityFrameworkCore.PostgreSql/Masa.Alert.EntityFrameworkCore.PostgreSql.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Infrastructure/Masa.Alert.EntityFrameworkCore.SqlServer/Masa.Alert.EntityFrameworkCore.SqlServer.csproj b/src/Infrastructure/Masa.Alert.EntityFrameworkCore.SqlServer/Masa.Alert.EntityFrameworkCore.SqlServer.csproj index f312e34c..fb819a62 100644 --- a/src/Infrastructure/Masa.Alert.EntityFrameworkCore.SqlServer/Masa.Alert.EntityFrameworkCore.SqlServer.csproj +++ b/src/Infrastructure/Masa.Alert.EntityFrameworkCore.SqlServer/Masa.Alert.EntityFrameworkCore.SqlServer.csproj @@ -1,7 +1,6 @@  - net6.0 enable enable diff --git a/src/Infrastructure/Masa.Alert.EntityFrameworkCore/Masa.Alert.EntityFrameworkCore.csproj b/src/Infrastructure/Masa.Alert.EntityFrameworkCore/Masa.Alert.EntityFrameworkCore.csproj index b66ba90b..3d325de4 100644 --- a/src/Infrastructure/Masa.Alert.EntityFrameworkCore/Masa.Alert.EntityFrameworkCore.csproj +++ b/src/Infrastructure/Masa.Alert.EntityFrameworkCore/Masa.Alert.EntityFrameworkCore.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Infrastructure/Masa.Alert.Infrastructure.Cache/Masa.Alert.Infrastructure.Cache.csproj b/src/Infrastructure/Masa.Alert.Infrastructure.Cache/Masa.Alert.Infrastructure.Cache.csproj index 655eda83..f5169446 100644 --- a/src/Infrastructure/Masa.Alert.Infrastructure.Cache/Masa.Alert.Infrastructure.Cache.csproj +++ b/src/Infrastructure/Masa.Alert.Infrastructure.Cache/Masa.Alert.Infrastructure.Cache.csproj @@ -1,13 +1,12 @@ - net6.0 enable enable - + diff --git a/src/Infrastructure/Masa.Alert.Infrastructure.Common/Masa.Alert.Infrastructure.Common.csproj b/src/Infrastructure/Masa.Alert.Infrastructure.Common/Masa.Alert.Infrastructure.Common.csproj index 70ccb2cb..c81727a4 100644 --- a/src/Infrastructure/Masa.Alert.Infrastructure.Common/Masa.Alert.Infrastructure.Common.csproj +++ b/src/Infrastructure/Masa.Alert.Infrastructure.Common/Masa.Alert.Infrastructure.Common.csproj @@ -1,7 +1,6 @@  - net6.0 enable enable diff --git a/src/Infrastructure/Masa.Alert.Infrastructure.Constants/Masa.Alert.Infrastructure.Constants.csproj b/src/Infrastructure/Masa.Alert.Infrastructure.Constants/Masa.Alert.Infrastructure.Constants.csproj index 132c02c5..61538f60 100644 --- a/src/Infrastructure/Masa.Alert.Infrastructure.Constants/Masa.Alert.Infrastructure.Constants.csproj +++ b/src/Infrastructure/Masa.Alert.Infrastructure.Constants/Masa.Alert.Infrastructure.Constants.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Infrastructure/Masa.Alert.Infrastructure.Ddd.Application.Contracts/Masa.Alert.Infrastructure.Ddd.Application.Contracts.csproj b/src/Infrastructure/Masa.Alert.Infrastructure.Ddd.Application.Contracts/Masa.Alert.Infrastructure.Ddd.Application.Contracts.csproj index f3ef5343..c90f09c9 100644 --- a/src/Infrastructure/Masa.Alert.Infrastructure.Ddd.Application.Contracts/Masa.Alert.Infrastructure.Ddd.Application.Contracts.csproj +++ b/src/Infrastructure/Masa.Alert.Infrastructure.Ddd.Application.Contracts/Masa.Alert.Infrastructure.Ddd.Application.Contracts.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Infrastructure/Masa.Alert.Infrastructure.EntityFrameworkCore/Masa.Alert.Infrastructure.EntityFrameworkCore.csproj b/src/Infrastructure/Masa.Alert.Infrastructure.EntityFrameworkCore/Masa.Alert.Infrastructure.EntityFrameworkCore.csproj index c5e108dc..b576cade 100644 --- a/src/Infrastructure/Masa.Alert.Infrastructure.EntityFrameworkCore/Masa.Alert.Infrastructure.EntityFrameworkCore.csproj +++ b/src/Infrastructure/Masa.Alert.Infrastructure.EntityFrameworkCore/Masa.Alert.Infrastructure.EntityFrameworkCore.csproj @@ -1,13 +1,12 @@  - net6.0 enable enable - + diff --git a/src/Infrastructure/Masa.Alert.Infrastructure.Middleware/Masa.Alert.Infrastructure.Middleware.csproj b/src/Infrastructure/Masa.Alert.Infrastructure.Middleware/Masa.Alert.Infrastructure.Middleware.csproj index 8b3e3957..42d3097c 100644 --- a/src/Infrastructure/Masa.Alert.Infrastructure.Middleware/Masa.Alert.Infrastructure.Middleware.csproj +++ b/src/Infrastructure/Masa.Alert.Infrastructure.Middleware/Masa.Alert.Infrastructure.Middleware.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable @@ -10,7 +9,7 @@ - + diff --git a/src/Infrastructure/Masa.Alert.NotificationService.Provider.Mc/Masa.Alert.NotificationService.Provider.Mc.csproj b/src/Infrastructure/Masa.Alert.NotificationService.Provider.Mc/Masa.Alert.NotificationService.Provider.Mc.csproj index 34167413..efe739e4 100644 --- a/src/Infrastructure/Masa.Alert.NotificationService.Provider.Mc/Masa.Alert.NotificationService.Provider.Mc.csproj +++ b/src/Infrastructure/Masa.Alert.NotificationService.Provider.Mc/Masa.Alert.NotificationService.Provider.Mc.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable diff --git a/src/Services/Masa.Alert.Service/Infrastructure/Authentication/TokenGenerater.cs b/src/Services/Masa.Alert.Service/Infrastructure/Authentication/TokenGenerater.cs index 19f12edc..f998be42 100644 --- a/src/Services/Masa.Alert.Service/Infrastructure/Authentication/TokenGenerater.cs +++ b/src/Services/Masa.Alert.Service/Infrastructure/Authentication/TokenGenerater.cs @@ -46,12 +46,13 @@ public TokenProvider Generater() private async Task GetClientCredentialsTokenAsync() { - var accessToken = await _cacheContext.GetOrSetAsync(CacheKeys.ClientCredentialsTokenKey(_masaStackConfig.GetWebId(MasaStackProject.Alert)), + string accessToken = await _cacheContext.GetOrSetAsync(CacheKeys.ClientCredentialsTokenKey(_masaStackConfig.GetWebId(MasaStackProject.Alert)), async () => { + string url = _masaStackConfig.GetSsoDomain(); var request = new ClientCredentialsTokenRequest { - Address = _masaStackConfig.GetSsoDomain() + "/connect/token", + Address = $"{url}{(url.EndsWith('/') ? "" : "/")}connect/token", GrantType = BuildingBlocks.Authentication.OpenIdConnect.Models.Constans.GrantType.CLIENT_CREDENTIALS, ClientId = _masaStackConfig.GetWebId(MasaStackProject.Alert), Scope = "MasaStack" diff --git a/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj b/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj index 336975bd..6715144f 100644 --- a/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj +++ b/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj @@ -1,7 +1,6 @@  - net6.0 enable enable ..\..\..\docker-compose.dcproj diff --git a/src/Web/Masa.Alert.Web.Admin.Server/Masa.Alert.Web.Admin.Server.csproj b/src/Web/Masa.Alert.Web.Admin.Server/Masa.Alert.Web.Admin.Server.csproj index 95fb5c1a..5cfedd88 100644 --- a/src/Web/Masa.Alert.Web.Admin.Server/Masa.Alert.Web.Admin.Server.csproj +++ b/src/Web/Masa.Alert.Web.Admin.Server/Masa.Alert.Web.Admin.Server.csproj @@ -1,7 +1,6 @@ - net6.0 enable enable ..\..\..\docker-compose.dcproj diff --git a/src/Web/Masa.Alert.Web.Admin.WebAssembly/Masa.Alert.Web.Admin.WebAssembly.csproj b/src/Web/Masa.Alert.Web.Admin.WebAssembly/Masa.Alert.Web.Admin.WebAssembly.csproj index 2a94899e..28d4b463 100644 --- a/src/Web/Masa.Alert.Web.Admin.WebAssembly/Masa.Alert.Web.Admin.WebAssembly.csproj +++ b/src/Web/Masa.Alert.Web.Admin.WebAssembly/Masa.Alert.Web.Admin.WebAssembly.csproj @@ -1,14 +1,13 @@  - - net6.0 + enable enable - - + + diff --git a/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj b/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj index 45b71bce..9c4307fc 100644 --- a/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj +++ b/src/Web/Masa.Alert.Web.Admin/Masa.Alert.Web.Admin.csproj @@ -1,7 +1,6 @@  - net6.0 enable enable @@ -20,8 +19,8 @@ - - + +