diff --git a/.github/workflows/dotnet-publish_nuget.yml b/.github/workflows/dotnet-publish_nuget.yml
new file mode 100644
index 00000000..f3d8ea85
--- /dev/null
+++ b/.github/workflows/dotnet-publish_nuget.yml
@@ -0,0 +1,25 @@
+name: Dotnet-Push
+on:
+ push:
+ tags:
+ - "*"
+
+jobs:
+ Push-DockerHub:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install Dotnet 6.x
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: "6.0"
+ include-prerelease: True
+ - name: Setting Version
+ id: vars
+ run: echo ::set-output name=tag::${GITHUB_REF:10}
+ - name: Build
+ run: dotnet build aspnet-core/Lion.AbpPro.sln
+ - name: Push Nuget
+ run:
+ dotnet pack aspnet-core/Lion.AbpPro.sln --include-source --include-symbols /p:Configuration=Release -p:PackageVersion=${GITHUB_REF:10} --output nupkgs &&
+ dotnet nuget push /**/*.symbols.nupkg -k ${{secrets.NUGET_KEY}}
diff --git a/.gitignore b/.gitignore
index e0201659..7fac0db2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -277,3 +277,4 @@ vben271/yarn.lock
/aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Production.json
/aspnet-core/services/host/Lion.AbpPro.IdentityServer/appsettings.Production.json
/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json
+aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Logs/logs.txt
diff --git a/aspnet-core/common.props b/aspnet-core/common.props
index 64e9aedd..5300fbbe 100644
--- a/aspnet-core/common.props
+++ b/aspnet-core/common.props
@@ -5,5 +5,7 @@
$(NoWarn);CS1591;CS0436
app
true
+ https://github.com/WangJunZzz/abp-vnext-pro
+ https://blog-resouce.oss-cn-shenzhen.aliyuncs.com/images/abp/06.jpg
\ No newline at end of file
diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs
index 5d2ef0fa..ed5b48b7 100644
--- a/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs
+++ b/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs
@@ -35,10 +35,10 @@ namespace Lion.AbpPro.Settings
{
var allSettings = _settingDefinitionManager.GetAll().ToList();
var settings = allSettings
- .Where(e => e.Properties.ContainsKey(AbpProSettings.Group.Defalut)).ToList();
+ .Where(e => e.Properties.ContainsKey(AbpProSettings.Group.Default)).ToList();
var settingOutput = settings
- .GroupBy(e => e.Properties[AbpProSettings.Group.Defalut].ToString()).Select(s =>
+ .GroupBy(e => e.Properties[AbpProSettings.Group.Default].ToString()).Select(s =>
new SettingOutput
{
Group = s.Key,
@@ -53,12 +53,12 @@ namespace Lion.AbpPro.Settings
var value = await SettingProvider.GetOrNullAsync(itemDefinition.Name);
var type = itemDefinition.Properties
- .FirstOrDefault(f => f.Key == AbpProSettings.ControlType.Defalut).Value
+ .FirstOrDefault(f => f.Key == AbpProSettings.ControlType.Default).Value
.ToString();
item.SettingItemOutput.Add(new SettingItemOutput(
itemDefinition.Name,
- L["DisplayName:" + itemDefinition.Name],
+ itemDefinition.DisplayName.Localize(_factory),
value,
type,
itemDefinition.Description.Localize(_factory)));
diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettingDefinitionProvider.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettingDefinitionProvider.cs
index d2ed6a7a..ec5c7ad4 100644
--- a/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettingDefinitionProvider.cs
+++ b/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettingDefinitionProvider.cs
@@ -19,45 +19,45 @@ namespace Lion.AbpPro.Settings
private static void OverrideDefalutSettings(ISettingDefinitionContext context)
{
context.GetOrNull("Abp.Localization.DefaultLanguage")
- .WithProperty(AbpProSettings.Group.Defalut,
+ .WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.SystemManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.TypeText);
context.GetOrNull("Abp.Identity.Password.RequiredLength")
- .WithProperty(AbpProSettings.Group.Defalut,
+ .WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.SystemManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.Number);
context.GetOrNull("Abp.Identity.Password.RequiredUniqueChars")
- .WithProperty(AbpProSettings.Group.Defalut,
+ .WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.SystemManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.Number);
context.GetOrNull("Abp.Identity.Password.RequireNonAlphanumeric")
- .WithProperty(AbpProSettings.Group.Defalut,
+ .WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.SystemManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.TypeCheckBox);
context.GetOrNull("Abp.Identity.Password.RequireLowercase")
- .WithProperty(AbpProSettings.Group.Defalut,
+ .WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.SystemManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.TypeCheckBox);
context.GetOrNull("Abp.Identity.Password.RequireUppercase")
- .WithProperty(AbpProSettings.Group.Defalut,
+ .WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.SystemManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.TypeCheckBox);
context.GetOrNull("Abp.Identity.Password.RequireDigit")
- .WithProperty(AbpProSettings.Group.Defalut,
+ .WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.SystemManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.TypeCheckBox);
context.Add(new SettingDefinition(
@@ -65,9 +65,9 @@ namespace Lion.AbpPro.Settings
"https://github.com/WangJunZzz/abp-vnext-pro",
L("DisplayName:" + AbpProSettings.Other.Github),
L("Description:" + AbpProSettings.Other.Github)
- ).WithProperty(AbpProSettings.Group.Defalut,
+ ).WithProperty(AbpProSettings.Group.Default,
AbpProSettings.Group.OtherManagement)
- .WithProperty(AbpProSettings.ControlType.Defalut,
+ .WithProperty(AbpProSettings.ControlType.Default,
AbpProSettings.ControlType.TypeText));
}
diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettings.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettings.cs
index 3d98890e..25e070c7 100644
--- a/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettings.cs
+++ b/aspnet-core/services/src/Lion.AbpPro.Domain/Settings/AbpProSettings.cs
@@ -9,7 +9,7 @@ namespace Lion.AbpPro.Settings
///
public static class ControlType
{
- public const string Defalut = "Type";
+ public const string Default = "Type";
public const string TypeText = "Text";
public const string TypeCheckBox = "CheckBox";
public const string Number = "Number";
@@ -20,9 +20,9 @@ namespace Lion.AbpPro.Settings
///
public static class Group
{
- public const string Defalut = "Setting.Group";
- public const string SystemManagement = Defalut + ".System";
- public const string OtherManagement = Defalut + ".Other";
+ public const string Default = "Setting.Group";
+ public const string SystemManagement = Default + ".System";
+ public const string OtherManagement = Default + ".Other";
}
///
@@ -30,8 +30,8 @@ namespace Lion.AbpPro.Settings
///
public static class Other
{
- private const string Defalut = "Setting.Group.Other";
- public const string Github = Defalut + ".Github";
+ private const string Default = "Setting.Group.Other";
+ public const string Github = Default + ".Github";
}
}
}
\ No newline at end of file