Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
This commit is contained in:
commit
94c16c4869
@ -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
|
||||
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user