chore : upgrade (#535)

* fix ： Handling the issue of operator name not displaying * chore : upgrade
masastack · Jul 17, 2023 · 60bb8aa · 60bb8aa
1 parent bcd4325
commit 60bb8aa
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 57 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <MasaFrameworkPackageVersion>1.0.0-rc.4.2</MasaFrameworkPackageVersion>
+    <MasaFrameworkPackageVersion>1.0.0-rc.4.4</MasaFrameworkPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Services/Masa.Mc.Service/Application/Channels/ChannelQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/Channels/ChannelQueryHandler.cs
@@ -78,7 +78,8 @@ private async Task FillChannelDtos(List<ChannelDto> dtos)
         var userInfos = await _authClient.UserService.GetListByIdsAsync(modifierUserIds);
         foreach (var item in dtos)
         {
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.RealDisplayName ?? string.Empty;
         }
     }
 }
diff --git a/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskQueryHandler.cs
@@ -202,7 +202,8 @@ private async Task FillMessageTaskListDtos(List<MessageTaskDto> dtos)
                 item.Content = HtmlHelper.CutString(messageContent, 500);
             }
 
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.RealDisplayName ?? string.Empty;
         }
     }
 

diff --git a/src/Services/Masa.Mc.Service/Application/MessageTemplates/MessageTemplateQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/MessageTemplates/MessageTemplateQueryHandler.cs
@@ -72,7 +72,8 @@ private async Task FillMessageTemplateDtos(List<MessageTemplateDto> dtos)
         var userInfos = await _authClient.UserService.GetListByIdsAsync(modifierUserIds);
         foreach (var item in dtos)
         {
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.RealDisplayName ?? string.Empty;
         }
     }
 }
diff --git a/src/Services/Masa.Mc.Service/Application/ReceiverGroups/ReceiverGroupQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/ReceiverGroups/ReceiverGroupQueryHandler.cs
@@ -60,7 +60,8 @@ private async Task FillReceiverGroupDtos(List<ReceiverGroupDto> dtos)
         var userInfos = await _authClient.UserService.GetListByIdsAsync(modifierUserIds);
         foreach (var item in dtos)
         {
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.RealDisplayName ?? string.Empty;
         }
     }
 }
diff --git a/src/Services/Masa.Mc.Service/Masa.Mc.Service.Admin.csproj b/src/Services/Masa.Mc.Service/Masa.Mc.Service.Admin.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Dcc" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Scheduler" Version="$(MasaFrameworkPackageVersion)" />
-		<PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaFrameworkPackageVersion)" />
+		<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.Configuration" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.Configuration.ConfigurationApi.Dcc" Version="$(MasaFrameworkPackageVersion)" />

diff --git a/src/Services/Masa.Mc.Service/_Imports.cs b/src/Services/Masa.Mc.Service/_Imports.cs
@@ -2,9 +2,6 @@
 // Licensed under the Apache License. See LICENSE.txt in the project root for license information.
 
 global using System.Text.Json;
-global using Dapr.Actors;
-global using Dapr.Actors.Client;
-global using Dapr.Actors.Runtime;
 global using FluentValidation;
 global using FluentValidation.AspNetCore;
 global using Masa.BuildingBlocks.Data.UoW;
@@ -14,17 +11,9 @@
 global using Masa.BuildingBlocks.Ddd.Domain.Repositories;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents;
-global using Masa.Contrib.Configuration;
-global using Masa.Contrib.Data.UoW.EFCore;
-global using Masa.Contrib.Ddd.Domain;
 global using Masa.Contrib.Ddd.Domain.Repository.EFCore;
 global using Masa.Contrib.Dispatcher.Events;
-global using Masa.Contrib.Dispatcher.Events.Enums;
-global using Masa.Contrib.Dispatcher.IntegrationEvents.Dapr;
 global using Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore;
-global using Masa.Contrib.ReadWriteSplitting.Cqrs.Commands;
-global using Masa.Contrib.ReadWriteSplitting.Cqrs.Queries;
-global using Masa.Mc.Service.Infrastructure;
 global using Masa.Mc.Service.Infrastructure.Middleware;
 global using Masa.Mc.Service.Admin.Infrastructure.EntityFrameworkCore;
 global using Masa.Mc.Infrastructure.Ddd.Application.Contracts.Dtos;
