chore: Upgrade Package

masastack · Jul 9, 2024 · 00ce393 · 00ce393
1 parent 41580fa
commit 00ce393
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 31 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,7 @@
 		<WarningsAsErrors>
 			$(WarningsAsErrors);CS8600;CS8601;CS8602;CS8603;CS8604;CS8609;CS8610;CS8614;CS8616;CS8618;CS8619;CS8620;CS8622;CS8625
 		</WarningsAsErrors>
-		<MasaFrameworkPackageVersion>1.0.1-preview.17</MasaFrameworkPackageVersion>
+		<MasaFrameworkPackageVersion>1.2.0-preview.2</MasaFrameworkPackageVersion>
+		<MasaStackSdksPackageVersion>1.1.0-preview.2</MasaStackSdksPackageVersion>
 	</PropertyGroup>
 </Project>
diff --git a/...ateways/Caller/Masa.Scheduler.ApiGateways.Caller/Masa.Scheduler.ApiGateways.Caller.csproj b/...ateways/Caller/Masa.Scheduler.ApiGateways.Caller/Masa.Scheduler.ApiGateways.Caller.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Contrib.StackSdks.Caller" Version="$(MasaFrameworkPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Caller" Version="$(MasaStackSdksPackageVersion)" />
   </ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Contracts/Masa.Scheduler.Contracts.Server/Masa.Scheduler.Contracts.Server.csproj b/src/Contracts/Masa.Scheduler.Contracts.Server/Masa.Scheduler.Contracts.Server.csproj
@@ -9,20 +9,20 @@
 	<PackageReference Include="FluentValidation" Version="11.2.0" />
     <PackageReference Include="Masa.BuildingBlocks.Caching" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Configuration.ConfigurationApi.Dcc" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.BuildingBlocks.StackSdks.Config" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaFrameworkPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.BuildingBlocks.StackSdks.Config" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaStackSdksPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Dispatcher.IntegrationEvents.Dapr" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Utils.Extensions.Validations.FluentValidation" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Utils.Security.Cryptography" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Utils.Configuration.Json" Version="$(MasaFrameworkPackageVersion)" />
 	<PackageReference Include="Masa.Contrib.Data.UoW.EFCore" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Isolation" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Dcc" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaFrameworkPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Isolation" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Dcc" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaStackSdksPackageVersion)" />
 	<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.5" />
   </ItemGroup>

diff --git a/...sa.Scheduler.Services.Server/Domain/Managers/Servers/SchedulerServerManagerHostService.cs b/...sa.Scheduler.Services.Server/Domain/Managers/Servers/SchedulerServerManagerHostService.cs
@@ -20,12 +20,12 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         var environmentProvider = _serviceProvider.GetRequiredService<EnvironmentProvider>();
         var data = _serviceProvider.GetRequiredService<SchedulerServerManagerData>();
 
-        foreach (var environment in environmentProvider.GetEnvionments())
-        {
-            data.TaskQueue.TryAdd(environment, new());
+        //foreach (var environment in environmentProvider.GetEnvionments())
+        //{
+        //    data.TaskQueue.TryAdd(environment, new());
 
-            await DoWorkAsync(environment, stoppingToken);
-        }
+        //    await DoWorkAsync(environment, stoppingToken);
+        //}
     }
 
     private async Task DoWorkAsync(string environment, CancellationToken stoppingToken)

diff --git a/src/Services/Masa.Scheduler.Services.Server/Masa.Scheduler.Services.Server.csproj b/src/Services/Masa.Scheduler.Services.Server/Masa.Scheduler.Services.Server.csproj
@@ -43,7 +43,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
 		<PackageReference Include="Masa.Contrib.Dispatcher.IntegrationEvents.Dapr" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.Exceptions" Version="$(MasaFrameworkPackageVersion)" />
-		<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaFrameworkPackageVersion)" />
+		<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaStackSdksPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.Globalization.I18n.AspNetCore" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.8" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />

diff --git a/src/Services/Masa.Scheduler.Services.Worker/Masa.Scheduler.Services.Worker.csproj b/src/Services/Masa.Scheduler.Services.Worker/Masa.Scheduler.Services.Worker.csproj
@@ -35,7 +35,7 @@
     <PackageReference Include="Masa.Contrib.Caching.Distributed.StackExchangeRedis" Version="$(MasaFrameworkPackageVersion)" />
 	<PackageReference Include="Masa.Contrib.Development.DaprStarter.AspNetCore" Version="$(MasaFrameworkPackageVersion)" />
 	<PackageReference Include="Masa.Contrib.Exceptions" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaFrameworkPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Middleware" Version="$(MasaStackSdksPackageVersion)" />
 	<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Shells/Masa.Scheduler.Shells.JobShell/Masa.Scheduler.Shells.JobShell.csproj b/src/Shells/Masa.Scheduler.Shells.JobShell/Masa.Scheduler.Shells.JobShell.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Contrib.StackSdks.Scheduler" Version="$(MasaFrameworkPackageVersion)" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
