Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
This commit is contained in:
commit
1e860b35af
Binary file not shown.
BIN
.nuget/packages/WebSocketSharpNetStandart.1.0.3-rc12.nupkg
Normal file
BIN
.nuget/packages/WebSocketSharpNetStandart.1.0.3-rc12.nupkg
Normal file
Binary file not shown.
@ -79,7 +79,6 @@ namespace ASC.Core.Data
|
||||
MaxFileSize = GetInBytes(r.MaxFileSize),
|
||||
MaxTotalSize = GetInBytes(r.MaxTotalSize),
|
||||
Price = r.Price,
|
||||
Price2 = r.Price2,
|
||||
Visible = r.Visible
|
||||
};
|
||||
|
||||
@ -127,7 +126,6 @@ namespace ASC.Core.Data
|
||||
ActiveUsers = quota.ActiveUsers,
|
||||
Features = quota.Features,
|
||||
Price = quota.Price,
|
||||
Price2 = quota.Price2,
|
||||
AvangateId = quota.AvangateId,
|
||||
Visible = quota.Visible
|
||||
};
|
||||
|
@ -14,7 +14,6 @@ namespace ASC.Core.Common.EF
|
||||
public int ActiveUsers { get; set; }
|
||||
public string Features { get; set; }
|
||||
public decimal Price { get; set; }
|
||||
public decimal Price2 { get; set; }
|
||||
public string AvangateId { get; set; }
|
||||
public bool Visible { get; set; }
|
||||
public override object[] GetKeys()
|
||||
@ -30,7 +29,7 @@ namespace ASC.Core.Common.EF
|
||||
.Add(MySqlAddDbQuota, Provider.MySql)
|
||||
.Add(PgSqlAddDbQuota, Provider.Postgre)
|
||||
.HasData(
|
||||
new DbQuota { Tenant = -1, Name = "default", Description = null, MaxFileSize = 102400, MaxTotalSize = 10995116277760, ActiveUsers = 10000, Features = "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", Price = decimal.Parse("0,00"), Price2 = decimal.Parse("0,00"), AvangateId = "0", Visible = false }
|
||||
new DbQuota { Tenant = -1, Name = "default", Description = null, MaxFileSize = 102400, MaxTotalSize = 10995116277760, ActiveUsers = 10000, Features = "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", Price = decimal.Parse("0,00"), AvangateId = "0", Visible = false }
|
||||
);
|
||||
|
||||
return modelBuilder;
|
||||
@ -81,10 +80,6 @@ namespace ASC.Core.Common.EF
|
||||
.HasColumnName("price")
|
||||
.HasColumnType("decimal(10,2)");
|
||||
|
||||
entity.Property(e => e.Price2)
|
||||
.HasColumnName("price2")
|
||||
.HasColumnType("decimal(10,2)");
|
||||
|
||||
entity.Property(e => e.Visible).HasColumnName("visible");
|
||||
});
|
||||
}
|
||||
@ -131,11 +126,6 @@ namespace ASC.Core.Common.EF
|
||||
.HasColumnType("numeric(10,2)")
|
||||
.HasDefaultValueSql("0.00");
|
||||
|
||||
entity.Property(e => e.Price2)
|
||||
.HasColumnName("price2")
|
||||
.HasColumnType("numeric(10,2)")
|
||||
.HasDefaultValueSql("0.00");
|
||||
|
||||
entity.Property(e => e.Visible).HasColumnName("visible");
|
||||
});
|
||||
}
|
||||
|
@ -657,10 +657,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
|
||||
.HasColumnType("decimal(10,2)")
|
||||
.HasColumnName("price");
|
||||
|
||||
b.Property<decimal>("Price2")
|
||||
.HasColumnType("decimal(10,2)")
|
||||
.HasColumnName("price2");
|
||||
|
||||
b.Property<bool>("Visible")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasColumnName("visible");
|
||||
@ -681,7 +677,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
|
||||
MaxTotalSize = 10995116277760L,
|
||||
Name = "default",
|
||||
Price = 0.00m,
|
||||
Price2 = 0.00m,
|
||||
Visible = false
|
||||
});
|
||||
});
|
||||
|
@ -58,7 +58,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
|
||||
features = table.Column<string>(type: "text", nullable: true, collation: "utf8_general_ci")
|
||||
.Annotation("MySql:CharSet", "utf8"),
|
||||
price = table.Column<decimal>(type: "decimal(10,2)", nullable: false),
|
||||
price2 = table.Column<decimal>(type: "decimal(10,2)", nullable: false),
|
||||
avangate_id = table.Column<string>(type: "varchar(128)", nullable: true, collation: "utf8_general_ci")
|
||||
.Annotation("MySql:CharSet", "utf8"),
|
||||
visible = table.Column<bool>(type: "tinyint(1)", nullable: false)
|
||||
@ -181,8 +180,8 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
|
||||
|
||||
migrationBuilder.InsertData(
|
||||
table: "tenants_quota",
|
||||
columns: new[] { "tenant", "active_users", "avangate_id", "description", "features", "max_file_size", "max_total_size", "name", "price", "price2", "visible" },
|
||||
values: new object[] { -1, 10000, "0", null, "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", 102400L, 10995116277760L, "default", 0.00m, 0.00m, false });
|
||||
columns: new[] { "tenant", "active_users", "avangate_id", "description", "features", "max_file_size", "max_total_size", "name", "price", "visible" },
|
||||
values: new object[] { -1, 10000, "0", null, "domain,audit,controlpanel,healthcheck,ldap,sso,whitelabel,branding,ssbranding,update,support,portals:10000,discencryption,privacyroom,restore", 102400L, 10995116277760L, "default", 0.00m, false });
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "last_modified",
|
||||
|
@ -655,10 +655,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
|
||||
.HasColumnType("decimal(10,2)")
|
||||
.HasColumnName("price");
|
||||
|
||||
b.Property<decimal>("Price2")
|
||||
.HasColumnType("decimal(10,2)")
|
||||
.HasColumnName("price2");
|
||||
|
||||
b.Property<bool>("Visible")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasColumnName("visible");
|
||||
@ -679,7 +675,6 @@ namespace ASC.Core.Common.Migrations.MySql.CoreDbContextMySql
|
||||
MaxTotalSize = 10995116277760L,
|
||||
Name = "default",
|
||||
Price = 0.00m,
|
||||
Price2 = 0.00m,
|
||||
Visible = false
|
||||
});
|
||||
});
|
||||
|
@ -652,12 +652,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
|
||||
.HasColumnType("numeric(10,2)")
|
||||
.HasDefaultValueSql("0.00");
|
||||
|
||||
b.Property<decimal>("Price2")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnName("price2")
|
||||
.HasColumnType("numeric(10,2)")
|
||||
.HasDefaultValueSql("0.00");
|
||||
|
||||
b.Property<bool>("Visible")
|
||||
.HasColumnName("visible")
|
||||
.HasColumnType("boolean");
|
||||
|
@ -56,7 +56,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
|
||||
active_users = table.Column<int>(nullable: false),
|
||||
features = table.Column<string>(nullable: true),
|
||||
price = table.Column<decimal>(type: "numeric(10,2)", nullable: false, defaultValueSql: "0.00"),
|
||||
price2 = table.Column<decimal>(type: "numeric(10,2)", nullable: false, defaultValueSql: "0.00"),
|
||||
avangate_id = table.Column<string>(maxLength: 128, nullable: true, defaultValueSql: "NULL"),
|
||||
visible = table.Column<bool>(nullable: false)
|
||||
},
|
||||
|
@ -650,12 +650,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
|
||||
.HasColumnType("numeric(10,2)")
|
||||
.HasDefaultValueSql("0.00");
|
||||
|
||||
b.Property<decimal>("Price2")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnName("price2")
|
||||
.HasColumnType("numeric(10,2)")
|
||||
.HasDefaultValueSql("0.00");
|
||||
|
||||
b.Property<bool>("Visible")
|
||||
.HasColumnName("visible")
|
||||
.HasColumnType("boolean");
|
||||
@ -676,7 +670,6 @@ namespace ASC.Core.Common.Migrations.Npgsql.CoreDbContextNpgsql
|
||||
MaxTotalSize = 10995116277760L,
|
||||
Name = "default",
|
||||
Price = 0.00m,
|
||||
Price2 = 0.00m,
|
||||
Visible = false
|
||||
});
|
||||
});
|
||||
|
@ -55,8 +55,6 @@ namespace ASC.Core.Tenants
|
||||
|
||||
public decimal Price { get; set; }
|
||||
|
||||
public decimal Price2 { get; set; }
|
||||
|
||||
public string AvangateId { get; set; }
|
||||
|
||||
public bool Visible { get; set; }
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
|
@ -5,13 +5,11 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="nunit.framework">
|
||||
<HintPath>..\..\..\..\..\Program Files (x86)\Microsoft\Xamarin\NuGet\nunit\3.12.0\lib\netstandard2.0\nunit.framework.dll</HintPath>
|
||||
</Reference>
|
||||
<ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -4,15 +4,13 @@
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
|
||||
<ProjectReference Include="..\..\ASC.Notify.Textile\ASC.Notify.Textile.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="nunit.framework">
|
||||
<HintPath>..\..\..\..\..\Program Files (x86)\Microsoft\Xamarin\NuGet\nunit\3.12.0\lib\netstandard2.0\nunit.framework.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -21,7 +21,7 @@
|
||||
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
|
||||
<PackageReference Include="WebSocketSharpNetStandart" Version="1.0.3-rc11" />
|
||||
<PackageReference Include="WebSocketSharpNetStandart" Version="1.0.3-rc12" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -31,6 +31,7 @@ using ASC.Common;
|
||||
using ASC.Core;
|
||||
using ASC.Core.Common.Settings;
|
||||
using ASC.Files.Core;
|
||||
using ASC.Web.Studio.Core;
|
||||
|
||||
namespace ASC.Web.Files.Classes
|
||||
{
|
||||
@ -115,11 +116,13 @@ namespace ASC.Web.Files.Classes
|
||||
{
|
||||
private SettingsManager SettingsManager { get; }
|
||||
private CoreBaseSettings CoreBaseSettings { get; }
|
||||
private SetupInfo SetupInfo { get; }
|
||||
|
||||
public FilesSettingsHelper(SettingsManager settingsManager, CoreBaseSettings coreBaseSettings)
|
||||
public FilesSettingsHelper(SettingsManager settingsManager, CoreBaseSettings coreBaseSettings, SetupInfo setupInfo)
|
||||
{
|
||||
SettingsManager = settingsManager;
|
||||
CoreBaseSettings = coreBaseSettings;
|
||||
SetupInfo = setupInfo;
|
||||
}
|
||||
|
||||
public bool ConfirmDelete
|
||||
@ -285,6 +288,11 @@ namespace ASC.Web.Files.Classes
|
||||
get => LoadForCurrentUser().DownloadTarGzSetting;
|
||||
}
|
||||
|
||||
public long ChunkUploadSize
|
||||
{
|
||||
get => SetupInfo.ChunkUploadSize;
|
||||
}
|
||||
|
||||
private FilesSettings LoadForCurrentUser()
|
||||
{
|
||||
return SettingsManager.LoadForCurrentUser<FilesSettings>();
|
||||
|
@ -35,6 +35,11 @@ namespace ASC.Files
|
||||
|
||||
builder.ConfigureKestrel((hostingContext, serverOptions) =>
|
||||
{
|
||||
serverOptions.Limits.MaxRequestBodySize = 100 * 1024 * 1024;
|
||||
serverOptions.Limits.MaxRequestBufferSize = 100 * 1024 * 1024;
|
||||
serverOptions.Limits.MinRequestBodyDataRate = null;
|
||||
serverOptions.Limits.MinResponseDataRate = null;
|
||||
|
||||
var kestrelConfig = hostingContext.Configuration.GetSection("Kestrel");
|
||||
|
||||
if (!kestrelConfig.Exists()) return;
|
||||
|
@ -24,7 +24,7 @@
|
||||
<PackageProjectUrl>http://sta.github.io/websocket-sharp</PackageProjectUrl>
|
||||
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
<Version>1.0.3-rc11</Version>
|
||||
<Version>1.0.3-rc12</Version>
|
||||
<AssemblyVersion>1.0.2.59611</AssemblyVersion>
|
||||
<FileVersion>1.0.2.59611</FileVersion>
|
||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||
|
@ -153,7 +153,7 @@ namespace ASC.Web.Studio.Core
|
||||
AvailableFileSize = GetAppSettings("web.available-file-size", 100L * 1024L * 1024L);
|
||||
|
||||
TeamlabSiteRedirect = GetAppSettings("web.teamlab-site", string.Empty);
|
||||
ChunkUploadSize = GetAppSettings("files.uploader.chunk-size", 5 * 1024 * 1024);
|
||||
ChunkUploadSize = GetAppSettings("files:uploader:chunk-size", 10 * 1024 * 1024);
|
||||
ThirdPartyAuthEnabled = string.Equals(GetAppSettings("web.thirdparty-auth", "true"), "true");
|
||||
ThirdPartyBannerEnabled = string.Equals(GetAppSettings("web.thirdparty-banner", "false"), "true");
|
||||
NoTenantRedirectURL = GetAppSettings("web.notenant-url", "");
|
||||
|
Loading…
Reference in New Issue
Block a user