Browse Source

feat(cap): added CAP dashboard middleware

pull/528/head
cKey 4 years ago
parent
commit
74e64c0202
  1. 4
      aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN/Abp/WorkflowCore/DistributedLock/AbpDistributedLockProvider.cs
  2. 3
      aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs
  3. 5
      aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs
  4. 5
      aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs
  5. 5
      aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs
  6. 7
      aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs
  7. 3
      aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs
  8. 3
      aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs
  9. 4
      aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs

4
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN/Abp/WorkflowCore/DistributedLock/AbpDistributedLockProvider.cs

@ -24,7 +24,7 @@ namespace LINGYUN.Abp.WorkflowCore.DistributedLock
public virtual async Task<bool> AcquireLock(string Id, CancellationToken cancellationToken) public virtual async Task<bool> AcquireLock(string Id, CancellationToken cancellationToken)
{ {
var handle = await _distributedLock.TryAcquireAsync(Id, _lockTimeout, cancellationToken); var handle = await _distributedLock.TryAcquireAsync(Id, cancellationToken: cancellationToken);
if (handle == null) if (handle == null)
{ {
return false; return false;
@ -32,7 +32,7 @@ namespace LINGYUN.Abp.WorkflowCore.DistributedLock
var cacheItem = new LockCacheItem(Id, handle); var cacheItem = new LockCacheItem(Id, handle);
// 预留一点时间 // 预留一点时间
_lockCache.Set(Id, cacheItem, TimeSpan.FromMinutes(1.5d)); _lockCache.Set(Id, cacheItem, _lockTimeout.Add(TimeSpan.FromMinutes(0.5d)));
return true; return true;
} }

3
aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs

@ -36,6 +36,7 @@ using Volo.Abp.PermissionManagement.HttpApi;
using Volo.Abp.PermissionManagement.IdentityServer; using Volo.Abp.PermissionManagement.IdentityServer;
using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore;
using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Saas.EntityFrameworkCore;
using DotNetCore.CAP;
namespace LY.MicroService.BackendAdmin; namespace LY.MicroService.BackendAdmin;
@ -131,6 +132,8 @@ public partial class BackendAdminHttpApiHostModule : AbpModule
app.UseMapRequestLocalization(); app.UseMapRequestLocalization();
// 授权 // 授权
app.UseAuthorization(); app.UseAuthorization();
// Cap Dashboard
app.UseCapDashboard();
// Swagger // Swagger
app.UseSwagger(); app.UseSwagger();
// Swagger可视化界面 // Swagger可视化界面

5
aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.AspNetCore.HttpOverrides; using DotNetCore.CAP;
using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.Data.DbMigrator; using LINGYUN.Abp.Data.DbMigrator;
using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.EventBus.CAP;
@ -98,6 +99,8 @@ namespace LY.MicroService.LocalizationManagement
app.UseMapRequestLocalization(); app.UseMapRequestLocalization();
// 授权 // 授权
app.UseAuthorization(); app.UseAuthorization();
// Cap Dashboard
app.UseCapDashboard();
// Swagger // Swagger
app.UseSwagger(); app.UseSwagger();
// Swagger可视化界面 // Swagger可视化界面

5
aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.AspNetCore.HttpOverrides; using DotNetCore.CAP;
using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.Data.DbMigrator; using LINGYUN.Abp.Data.DbMigrator;
using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.EventBus.CAP;
@ -128,6 +129,8 @@ public partial class PlatformManagementHttpApiHostModule : AbpModule
app.UseMapRequestLocalization(); app.UseMapRequestLocalization();
// 授权 // 授权
app.UseAuthorization(); app.UseAuthorization();
// Cap Dashboard
app.UseCapDashboard();
// Swagger // Swagger
app.UseSwagger(); app.UseSwagger();
// Swagger可视化界面 // Swagger可视化界面

5
aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs

@ -1,4 +1,5 @@
using Hangfire; using DotNetCore.CAP;
using Hangfire;
using LINGYUN.Abp.AspNetCore.HttpOverrides; using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.BackgroundJobs.Hangfire; using LINGYUN.Abp.BackgroundJobs.Hangfire;
@ -125,6 +126,8 @@ namespace LY.MicroService.RealtimeMessage
app.UseMapRequestLocalization(); app.UseMapRequestLocalization();
// 授权 // 授权
app.UseAuthorization(); app.UseAuthorization();
// Cap Dashboard
app.UseCapDashboard();
// Swagger // Swagger
app.UseSwagger(); app.UseSwagger();
// Swagger可视化界面 // Swagger可视化界面

7
aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.AuditLogging.Elasticsearch; using DotNetCore.CAP;
using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.BackgroundTasks.ExceptionHandling; using LINGYUN.Abp.BackgroundTasks.ExceptionHandling;
using LINGYUN.Abp.BackgroundTasks.Jobs; using LINGYUN.Abp.BackgroundTasks.Jobs;
using LINGYUN.Abp.BackgroundTasks.Quartz; using LINGYUN.Abp.BackgroundTasks.Quartz;
@ -15,7 +16,6 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using System.Globalization;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.Authentication.JwtBearer;
using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.MultiTenancy;
@ -108,8 +108,9 @@ public partial class TaskManagementHttpApiHostModule : AbpModule
app.UseAuthentication(); app.UseAuthentication();
app.UseJwtTokenMiddleware(); app.UseJwtTokenMiddleware();
app.UseMultiTenancy(); app.UseMultiTenancy();
app.UseAbpRequestLocalization(options => options.SetDefaultCulture(CultureInfo.CurrentCulture.Name)); app.UseAbpRequestLocalization();
app.UseAuthorization(); app.UseAuthorization();
app.UseCapDashboard();
app.UseSwagger(); app.UseSwagger();
app.UseAbpSwaggerUI(options => app.UseAbpSwaggerUI(options =>
{ {

3
aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs

@ -17,7 +17,6 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using System.Globalization;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.Authentication.JwtBearer;
using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.MultiTenancy;
@ -110,7 +109,7 @@ public partial class WorkflowManagementHttpApiHostModule : AbpModule
app.UseAuthentication(); app.UseAuthentication();
app.UseJwtTokenMiddleware(); app.UseJwtTokenMiddleware();
app.UseMultiTenancy(); app.UseMultiTenancy();
app.UseAbpRequestLocalization(options => options.SetDefaultCulture(CultureInfo.CurrentCulture.Name)); app.UseAbpRequestLocalization();
app.UseAuthorization(); app.UseAuthorization();
app.UseSwagger(); app.UseSwagger();
app.UseAbpSwaggerUI(options => app.UseAbpSwaggerUI(options =>

3
aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs

@ -1,3 +1,4 @@
using DotNetCore.CAP;
using LINGYUN.Abp.AspNetCore.HttpOverrides; using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.EventBus.CAP;
@ -106,6 +107,8 @@ public partial class IdentityServerHttpApiHostModule : AbpModule
app.UseMapRequestLocalization(); app.UseMapRequestLocalization();
// 授权 // 授权
app.UseAuthorization(); app.UseAuthorization();
// Cap Dashboard
app.UseCapDashboard();
// Swagger // Swagger
app.UseSwagger(); app.UseSwagger();
// Swagger可视化界面 // Swagger可视化界面

4
aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.AspNetCore.HttpOverrides; using DotNetCore.CAP;
using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.Data.DbMigrator; using LINGYUN.Abp.Data.DbMigrator;
using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.EventBus.CAP;
@ -129,6 +130,7 @@ public partial class IdentityServerModule : AbpModule
app.UseMapRequestLocalization(); app.UseMapRequestLocalization();
app.UseIdentityServer(); app.UseIdentityServer();
app.UseAuthorization(); app.UseAuthorization();
app.UseCapDashboard();
app.UseAuditing(); app.UseAuditing();
app.UseAbpSerilogEnrichers(); app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints(); app.UseConfiguredEndpoints();

Loading…
Cancel
Save