Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Rename DbConnectionString to ConnectionString for clarity
supportebfab27b9ce8
diff --git a/src/Core/Grand.Infrastructure/Configuration/DatabaseConfig.cs b/src/Core/Grand.Infrastructure/Configuration/DatabaseConfig.csindex 26987a950..af9f95d26 100644--- a/src/Core/Grand.Infrastructure/Configuration/DatabaseConfig.cs+++ b/src/Core/Grand.Infrastructure/Configuration/DatabaseConfig.cs@@ -20,7 +20,7 @@/// <summary>/// Gets or sets a value indicating whether use connection string for database (only for installed databases)/// </summary>- public string DbConnectionString { get; set; }+ public string ConnectionString { get; set; }public int DbProvider { get; set; }}diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.csindex 352edc9c2..14f6e26eb 100644--- a/src/Core/Grand.Infrastructure/StartupBase.cs+++ b/src/Core/Grand.Infrastructure/StartupBase.cs@@ -35,10 +35,10 @@ namespace Grand.Infrastructureprivate static void InitDatabase(IServiceCollection services, IConfiguration configuration){var dbConfig = services.StartupConfig<DatabaseConfig>(configuration.GetSection("Database"));- if (!string.IsNullOrEmpty(dbConfig.DbConnectionString))+ if (!string.IsNullOrEmpty(dbConfig.ConnectionString)){DataSettingsManager.LoadDataSettings(new DataSettings {- ConnectionString = dbConfig.DbConnectionString,+ ConnectionString = dbConfig.ConnectionString,DbProvider = (DbProvider)dbConfig.DbProvider});}diff --git a/src/Web/Grand.Web.Admin/App_Data/appsettings.json b/src/Web/Grand.Web.Admin/App_Data/appsettings.jsonindex 7fcaec52b..39bb7d0e8 100644--- a/src/Web/Grand.Web.Admin/App_Data/appsettings.json+++ b/src/Web/Grand.Web.Admin/App_Data/appsettings.json@@ -34,7 +34,7 @@//Init connection string - it's required only for the installation process!"LiteDbConnectionString": "Filename=App_Data/database.db",//only for advanced users, allow to set ConnectionString for MongoDb- "DbConnectionString": "",+ "ConnectionString": "","DbProvider": 0},@@ -205,14 +205,6 @@"SystemModel": true},"UseSwagger": false,- //Settings only for advanced users- "Advanced": {- "DbConnectionString": "",- "DbProvider": 0,- //separator comma- "InstalledPlugins": ""- },-"Logging": {"LogLevel": {"Default": "Information",diff --git a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json b/src/Web/Grand.Web.Vendor/App_Data/appsettings.jsonindex 7fcaec52b..39bb7d0e8 100644--- a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json+++ b/src/Web/Grand.Web.Vendor/App_Data/appsettings.json@@ -34,7 +34,7 @@//Init connection string - it's required only for the installation process!"LiteDbConnectionString": "Filename=App_Data/database.db",//only for advanced users, allow to set ConnectionString for MongoDb- "DbConnectionString": "",+ "ConnectionString": "","DbProvider": 0},@@ -205,14 +205,6 @@"SystemModel": true},"UseSwagger": false,- //Settings only for advanced users- "Advanced": {- "DbConnectionString": "",- "DbProvider": 0,- //separator comma- "InstalledPlugins": ""- },-"Logging": {"LogLevel": {"Default": "Information",diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.jsonindex 2796766fe..074083f88 100644--- a/src/Web/Grand.Web/App_Data/appsettings.json+++ b/src/Web/Grand.Web/App_Data/appsettings.json@@ -41,7 +41,7 @@//Init connection string - it's required only for the installation process!"LiteDbConnectionString": "Filename=App_Data/database.db",//only for advanced users, allow to set ConnectionString for MongoDb- "DbConnectionString": "",+ "ConnectionString": "","DbProvider": 0},