@@ -51,18 +40,15 @@
 global using System.Collections.Concurrent;
 global using Microsoft.AspNetCore.Mvc;
 global using Mapster;
-global using MapsterMapper;
 global using System.Reflection;
 global using Masa.Mc.Contracts.Admin.Dtos.MessageTemplates.Validator;
 global using Masa.Mc.Service.Admin.Application.MessageTemplates.Queries;
 global using Masa.Mc.Service.Admin.Domain.MessageTemplates.Services;
-global using System.Linq;
 global using System.Linq.Dynamic.Core;
 global using Masa.Mc.Infrastructure.Sms;
 global using Masa.Mc.Infrastructure.Sms.Aliyun;
 global using Masa.Mc.Contracts.Admin.Options.Channels;
 global using Masa.Mc.Infrastructure.Common.Helper;
-global using Masa.Mc.Infrastructure.Common.Extensions;
 global using Masa.Mc.Service.Admin.Domain.ReceiverGroups.Aggregates;
 global using Masa.Mc.Infrastructure.Sms.Aliyun.Infrastructure.OptionsResolve.Contributors;
 global using Masa.Mc.Infrastructure.Sms.Services;
@@ -76,7 +62,6 @@
 global using System.Collections.ObjectModel;
 global using Masa.Mc.Contracts.Admin.Dtos.ReceiverGroups.Validator;
 global using Masa.Mc.Service.Admin.Domain.ReceiverGroups.Events;
-global using Masa.Contrib.Isolation.MultiEnvironment;
 global using Masa.Mc.Contracts.Admin.Enums.MessageTasks;
 global using Masa.Mc.Service.Admin.Domain.MessageTasks.Aggregates;
 global using Masa.Mc.Contracts.Admin.Dtos.MessageTasks;
@@ -115,7 +100,6 @@
 global using Dapr;
 global using Masa.Mc.Service.Admin.Domain.WebsiteMessages.Aggregates;
 global using Masa.Mc.Service.Admin.Domain.WebsiteMessages.Repositories;
-global using Masa.Mc.Service.Admin.Domain.MessageTemplates.EventHandler;
 global using Microsoft.AspNetCore.SignalR;
 global using Masa.Mc.Contracts.Admin.Dtos.WebsiteMessages;
 global using Masa.Mc.Service.Admin.Application.WebsiteMessages.Queries;
@@ -125,21 +109,15 @@
 global using Microsoft.Extensions.Options;
 global using Masa.Mc.Contracts.Admin.Enums.WebsiteMessages;
 global using Masa.Mc.Service.Admin.Application.WebsiteMessages.Commands;
-global using Microsoft.AspNetCore.Authorization;
 global using Masa.Mc.Contracts.Admin.Consts;
 global using Masa.Mc.Service.Admin.Domain.WebsiteMessages.Services;
 global using Magicodes.ExporterAndImporter.Core.Extension;
 global using Masa.Contrib.Storage.ObjectStorage.Aliyun;
-global using Dapr.Client;
-global using Masa.Contrib.Storage.ObjectStorage.Aliyun.Options;
 global using Masa.Mc.Contracts.Admin.Dtos.Oss;
 global using Masa.BuildingBlocks.Storage.ObjectStorage;
 global using Masa.BuildingBlocks.StackSdks.Auth;
 global using Masa.Mc.Contracts.Admin.Dtos.Subjects;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
-global using Masa.BuildingBlocks.SearchEngine.AutoComplete;
-global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Enum;
-global using Masa.Contrib.StackSdks.Auth;
 global using Masa.Mc.Service.Admin.Application.MessageRecords.Commands;
 global using Masa.Mc.Service.Admin.Domain.MessageRecords.Events;
 global using Masa.Mc.Contracts.Admin.Dtos.MessageTasks.Imports;
@@ -150,17 +128,14 @@
 global using Masa.BuildingBlocks.StackSdks.Scheduler.Enum;
 global using Masa.BuildingBlocks.StackSdks.Scheduler.Request;
 global using Masa.Mc.Service.Admin.Jobs;
