From 4c85a93a9720c71e938cb5f077e8f6f76c8ed761 Mon Sep 17 00:00:00 2001 From: Eric Nguyen Date: Mon, 1 Jan 2024 17:41:38 +0700 Subject: [PATCH] clean mix mq --- src/Mixcore.sln | 7 ------ .../Controllers/SharedTenantApiController.cs | 8 +++++-- .../Domain/Models/AllSettingModel.cs | 1 + .../ViewModels/MixDatabaseViewModel.cs | 8 +++---- .../ViewModels/RepoDbMixDatabaseViewModel.cs | 8 +++---- .../mix.auth.service/mix.auth.service.csproj | 7 ++++++ .../mix.mq.lib/mix.mq.lib.csproj | 24 ------------------- .../mix.mq.server/mix.mq.server.csproj | 5 +++- 8 files changed, 26 insertions(+), 42 deletions(-) delete mode 100644 src/services/mix-message-queue/mix.mq.lib/mix.mq.lib.csproj diff --git a/src/Mixcore.sln b/src/Mixcore.sln index 03acee8b2..15391384b 100644 --- a/src/Mixcore.sln +++ b/src/Mixcore.sln @@ -119,8 +119,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.portal", "modules\mix.p EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mix-message-queue", "mix-message-queue", "{C93898B7-2001-4C29-9BBE-33A2E61C350A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.mq.lib", "services\mix-message-queue\mix.mq.lib\mix.mq.lib.csproj", "{70E0E3FE-11A6-4342-AFD7-D2E5E3CB2658}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mix-auth-service", "mix-auth-service", "{EC933357-1D95-4CDD-B290-7A5984FC1AA2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.auth.service", "services\mix-auth-service\mix.auth.service\mix.auth.service.csproj", "{D503F737-90E6-438F-ACB2-1074CACEE407}" @@ -281,10 +279,6 @@ Global {F5D4C70F-DD2E-4EC9-A191-56A717B1B5EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5D4C70F-DD2E-4EC9-A191-56A717B1B5EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5D4C70F-DD2E-4EC9-A191-56A717B1B5EE}.Release|Any CPU.Build.0 = Release|Any CPU - {70E0E3FE-11A6-4342-AFD7-D2E5E3CB2658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70E0E3FE-11A6-4342-AFD7-D2E5E3CB2658}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70E0E3FE-11A6-4342-AFD7-D2E5E3CB2658}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70E0E3FE-11A6-4342-AFD7-D2E5E3CB2658}.Release|Any CPU.Build.0 = Release|Any CPU {D503F737-90E6-438F-ACB2-1074CACEE407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D503F737-90E6-438F-ACB2-1074CACEE407}.Debug|Any CPU.Build.0 = Debug|Any CPU {D503F737-90E6-438F-ACB2-1074CACEE407}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -355,7 +349,6 @@ Global {5FA252B6-6FDA-451E-BE5E-F6D82EDE9AB1} = {4E880812-C336-4EB2-9FED-2E437957F50A} {F5D4C70F-DD2E-4EC9-A191-56A717B1B5EE} = {B4C40E02-E06A-4359-BDC5-349E103366AD} {C93898B7-2001-4C29-9BBE-33A2E61C350A} = {C0A05428-767E-46C5-A31F-0D220E41F7C5} - {70E0E3FE-11A6-4342-AFD7-D2E5E3CB2658} = {C93898B7-2001-4C29-9BBE-33A2E61C350A} {EC933357-1D95-4CDD-B290-7A5984FC1AA2} = {C0A05428-767E-46C5-A31F-0D220E41F7C5} {D503F737-90E6-438F-ACB2-1074CACEE407} = {EC933357-1D95-4CDD-B290-7A5984FC1AA2} {7C5101F3-E3E6-42DB-8585-D08C2BE5E30C} = {C93898B7-2001-4C29-9BBE-33A2E61C350A} diff --git a/src/modules/mix.common/Controllers/SharedTenantApiController.cs b/src/modules/mix.common/Controllers/SharedTenantApiController.cs index c0ae3521a..7b5176da7 100644 --- a/src/modules/mix.common/Controllers/SharedTenantApiController.cs +++ b/src/modules/mix.common/Controllers/SharedTenantApiController.cs @@ -20,6 +20,7 @@ public class SharedTenantApiController : MixTenantApiControllerBase private readonly ViewQueryRepository _configRepo; private readonly ViewQueryRepository _langRepo; private readonly MixAuthenticationConfigurations _authConfigurations; + private readonly MixEndpointService _endpointService; public SharedTenantApiController( IHttpContextAccessor httpContextAccessor, IConfiguration configuration, @@ -29,7 +30,8 @@ public SharedTenantApiController( AuthConfigService authConfigService, MixCmsContext context, IQueueService queueService, - IMixTenantService mixTenantService) + IMixTenantService mixTenantService, + MixEndpointService endpointService) : base(httpContextAccessor, configuration, cacheService, translator, mixIdentityService, queueService, mixTenantService) { @@ -38,6 +40,7 @@ public SharedTenantApiController( Uow = new(Context); _configRepo = MixConfigurationContentViewModel.GetRepository(Uow, CacheService); _langRepo = MixLanguageContentViewModel.GetRepository(Uow, CacheService); + _endpointService = endpointService; } #region Routes @@ -90,7 +93,8 @@ private async Task GetSettingsAsync(string lang = null, Cancell { GlobalSettings = CommonHelper.GetAppSettings(_authConfigurations, CurrentTenant), MixConfigurations = await _configRepo.GetListAsync(m => m.Specificulture == lang, cancellationToken), - Translator = _langRepo.GetListQuery(m => m.Specificulture == lang).ToList() + Translator = _langRepo.GetListQuery(m => m.Specificulture == lang).ToList(), + Endpoints = _endpointService.AppSettings }; } } diff --git a/src/modules/mix.common/Domain/Models/AllSettingModel.cs b/src/modules/mix.common/Domain/Models/AllSettingModel.cs index a85a7a19e..025ee3309 100644 --- a/src/modules/mix.common/Domain/Models/AllSettingModel.cs +++ b/src/modules/mix.common/Domain/Models/AllSettingModel.cs @@ -7,5 +7,6 @@ public class AllSettingModel public GlobalSettings GlobalSettings { get; set; } public List MixConfigurations { get; set; } public List Translator { get; set; } + public JObject Endpoints { get; set; } } } diff --git a/src/platform/mix.library/ViewModels/MixDatabaseViewModel.cs b/src/platform/mix.library/ViewModels/MixDatabaseViewModel.cs index 776a261b8..a06bad331 100644 --- a/src/platform/mix.library/ViewModels/MixDatabaseViewModel.cs +++ b/src/platform/mix.library/ViewModels/MixDatabaseViewModel.cs @@ -12,10 +12,10 @@ public sealed class MixDatabaseViewModel : TenantDataViewModelBase ReadPermissions { get; set; } + public List CreatePermissions { get; set; } + public List UpdatePermissions { get; set; } + public List DeletePermissions { get; set; } public bool SelfManaged { get; set; } public List Columns { get; set; } = new(); diff --git a/src/platform/mix.repodb/ViewModels/RepoDbMixDatabaseViewModel.cs b/src/platform/mix.repodb/ViewModels/RepoDbMixDatabaseViewModel.cs index 51d533c39..d36cd1c5d 100644 --- a/src/platform/mix.repodb/ViewModels/RepoDbMixDatabaseViewModel.cs +++ b/src/platform/mix.repodb/ViewModels/RepoDbMixDatabaseViewModel.cs @@ -15,10 +15,10 @@ public sealed class RepoDbMixDatabaseViewModel public string SystemName { get; set; } public MixDatabaseType Type { get; set; } = MixDatabaseType.Service; - public string ReadPermissions { get; set; } - public string CreatePermissions { get; set; } - public string UpdatePermissions { get; set; } - public string DeletePermissions { get; set; } + public List ReadPermissions { get; set; } + public List CreatePermissions { get; set; } + public List UpdatePermissions { get; set; } + public List DeletePermissions { get; set; } public bool SelfManaged { get; set; } public List Columns { get; set; } = new(); diff --git a/src/services/mix-auth-service/mix.auth.service/mix.auth.service.csproj b/src/services/mix-auth-service/mix.auth.service/mix.auth.service.csproj index a8fe10b8c..0c07d9c3f 100644 --- a/src/services/mix-auth-service/mix.auth.service/mix.auth.service.csproj +++ b/src/services/mix-auth-service/mix.auth.service/mix.auth.service.csproj @@ -11,6 +11,13 @@ ..\..\.. + + + + + + + diff --git a/src/services/mix-message-queue/mix.mq.lib/mix.mq.lib.csproj b/src/services/mix-message-queue/mix.mq.lib/mix.mq.lib.csproj deleted file mode 100644 index 2e50d43d2..000000000 --- a/src/services/mix-message-queue/mix.mq.lib/mix.mq.lib.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - net8.0 - enable - enable - Mix.Mq.Lib - - - - - - - - - - - - - - - - - diff --git a/src/services/mix-message-queue/mix.mq.server/mix.mq.server.csproj b/src/services/mix-message-queue/mix.mq.server/mix.mq.server.csproj index d299a4eec..2287a2148 100644 --- a/src/services/mix-message-queue/mix.mq.server/mix.mq.server.csproj +++ b/src/services/mix-message-queue/mix.mq.server/mix.mq.server.csproj @@ -15,11 +15,14 @@ + + + - +