chore : from main

masastack · Feb 24, 2023 · 1083322 · 1083322
2 parents 6caef74 + 5d28fb6
commit 1083322
Show file tree

Hide file tree

Showing 46 changed files with 2,224 additions and 1,073 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <MasaFrameworkPackageVersion>0.7.0-preview.25</MasaFrameworkPackageVersion>
+    <MasaFrameworkPackageVersion>1.0.0-preview.9</MasaFrameworkPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Masa.Mc.ApiGateways.Caller.csproj b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Masa.Mc.ApiGateways.Caller.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Contrib.Service.Caller" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Service.Caller.Authentication.OpenIdConnect" Version="$(MasaFrameworkPackageVersion)" />
   </ItemGroup>
 

diff --git a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/McCaller.cs b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/McCaller.cs
@@ -41,14 +41,11 @@ public class McCaller : HttpClientCallerBase
 
     protected override string BaseAddress { get; set; }
 
-    public override string Name { get; set; }
-
     public McCaller(
         IServiceProvider serviceProvider,
         TokenProvider tokenProvider,
         McApiOptions options) : base(serviceProvider)
     {
-        Name = nameof(McCaller);
         BaseAddress = options.McServiceBaseAddress;
         _tokenProvider = tokenProvider;
     }

diff --git a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/ServiceCollectionExtensions.cs b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/ServiceCollectionExtensions.cs
@@ -13,7 +13,7 @@ public static IServiceCollection AddMcApiGateways(this IServiceCollection servic
         configure?.Invoke(options);
         services.AddSingleton(options);
         services.AddScoped<HttpClientAuthorizationDelegatingHandler>();
-        services.AddCaller(Assembly.Load("Masa.Mc.ApiGateways.Caller"));
+        services.AddAutoRegistrationCaller(Assembly.Load("Masa.Mc.ApiGateways.Caller"));
         return services;
     }
 }
diff --git a/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/MessageTaskDto.cs b/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/MessageTaskDto.cs
@@ -46,4 +46,6 @@ public class MessageTaskDto : AuditEntityDto<Guid, Guid>
     public MessageTaskSources Source { get; set; }
 
     public string ModifierName { get; set; } = string.Empty;
+
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
 }
diff --git a/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/MessageTaskUpsertDto.cs b/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/MessageTaskUpsertDto.cs
@@ -38,4 +38,6 @@ public class MessageTaskUpsertDto
     public Guid OperatorId { get; set; } = default;
 
     public string SystemId { get; set; } = string.Empty;
+
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
 }
diff --git a/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendOrdinaryMessageByExternalInputDto.cs b/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendOrdinaryMessageByExternalInputDto.cs
@@ -23,6 +23,8 @@ public class SendOrdinaryMessageByExternalInputDto
 
     public string SystemId { get; set; } = string.Empty;
 
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
+
 
     public static implicit operator MessageTaskUpsertDto(SendOrdinaryMessageByExternalInputDto dto)
     {
@@ -45,7 +47,8 @@ public static implicit operator MessageTaskUpsertDto(SendOrdinaryMessageByExtern
             Variables = dto.Variables,
             Source = MessageTaskSources.Sdk,
             OperatorId = dto.OperatorId,
-            SystemId = dto.SystemId
+            SystemId = dto.SystemId,
+            ExtraProperties = dto.ExtraProperties
         };
     }
 }
diff --git a/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendOrdinaryMessageByInternalInputDto.cs b/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendOrdinaryMessageByInternalInputDto.cs
@@ -23,6 +23,8 @@ public class SendOrdinaryMessageByInternalInputDto
 
     public string SystemId { get; set; } = string.Empty;
 
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
+
     public static implicit operator MessageTaskUpsertDto(SendOrdinaryMessageByInternalInputDto dto)
     {
         return new MessageTaskUpsertDto
@@ -39,7 +41,8 @@ public static implicit operator MessageTaskUpsertDto(SendOrdinaryMessageByIntern
             Variables = dto.Variables,
             Source = MessageTaskSources.Sdk,
             OperatorId = dto.OperatorId,
-            SystemId = dto.SystemId
+            SystemId = dto.SystemId,
+            ExtraProperties = dto.ExtraProperties
         };
     }
 }
diff --git a/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendOrdinaryMessageTaskInputDto.cs b/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendOrdinaryMessageTaskInputDto.cs
@@ -22,6 +22,8 @@ public class SendOrdinaryMessageTaskInputDto
 
     public Guid OperatorId { get; set; } = default;
 
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
+
     public static implicit operator MessageTaskUpsertDto(SendOrdinaryMessageTaskInputDto dto)
     {
         return new MessageTaskUpsertDto
@@ -38,6 +40,7 @@ public static implicit operator MessageTaskUpsertDto(SendOrdinaryMessageTaskInpu
             Variables = dto.Variables,
             Source = MessageTaskSources.Sdk,
             OperatorId = dto.OperatorId,
+            ExtraProperties = dto.ExtraProperties
         };
     }
 }
diff --git a/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendTemplateMessageByExternalInputDto.cs b/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendTemplateMessageByExternalInputDto.cs
@@ -25,6 +25,8 @@ public class SendTemplateMessageByExternalInputDto
 
     public string SystemId { get; set; } = string.Empty;
 
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
+
     public static implicit operator MessageTaskUpsertDto(SendTemplateMessageByExternalInputDto dto)
     {
         return new MessageTaskUpsertDto
@@ -46,7 +48,8 @@ public static implicit operator MessageTaskUpsertDto(SendTemplateMessageByExtern
             Variables = dto.Variables,
             Source = MessageTaskSources.Sdk,
             OperatorId = dto.OperatorId,
-            SystemId = dto.SystemId 
+            SystemId = dto.SystemId,
+            ExtraProperties = dto.ExtraProperties
         };
     }
 }
diff --git a/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendTemplateMessageByInternalInputDto.cs b/...tracts/Masa.Mc.Contracts.Admin/Dtos/MessageTasks/SendTemplateMessageByInternalInputDto.cs
@@ -25,6 +25,8 @@ public class SendTemplateMessageByInternalInputDto
 
     public string SystemId { get; set; } = string.Empty;
 
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
+
     public static implicit operator MessageTaskUpsertDto(SendTemplateMessageByInternalInputDto dto)
     {
         return new MessageTaskUpsertDto
@@ -41,7 +43,8 @@ public static implicit operator MessageTaskUpsertDto(SendTemplateMessageByIntern
             Variables = dto.Variables,
             Source = MessageTaskSources.Sdk,
             OperatorId = dto.OperatorId,
-            SystemId = dto.SystemId
+            SystemId = dto.SystemId,
+            ExtraProperties = dto.ExtraProperties
         };
     }
 }
diff --git a/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/WebsiteMessages/WebsiteMessageDto.cs b/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/WebsiteMessages/WebsiteMessageDto.cs
@@ -28,4 +28,6 @@ public class WebsiteMessageDto : AuditEntityDto<Guid, Guid>
     public Guid PrevId { get; set; }
 
     public Guid NextId { get; set; }
+
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
 }
diff --git a/src/Infrastructure/Masa.Mc.Infrastructure.Common/Extensions/CollectionExtensions.cs b/src/Infrastructure/Masa.Mc.Infrastructure.Common/Extensions/CollectionExtensions.cs