diff --git a/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs b/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs index 4a3c6cf9f1..525944df38 100644 --- a/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs +++ b/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs @@ -27,10 +27,10 @@ using ASC.Core.Configuration; using ASC.Core.Tenants; using System; -using System.Configuration; using System.Text; using Newtonsoft.Json; - +using ASC.Common.Utils; + namespace ASC.Core { public class CoreConfiguration diff --git a/web/ASC.Web.Api/Properties/launchSettings.json b/web/ASC.Web.Api/Properties/launchSettings.json index 86538d034d..8b84fe3dab 100644 --- a/web/ASC.Web.Api/Properties/launchSettings.json +++ b/web/ASC.Web.Api/Properties/launchSettings.json @@ -12,19 +12,13 @@ "IIS Express": { "commandName": "IISExpress", "launchBrowser": false, - "launchUrl": "api/modules", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } + "launchUrl": "api/modules" }, "ASC.Web.Api": { "commandName": "Project", "launchBrowser": false, "launchUrl": "api/modules", - "applicationUrl": "http://localhost:8080", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } + "applicationUrl": "http://localhost:8080" } } } \ No newline at end of file diff --git a/web/ASC.Web.Api/appsettings.Development.json b/web/ASC.Web.Api/appsettings.Development.json index e203e9407e..8b8ab04572 100644 --- a/web/ASC.Web.Api/appsettings.Development.json +++ b/web/ASC.Web.Api/appsettings.Development.json @@ -1,9 +1,20 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "ConnectionStrings": { + "default": { + "name": "default", + "connectionString": "Server=172.18.0.2;Port=3306;Database=onlyoffice;User ID=onlyoffice_user;Password=onlyoffice_pass;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none", + "providerName": "MySql.Data.MySqlClient" + } + }, + "core": { + "base-domain": "localhost", + "machinekey": "1VVAepxpW8f7" + } +}