From 49f8820f40ca03f7d034f92baf00ab55d2cda2b1 Mon Sep 17 00:00:00 2001 From: uniquesyp Date: Sat, 13 Jun 2020 20:31:15 +0800 Subject: [PATCH 1/2] Fix default store name declaration --- .../EShop/Stores/Settings/StoresSettingDefinitionProvider.cs | 2 +- .../EasyAbp/EShop/Stores/Settings/StoresSettings.cs | 2 +- .../EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs index 3e31781d..df2425d9 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs @@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Stores.Settings * Use names from StoresSettings class. */ - context.Add(new SettingDefinition(StoresSettings.DefaultProductTypeDisplayName, "My store")); + context.Add(new SettingDefinition(StoresSettings.DefaultStoreDisplayName, "My store")); } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs index 3721f6d8..d7e63988 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs @@ -8,6 +8,6 @@ * public const string MySettingName = GroupName + ".MySettingName"; */ - public const string DefaultProductTypeDisplayName = GroupName + ".DefaultProductTypeDisplayName"; + public const string DefaultStoreDisplayName = GroupName + ".DefaultStoreDisplayName"; } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs index 038dc865..9699d960 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs @@ -35,7 +35,7 @@ namespace EasyAbp.EShop.Stores.Stores { await _storeRepository.InsertAsync( new Store(_guidGenerator.Create(), _currentTenant.Id, - await _settingProvider.GetOrNullAsync(StoresSettings.DefaultProductTypeDisplayName)), true); + await _settingProvider.GetOrNullAsync(StoresSettings.DefaultStoreDisplayName)), true); } } } From 46f4018ceeefc42a7ae1dcb568ef7b0c878fe3b4 Mon Sep 17 00:00:00 2001 From: gdlcf88 <47396430@qq.com> Date: Sat, 13 Jun 2020 20:47:19 +0800 Subject: [PATCH 2/2] Rename "DefaultStoreDisplayName" to "DefaultStoreName" --- .../EShop/Stores/Settings/StoresSettingDefinitionProvider.cs | 2 +- .../EasyAbp/EShop/Stores/Settings/StoresSettings.cs | 2 +- .../EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs index df2425d9..6f367577 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettingDefinitionProvider.cs @@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Stores.Settings * Use names from StoresSettings class. */ - context.Add(new SettingDefinition(StoresSettings.DefaultStoreDisplayName, "My store")); + context.Add(new SettingDefinition(StoresSettings.DefaultStoreName, "My store")); } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs index d7e63988..e4f3b5ec 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Settings/StoresSettings.cs @@ -8,6 +8,6 @@ * public const string MySettingName = GroupName + ".MySettingName"; */ - public const string DefaultStoreDisplayName = GroupName + ".DefaultStoreDisplayName"; + public const string DefaultStoreName = GroupName + ".DefaultStoreName"; } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs index 9699d960..0618cfab 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/StoreDataSeeder.cs @@ -35,7 +35,7 @@ namespace EasyAbp.EShop.Stores.Stores { await _storeRepository.InsertAsync( new Store(_guidGenerator.Create(), _currentTenant.Id, - await _settingProvider.GetOrNullAsync(StoresSettings.DefaultStoreDisplayName)), true); + await _settingProvider.GetOrNullAsync(StoresSettings.DefaultStoreName)), true); } } }