IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Files: EF, DI

Browse Source
This commit is contained in:
pavelbannov 2020-02-05 16:33:09 +03:00
parent ff84afb110
commit 508efb1fca
4 changed files with 545 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Core.Common/BaseCommonLinkUtility.cs
View File

@ -187,7 +187,7 @@ namespace ASC.Core.Common
return ServerRootPath + VirtualRoot.TrimEnd('/') + "/" + virtualPath.TrimStart('~', '/');
}
public static string ToAbsolute(string virtualPath)
public string ToAbsolute(string virtualPath)
{
if (_vpath == null)
{

12
products/ASC.Files/Server/Helpers/PathProvider.cs
View File

@ -51,7 +51,7 @@ namespace ASC.Web.Files.Classes
public static readonly string StartURL = FilesLinkUtility.FilesBaseVirtualPath;
public static readonly string GetFileServicePath = BaseCommonLinkUtility.ToAbsolute("~/Products/Files/Services/WCFService/service.svc/");
public readonly string GetFileServicePath;
public WebImageSupplier WebImageSupplier { get; }
public IDaoFactory DaoFactory { get; }
@ -59,6 +59,7 @@ namespace ASC.Web.Files.Classes
public FilesLinkUtility FilesLinkUtility { get; }
public EmailValidationKeyProvider EmailValidationKeyProvider { get; }
public GlobalStore GlobalStore { get; }
public BaseCommonLinkUtility BaseCommonLinkUtility { get; }
public PathProvider(
WebImageSupplier webImageSupplier,
@ -66,7 +67,8 @@ namespace ASC.Web.Files.Classes
CommonLinkUtility commonLinkUtility,
FilesLinkUtility filesLinkUtility,
EmailValidationKeyProvider emailValidationKeyProvider,
GlobalStore globalStore)
GlobalStore globalStore,
BaseCommonLinkUtility baseCommonLinkUtility)
{
WebImageSupplier = webImageSupplier;
DaoFactory = daoFactory;
@ -74,6 +76,8 @@ namespace ASC.Web.Files.Classes
FilesLinkUtility = filesLinkUtility;
EmailValidationKeyProvider = emailValidationKeyProvider;
GlobalStore = globalStore;
BaseCommonLinkUtility = baseCommonLinkUtility;
GetFileServicePath = BaseCommonLinkUtility.ToAbsolute("~/Products/Files/Services/WCFService/service.svc/");
}
public string GetImagePath(string imgFileName)
@ -81,7 +85,7 @@ namespace ASC.Web.Files.Classes
return WebImageSupplier.GetAbsoluteWebPath(imgFileName, Configuration.ProductEntryPoint.ID);
}
public static string GetFileStaticRelativePath(string fileName)
public string GetFileStaticRelativePath(string fileName)
{
var ext = FileUtility.GetFileExtension(fileName);
switch (ext)
@ -97,7 +101,7 @@ namespace ASC.Web.Files.Classes
return fileName;
}
public static string GetFileControlPath(string fileName)
public string GetFileControlPath(string fileName)
{
return BaseCommonLinkUtility.ToAbsolute("~/Products/Files/Controls/" + fileName);
}

1000
products/ASC.Files/Server/HttpHandlers/FileHandler.ashx.cs
View File

File diff suppressed because it is too large Load Diff

10
web/ASC.Web.Core/Files/FilesLinkUtility.cs
View File

@ -44,14 +44,22 @@ namespace ASC.Web.Core.Files
public const string EditorPage = "doceditor.aspx";
private readonly string FilesUploaderURL;
public CommonLinkUtility CommonLinkUtility { get; set; }
public BaseCommonLinkUtility BaseCommonLinkUtility { get; }
public CoreBaseSettings CoreBaseSettings { get; set; }
public CoreSettings CoreSettings { get; set; }
public IConfiguration Configuration { get; }
public InstanceCrypto InstanceCrypto { get; }
public FilesLinkUtility(CommonLinkUtility commonLinkUtility, CoreBaseSettings coreBaseSettings, CoreSettings coreSettings, IConfiguration configuration, InstanceCrypto instanceCrypto)
public FilesLinkUtility(
CommonLinkUtility commonLinkUtility,
BaseCommonLinkUtility baseCommonLinkUtility,
CoreBaseSettings coreBaseSettings,
CoreSettings coreSettings,
IConfiguration configuration,
InstanceCrypto instanceCrypto)
{
CommonLinkUtility = commonLinkUtility;
BaseCommonLinkUtility = baseCommonLinkUtility;
CoreBaseSettings = coreBaseSettings;
CoreSettings = coreSettings;
Configuration = configuration;