From 00ce393db8725cbf867d87e4119cfe13bafa0763 Mon Sep 17 00:00:00 2001 From: wzh425 Date: Tue, 9 Jul 2024 11:16:50 +0800 Subject: [PATCH] chore: Upgrade Package --- Directory.Build.props | 3 ++- .../Masa.Scheduler.ApiGateways.Caller.csproj | 2 +- .../Masa.Scheduler.Contracts.Server.csproj | 18 +++++++++--------- .../SchedulerServerManagerHostService.cs | 10 +++++----- .../Masa.Scheduler.Services.Server.csproj | 2 +- .../Masa.Scheduler.Services.Worker.csproj | 2 +- .../Masa.Scheduler.Shells.JobShell.csproj | 4 ++-- .../Pages/_Layout.cshtml | 2 +- .../LogAlarmRuleUpsertModal.razor.cs | 4 +--- .../Masa.Scheduler.Web.Admin.csproj | 4 ++-- .../Shared/ProComponentBase.cs | 2 +- src/Web/Masa.Scheduler.Web.Admin/_Imports.cs | 2 -- .../Masa.Scheduler.Web.Admin/_Imports.razor | 3 +-- 13 files changed, 27 insertions(+), 31 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ef0481da..f5be8b96 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,6 +4,7 @@ $(WarningsAsErrors);CS8600;CS8601;CS8602;CS8603;CS8604;CS8609;CS8610;CS8614;CS8616;CS8618;CS8619;CS8620;CS8622;CS8625 - 1.0.1-preview.17 + 1.2.0-preview.2 + 1.1.0-preview.2 \ No newline at end of file diff --git a/src/ApiGateways/Caller/Masa.Scheduler.ApiGateways.Caller/Masa.Scheduler.ApiGateways.Caller.csproj b/src/ApiGateways/Caller/Masa.Scheduler.ApiGateways.Caller/Masa.Scheduler.ApiGateways.Caller.csproj index 1b1b143e..0eaa92b3 100644 --- a/src/ApiGateways/Caller/Masa.Scheduler.ApiGateways.Caller/Masa.Scheduler.ApiGateways.Caller.csproj +++ b/src/ApiGateways/Caller/Masa.Scheduler.ApiGateways.Caller/Masa.Scheduler.ApiGateways.Caller.csproj @@ -7,7 +7,7 @@ - + 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 index e3eab131..2a62a1d0 100644 --- 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 @@ - - - + + + - - - - - - + + + + + + diff --git a/src/Services/Masa.Scheduler.Services.Server/Domain/Managers/Servers/SchedulerServerManagerHostService.cs b/src/Services/Masa.Scheduler.Services.Server/Domain/Managers/Servers/SchedulerServerManagerHostService.cs index 49c12505..f5dceece 100644 --- a/src/Services/Masa.Scheduler.Services.Server/Domain/Managers/Servers/SchedulerServerManagerHostService.cs +++ b/src/Services/Masa.Scheduler.Services.Server/Domain/Managers/Servers/SchedulerServerManagerHostService.cs @@ -20,12 +20,12 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) var environmentProvider = _serviceProvider.GetRequiredService(); var data = _serviceProvider.GetRequiredService(); - 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 index 6738c809..28deb671 100644 --- 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 @@ - + 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 index 89a0100f..fc22faed 100644 --- 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 @@ - + all 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 index 0618ac44..70626c13 100644 --- 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 @@ - - + + diff --git a/src/Web/Masa.Scheduler.Web.Admin.Server/Pages/_Layout.cshtml b/src/Web/Masa.Scheduler.Web.Admin.Server/Pages/_Layout.cshtml index 79a33176..f8ee55bd 100644 --- 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 @@ @RenderBody() - + 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 index 338e175c..344c4435 100644 --- 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 index 7984d7b0..5122e51f 100644 --- 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 @@ - + - + diff --git a/src/Web/Masa.Scheduler.Web.Admin/Shared/ProComponentBase.cs b/src/Web/Masa.Scheduler.Web.Admin/Shared/ProComponentBase.cs index 0b922702..a876808a 100644 --- 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 index c6e037aa..e0ec066e 100644 --- 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 index 97a3c765..f3a06390 100644 --- 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