Browse Source

Do not change cookies when downloading files

外部访问oss时,需要通过路由或FormData传递租户标识,而UseMultiTenancy中间件可能会写入cookies对业务造成干扰,因此需要显示传递租户标识到路由中
pull/745/head
cKey 3 years ago
parent
commit
d150add5ed
  1. 7
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/GetPublicFileInput.cs
  2. 7
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/GetStaticFileInput.cs
  3. 7
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PrivateFilesController.cs
  4. 7
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PublicFilesController.cs
  5. 7
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/StaticFilesController.cs

7
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/GetPublicFileInput.cs

@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel.DataAnnotations;
namespace LINGYUN.Abp.OssManagement
{
@ -10,5 +11,9 @@ namespace LINGYUN.Abp.OssManagement
public string Path { get; set; }
public string Process { get; set; }
/// <summary>
/// 解决通过路由传递租户标识时,abp写入cookies
/// </summary>
public Guid? TenantId { get; set; }
}
}

7
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/GetStaticFileInput.cs

@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel.DataAnnotations;
namespace LINGYUN.Abp.OssManagement
{
@ -12,5 +13,9 @@ namespace LINGYUN.Abp.OssManagement
public string Bucket { get; set; }
public string Process { get; set; }
/// <summary>
/// 解决通过路由传递租户标识时,abp写入cookies
/// </summary>
public Guid? TenantId { get; set; }
}
}

7
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PrivateFilesController.cs

@ -51,10 +51,17 @@ namespace LINGYUN.Abp.OssManagement
[Route("{Name}/{Process}")]
[Route("p/{Path}/{Name}")]
[Route("p/{Path}/{Name}/{Process}")]
[Route("t/{TenantId}/{Name}")]
[Route("t/{TenantId}/{Name}/{Process}")]
[Route("t/{TenantId}/p/{Path}/{Name}")]
[Route("t/{TenantId}/p/{Path}/{Name}/{Process}")]
public async virtual Task<IRemoteStreamContent> GetAsync([FromRoute] GetPublicFileInput input)
{
using (CurrentTenant.Change(input.TenantId ?? CurrentTenant.Id))
{
return await _service.GetAsync(input);
}
}
[HttpDelete]
public async virtual Task DeleteAsync(GetPublicFileInput input)

7
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PublicFilesController.cs

@ -50,10 +50,17 @@ namespace LINGYUN.Abp.OssManagement
[Route("{Name}/{Process}")]
[Route("p/{Path}/{Name}")]
[Route("p/{Path}/{Name}/{Process}")]
[Route("t/{TenantId}/{Name}")]
[Route("t/{TenantId}/{Name}/{Process}")]
[Route("t/{TenantId}/p/{Path}/{Name}")]
[Route("t/{TenantId}/p/{Path}/{Name}/{Process}")]
public async virtual Task<IRemoteStreamContent> GetAsync([FromRoute] GetPublicFileInput input)
{
using (CurrentTenant.Change(input.TenantId ?? CurrentTenant.Id))
{
return await _publicFileAppService.GetAsync(input);
}
}
[HttpDelete]
public async virtual Task DeleteAsync(GetPublicFileInput input)

7
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/StaticFilesController.cs

@ -39,9 +39,16 @@ namespace LINGYUN.Abp.OssManagement
[Route("{Bucket}/{Name}/{Process}")]
[Route("{Bucket}/p/{Path}/{Name}")]
[Route("{Bucket}/p/{Path}/{Name}/{Process}")]
[Route("t/{TenantId}/{Bucket}/{Name}")]
[Route("t/{TenantId}/{Bucket}/{Name}/{Process}")]
[Route("t/{TenantId}/{Bucket}/p/{Path}/{Name}")]
[Route("t/{TenantId}/{Bucket}/p/{Path}/{Name}/{Process}")]
public async virtual Task<IRemoteStreamContent> GetAsync([FromRoute] GetStaticFileInput input)
{
using (CurrentTenant.Change(input.TenantId ?? CurrentTenant.Id))
{
return await _staticFilesAppServic.GetAsync(input);
}
}
}
}

Loading…
Cancel
Save