Skip to content

Commit

Permalink
clean mix mq
Browse files Browse the repository at this point in the history
  • Loading branch information
@nhathoang989
nhathoang989 committed Jan 1, 2024
1 parent 6caa747 commit 4c85a93
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 42 deletions.
7 changes: 0 additions & 7 deletions src/Mixcore.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
8 changes: 6 additions & 2 deletions src/modules/mix.common/Controllers/SharedTenantApiController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class SharedTenantApiController : MixTenantApiControllerBase
private readonly ViewQueryRepository<MixCmsContext, MixConfigurationContent, int, MixConfigurationContentViewModel> _configRepo;
private readonly ViewQueryRepository<MixCmsContext, MixLanguageContent, int, MixLanguageContentViewModel> _langRepo;
private readonly MixAuthenticationConfigurations _authConfigurations;
private readonly MixEndpointService _endpointService;
public SharedTenantApiController(
IHttpContextAccessor httpContextAccessor,
IConfiguration configuration,
Expand All @@ -29,7 +30,8 @@ public SharedTenantApiController(
AuthConfigService authConfigService,
MixCmsContext context,
IQueueService<MessageQueueModel> queueService,
IMixTenantService mixTenantService)
IMixTenantService mixTenantService,
MixEndpointService endpointService)
: base(httpContextAccessor, configuration,
cacheService, translator, mixIdentityService, queueService, mixTenantService)
{
Expand All @@ -38,6 +40,7 @@ public SharedTenantApiController(
Uow = new(Context);
_configRepo = MixConfigurationContentViewModel.GetRepository(Uow, CacheService);
_langRepo = MixLanguageContentViewModel.GetRepository(Uow, CacheService);
_endpointService = endpointService;
}

#region Routes
Expand Down Expand Up @@ -90,7 +93,8 @@ private async Task<AllSettingModel> 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
};
}
}
Expand Down
1 change: 1 addition & 0 deletions src/modules/mix.common/Domain/Models/AllSettingModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ public class AllSettingModel
public GlobalSettings GlobalSettings { get; set; }
public List<MixConfigurationContentViewModel> MixConfigurations { get; set; }
public List<MixLanguageContent> Translator { get; set; }
public JObject Endpoints { get; set; }
}
}
8 changes: 4 additions & 4 deletions src/platform/mix.library/ViewModels/MixDatabaseViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ public sealed class MixDatabaseViewModel : TenantDataViewModelBase<MixCmsContext
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<string> ReadPermissions { get; set; }
public List<string> CreatePermissions { get; set; }
public List<string> UpdatePermissions { get; set; }
public List<string> DeletePermissions { get; set; }
public bool SelfManaged { get; set; }

public List<MixDatabaseColumnViewModel> Columns { get; set; } = new();
Expand Down
8 changes: 4 additions & 4 deletions src/platform/mix.repodb/ViewModels/RepoDbMixDatabaseViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> ReadPermissions { get; set; }
public List<string> CreatePermissions { get; set; }
public List<string> UpdatePermissions { get; set; }
public List<string> DeletePermissions { get; set; }
public bool SelfManaged { get; set; }

public List<MixDatabaseColumnViewModel> Columns { get; set; } = new();
Expand Down
7 changes: 7 additions & 0 deletions src/services/mix-auth-service/mix.auth.service/mix.auth.service.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
<DockerfileContext>..\..\..</DockerfileContext>
</PropertyGroup>

<ItemGroup>
<Compile Remove="mixcontent\templates\**" />
<Content Remove="mixcontent\templates\**" />
<EmbeddedResource Remove="mixcontent\templates\**" />
<None Remove="mixcontent\templates\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6-Preview.2" />
</ItemGroup>
Expand Down
24 changes: 0 additions & 24 deletions src/services/mix-message-queue/mix.mq.lib/mix.mq.lib.csproj
View file

This file was deleted.

5 changes: 4 additions & 1 deletion src/services/mix-message-queue/mix.mq.server/mix.mq.server.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.59.0" />
<PackageReference Include="Google.Protobuf" Version="3.25.1" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.59.0" />
<PackageReference Include="Grpc.AspNetCore.Web" Version="2.60.0-pre1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\applications\mixcore.host.aspire\mixcore.host.aspire.ServiceDefaults\mixcore.host.aspire.ServiceDefaults.csproj" />
<ProjectReference Include="..\mix.mq.lib\mix.mq.lib.csproj" />
<ProjectReference Include="..\..\..\platform\mix.queue\mix.queue.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 4c85a93

Please sign in to comment.