diff --git a/Directory.Build.props b/Directory.Build.props
index 43450655..ecab17c1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,5 @@
- 1.0.0-rc.3.5
+ 1.0.0-rc.4.2
diff --git a/src/Contracts/Masa.Mc.Contracts.Admin/Consts/MasaStackConsts.cs b/src/Contracts/Masa.Mc.Contracts.Admin/Consts/MasaStackConsts.cs
deleted file mode 100644
index 6862a08f..00000000
--- a/src/Contracts/Masa.Mc.Contracts.Admin/Consts/MasaStackConsts.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) MASA Stack All rights reserved.
-// Licensed under the Apache License. See LICENSE.txt in the project root for license information.
-
-namespace Masa.Mc.Contracts.Admin.Consts;
-
-public class MasaStackConsts
-{
- public const string AUTH_SYSTEM_ID = "auth";
- public const string PM_SYSTEM_ID = "pm";
- public const string DCC_SYSTEM_ID = "dcc";
- public const string MC_SYSTEM_ID = "mc";
-
- public const string ORGANIZATION_NAME = "MasaStack";
- public const string ORGANIZATION_DESCRIPTION = "MasaStack Root Department";
-}
diff --git a/src/Services/Masa.Mc.Service/Domain/MessageRecords/EventHandler/UpdateMessageRecordUserEventHandler.cs b/src/Services/Masa.Mc.Service/Domain/MessageRecords/EventHandler/UpdateMessageRecordUserEventHandler.cs
index 4956e00d..bd58903d 100644
--- a/src/Services/Masa.Mc.Service/Domain/MessageRecords/EventHandler/UpdateMessageRecordUserEventHandler.cs
+++ b/src/Services/Masa.Mc.Service/Domain/MessageRecords/EventHandler/UpdateMessageRecordUserEventHandler.cs
@@ -31,7 +31,7 @@ public async Task HandleEventAsync(UpdateMessageRecordUserEvent eto)
var user = await GetMessageRecordsUser(messageRecord);
- if (messageRecord.SystemId == MasaStackConsts.MC_SYSTEM_ID && user == null)
+ if (messageRecord.SystemId == MasaStackProject.MC.Name && user == null)
{
user = await CreateExternalUserAsync(messageRecord);
}
diff --git a/src/Services/Masa.Mc.Service/Infrastructure/ChannelUserFinder/Provider/Auth/AuthChannelUserFinder.cs b/src/Services/Masa.Mc.Service/Infrastructure/ChannelUserFinder/Provider/Auth/AuthChannelUserFinder.cs
index c4e212bc..5783b49a 100644
--- a/src/Services/Masa.Mc.Service/Infrastructure/ChannelUserFinder/Provider/Auth/AuthChannelUserFinder.cs
+++ b/src/Services/Masa.Mc.Service/Infrastructure/ChannelUserFinder/Provider/Auth/AuthChannelUserFinder.cs
@@ -70,24 +70,8 @@ public async Task> TransformUserReceivers(AppCh
private async Task> GetUserClientIds(AppChannel channel, List userIds)
{
- var userSystemDatas = await _authClient.UserService.GetSystemListDataAsync(userIds, $"{MasaStackConsts.MC_SYSTEM_ID}:{channel.Code}");
- return userIds.ToDictionary(x => x, x =>
- {
- var userSystemValue = userSystemDatas.GetValueOrDefault(x);
- if (userSystemValue == null)
- return string.Empty;
-
- var userSystemData = JsonSerializer.Deserialize(userSystemValue);
- return userSystemData?.ClientId ?? string.Empty;
- });
- //return userSystemDatas.ToDictionary(x => x.Key, x =>
- //{
- // var userSystemData = JsonSerializer.Deserialize(x.Value);
- // return userSystemData?.ClientId ?? string.Empty;
- //});
-
- //var userSystemDatas = await _authClient.UserService.GetSystemListDataAsync(userIds, $"{MasaStackConsts.MC_SYSTEM_ID}:{channel.Code}");
- //return userSystemDatas.ToDictionary(x => x.Key, x => x.Value.ClientId);
+ var userSystemDatas = await _authClient.UserService.GetSystemListDataAsync(userIds, $"{MasaStackProject.MC.Name}:{channel.Code}");
+ return userSystemDatas.ToDictionary(x => x.Key, x => x.Value?.ClientId ?? string.Empty);
}
private async Task> TransformDepartmentReceiversAsync(AppChannel channel, ExtraPropertyDictionary variables, IEnumerable receivers)
@@ -205,7 +189,7 @@ private async Task GetChannelUserIdentity(AppChannel Channel, Receiver r
{
if (Channel.Type == ChannelType.App)
{
- var userSystemData = await _authClient.UserService.GetSystemDataAsync(receiver.SubjectId, $"{MasaStackConsts.MC_SYSTEM_ID}:{Channel.Code}");
+ var userSystemData = await _authClient.UserService.GetSystemDataAsync(receiver.SubjectId, $"{MasaStackProject.MC.Name}:{Channel.Code}");
return userSystemData?.ClientId ?? string.Empty;
}
diff --git a/src/Services/Masa.Mc.Service/Infrastructure/MessageTaskJobService/MessageTaskHttpJobService.cs b/src/Services/Masa.Mc.Service/Infrastructure/MessageTaskJobService/MessageTaskHttpJobService.cs
index c66b7785..53c9bbe8 100644
--- a/src/Services/Masa.Mc.Service/Infrastructure/MessageTaskJobService/MessageTaskHttpJobService.cs
+++ b/src/Services/Masa.Mc.Service/Infrastructure/MessageTaskJobService/MessageTaskHttpJobService.cs
@@ -35,7 +35,7 @@ public async Task RegisterJobAsync(Guid jobId, Guid messageTaskId, string
var request = new UpsertSchedulerJobRequest
{
- ProjectIdentity = MasaStackConsts.MC_SYSTEM_ID,
+ ProjectIdentity = MasaStackProject.MC.Name,
Name = jobName,
JobType = JobTypes.Http,
CronExpression = cronExpression,
diff --git a/src/Services/Masa.Mc.Service/Services/MessageTaskService.cs b/src/Services/Masa.Mc.Service/Services/MessageTaskService.cs
index 3fbe3e54..38e00add 100644
--- a/src/Services/Masa.Mc.Service/Services/MessageTaskService.cs
+++ b/src/Services/Masa.Mc.Service/Services/MessageTaskService.cs
@@ -192,7 +192,7 @@ public async Task ResendAsync(IEventBus eventBus, Guid id)
[RoutePattern(HttpMethod = "Post")]
public async Task BindClientIdAsync([FromServices] IMasaConfiguration configuration, [FromServices] IAuthClient authClient, BindClientIdInputDto inputDto)
{
- var systemId = $"{MasaStackConsts.MC_SYSTEM_ID}:{inputDto.ChannelCode}";
+ var systemId = $"{MasaStackProject.MC.Name}:{inputDto.ChannelCode}";
var userSystemData = await authClient.UserService.GetSystemDataAsync(systemId) ?? new();
userSystemData.ClientId = inputDto.ClientId;
await authClient.UserService.UpsertSystemDataAsync(systemId, userSystemData);
diff --git a/src/Web/Masa.Mc.Web.Admin/Masa.Mc.Web.Admin.csproj b/src/Web/Masa.Mc.Web.Admin/Masa.Mc.Web.Admin.csproj
index e067b804..f08462c4 100644
--- a/src/Web/Masa.Mc.Web.Admin/Masa.Mc.Web.Admin.csproj
+++ b/src/Web/Masa.Mc.Web.Admin/Masa.Mc.Web.Admin.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageCreateModal.razor.cs b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageCreateModal.razor.cs
index c37a7cb1..83819832 100644
--- a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageCreateModal.razor.cs
+++ b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageCreateModal.razor.cs
@@ -9,7 +9,7 @@ public partial class OrdinaryMessageCreateModal : AdminCompontentBase
public EventCallback OnOk { get; set; }
private MForm? _form;
- private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackProject.MC.Name };
private bool _visible;
private List _channelItems = new();
private List _selectReceivers = new();
@@ -89,7 +89,7 @@ private async Task HandleOkAsync()
private void ResetForm()
{
- _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackProject.MC.Name };
_selectReceivers = new();
_importReceivers = new();
_selectReceiverType = false;
diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageEditModal.razor.cs b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageEditModal.razor.cs
index 3aaaf1e7..6463c06b 100644
--- a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageEditModal.razor.cs
+++ b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/OrdinaryMessageEditModal.razor.cs
@@ -9,7 +9,7 @@ public partial class OrdinaryMessageEditModal : AdminCompontentBase
public EventCallback OnOk { get; set; }
private MForm? _form;
- private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackProject.MC.Name };
private Guid _entityId;
private bool _visible;
private List _channelItems = new();
@@ -114,7 +114,7 @@ private async Task HandleOkAsync()
private void ResetForm()
{
- _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ _model = new() { EntityType = MessageEntityTypes.Ordinary, SystemId = MasaStackProject.MC.Name };
_selectReceivers = new();
_importReceivers = new();
_selectReceiverType = false;
diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageCreateModal.razor.cs b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageCreateModal.razor.cs
index 63a40394..32cc0ca9 100644
--- a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageCreateModal.razor.cs
+++ b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageCreateModal.razor.cs
@@ -9,7 +9,7 @@ public partial class TemplateMessageCreateModal : AdminCompontentBase
public EventCallback OnOk { get; set; }
private MForm? _form;
- private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackProject.MC.Name };
private bool _visible;
private List _templateItems = new();
private MessageTemplateDto _messageInfo = new();
@@ -82,7 +82,7 @@ private async Task HandleOkAsync()
private void ResetForm()
{
- _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackProject.MC.Name };
_selectReceivers = new();
_importReceivers = new();
_selectReceiverType = false;
diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageEditModal.razor.cs b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageEditModal.razor.cs
index 07330660..74147e44 100644
--- a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageEditModal.razor.cs
+++ b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/TemplateMessageEditModal.razor.cs
@@ -9,7 +9,7 @@ public partial class TemplateMessageEditModal : AdminCompontentBase
public EventCallback OnOk { get; set; }
private MForm? _form;
- private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ private MessageTaskUpsertModel _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackProject.MC.Name };
private Guid _entityId;
private bool _visible;
private List _templateItems = new();
@@ -110,7 +110,7 @@ private async Task HandleOkAsync()
private void ResetForm()
{
- _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackConsts.MC_SYSTEM_ID };
+ _model = new() { EntityType = MessageEntityTypes.Template, SystemId = MasaStackProject.MC.Name };
_selectReceivers = new();
_importReceivers = new();
_selectReceiverType = false;
diff --git a/src/Web/Masa.Mc.Web.Admin/_Imports.cs b/src/Web/Masa.Mc.Web.Admin/_Imports.cs
index c70b1ec1..8a02a544 100644
--- a/src/Web/Masa.Mc.Web.Admin/_Imports.cs
+++ b/src/Web/Masa.Mc.Web.Admin/_Imports.cs
@@ -76,4 +76,5 @@
global using Masa.BuildingBlocks.StackSdks.Auth;
global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
global using Masa.Stack.Components.Extensions;
-global using Masa.Contrib.StackSdks.Mc.Infrastructure.Extensions;
\ No newline at end of file
+global using Masa.Contrib.StackSdks.Mc.Infrastructure.Extensions;
+global using Masa.Contrib.StackSdks.Config;
\ No newline at end of file