-global using Masa.Contrib.Dispatcher.IntegrationEvents;
 global using Masa.Mc.Infrastructure.Common.Utils;
 global using Masa.Contrib.Configuration.ConfigurationApi.Dcc;
 global using Masa.BuildingBlocks.Configuration;
 global using EFCore.BulkExtensions;
-global using Microsoft.Extensions.Diagnostics.HealthChecks;
 global using Masa.BuildingBlocks.Authentication.Identity;
 global using Masa.Contrib.StackSdks.Mc.Infrastructure.Extensions;
 global using Masa.BuildingBlocks.StackSdks.Mc;
 global using Masa.BuildingBlocks.Data;
-global using System.Net;
 global using Masa.Mc.Service.Admin.Infrastructure.Middleware;
 global using System.Text.RegularExpressions;
 global using Masa.Contrib.StackSdks.Scheduler;
@@ -170,11 +145,6 @@
 global using Masa.Contrib.Configuration.ConfigurationApi.Dcc.Options;
 global using Masa.Contrib.Caching.Distributed.StackExchangeRedis;
 global using Masa.Mc.Service.Admin.Infrastructure.Models;
-global using System.Security.Principal;
-global using System.Xml.Linq;
-global using HealthChecks.UI.Client;
-global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-global using System.Net.Http.Headers;
 global using Masa.Mc.Service.Admin.Application.QueryModels;
 global using Masa.Mc.Service.Admin.Application.QueryContext;
 global using Masa.BuildingBlocks.Ddd.Domain.Values;
@@ -196,17 +166,14 @@
 global using Masa.Mc.Service.Admin.Infrastructure.Extensions;
 global using FluentValidation.Resources;
 global using Masa.Contrib.StackSdks.Middleware;
-global using Masa.Utils.Configuration.Json;
 global using Microsoft.EntityFrameworkCore.Design;
 global using Masa.Mc.Contracts.Admin.Scheduler;
-global using Masa.Contrib.StackSdks.Caller;
 global using Masa.Mc.Service.Admin.Domain.Channels.Events;
 global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents.Logs;
-global using Masa.Mc.Infrastructure.Sms.Model.Response;
 global using Moq;
-global using Microsoft.Extensions.DependencyInjection.Extensions;
 global using Masa.Mc.Service.Admin.Infrastructure.Mock;
 global using Masa.BuildingBlocks.Extensions.BackgroundJobs;
 global using Masa.Mc.Service.Admin.Application.MessageTasks.Jobs;
 global using Masa.Contrib.StackSdks.Isolation;
-global using Masa.Mc.Contracts.Admin.Infrastructure;
+global using Masa.Mc.Contracts.Admin.Infrastructure;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
diff --git a/src/Web/Masa.Mc.Web.Admin.Server/Masa.Mc.Web.Admin.Server.csproj b/src/Web/Masa.Mc.Web.Admin.Server/Masa.Mc.Web.Admin.Server.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaFrameworkPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
   </ItemGroup>

diff --git a/src/Web/Masa.Mc.Web.Admin.Server/Program.cs b/src/Web/Masa.Mc.Web.Admin.Server/Program.cs
@@ -20,20 +20,7 @@
         });
     });
 }
-builder.Services.AddObservable(builder.Logging, () =>
-{
-    return new MasaObservableOptions
-    {
-        ServiceNameSpace = builder.Environment.EnvironmentName,
-        ServiceVersion = masaStackConfig.Version,
-        ServiceName = masaStackConfig.GetWebId(MasaStackProject.MC),
-        Layer = masaStackConfig.Namespace,
-        ServiceInstanceId = builder.Configuration.GetValue<string>("HOSTNAME")
-    };
-}, () =>
-{
-    return masaStackConfig.OtlpUrl;
-}, true);
+
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();

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
@@ -17,7 +17,7 @@
 		<PackageReference Include="Mapster" Version="7.3.0" />
 		<PackageReference Include="Masa.BuildingBlocks.Authentication.Identity" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch" Version="$(MasaFrameworkPackageVersion)" />
-		<PackageReference Include="Masa.Stack.Components" Version="0.0.409" />
+		<PackageReference Include="Masa.Stack.Components" Version="0.0.413" />
 		<PackageReference Include="Masa.Utils.Data.Elasticsearch" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.16" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.5" />