+    <PackageReference Include="Masa.Contrib.StackSdks.Scheduler" Version="$(MasaStackSdksPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaStackSdksPackageVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
   </ItemGroup>

diff --git a/src/Web/Masa.Scheduler.Web.Admin.Server/Pages/_Layout.cshtml b/src/Web/Masa.Scheduler.Web.Admin.Server/Pages/_Layout.cshtml
@@ -27,7 +27,7 @@
 <body>
     @RenderBody()
     <script src="_framework/blazor.server.js"></script>
-    <script src="_content/BlazorComponent/js/blazor-component.js"></script>
+    <script src="_content/Masa.Blazor/js/masa-blazor.js"></script>
     <script src="_content/Masa.Stack.Components/js/components.js"></script>
     <script src="https://cdn.masastack.com/npm/echarts/5.1.1/echarts.min.js"></script>
     <script src="_content/MASA.Blazor.Experimental.Components/js/experimental.js"></script>

diff --git a/src/Web/Masa.Scheduler.Web.Admin/Components/AlarmRules/LogAlarmRuleUpsertModal.razor.cs b/src/Web/Masa.Scheduler.Web.Admin/Components/AlarmRules/LogAlarmRuleUpsertModal.razor.cs
@@ -68,9 +68,7 @@ await InvokeAsync(() =>
 
     private async Task InitData(Guid jobId, string displayName)
     {
-        var whereExpression = $@"SeverityText='Error' 
-and indexOf(LogAttributesKeys,'JobId')>0
-and LogAttributesValues[indexOf(LogAttributesKeys,'JobId')]='{jobId}'";
+        var whereExpression = $@"{{""bool"":{{""must"":[{{""term"":{{""Attributes.JobId.keyword"":""{jobId}""}}}},{{""term"":{{""SeverityText.keyword"":""Error""}}}}]}}}}";
         var ruleExpression = @"{""Rules"":[{""RuleName"":""CheckWorkerErrorJob"",""ErrorMessage"":""Log with error level."",""ErrorType"":""Error"",""RuleExpressionType"":""LambdaExpression"",""Expression"":""JobId > 0""}]}";
         var alarmRule = new AlarmRuleUpsertViewModel
         {

diff --git a/src/Web/Masa.Scheduler.Web.Admin/Masa.Scheduler.Web.Admin.csproj b/src/Web/Masa.Scheduler.Web.Admin/Masa.Scheduler.Web.Admin.csproj
@@ -20,10 +20,10 @@
     <PackageReference Include="Masa.BuildingBlocks.Authentication.Identity" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.Data.Mapping.Mapster" Version="$(MasaFrameworkPackageVersion)" />
     <PackageReference Include="Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch" Version="$(MasaFrameworkPackageVersion)" />
-    <PackageReference Include="Masa.Stack.Components" Version="0.0.451" />
+    <PackageReference Include="Masa.Stack.Components" Version="0.0.458" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.15" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.6.2" />
-	<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaFrameworkPackageVersion)" />
+	<PackageReference Include="Masa.Contrib.StackSdks.Alert" Version="$(MasaStackSdksPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Web/Masa.Scheduler.Web.Admin/Shared/ProComponentBase.cs b/src/Web/Masa.Scheduler.Web.Admin/Shared/ProComponentBase.cs
@@ -3,7 +3,7 @@
 
 namespace Masa.Scheduler.Web.Admin;
 
-public abstract class ProComponentBase : BDomComponentBase
+public abstract class ProComponentBase : Blazor.Core.MasaComponentBase
 {
     private SchedulerServerCaller? _schedulerServerCaller;
     private GlobalConfig? _globalConfig;

diff --git a/src/Web/Masa.Scheduler.Web.Admin/_Imports.cs b/src/Web/Masa.Scheduler.Web.Admin/_Imports.cs
@@ -1,8 +1,6 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the Apache License. See LICENSE.txt in the project root for license information.
 
-global using BlazorComponent;
-global using BlazorComponent.I18n;
 global using FluentValidation;
 global using Humanizer;
 global using Humanizer.Localisation;

diff --git a/src/Web/Masa.Scheduler.Web.Admin/_Imports.razor b/src/Web/Masa.Scheduler.Web.Admin/_Imports.razor
@@ -1,5 +1,4 @@
-@using BlazorComponent
-@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web
 @using Masa.Blazor
 @using Masa.Scheduler.Web.Admin.Global
 @using Masa.Scheduler.Web.Admin.Data