diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d81c5dce3e..86df2d8748 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -52,6 +52,9 @@ jobs: if: ${{ !github.event.pull_request.draft }} steps: - uses: jlumbroso/free-disk-space@main + - uses: PSModule/install-powershell@v1 + with: + Version: latest - uses: actions/checkout@v2 - uses: actions/setup-dotnet@master with: diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/DemoAppTickerQModule.cs b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/DemoAppTickerQModule.cs index c59bdac31a..f25dc778b7 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/DemoAppTickerQModule.cs +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/DemoAppTickerQModule.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; +using TickerQ.Dashboard.DependencyInjection; using TickerQ.DependencyInjection; using TickerQ.Utilities.Interfaces.Managers; using TickerQ.Utilities.Models.Ticker; @@ -31,6 +31,13 @@ public class DemoAppTickerQModule : AbpModule context.Services.AddTickerQ(options => { options.UpdateMissedJobCheckDelay(TimeSpan.FromSeconds(30)); + + options.AddDashboard(x => + { + x.BasePath = "/tickerq-dashboard"; + + x.UseHostAuthentication = true; + }); }); Configure(options => @@ -62,7 +69,7 @@ public class DemoAppTickerQModule : AbpModule { endpoints.MapGet("/", async httpContext => { - await httpContext.Response.WriteAsync("Hello TickerQ!"); + httpContext.Response.Redirect("/tickerq-dashboard", true); }); }); diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Program.cs b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Program.cs index 4f5ae47673..72e7f9090c 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Program.cs +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Program.cs @@ -10,7 +10,7 @@ public class Program public static async Task Main(string[] args) { var builder = WebApplication.CreateBuilder(args); - builder.Host.AddAppSettingsSecretsJson().UseAutofac(); + builder.Host.UseAutofac(); await builder.AddApplicationAsync(); var app = builder.Build(); await app.InitializeApplicationAsync(); diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Properties/launchSettings.json b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Properties/launchSettings.json new file mode 100644 index 0000000000..1b8cdbbc25 --- /dev/null +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Properties/launchSettings.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "profiles": { + "Volo.Abp.BackgroundJobs.DemoApp.TickerQ": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Volo.Abp.BackgroundJobs.DemoApp.TickerQ.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Volo.Abp.BackgroundJobs.DemoApp.TickerQ.csproj index d209974fe8..f30eba83dd 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Volo.Abp.BackgroundJobs.DemoApp.TickerQ.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.TickerQ/Volo.Abp.BackgroundJobs.DemoApp.TickerQ.csproj @@ -11,6 +11,7 @@ +